diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C index 340994d493..1f783a2e49 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C @@ -59,9 +59,12 @@ Foam::diameterModels::binaryBreakupModels::LuoSvendsen::LuoSvendsen gammaUpperReg2by11_(), gammaUpperReg5by11_(), gammaUpperReg8by11_(), - C4_(dict.lookupOrDefault("C4", 0.923)), - beta_(dict.lookupOrDefault("beta", 2.05)), - minEddyRatio_(dict.lookupOrDefault("minEddyRatio", 11.4)), + C4_(dimensionedScalar::lookupOrDefault("C4", dict, dimless, 0.923)), + beta_(dimensionedScalar::lookupOrDefault("beta", dict, dimless, 2.05)), + minEddyRatio_ + ( + dimensionedScalar::lookupOrDefault("minEddyRatio", dict, dimless, 11.4) + ), kolmogorovLengthScale_ ( IOobject @@ -166,12 +169,12 @@ Foam::diameterModels::binaryBreakupModels::LuoSvendsen::addToBinaryBreakupRate const sizeGroup& fi = popBal_.sizeGroups()[i]; const sizeGroup& fj = popBal_.sizeGroups()[j]; - dimensionedScalar cf + const dimensionedScalar cf ( - pow(fi.x()/fj.x(), 2.0/3.0) + pow((1.0 - fi.x()/fj.x()), 2.0/3.0) - 1.0 + pow(fi.x()/fj.x(), 2.0/3.0) + pow((1 - fi.x()/fj.x()), 2.0/3.0) - 1 ); - volScalarField b + const volScalarField b ( 12.0*cf*popBal_.sigmaWithContinuousPhase(fi.phase()) /( @@ -180,9 +183,9 @@ Foam::diameterModels::binaryBreakupModels::LuoSvendsen::addToBinaryBreakupRate ) ); - volScalarField xiMin(minEddyRatio_*kolmogorovLengthScale_/fj.d()); + const volScalarField xiMin(minEddyRatio_*kolmogorovLengthScale_/fj.d()); - volScalarField tMin(b/pow(xiMin, 11.0/3.0)); + const volScalarField tMin(b/pow(xiMin, 11.0/3.0)); volScalarField integral(3.0/(11.0*pow(b, 8.0/11.0))); @@ -197,7 +200,7 @@ Foam::diameterModels::binaryBreakupModels::LuoSvendsen::addToBinaryBreakupRate } binaryBreakupRate += - C4_*(1.0 - popBal_.alphas())/fj.x() + C4_*(1 - popBal_.alphas())/fj.x() *cbrt ( popBal_.continuousTurbulence().epsilon() diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C index 19bf3612da..d6805da323 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,12 +59,16 @@ LaakkonenAlopaeusAittamaa breakupModel(popBal, dict), C1_ ( - "C1", - dimensionSet(0, -2.0/3.0, 0, 0, 0), - dict.lookupOrDefault("C1", 6.0) + dimensionedScalar::lookupOrDefault + ( + "C1", + dict, + dimensionSet(0, -2.0/3.0, 0, 0, 0), + 6.0 + ) ), - C2_("C2", dimless, dict.lookupOrDefault("C2", 0.04)), - C3_("C3", dimless, dict.lookupOrDefault("C3", 0.01)) + C2_(dimensionedScalar::lookupOrDefault("C2", dict, dimless, 0.04)), + C3_(dimensionedScalar::lookupOrDefault("C3", dict, dimless, 0.01)) {} diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C index b06018b470..705aa95fc6 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -57,8 +57,8 @@ CoulaloglouTavlaridesCoalescence ) : coalescenceModel(popBal, dict), - C1_("C1", dimless, dict.lookupOrDefault("C1", 2.8)), - C2_("C2", inv(dimArea), dict.lookupOrDefault("C2", 1.83e9)) + C1_(dimensionedScalar::lookupOrDefault("C1", dict, dimless, 2.8)), + C2_(dimensionedScalar::lookupOrDefault("C2", dict, inv(dimArea), 1.83e9)) {} diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C index 4239ca4345..49cd5a4b7c 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C @@ -84,7 +84,7 @@ addToCoalescenceRate const sizeGroup& fi = popBal_.sizeGroups()[i]; const sizeGroup& fj = popBal_.sizeGroups()[j]; - volScalarField uChar + const volScalarField uChar ( max ( diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C index 98c4aad648..7657e14c05 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C @@ -96,9 +96,9 @@ addToCoalescenceRate popBal_.continuousPhase() ); - dimensionedScalar xi = fi.d()/fj.d(); + const dimensionedScalar xi = fi.d()/fj.d(); - volScalarField uij + const volScalarField uij ( sqrt(beta_) *cbrt(popBal_.continuousTurbulence().epsilon()*fi.d()) diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C index 0b2e0baa3b..ac9e935056 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,9 +59,27 @@ PrinceBlanch ) : coalescenceModel(popBal, dict), - C1_("C1", dimless, dict.lookupOrDefault("C1", 0.356)), - h0_("h0", dimLength, dict.lookupOrDefault("h0", 1e-4)), - hf_("hf", dimLength, dict.lookupOrDefault("hf", 1e-8)), + C1_(dimensionedScalar::lookupOrDefault("C1", dict, dimless, 0.356)), + h0_ + ( + dimensionedScalar::lookupOrDefault + ( + "h0", + dict, + dimLength, + 1e-4 + ) + ), + hf_ + ( + dimensionedScalar::lookupOrDefault + ( + "hf", + dict, + dimLength, + 1e-8 + ) + ), turbulence_(dict.lookup("turbulence")), buoyancy_(dict.lookup("buoyancy")), laminarShear_(dict.lookup("laminarShear")) @@ -84,7 +102,7 @@ addToCoalescenceRate const uniformDimensionedVectorField& g = popBal_.mesh().lookupObject("g"); - dimensionedScalar rij(1.0/(1.0/fi.d() + 1.0/fj.d())); + const dimensionedScalar rij(1.0/(1.0/fi.d() + 1.0/fj.d())); const volScalarField collisionEfficiency ( @@ -113,7 +131,7 @@ addToCoalescenceRate if (buoyancy_) { - dimensionedScalar Sij(pi/4.0*sqr(fi.d() + fj.d())); + const dimensionedScalar Sij(pi/4.0*sqr(fi.d() + fj.d())); coalescenceRate += ( diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C index b6bf2cda31..a28bff182b 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C @@ -110,6 +110,7 @@ void Foam::diameterModels::driftModels::phaseChange::correct() forAll(vgj.sizeGroups(), i) { const sizeGroup& fi = vgj.sizeGroups()[i]; + W_[k] += fi*max(fi.phase(), small) /(numberWeighted_ ? fi.x() : fi.d());