diff --git a/applications/solvers/combustion/PDRFoam/EaEqn.H b/applications/solvers/combustion/PDRFoam/EaEqn.H index 5268099496..3aae440578 100644 --- a/applications/solvers/combustion/PDRFoam/EaEqn.H +++ b/applications/solvers/combustion/PDRFoam/EaEqn.H @@ -7,12 +7,7 @@ + betav*fvc::ddt(rho, K) + fvc::div(phi, K) + ( hea.name() == "ea" - ? fvc::div - ( - phi/fvc::interpolate(rho), - p, - "div(phiv,p)" - ) + ? mvConvection->fvcDiv(fvc::absolute(phi, rho, U), p/rho) : -betav*dpdt ) - fvm::laplacian(Db, hea) diff --git a/applications/solvers/combustion/PDRFoam/EauEqn.H b/applications/solvers/combustion/PDRFoam/EauEqn.H index 98d3d53f6b..a8f988b9f7 100644 --- a/applications/solvers/combustion/PDRFoam/EauEqn.H +++ b/applications/solvers/combustion/PDRFoam/EauEqn.H @@ -8,12 +8,8 @@ if (ign.ignited()) + (betav*fvc::ddt(rho, K) + fvc::div(phi, K))*rho/thermo.rhou() + ( heau.name() == "eau" - ? fvc::div - ( - phi/fvc::interpolate(rho), - p, - "div(phiv,p)" - )*rho/thermo.rhou() + ? mvConvection->fvcDiv(fvc::absolute(phi, rho, U), p/rho) + *rho/thermo.rhou() : -betav*dpdt*rho/thermo.rhou() ) - fvm::laplacian(Db, heau) diff --git a/applications/solvers/combustion/XiFoam/EaEqn.H b/applications/solvers/combustion/XiFoam/EaEqn.H index aa44299d1d..67bfb685c5 100644 --- a/applications/solvers/combustion/XiFoam/EaEqn.H +++ b/applications/solvers/combustion/XiFoam/EaEqn.H @@ -7,12 +7,7 @@ + fvc::ddt(rho, K) + fvc::div(phi, K) + ( hea.name() == "ea" - ? fvc::div - ( - fvc::absolute(phi/fvc::interpolate(rho), U), - p, - "div(phiv,p)" - ) + ? mvConvection->fvcDiv(fvc::absolute(phi, rho, U), p/rho) : -dpdt ) - fvm::laplacian(thermophysicalTransport->alphaEff(), hea) diff --git a/applications/solvers/combustion/XiFoam/EauEqn.H b/applications/solvers/combustion/XiFoam/EauEqn.H index 33703a7f80..4893cca11e 100644 --- a/applications/solvers/combustion/XiFoam/EauEqn.H +++ b/applications/solvers/combustion/XiFoam/EauEqn.H @@ -8,12 +8,8 @@ if (ign.ignited()) + (fvc::ddt(rho, K) + fvc::div(phi, K))*rho/thermo.rhou() + ( heau.name() == "eau" - ? fvc::div - ( - fvc::absolute(phi/fvc::interpolate(rho), U), - p, - "div(phiv,p)" - )*rho/thermo.rhou() + ? mvConvection->fvcDiv(fvc::absolute(phi, rho, U), p/rho) + *rho/thermo.rhou() : -dpdt*rho/thermo.rhou() ) - fvm::laplacian(thermophysicalTransport->alphaEff(), heau) diff --git a/applications/solvers/combustion/reactingFoam/EEqn.H b/applications/solvers/combustion/reactingFoam/EEqn.H index 0827cd91d7..cb93bd570d 100644 --- a/applications/solvers/combustion/reactingFoam/EEqn.H +++ b/applications/solvers/combustion/reactingFoam/EEqn.H @@ -7,12 +7,7 @@ + fvc::ddt(rho, K) + fvc::div(phi, K) + ( he.name() == "e" - ? fvc::div - ( - fvc::absolute(phi/fvc::interpolate(rho), U), - p, - "div(phiv,p)" - ) + ? mvConvection->fvcDiv(fvc::absolute(phi, rho, U), p/rho) : -dpdt ) + thermophysicalTransport->divq(he) diff --git a/applications/solvers/compressible/rhoPimpleFoam/EEqn.H b/applications/solvers/compressible/rhoPimpleFoam/EEqn.H index a3844fd766..c2c0a51d54 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/EEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/EEqn.H @@ -7,12 +7,7 @@ + fvc::ddt(rho, K) + fvc::div(phi, K) + ( he.name() == "e" - ? fvc::div - ( - fvc::absolute(phi/fvc::interpolate(rho), U), - p, - "div(phiv,p)" - ) + ? fvc::div(fvc::absolute(phi, rho, U), p/rho) : -dpdt ) + thermophysicalTransport->divq(he) diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H index 833bff454f..4fe0523821 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H @@ -7,12 +7,7 @@ + fvc::ddt(rho, K) + fvc::div(phi, K) + ( he.name() == "e" - ? fvc::div - ( - fvc::absolute(phi/fvc::interpolate(rho), U), - p, - "div(phiv,p)" - ) + ? fvc::div(fvc::absolute(phi, rho, U), p/rho) : -dpdt ) + thermophysicalTransport->divq(he) diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H index 35530ca7c5..37cdc40b26 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H @@ -12,12 +12,9 @@ + fvc::ddt(rho, K) + fvc::div(phi, K) + ( he.name() == "e" - ? fvc::div - ( - fvc::absolute(phi/fvc::interpolate(rho), U), - p, - "div(phiv,p)" - ) + ? mvConvection.valid() + ? mvConvection->fvcDiv(fvc::absolute(phi, rho, U), p/rho) + : fvc::div(fvc::absolute(phi, rho, U), p/rho) : -dpdt ) + thermophysicalTransport.divq(he) diff --git a/applications/solvers/heatTransfer/thermoFoam/EEqn.H b/applications/solvers/heatTransfer/thermoFoam/EEqn.H index a3844fd766..c2c0a51d54 100644 --- a/applications/solvers/heatTransfer/thermoFoam/EEqn.H +++ b/applications/solvers/heatTransfer/thermoFoam/EEqn.H @@ -7,12 +7,7 @@ + fvc::ddt(rho, K) + fvc::div(phi, K) + ( he.name() == "e" - ? fvc::div - ( - fvc::absolute(phi/fvc::interpolate(rho), U), - p, - "div(phiv,p)" - ) + ? fvc::div(fvc::absolute(phi, rho, U), p/rho) : -dpdt ) + thermophysicalTransport->divq(he) diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSchemes b/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSchemes index 12469b27b0..76b7c64d65 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSchemes +++ b/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSchemes @@ -32,7 +32,6 @@ divSchemes div(phi,K) Gauss upwind; div(phid,p) Gauss upwind; div(meshPhi,p) Gauss upwind; - div(phiv,p) Gauss upwind; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; div(phi,R) Gauss upwind; diff --git a/tutorials/combustion/coldEngineFoam/freePiston/system/fvSchemes b/tutorials/combustion/coldEngineFoam/freePiston/system/fvSchemes index 58725edc8a..26fa6a4d72 100644 --- a/tutorials/combustion/coldEngineFoam/freePiston/system/fvSchemes +++ b/tutorials/combustion/coldEngineFoam/freePiston/system/fvSchemes @@ -27,17 +27,17 @@ gradSchemes divSchemes { - default none; + default none; - div(phi,U) Gauss linearUpwind grad(U); - div(phi,e) Gauss linearUpwind grad(e); + div(phi,U) Gauss linearUpwind grad(U); + div(phi,e) Gauss linearUpwind grad(e); - div(phiv,p) Gauss linear; - div(phi,K) Gauss linear; - div(meshPhi,p) Gauss linear; + div(phi,(p|rho)) Gauss linear; + div(phi,K) Gauss linear; + div(meshPhi,p) Gauss linear; - div(phi,k) Gauss upwind; - div(phi,epsilon) Gauss upwind; + div(phi,k) Gauss upwind; + div(phi,epsilon) Gauss upwind; div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/combustion/reactingFoam/Lagrangian/filter/system/fvSchemes b/tutorials/combustion/reactingFoam/Lagrangian/filter/system/fvSchemes index 23f46ba36e..b14df4acf4 100644 --- a/tutorials/combustion/reactingFoam/Lagrangian/filter/system/fvSchemes +++ b/tutorials/combustion/reactingFoam/Lagrangian/filter/system/fvSchemes @@ -32,7 +32,6 @@ divSchemes div(phi,U) Gauss upwind; div(phid,p) Gauss upwind; div(phi,K) Gauss linear; - div(phiv,p) Gauss upwind; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; div(U) Gauss linear; diff --git a/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/system/fvSchemes b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/system/fvSchemes index 69c230b9d6..11c8a088a0 100644 --- a/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/system/fvSchemes +++ b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/system/fvSchemes @@ -32,7 +32,6 @@ divSchemes div(phi,U) Gauss upwind; div(phid,p) Gauss upwind; div(phi,K) Gauss upwind; - div(phiv,p) Gauss upwind; div(phi,e) Gauss upwind; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; diff --git a/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/system/fvSchemes b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/system/fvSchemes index 96134e427d..c88ac917f3 100644 --- a/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/system/fvSchemes +++ b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/system/fvSchemes @@ -31,7 +31,6 @@ divSchemes div(phi,U) Gauss upwind; div(phid,p) Gauss upwind; div(phi,K) Gauss upwind; - div(phiv,p) Gauss upwind; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; div(phi,omega) Gauss upwind; diff --git a/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/system/fvSchemes b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/system/fvSchemes index 93d76ef423..325ea0e2ff 100644 --- a/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/system/fvSchemes +++ b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/system/fvSchemes @@ -31,7 +31,6 @@ divSchemes div(phi,U) Gauss upwind; div(phid,p) Gauss upwind; div(phi,K) Gauss upwind; - div(phiv,p) Gauss upwind; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; div(phi,omega) Gauss upwind; diff --git a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/fvSchemes index baa57240bf..ce3d6de6cd 100644 --- a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/fvSchemes +++ b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/fvSchemes @@ -27,15 +27,17 @@ gradSchemes divSchemes { - default none; - div(phi,U) Gauss LUST grad(U); - div(phi,e) Gauss LUST grad(e); - div(phi,K) Gauss linear; - div(phiv,p) Gauss linear; - div(phi,k) Gauss limitedLinear 1; - div(phi,B) Gauss limitedLinear 1; - div(phi,muTilda) Gauss limitedLinear 1; - div(B) Gauss linear; + default none; + + div(phi,U) Gauss LUST grad(U); + div(phi,e) Gauss LUST grad(e); + div(phi,K) Gauss linear; + div(phi,(p|rho)) Gauss linear; + div(phi,k) Gauss limitedLinear 1; + div(phi,B) Gauss limitedLinear 1; + div(phi,muTilda) Gauss limitedLinear 1; + div(B) Gauss linear; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvSchemes index f1e64ac273..5382a140c9 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvSchemes +++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/fvSchemes @@ -31,24 +31,24 @@ gradSchemes divSchemes { - default none; + default none; - div(phi,U) Gauss linearUpwind limited; + div(phi,U) Gauss linearUpwind limited; - turbulence Gauss linearUpwind limited; - energy Gauss linearUpwind limited; + turbulence Gauss linearUpwind limited; + energy Gauss linearUpwind limited; - div(phi,k) $turbulence; - div(phi,omega) $turbulence; + div(phi,k) $turbulence; + div(phi,omega) $turbulence; - div(phi,e) $energy; - div(phi,K) $energy; - div(phi,Ekp) $energy; + div(phi,e) $energy; + div(phi,K) $energy; + div(phi,Ekp) $energy; + div(phi,(p|rho)) $energy; - div(phiv,p) Gauss upwind; div((phi|interpolate(rho)),p) Gauss upwind; - div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSchemes index 36f8033274..fbd297f936 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSchemes +++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/system/fvSchemes @@ -27,19 +27,22 @@ gradSchemes divSchemes { - default none; - div(phi,U) bounded Gauss upwind; - div(phid,p) bounded Gauss upwind; - div(phiv,p) bounded Gauss linear; - div(phi,K) bounded Gauss linear; - div(phi,e) bounded Gauss upwind; - div(phi,k) bounded Gauss upwind; - div(phi,epsilon) bounded Gauss upwind; - div(phi,R) bounded Gauss upwind; - div(phi,omega) bounded Gauss upwind; - div((rho*R)) Gauss linear; - div(R) Gauss linear; - div(U) Gauss linear; + default none; + + div(phi,U) bounded Gauss upwind; + div(phid,p) bounded Gauss upwind; + div(phi,(p|rho)) bounded Gauss upwind; + div(phi,K) bounded Gauss linear; + div(phi,e) bounded Gauss upwind; + div(phi,k) bounded Gauss upwind; + div(phi,epsilon) bounded Gauss upwind; + div(phi,R) bounded Gauss upwind; + div(phi,omega) bounded Gauss upwind; + + div((rho*R)) Gauss linear; + div(R) Gauss linear; + div(U) Gauss linear; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/system/fvSchemes index f8ab6465c2..a5961eb6b1 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/system/fvSchemes +++ b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/system/fvSchemes @@ -27,14 +27,16 @@ gradSchemes divSchemes { - default none; - div(phi,U) Gauss limitedLinearV 1; - div(phi,e) Gauss limitedLinear 1; - div(phid,p) Gauss limitedLinear 1; - div(phi,K) Gauss limitedLinear 1; - div(phiv,p) Gauss limitedLinear 1; - div(phi,k) Gauss upwind; - div(phi,epsilon) Gauss upwind; + default none; + + div(phi,U) Gauss limitedLinearV 1; + div(phi,e) Gauss limitedLinear 1; + div(phid,p) Gauss limitedLinear 1; + div(phi,K) Gauss limitedLinear 1; + div(phi,(p|rho)) Gauss limitedLinear 1; + div(phi,k) Gauss upwind; + div(phi,epsilon) Gauss upwind; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/prism/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/prism/system/fvSchemes index 9b35c9dbc7..2c2c6a7f26 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/prism/system/fvSchemes +++ b/tutorials/compressible/rhoPimpleFoam/RAS/prism/system/fvSchemes @@ -27,14 +27,16 @@ gradSchemes divSchemes { - default none; - div(phi,U) Gauss limitedLinearV 1; - div(phi,e) Gauss limitedLinear 1; - div(phid,p) Gauss limitedLinear 1; - div(phi,K) Gauss limitedLinear 1; - div(phiv,p) Gauss limitedLinear 1; - div(phi,k) Gauss upwind; - div(phi,epsilon) Gauss upwind; + default none; + + div(phi,U) Gauss limitedLinearV 1; + div(phi,e) Gauss limitedLinear 1; + div(phid,p) Gauss limitedLinear 1; + div(phi,K) Gauss limitedLinear 1; + div(phi,(p|rho)) Gauss limitedLinear 1; + div(phi,k) Gauss upwind; + div(phi,epsilon) Gauss upwind; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/fvSchemes index 32f5f68cec..62767bee59 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/fvSchemes +++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/system/fvSchemes @@ -36,7 +36,7 @@ divSchemes div(phi,epsilon) Gauss linearUpwind limited; div(phi,k) Gauss linearUpwind limited; div(phi,K) Gauss linearUpwind limited; - div(phiv,p) Gauss linearUpwind limited; + div(phi,(p|rho)) Gauss linearUpwind limited; div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/system/fvSchemes index 9dd5473376..7df3233954 100644 --- a/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/system/fvSchemes +++ b/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/system/fvSchemes @@ -29,11 +29,13 @@ gradSchemes divSchemes { default none; + div(phi,U) Gauss linearUpwind limited; div(phi,e) Gauss linearUpwind limited; div(phi,tracer) Gauss linearUpwind limited; div(phi,K) Gauss linear; - div(phiv,p) Gauss linear; + div(phi,(p|rho)) Gauss linear; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/system/fvSchemes index d1d604d3af..e2c605c79a 100644 --- a/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/system/fvSchemes +++ b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/system/fvSchemes @@ -27,13 +27,13 @@ gradSchemes divSchemes { - default none; + default none; - div(phi,U) Gauss limitedLinearV 1; - div(phid,p) Gauss limitedLinear 1; - div(phi,e) Gauss limitedLinear 1; - div(phi,K) Gauss limitedLinear 1; - div(phiv,p) Gauss limitedLinear 1; + div(phi,U) Gauss limitedLinearV 1; + div(phid,p) Gauss limitedLinear 1; + div(phi,e) Gauss limitedLinear 1; + div(phi,K) Gauss limitedLinear 1; + div(phi,(p|rho)) Gauss limitedLinear 1; div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/system/fvSchemes index e66604a007..e3162daf38 100644 --- a/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/system/fvSchemes +++ b/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/system/fvSchemes @@ -27,12 +27,13 @@ gradSchemes divSchemes { - default none; - div(phi,U) Gauss upwind; - div(phid,p) Gauss limitedLinear 1; - div(phi,e) Gauss limitedLinear 1; - div(phi,K) Gauss limitedLinear 1; - div(phiv,p) Gauss limitedLinear 1; + default none; + div(phi,U) Gauss upwind; + div(phid,p) Gauss limitedLinear 1; + div(phi,e) Gauss limitedLinear 1; + div(phi,K) Gauss limitedLinear 1; + div(phi,(p|rho)) Gauss limitedLinear 1; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/fvSchemes index 215f901720..d9c4399d18 100644 --- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/fvSchemes +++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/fvSchemes @@ -27,11 +27,13 @@ gradSchemes divSchemes { - default none; - div(phi,U) Gauss limitedLinearV 1; - div(phi,e) Gauss limitedLinear 1; - div(phi,K) Gauss limitedLinear 1; - div(phiv,p) Gauss limitedLinear 1; + default none; + + div(phi,U) Gauss limitedLinearV 1; + div(phi,e) Gauss limitedLinear 1; + div(phi,K) Gauss limitedLinear 1; + div(phi,(p|rho)) Gauss limitedLinear 1; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/system/fvSchemes index 7b26c955f1..44a536cd45 100644 --- a/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/system/fvSchemes +++ b/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/system/fvSchemes @@ -27,12 +27,14 @@ gradSchemes divSchemes { - default none; - div(phi,U) Gauss upwind; - div(phid,p) Gauss limitedLinear 1; - div(phi,e) Gauss limitedLinear 1; - div(phi,K) Gauss limitedLinear 1; - div(phiv,p) Gauss limitedLinear 1; + default none; + + div(phi,U) Gauss upwind; + div(phid,p) Gauss limitedLinear 1; + div(phi,e) Gauss limitedLinear 1; + div(phi,K) Gauss limitedLinear 1; + div(phi,(p|rho)) Gauss limitedLinear 1; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/fvSchemes b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/fvSchemes index 942e2f832f..c5cf306d55 100644 --- a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/fvSchemes @@ -27,17 +27,17 @@ gradSchemes divSchemes { - default none; + default none; - div(phi,U) Gauss linearUpwind grad(U); - div(phi,e) Gauss limitedLinear 1; + div(phi,U) Gauss linearUpwind grad(U); + div(phi,e) Gauss limitedLinear 1; - turbulence Gauss limitedLinear 1; - div(phi,k) $turbulence; - div(phi,epsilon) $turbulence; + turbulence Gauss limitedLinear 1; + div(phi,k) $turbulence; + div(phi,epsilon) $turbulence; - div(phiv,p) Gauss linear; - div(phi,K) Gauss linear; + div(phi,(p|rho)) Gauss limitedLinear 1; + div(phi,K) Gauss linear; div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/fvSchemes b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/fvSchemes index 72b81b2b96..1be28462da 100644 --- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/system/fvSchemes @@ -27,16 +27,16 @@ gradSchemes divSchemes { - default none; + default none; - div(phi,U) Gauss upwind; - div(phi,e) Gauss upwind; + div(phi,U) Gauss upwind; + div(phi,e) Gauss upwind; - div(phi,k) Gauss upwind; - div(phi,epsilon) Gauss upwind; + div(phi,k) Gauss upwind; + div(phi,epsilon) Gauss upwind; - div(phiv,p) Gauss linear; - div(phi,K) Gauss linear; + div(phi,(p|rho)) Gauss linear; + div(phi,K) Gauss linear; div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/coolingCylinder2D/system/fluid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/coolingCylinder2D/system/fluid/fvSchemes index 481c43d8ff..66e9b55930 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/coolingCylinder2D/system/fluid/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/coolingCylinder2D/system/fluid/fvSchemes @@ -31,17 +31,17 @@ gradSchemes divSchemes { - default none; + default none; - div(phi,U) Gauss linearUpwind limited; + div(phi,U) Gauss linearUpwind limited; - turbulence Gauss limitedLinear 1; - div(phi,k) $turbulence; - div(phi,omega) $turbulence; - div(phi,e) $turbulence; - div(phi,K) $turbulence; + turbulence Gauss limitedLinear 1; + div(phi,k) $turbulence; + div(phi,omega) $turbulence; + div(phi,e) $turbulence; + div(phi,K) $turbulence; + div(phi,(p|rho)) $turbulence; - div(phiv,p) Gauss upwind; div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/fvSchemes index 7421cfba41..ad787276e1 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/fvSchemes @@ -28,14 +28,16 @@ gradSchemes divSchemes { - default none; - div(phi,U) bounded Gauss upwind; - div(phi,h) bounded Gauss upwind; - div(phi,e) bounded Gauss upwind; - div(phi,K) bounded Gauss upwind; - div(phiv,p) Gauss upwind; - div(phi,k) bounded Gauss upwind; - div(phi,epsilon) bounded Gauss upwind; + default none; + + div(phi,U) bounded Gauss upwind; + div(phi,h) bounded Gauss upwind; + div(phi,e) bounded Gauss upwind; + div(phi,K) bounded Gauss upwind; + div(phi,(p|rho)) Gauss upwind; + div(phi,k) bounded Gauss upwind; + div(phi,epsilon) bounded Gauss upwind; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/porous/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/porous/fvSchemes index 10e4ad2fda..906e0ae4c6 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/porous/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/porous/fvSchemes @@ -26,14 +26,16 @@ gradSchemes divSchemes { - default none; - div(phi,U) bounded Gauss upwind; - div(phi,h) bounded Gauss upwind; - div(phi,e) bounded Gauss upwind; - div(phiv,p) Gauss upwind; - div(phi,K) bounded Gauss upwind; - div(phi,k) bounded Gauss upwind; - div(phi,epsilon) bounded Gauss upwind; + default none; + + div(phi,U) bounded Gauss upwind; + div(phi,h) bounded Gauss upwind; + div(phi,e) bounded Gauss upwind; + div(phi,(p|rho)) bounded Gauss upwind; + div(phi,K) bounded Gauss upwind; + div(phi,k) bounded Gauss upwind; + div(phi,epsilon) bounded Gauss upwind; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/fvSchemes index bcbd5ef9de..bfe1c231ad 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/fvSchemes @@ -27,14 +27,15 @@ gradSchemes divSchemes { - default none; + default none; + + div(phi,U) Gauss linearUpwind grad(U); + div(phi,Yi_h) Gauss limitedLinear 1; + div(phi,k) Gauss linearUpwind limitedGrad; + div(phi,epsilon) Gauss linearUpwind limitedGrad; + div(phi,K) Gauss linear; + div(phi,(p|rho)) Gauss linear; - div(phi,U) Gauss linearUpwind grad(U); - div(phi,Yi_h) Gauss limitedLinear 1; - div(phi,k) Gauss linearUpwind limitedGrad; - div(phi,epsilon) Gauss linearUpwind limitedGrad; - div(phi,K) Gauss linear; - div(phiv,p) Gauss linear; div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; }