zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

populationBalanceModel/coalescenceModels/PrinceBlanch: Updated to compile with clang

Browse Source
This commit is contained in:
Henry Weller
2018-05-24 16:45:53 +01:00
parent 63a185450b
commit 55f086bc86
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C
View File

@ -47,6 +47,7 @@ namespace coalescenceModels
} }
} }
using Foam::constant::mathematical::pi;
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -69,8 +70,7 @@ PrinceBlanch
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void void Foam::diameterModels::coalescenceModels::PrinceBlanch::
Foam::diameterModels::coalescenceModels::PrinceBlanch::
addToCoalescenceRate addToCoalescenceRate
( (
volScalarField& coalescenceRate, volScalarField& coalescenceRate,
@ -81,13 +81,13 @@ addToCoalescenceRate
const phaseModel& continuousPhase = popBal_.continuousPhase(); const phaseModel& continuousPhase = popBal_.continuousPhase();
const sizeGroup& fi = *popBal_.sizeGroups()[i]; const sizeGroup& fi = *popBal_.sizeGroups()[i];
const sizeGroup& fj = *popBal_.sizeGroups()[j]; const sizeGroup& fj = *popBal_.sizeGroups()[j];
scalar pi = constant::mathematical::pi;
const uniformDimensionedVectorField& g = const uniformDimensionedVectorField& g =
popBal_.mesh().lookupObject<uniformDimensionedVectorField>("g"); popBal_.mesh().lookupObject<uniformDimensionedVectorField>("g");
dimensionedScalar rij = 1.0/(1.0/fi.d() + 1.0/fj.d()); dimensionedScalar rij(1.0/(1.0/fi.d() + 1.0/fj.d()));
volScalarField collisionEfficiency = const volScalarField collisionEfficiency
(
exp exp
( (
- sqrt - sqrt
@ -97,7 +97,8 @@ addToCoalescenceRate
) )
*log(h0_/hf_) *log(h0_/hf_)
*cbrt(popBal_.continuousTurbulence().epsilon())/pow(rij, 2.0/3.0) *cbrt(popBal_.continuousTurbulence().epsilon())/pow(rij, 2.0/3.0)
); )
);
if (turbulentCollisions_) if (turbulentCollisions_)
{ {
@ -112,7 +113,7 @@ addToCoalescenceRate
if (buoyantCollisions_) if (buoyantCollisions_)
{ {
dimensionedScalar Sij = pi/4.0*sqr(fi.d() + fj.d()); dimensionedScalar Sij(pi/4.0*sqr(fi.d() + fj.d()));
coalescenceRate += coalescenceRate +=
( (