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

Comparing trunk/src/applications/hydrodynamics/ApproximationModel.cpp (file contents):
Revision 981 by gezelter, Mon Jun 5 18:24:45 2006 UTC vs.
Revision 1177 by xsun, Tue Aug 14 17:40:33 2007 UTC

# Line 72 | Line 72 | namespace oopse {
72    bool ApproximationModel::calcHydroProps(Shape* shape, RealType viscosity, RealType temperature) {
73      
74      bool ret = true;
75 <    HydroProp* cr;
76 <    HydroProp* cd;
75 >    HydroProp* cr = new HydroProp();
76 >    HydroProp* cd = new HydroProp();
77      calcHydroPropsAtCR(beads_, viscosity, temperature, cr);
78 <    //calcHydroPropsAtCD(beads_, viscosity, temperature, cd);
78 >    calcHydroPropsAtCD(beads_, viscosity, temperature, cd);
79      setCR(cr);
80      setCD(cd);
81 –    
81      return true;    
82    }
83    
# Line 255 | Line 254 | namespace oopse {
254      return true;
255   }
256    
257 <  bool ApproximationModel::calcHydroPropsAtCD(std::vector<BeadParam>& beads, RealType viscosity, RealType temperature, HydroProp* cr) {
257 >  bool ApproximationModel::calcHydroPropsAtCD(std::vector<BeadParam>& beads, RealType viscosity, RealType temperature, HydroProp* cd) {
258      
259      int nbeads = beads.size();
260      DynamicRectMatrix<RealType> B(3*nbeads, 3*nbeads);
# Line 407 | Line 406 | namespace oopse {
406  
407      Mat6x6d Xi, D;
408  
409 <    cr->setCOR(rod);
409 >    cd->setCOR(rod);
410  
411 <    cr->setXi(Xid);
411 >    cd->setXi(Xid);
412  
413      D.setSubMatrix(0, 0, Ddtt);
414      D.setSubMatrix(0, 3, Ddtr);
415      D.setSubMatrix(3, 0, Ddtr);
416      D.setSubMatrix(3, 3, Ddrr);
417  
418 <    cr->setD(D);
418 >    cd->setD(D);
419  
420      std::cout << "viscosity = " << viscosity << std::endl;
421      std::cout << "temperature = " << temperature << std::endl;

Diff Legend

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