STYLE: Minor code style changes

This commit is contained in:
andy
2011-05-27 13:19:29 +01:00
parent 11dab784cd
commit c6ef6a0230

View File

@ -248,7 +248,6 @@ bool Foam::TrajectoryCollision<CloudType>::collideSorted
bool coalescence = false;
vector vRel = U1 - U2;
scalar magVRel = mag(vRel);
scalar mdMin = m2/N2;
@ -274,7 +273,7 @@ bool Foam::TrajectoryCollision<CloudType>::collideSorted
scalar rho = mTot/Vtot;
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);
@ -308,7 +307,8 @@ bool Foam::TrajectoryCollision<CloudType>::collideSorted
{
scalar gf = sqrt(prob) - sqrt(coalesceProb);
scalar denom = 1.0 - sqrt(coalesceProb);
if (denom < 1.0e-5) {
if (denom < 1.0e-5)
{
denom = 1.0;
}
gf /= denom;