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 1668 by gezelter, Fri Jan 6 19:03:05 2012 UTC vs.
Revision 1826 by gezelter, Wed Jan 9 19:41:48 2013 UTC

# Line 72 | Line 72 | namespace OpenMD {
72    
73    bool ApproximationModel::calcHydroProps(Shape* shape, RealType viscosity, RealType temperature) {
74      
75 –    bool ret = true;
75      HydroProp* cr = new HydroProp();
76      HydroProp* cd = new HydroProp();
77      calcHydroPropsAtCR(beads_, viscosity, temperature, cr);
# Line 84 | Line 83 | namespace OpenMD {
83    
84    bool ApproximationModel::calcHydroPropsAtCR(std::vector<BeadParam>& beads, RealType viscosity, RealType temperature, HydroProp* cr) {
85      
86 <    int nbeads = beads.size();
86 >    unsigned int nbeads = beads.size();
87      DynamicRectMatrix<RealType> B(3*nbeads, 3*nbeads);
88      DynamicRectMatrix<RealType> C(3*nbeads, 3*nbeads);
89      Mat3x3d I;
# Line 121 | Line 120 | namespace OpenMD {
120      
121      //prepare U Matrix relative to arbitrary origin O(0.0, 0.0, 0.0)
122      std::vector<Mat3x3d> U;
123 <    for (int i = 0; i < nbeads; ++i) {
123 >    for (unsigned int i = 0; i < nbeads; ++i) {
124        Mat3x3d currU;
125        currU.setupSkewMat(beads[i].pos);
126        U.push_back(currU);
# Line 257 | Line 256 | namespace OpenMD {
256    
257    bool ApproximationModel::calcHydroPropsAtCD(std::vector<BeadParam>& beads, RealType viscosity, RealType temperature, HydroProp* cd) {
258      
259 <    int nbeads = beads.size();
259 >    unsigned int nbeads = beads.size();
260      DynamicRectMatrix<RealType> B(3*nbeads, 3*nbeads);
261      DynamicRectMatrix<RealType> C(3*nbeads, 3*nbeads);
262      Mat3x3d I;
# Line 294 | Line 293 | namespace OpenMD {
293      
294      //prepare U Matrix relative to arbitrary origin O(0.0, 0.0, 0.0)
295      std::vector<Mat3x3d> U;
296 <    for (int i = 0; i < nbeads; ++i) {
296 >    for (unsigned int i = 0; i < nbeads; ++i) {
297        Mat3x3d currU;
298        currU.setupSkewMat(beads[i].pos);
299        U.push_back(currU);

Diff Legend

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