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

COMP: specie - ensure if block is evaluated

Browse Source
This commit is contained in:
Andrew Heather
2017-05-18 22:12:48 +01:00
parent 0a4733acab
commit 62ff00f860
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/thermophysicalModels/specie/specie/specieI.H
View File

@ -159,14 +159,17 @@ inline specie operator==(const specie& st1, const specie& st2)
diffY = SMALL; diffY = SMALL;
} }
const scalar diffRW = const scalar diffRW = st2.Y_/st2.molWeight_ - st1.Y_/st1.molWeight_;
st2.Y_/st2.molWeight_ - st1.Y_/st1.molWeight_;
scalar molWeight = GREAT; // if (mag(diffRW) > SMALL)
if (mag(diffRW) > SMALL) // {
{ // molWeight = diffY/diffRW;
molWeight = diffY/diffRW; // }
}
// Using intermediate volatile bool to prevent compiler optimising out the
// if block (above) - CLANG 3.7.1
volatile const bool valid = (mag(diffRW) > SMALL);
const scalar molWeight = valid ? diffY/diffRW : GREAT;
return specie(diffY, molWeight); return specie(diffY, molWeight);
} }