zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into cvm

Browse Source
This commit is contained in:
graham
2009-11-11 13:26:39 +00:00
parent c2b4f49136 3ec8579187
commit 8f299ef96d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.C
View File

@ -71,9 +71,10 @@ scalar pitchForkRing::energy(const vector r) const
{
scalar p = sqrt(r.x()*r.x() + r.y()*r.y());
scalar pMinusRSqr = (p - rOrbit_)*(p - rOrbit_);
scalar pMinusRSqr = sqr(p - rOrbit_);
return -0.5 * mu_ * pMinusRSqr
return
-0.5 * mu_ * pMinusRSqr
+ 0.25 * pMinusRSqr * pMinusRSqr
+ 0.5 * alpha_ * r.z() * r.z();
}
@ -87,9 +88,9 @@ vector pitchForkRing::force(const vector r) const
return vector
(
(mu_ - pMinusR * pMinusR) * pMinusR * r.x()/p,
(mu_ - pMinusR * pMinusR) * pMinusR * r.y()/p,
-alpha_ * r.z()
(mu_ - sqr(pMinusR)) * pMinusR * r.x()/(p + VSMALL),
(mu_ - sqr(pMinusR)) * pMinusR * r.y()/(p + VSMALL),
- alpha_ * r.z()
);
}