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

Comparing trunk/src/integrators/LDForceManager.cpp (file contents):
Revision 1609 by gezelter, Fri Jul 9 19:29:05 2010 UTC vs.
Revision 1610 by gezelter, Fri Aug 12 14:37:25 2011 UTC

# Line 164 | Line 164 | namespace OpenMD {
164                  
165                  if (gayBerneData != NULL) {  
166                    GayBerneParam gayBerneParam = gayBerneData->getData();
167 <                  currShape = new Ellipsoid(V3Zero,
167 >                  currShape = new Ellipsoid(V3Zero,
168                                              gayBerneParam.GB_l / 2.0,
169                                              gayBerneParam.GB_d / 2.0,
170                                              Mat3x3d::identity());
# Line 226 | Line 226 | namespace OpenMD {
226              simError();
227            }
228  
229 –
229            HydroProp* currHydroProp = currShape->getHydroProp(simParams->getViscosity(),simParams->getTargetTemp());
230 +
231            std::map<std::string, HydroProp*>::iterator iter = hydroPropMap.find(integrableObject->getType());
232            if (iter != hydroPropMap.end())
233              hydroProps_.push_back(iter->second);
# Line 323 | Line 323 | namespace OpenMD {
323              genRandomForceAndTorque(randomForceBody, randomTorqueBody, index, variance_);
324              Vector3d randomForceLab = Atrans * randomForceBody;
325              Vector3d randomTorqueLab = Atrans * randomTorqueBody;
326 +
327              integrableObject->addFrc(randomForceLab);            
328              integrableObject->addTrq(randomTorqueLab + cross(rcrLab, randomForceLab ));            
329  

Diff Legend

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