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

STYLE: Minor code style changes

Browse Source
This commit is contained in:
andy
2011-05-27 13:19:29 +01:00
parent 11dab784cd
commit c6ef6a0230
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lagrangian/spray/submodels/StochasticCollision/TrajectoryCollision/TrajectoryCollision.C
View File

@ -248,7 +248,6 @@ bool Foam::TrajectoryCollision<CloudType>::collideSorted
bool coalescence = false; bool coalescence = false;
vector vRel = U1 - U2; vector vRel = U1 - U2;
scalar magVRel = mag(vRel);
scalar mdMin = m2/N2; scalar mdMin = m2/N2;
@ -274,7 +273,7 @@ bool Foam::TrajectoryCollision<CloudType>::collideSorted
scalar rho = mTot/Vtot; scalar rho = mTot/Vtot;
scalar dMean = sqrt(d1*d2); scalar dMean = sqrt(d1*d2);
scalar WeColl = max(1.0e-12, 0.5*rho*magVRel*magVRel*dMean/sigma); scalar WeColl = max(1.0e-12, 0.5*rho*magSqr(vRel)*dMean/sigma);
scalar coalesceProb = min(1.0, 2.4*f/WeColl); scalar coalesceProb = min(1.0, 2.4*f/WeColl);
@ -308,7 +307,8 @@ bool Foam::TrajectoryCollision<CloudType>::collideSorted
{ {
scalar gf = sqrt(prob) - sqrt(coalesceProb); scalar gf = sqrt(prob) - sqrt(coalesceProb);
scalar denom = 1.0 - sqrt(coalesceProb); scalar denom = 1.0 - sqrt(coalesceProb);
if (denom < 1.0e-5) { if (denom < 1.0e-5)
{
denom = 1.0; denom = 1.0;
} }
gf /= denom; gf /= denom;