ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/integrators/SMIPDForceManager.cpp
(Generate patch)

Comparing trunk/OOPSE-4/src/integrators/SMIPDForceManager.cpp (file contents):
Revision 3473 by chuckv, Fri Nov 14 15:44:34 2008 UTC vs.
Revision 3475 by chuckv, Fri Nov 14 23:16:13 2008 UTC

# Line 341 | Line 341 | namespace oopse {
341        Vector3d facetVel = thisTriangle.getFacetVelocity();
342        RealType hydroLength = thisTriangle.getIncircleRadius()*2.0/3.14;
343  
344 <      RealType f_normal = simParams->getViscosity()*hydroLength*1.439326479e4*OOPSEConstant::energyConvert;
345 <      RealType extPressure = -(targetPressure_ * thisArea);
346 <      RealType randomForce = randNums[thisNumber] * f_normal * OOPSEConstant::kb*simParams->getTargetTemp()/simParams->getDt();
344 >      RealType f_normal = simParams->getViscosity()*hydroLength*1.439326479e4;
345 >      RealType extPressure = -(targetPressure_ * thisArea)/OOPSEConstant::energyConvert;
346 >      RealType randomForce = randNums[thisNumber] * sqrt(2.0 * f_normal * OOPSEConstant::kb*targetTemp_/simParams->getDt());
347        RealType dragForce = -f_normal * dot(facetVel, unitNormal);      
348        Vector3d langevinForce = (extPressure + randomForce + dragForce) * unitNormal;
349        

Diff Legend

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