diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C index 0c7d129868..b48c5946a5 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C @@ -106,9 +106,6 @@ Foam::AnisothermalPhaseModel::heEqn() const tmp tU(this->U()); const volVectorField& U(tU()); - const tmp talphaPhi(this->alphaPhi()); - const surfaceScalarField& alphaPhi(talphaPhi()); - const tmp talphaRhoPhi(this->alphaRhoPhi()); const surfaceScalarField& alphaRhoPhi(talphaRhoPhi()); @@ -139,7 +136,11 @@ Foam::AnisothermalPhaseModel::heEqn() { tEEqn.ref() += filterPressureWork ( - fvc::div(fvc::absolute(alphaPhi, alpha, U), this->thermo().p()) + fvc::div + ( + fvc::absolute(alphaRhoPhi, alpha, rho, U), + this->thermo().p()/rho + ) + (fvc::ddt(alpha) - contErr/rho)*this->thermo().p() ); } diff --git a/src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModels.C b/src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModels.C index ee7b1b080a..e0cb1b71ea 100644 --- a/src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModels.C +++ b/src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModels.C @@ -56,6 +56,9 @@ makeRASLESThermophysicalTransportModel(RAS, eddyDiffusivity); #include "unityLewisEddyDiffusivity.H" makeRASLESThermophysicalTransportModel(RAS, unityLewisEddyDiffusivity); +#include "nonUnityLewisEddyDiffusivity.H" +makeRASLESThermophysicalTransportModel(RAS, nonUnityLewisEddyDiffusivity); + // -------------------------------------------------------------------------- // // LES models @@ -67,5 +70,8 @@ makeRASLESThermophysicalTransportModel(LES, eddyDiffusivity); #include "unityLewisEddyDiffusivity.H" makeRASLESThermophysicalTransportModel(LES, unityLewisEddyDiffusivity); +#include "nonUnityLewisEddyDiffusivity.H" +makeRASLESThermophysicalTransportModel(LES, nonUnityLewisEddyDiffusivity); + // ************************************************************************* // diff --git a/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C b/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C index 19e18cb69a..615c5ab3e5 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C +++ b/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C @@ -231,6 +231,32 @@ Foam::tmp Foam::fvc::absolute } +Foam::tmp Foam::fvc::absolute +( + const tmp& tphi, + const volScalarField& alpha, + const volScalarField& rho, + const volVectorField& U +) +{ + if (tphi().mesh().moving()) + { + const word phiName(tphi().name()); + + return surfaceScalarField::New + ( + phiName, + tphi + + fvc::interpolate(alpha)*fvc::interpolate(rho)*fvc::meshPhi(rho, U) + ); + } + else + { + return tmp(tphi, true); + } +} + + void Foam::fvc::correctUf ( autoPtr& Uf, diff --git a/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.H b/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.H index d5e7143ba6..81789f76e8 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.H +++ b/src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -148,6 +148,15 @@ namespace fvc const volVectorField& U ); + //- Return the given relative flux in absolute form + tmp absolute + ( + const tmp& tphi, + const volScalarField& alpha, + const volScalarField& rho, + const volVectorField& U + ); + void correctUf ( autoPtr& Uf, diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/system/fvSchemes index 5a9fc1f07e..1e3353221b 100644 --- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/system/fvSchemes +++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/system/fvSchemes @@ -38,7 +38,7 @@ divSchemes "div\(alphaRhoPhi.*,Yi\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; } diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/system/fvSchemes index 5a9fc1f07e..1e3353221b 100644 --- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/system/fvSchemes +++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/system/fvSchemes @@ -38,7 +38,7 @@ divSchemes "div\(alphaRhoPhi.*,Yi\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; } diff --git a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/system/fvSchemes index 5a9fc1f07e..1e3353221b 100644 --- a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/system/fvSchemes +++ b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/system/fvSchemes @@ -38,7 +38,7 @@ divSchemes "div\(alphaRhoPhi.*,Yi\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/LES/bubbleColumn/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/LES/bubbleColumn/system/fvSchemes index 86c2ff6427..114b8e5f94 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/LES/bubbleColumn/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/LES/bubbleColumn/system/fvSchemes @@ -39,7 +39,7 @@ divSchemes "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,k.*\)" Gauss limitedLinear 1; "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/fvSchemes index 25dd315e73..86ebe40407 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/fvSchemes @@ -40,7 +40,7 @@ divSchemes "div\(alphaRhoPhi.*,(h|e).*\)" Gauss linearUpwind limited; "div\(alphaRhoPhi.*,f.*\)" Gauss upwind; "div\(alphaRhoPhi.*,K.*\)" Gauss linearUpwind limited; - "div\(alphaPhi.*,p\)" Gauss linearUpwind limited; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss linearUpwind limited; "div\(phi.*,kappai.*\)" Gauss linearUpwind limited; "div\(alphaRhoPhi.*,(k|epsilon|omega).*\)" Gauss upwind; "div\(phim,(k|epsilon)m\)" Gauss upwind; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/system/fvSchemes index 3f22c62a70..96fe2fb2a7 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/system/fvSchemes @@ -37,7 +37,7 @@ divSchemes "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; div(alphaRhoPhi.solids,Theta.solids) Gauss limitedLinear 1; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumn/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumn/system/fvSchemes index 1b30245080..98c180e326 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumn/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumn/system/fvSchemes @@ -39,7 +39,7 @@ divSchemes "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,(k|epsilon).*\)" Gauss limitedLinear 1; "div\(phim,(k|epsilon)m\)" Gauss limitedLinear 1; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes index f09758b254..0507201ffe 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes @@ -38,7 +38,7 @@ divSchemes "div\(alphaRhoPhi.*,Yi\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,(k|epsilon).*\)" Gauss limitedLinear 1; "div\(phim,(k|epsilon)m\)" Gauss limitedLinear 1; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/system/fvSchemes index f23a41731c..3475574e72 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/system/fvSchemes @@ -37,7 +37,7 @@ divSchemes "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; div(alphaRhoPhi.particles,Theta.particles) Gauss limitedLinear 1; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/fvSchemes index b3039f6269..88c54f7af2 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/fvSchemes @@ -39,7 +39,7 @@ divSchemes "div\(alphaRhoPhi.*,Yi\)" Gauss linearUpwind limited; "div\(alphaRhoPhi.*,(h|e).*\)" Gauss linearUpwind limited; "div\(alphaRhoPhi.*,K.*\)" Gauss linearUpwind limited; - "div\(alphaPhi.*,p\)" Gauss linearUpwind limited; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss linearUpwind limited; "div\(alphaRhoPhi.*,(k|epsilon|omega).*\)" Gauss linearUpwind limited; "div\(phim,(k|epsilon)m\)" Gauss linearUpwind limited; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes index 8c2065a1e5..c0804b7f3a 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes @@ -39,7 +39,7 @@ divSchemes "div\(alphaRhoPhi.*,Yi\)" Gauss linearUpwind limited; "div\(alphaRhoPhi.*,(h|e).*\)" Gauss linearUpwind limited; "div\(alphaRhoPhi.*,K.*\)" Gauss linearUpwind limited; - "div\(alphaPhi.*,p\)" Gauss linearUpwind limited; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss linearUpwind limited; "div\(phi.*,kappai.*\)" Gauss linearUpwind limited; "div\(alphaRhoPhi.*,(k|epsilon|omega).*\)" Gauss linearUpwind limited; "div\(phim,(k|epsilon)m\)" Gauss linearUpwind limited; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/fvSchemes index 8987054048..f53a763de7 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/fvSchemes @@ -40,7 +40,7 @@ divSchemes "div\(alphaRhoPhi.*,(h|e).*\)" Gauss linearUpwind limited; "div\(alphaPhi.*,f.*\)" Gauss linearUpwind limited; "div\(alphaRhoPhi.*,K.*\)" Gauss linearUpwind limited; - "div\(alphaPhi.*,p\)" Gauss linearUpwind limited; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss linearUpwind limited; "div\(alphaRhoPhi.*,(k|epsilon|omega).*\)" Gauss linearUpwind limited; "div\(phim,(k|epsilon)m\)" Gauss linearUpwind limited; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/fvSchemes index 8987054048..f53a763de7 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/fvSchemes @@ -40,7 +40,7 @@ divSchemes "div\(alphaRhoPhi.*,(h|e).*\)" Gauss linearUpwind limited; "div\(alphaPhi.*,f.*\)" Gauss linearUpwind limited; "div\(alphaRhoPhi.*,K.*\)" Gauss linearUpwind limited; - "div\(alphaPhi.*,p\)" Gauss linearUpwind limited; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss linearUpwind limited; "div\(alphaRhoPhi.*,(k|epsilon|omega).*\)" Gauss linearUpwind limited; "div\(phim,(k|epsilon)m\)" Gauss linearUpwind limited; diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/system/fvSchemes index 920e245f78..de351ff219 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/system/fvSchemes @@ -37,7 +37,7 @@ divSchemes "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes index 555080a927..972d3b6d34 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes @@ -39,7 +39,8 @@ divSchemes "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; + "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1; "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes index 5a9fc1f07e..1e3353221b 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes @@ -38,7 +38,7 @@ divSchemes "div\(alphaRhoPhi.*,Yi\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes index 5a9fc1f07e..1e3353221b 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes @@ -38,7 +38,7 @@ divSchemes "div\(alphaRhoPhi.*,Yi\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes index b9ed3c1839..660aebc97a 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes @@ -41,7 +41,7 @@ divSchemes "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/system/fvSchemes index 09e53669d0..f60937ef11 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/system/fvSchemes @@ -35,7 +35,7 @@ divSchemes "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/system/fvSchemes index 35869c8314..d56ca7a51c 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/system/fvSchemes @@ -37,7 +37,7 @@ divSchemes "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; div((((alpha.air*thermo:rho.air)*nuEff.air)*dev2(T(grad(U.air))))) Gauss linear; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/system/fvSchemes index 74bd269cb3..c46af4352a 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/system/fvSchemes @@ -39,7 +39,7 @@ divSchemes "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes index 09e53669d0..f60937ef11 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes @@ -35,7 +35,7 @@ divSchemes "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/fvSchemes index 09e53669d0..f60937ef11 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/system/fvSchemes @@ -35,7 +35,7 @@ divSchemes "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/system/fvSchemes index ad4c8f2dbc..38bf972257 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/system/fvSchemes @@ -38,7 +38,7 @@ divSchemes "div\(alphaRhoPhi.*,Yi\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,(k|epsilon).*\)" Gauss limitedLinear 1; "div\(phim,(k|epsilon)m\)" Gauss limitedLinear 1; diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/fvSchemes index 18c7c5965a..f5f21a6773 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/fvSchemes @@ -39,7 +39,7 @@ divSchemes "div\(alphaRhoPhi.*,(k|epsilon|h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,Y.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; "div\(alphaPhi.*,f.*\)" Gauss upwind; "div\(fAlphaPhi.*,kappa.*\)" Gauss linearUpwind limited; diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/fvSchemes index 18c7c5965a..f5f21a6773 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/fvSchemes @@ -39,7 +39,7 @@ divSchemes "div\(alphaRhoPhi.*,(k|epsilon|h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,Y.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; "div\(alphaPhi.*,f.*\)" Gauss upwind; "div\(fAlphaPhi.*,kappa.*\)" Gauss linearUpwind limited; diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/fvSchemes index 920e245f78..de351ff219 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/fvSchemes @@ -37,7 +37,7 @@ divSchemes "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div(alphaRhoPhi.*,(p|thermo:rho.*))" Gauss limitedLinear 1; "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; }