ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/applications/hydrodynamics/ApproximationModel.cpp
(Generate patch)

Comparing branches/development/src/applications/hydrodynamics/ApproximationModel.cpp (file contents):
Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC vs.
Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC

# Line 84 | Line 84 | namespace OpenMD {
84    
85    bool ApproximationModel::calcHydroPropsAtCR(std::vector<BeadParam>& beads, RealType viscosity, RealType temperature, HydroProp* cr) {
86      
87 <    int nbeads = beads.size();
87 >    unsigned int nbeads = beads.size();
88      DynamicRectMatrix<RealType> B(3*nbeads, 3*nbeads);
89      DynamicRectMatrix<RealType> C(3*nbeads, 3*nbeads);
90      Mat3x3d I;
# Line 121 | Line 121 | namespace OpenMD {
121      
122      //prepare U Matrix relative to arbitrary origin O(0.0, 0.0, 0.0)
123      std::vector<Mat3x3d> U;
124 <    for (int i = 0; i < nbeads; ++i) {
124 >    for (unsigned int i = 0; i < nbeads; ++i) {
125        Mat3x3d currU;
126        currU.setupSkewMat(beads[i].pos);
127        U.push_back(currU);
# Line 152 | Line 152 | namespace OpenMD {
152      }
153  
154      // add the volume correction
155 <    Xiorr += (6.0 * viscosity * volume) * I;    
155 >    Xiorr += (RealType(6.0) * viscosity * volume) * I;    
156      
157      Xiott *= PhysicalConstants::viscoConvert;
158      Xiotr *= PhysicalConstants::viscoConvert;
# Line 257 | Line 257 | namespace OpenMD {
257    
258    bool ApproximationModel::calcHydroPropsAtCD(std::vector<BeadParam>& beads, RealType viscosity, RealType temperature, HydroProp* cd) {
259      
260 <    int nbeads = beads.size();
260 >    unsigned int nbeads = beads.size();
261      DynamicRectMatrix<RealType> B(3*nbeads, 3*nbeads);
262      DynamicRectMatrix<RealType> C(3*nbeads, 3*nbeads);
263      Mat3x3d I;
# Line 294 | Line 294 | namespace OpenMD {
294      
295      //prepare U Matrix relative to arbitrary origin O(0.0, 0.0, 0.0)
296      std::vector<Mat3x3d> U;
297 <    for (int i = 0; i < nbeads; ++i) {
297 >    for (unsigned int i = 0; i < nbeads; ++i) {
298        Mat3x3d currU;
299        currU.setupSkewMat(beads[i].pos);
300        U.push_back(currU);
# Line 324 | Line 324 | namespace OpenMD {
324        }
325      }
326      // add the volume correction here:
327 <    Xirr += (6.0 * viscosity * volume) * I;    
327 >    Xirr += (RealType(6.0) * viscosity * volume) * I;    
328      
329      Xitt *= PhysicalConstants::viscoConvert;
330      Xitr *= PhysicalConstants::viscoConvert;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines