diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C index dc123f6a22..fc693cd516 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C @@ -98,29 +98,28 @@ Foam::diameterModels::velocityGroup::fSum() const } -void Foam::diameterModels::velocityGroup::renormalize() +void Foam::diameterModels::velocityGroup::scale() { - Info<< "Renormalizing sizeGroups for velocityGroup " - << phase_.name() - << endl; + Info<< "Scaling sizeGroups for velocityGroup " << phase_.name() << endl; - // Set negative values to zero - forAll(sizeGroups_, i) - { - sizeGroups_[i] *= pos(sizeGroups_[i]); - }; + forAll(sizeGroups_, i) + { + sizeGroups_[i].max(0); + }; - forAll(sizeGroups_, i) - { - sizeGroups_[i] /= fSum_; - }; + f_ = fSum(); + + forAll(sizeGroups_, i) + { + sizeGroups_[i] /= f_; + }; } Foam::tmp> Foam::diameterModels::velocityGroup::mvconvection() const { - tmp > mvConvection + tmp> mvConvection ( fv::convectionScheme::New ( @@ -174,24 +173,6 @@ Foam::diameterModels::velocityGroup::velocityGroup diameterProperties.lookup("sizeGroups"), sizeGroup::iNew(phase, *this) ), - fSum_ - ( - IOobject - ( - IOobject::groupName - ( - "fsum", - IOobject::groupName - ( - phase.name(), - popBalName_ - ) - ), - phase.time().timeName(), - phase.mesh() - ), - fSum() - ), d_ ( IOobject @@ -217,49 +198,6 @@ Foam::diameterModels::velocityGroup::velocityGroup dimensionedScalar(dimDensity/dimTime, Zero) ) { - if - ( - phase_.mesh().solverDict(popBalName_).lookupOrDefault - ( - "renormalizeAtRestart", - false - ) - || - phase_.mesh().solverDict(popBalName_).lookupOrDefault - ( - "renormalize", - false - ) - ) - { - renormalize(); - } - - fSum_ = fSum(); - - if - ( - mag(1 - fSum_.weightedAverage(fSum_.mesh().V()).value()) >= 1e-5 - || mag(1 - max(fSum_).value()) >= 1e-5 - || mag(1 - min(fSum_).value()) >= 1e-5 - ) - { - FatalErrorInFunction - << " Initial values of the sizeGroups belonging to velocityGroup " - << this->phase().name() - << " must add to" << nl << " unity. This condition might be" - << " violated due to wrong entries in the" << nl - << " velocityGroupCoeffs subdictionary or bad initial conditions in" - << " the startTime" << nl - << " directory. The sizeGroups can be renormalized at every" - << " timestep or at restart" << nl - << " only by setting the corresponding switch renormalize or" - << " renormalizeAtRestart" << nl - << " in the fvSolution subdictionary " << popBalName_ << "." - << " Note that boundary conditions are not" << nl << "renormalized." - << exit(FatalError); - } - forAll(sizeGroups_, i) { fields_.add(sizeGroups_[i]); @@ -286,6 +224,28 @@ void Foam::diameterModels::velocityGroup::preSolve() void Foam::diameterModels::velocityGroup::postSolve() { + if + ( + phase_.mesh().solverDict(popBalName_).lookupOrDefault + ( + "scale", + true + ) + ) + { + scale(); + } + + f_ = fSum(); + + f_.correctBoundaryConditions(); + + Info<< phase_.name() << " sizeGroups-sum volume fraction, min, max = " + << f_.weightedAverage(phase_.mesh().V()).value() + << ' ' << min(f_).value() + << ' ' << max(f_).value() + << endl; + d_ = dsm(); Info<< this->phase().name() << " Sauter mean diameter, min, max = " @@ -293,26 +253,6 @@ void Foam::diameterModels::velocityGroup::postSolve() << ' ' << min(d_).value() << ' ' << max(d_).value() << endl; - - fSum_ = fSum(); - - Info<< phase_.name() << " sizeGroups-sum volume fraction, min, max = " - << fSum_.weightedAverage(phase_.mesh().V()).value() - << ' ' << min(fSum_).value() - << ' ' << max(fSum_).value() - << endl; - - if - ( - phase_.mesh().solverDict(popBalName_).lookupOrDefault - ( - "renormalize", - false - ) - ) - { - renormalize(); - } } diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.H index 480db37472..0c345ed2c7 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.H @@ -100,7 +100,8 @@ class velocityGroup //- Name of the populationBalance this velocityGroup belongs to word popBalName_; - //- Reference field from which the sizeGroup fields are derived + //- Sum of the sizeGroup volume fractions and reference field from which + // the sizeGroup fields are derived volScalarField f_; //- Form factor relating diameter and volume @@ -109,9 +110,6 @@ class velocityGroup //- sizeGroups belonging to this velocityGroup PtrList sizeGroups_; - //- Sum of sizeGroup volume fractions - volScalarField fSum_; - //- Number-based Sauter-mean diameter of the phase volScalarField d_; @@ -131,7 +129,7 @@ class velocityGroup tmp fSum() const; - void renormalize(); + void scale(); tmp> mvconvection() const; diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/binaryBreakup/system/fvSolution b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/binaryBreakup/system/fvSolution index 5cbe576dd4..a39be34d27 100644 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/binaryBreakup/system/fvSolution +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/binaryBreakup/system/fvSolution @@ -27,7 +27,7 @@ solvers { nCorr 1; tolerance 1e-4; - renormalize false; + scale false; } p_rgh diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/breakup/system/fvSolution b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/breakup/system/fvSolution index 5cbe576dd4..a39be34d27 100644 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/breakup/system/fvSolution +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/breakup/system/fvSolution @@ -27,7 +27,7 @@ solvers { nCorr 1; tolerance 1e-4; - renormalize false; + scale false; } p_rgh diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/coalescence/system/fvSolution b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/coalescence/system/fvSolution index 5d4a4e5b6a..7e55f84b88 100644 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/coalescence/system/fvSolution +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/coalescence/system/fvSolution @@ -27,7 +27,7 @@ solvers { nCorr 1; tolerance 1e-4; - renormalize false; + scale false; } p_rgh diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/simultaneousCoalescenceAndBreakup/system/fvSolution b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/simultaneousCoalescenceAndBreakup/system/fvSolution index 176deaad61..dffb4a9780 100644 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/simultaneousCoalescenceAndBreakup/system/fvSolution +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/simultaneousCoalescenceAndBreakup/system/fvSolution @@ -27,7 +27,7 @@ solvers { nCorr 1; tolerance 1e-4; - renormalize true; + scale true; } p_rgh diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/drift/system/fvSolution b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/drift/system/fvSolution index 5cbe576dd4..a39be34d27 100644 --- a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/drift/system/fvSolution +++ b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/drift/system/fvSolution @@ -27,7 +27,7 @@ solvers { nCorr 1; tolerance 1e-4; - renormalize false; + scale false; } p_rgh diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/negativeDrift/system/fvSolution b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/negativeDrift/system/fvSolution index 5cbe576dd4..a39be34d27 100644 --- a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/negativeDrift/system/fvSolution +++ b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/negativeDrift/system/fvSolution @@ -27,7 +27,7 @@ solvers { nCorr 1; tolerance 1e-4; - renormalize false; + scale false; } p_rgh diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/Allrun b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/Allrun index 75da787cd8..ed61ac5435 100755 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/Allrun +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/Allrun @@ -1,14 +1,11 @@ #!/bin/sh -cd ${0%/*} || exit 1 # run from this directory +cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Set application name -application=$(getApplication) - runApplication blockMesh runApplication setFields -runApplication $application +runApplication $(getApplication) -# ----------------------------------------------------------------- end-of-file +#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/0/f.air1.bubbles b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/0/f.air1.bubbles index c1f349de97..2164bcd380 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/0/f.air1.bubbles +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/0/f.air1.bubbles @@ -17,7 +17,7 @@ FoamFile dimensions [0 0 0 0 0 0 0]; -internalField uniform 0; +internalField uniform 1; boundaryField { diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/0/f.air2.bubbles b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/0/f.air2.bubbles index 88c34eb920..7b81d4e221 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/0/f.air2.bubbles +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/0/f.air2.bubbles @@ -17,7 +17,7 @@ FoamFile dimensions [0 0 0 0 0 0 0]; -internalField uniform 0; +internalField uniform 1; boundaryField { diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/Allrun b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/Allrun index c701ab1bc3..c9bcf24f33 100755 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/Allrun +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/Allrun @@ -1,15 +1,12 @@ #!/bin/sh -cd ${0%/*} || exit 1 # run from this directory +cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Set application name -application=$(getApplication) - runApplication blockMesh runApplication topoSet runApplication setFields -runApplication $application +runApplication $(getApplication) -# ----------------------------------------------------------------- end-of-file +#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/system/fvSolution index 576493d87f..b654238da4 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/system/fvSolution +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/system/fvSolution @@ -25,9 +25,10 @@ solvers bubbles { - nCorr 1; - tolerance 1e-4; - renormalize true; + nCorr 1; + tolerance 1e-4; + scale true; + solveOnFinalIterOnly true; } p_rgh diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0/f.air.bubbles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0/f.air.bubbles index 6cc1178cc9..eabe6c247d 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0/f.air.bubbles +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0/f.air.bubbles @@ -17,7 +17,7 @@ FoamFile dimensions [0 0 0 0 0 0 0]; -internalField uniform 0; +internalField uniform 1; boundaryField { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/Allrun b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/Allrun index 955b551760..c9bcf24f33 100755 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/Allrun +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/Allrun @@ -1,15 +1,12 @@ #!/bin/sh -cd ${0%/*} || exit 1 # run from this directory +cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Set application name -application=$(getApplication) - runApplication blockMesh runApplication topoSet runApplication setFields -runApplication $application +runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/phaseProperties index f93ad0a9c2..e0e02f0faa 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/phaseProperties +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/phaseProperties @@ -81,21 +81,16 @@ populationBalanceCoeffs coalescenceModels ( - CoulaloglouTavlarides{} + LehrMilliesMewes{} ); binaryBreakupModels - (); + ( + LehrMilliesMewes{} + ); breakupModels - ( - exponential - { - C 10.0; - exponent 1.0; - daughterSizeDistributionModel uniform; - } - ); + (); driftModels ( diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.air index 45cb891c83..2ebb41c688 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.air @@ -24,11 +24,11 @@ RAS turbulence on; printCoeffs on; - // mixtureKEpsilonCoeffs - // { - // Cp 1; - // C3 1; - // } + mixtureKEpsilonCoeffs + { + Cp 1; + C3 1; + } } // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSolution index d0f30d0a4e..4df544e655 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSolution @@ -27,7 +27,7 @@ solvers { nCorr 1; tolerance 1e-4; - renormalize false; + scale true; solveOnFinalIterOnly true; } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/T.gas similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/T.gas rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/T.gas diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/T.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/T.liquid similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/T.liquid rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/T.liquid diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/U.gas similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/U.gas rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/U.gas diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/U.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/U.liquid similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/U.liquid rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/U.liquid diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/alpha.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/alpha.gas similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/alpha.gas rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/alpha.gas diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/alpha.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/alpha.liquid similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/alpha.liquid rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/alpha.liquid diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/alphat.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/alphat.gas similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/alphat.gas rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/alphat.gas diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/alphat.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/alphat.liquid similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/alphat.liquid rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/alphat.liquid diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/epsilon.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/epsilon.gas similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/epsilon.gas rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/epsilon.gas diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/epsilon.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/epsilon.liquid similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/epsilon.liquid rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/epsilon.liquid diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/f.gas.bubbles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/f.gas.bubbles similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/f.gas.bubbles rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/f.gas.bubbles diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/k.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/k.gas similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/k.gas rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/k.gas diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/k.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/k.liquid similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/k.liquid rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/k.liquid diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/nut.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/nut.gas similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/nut.gas rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/nut.gas diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/nut.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/nut.liquid similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/nut.liquid rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/nut.liquid diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/p similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/p rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/p diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/p_rgh similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/0/p_rgh rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/0/p_rgh diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/Allrun b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/Allrun similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/Allrun rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/Allrun diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/Tsat_water_1_2bar.csv b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/Tsat_water_1_2bar.csv similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/Tsat_water_1_2bar.csv rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/Tsat_water_1_2bar.csv diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/g similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/g rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/g diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties similarity index 93% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/phaseProperties rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties index 9a52caba47..8f512b965b 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/phaseProperties +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties @@ -76,24 +76,16 @@ populationBalanceCoeffs coalescenceModels ( - hydrodynamic - { - C 0.25; - } + LehrMilliesMewes{} ); binaryBreakupModels - (); + ( + LehrMilliesMewes{} + ); breakupModels - ( - exponential - { - C 0.5; - exponent 0.01; - daughterSizeDistributionModel uniform; - } - ); + (); driftModels ( @@ -125,7 +117,13 @@ blending } surfaceTension -(); +( + (gas and liquid) + { + type constant; + sigma 0.07; + } +); saturationModel { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/thermophysicalProperties.gas similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/thermophysicalProperties.gas rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/thermophysicalProperties.gas diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/thermophysicalProperties.liquid similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/thermophysicalProperties.liquid rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/thermophysicalProperties.liquid diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/turbulenceProperties.gas similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/turbulenceProperties.gas rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/turbulenceProperties.gas diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/turbulenceProperties.liquid similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/turbulenceProperties.liquid rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/turbulenceProperties.liquid diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/system/blockMeshDict similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/system/blockMeshDict rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/system/blockMeshDict diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/system/controlDict.orig b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/system/controlDict.orig similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/system/controlDict.orig rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/system/controlDict.orig diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/system/fvSchemes similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/system/fvSchemes rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/system/fvSchemes diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/system/fvSolution similarity index 92% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/system/fvSolution rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/system/fvSolution index 7acf70d3fe..e7cb5123b6 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/system/fvSolution @@ -25,11 +25,10 @@ solvers bubbles { - nCorr 1; - tolerance 1e-4; - renormalizeOnRestart true; - renormalize true; - solveOnFinalIterOnly true; + nCorr 1; + tolerance 1e-4; + scale true; + solveOnFinalIterOnly true; } p_rgh