From 82f4a4fb5186534b2fe7a689dfe06f45172166f7 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Mon, 31 Oct 2022 17:11:12 +0000 Subject: [PATCH] tutorials/multiphase: Updated fvSchemes utilising commit 1c2f614b6ccd6dfe609ff9e5eab0e23f15a71799 --- .../laminar/damBreak4phase/system/fvSchemes | 2 +- .../driftFluxFoam/RAS/dahl/system/fvSchemes | 4 +-- .../RAS/mixerVessel2DMRF/system/fvSchemes | 4 +-- .../driftFluxFoam/RAS/tank3D/system/fvSchemes | 4 +-- .../LES/bubbleColumn/system/fvSchemes | 14 +++++------ .../RAS/Grossetete/system/fvSchemes | 24 +++++++++--------- .../RAS/LBend/system/fvSchemes | 16 ++++++------ .../RAS/bubbleColumn/system/fvSchemes | 14 +++++------ .../system/fvSchemes | 20 +++++++-------- .../RAS/bubblePipe/system/fvSchemes | 14 +++++------ .../RAS/fluidisedBed/system/fvSchemes | 16 ++++++------ .../RAS/pipeBend/system/fvSchemes | 19 +++++++------- .../RAS/wallBoiling/system/fvSchemes | 20 +++++++-------- .../RAS/wallBoilingIATE/system/fvSchemes | 22 ++++++++-------- .../wallBoilingPolydisperse/system/fvSchemes | 22 ++++++++-------- .../system/fvSchemes | 22 ++++++++-------- .../laminar/bed/system/fvSchemes | 16 ++++++------ .../laminar/bubbleColumn/system/fvSchemes | 2 +- .../bubbleColumnEvaporating/system/fvSchemes | 18 ++++++------- .../system/fvSchemes | 18 ++++++------- .../laminar/bubbleColumnIATE/system/fvSchemes | 12 ++++----- .../laminar/damBreak4phase/system/fvSchemes | 16 ++++++------ .../laminar/fluidisedBed/system/fvSchemes | 14 +++++------ .../laminar/injection/system/fvSchemes | 12 ++++----- .../laminar/mixerVessel2D/system/fvSchemes | 16 ++++++------ .../laminar/mixerVessel2DMRF/system/fvSchemes | 16 ++++++------ .../laminar/steamInjection/system/fvSchemes | 25 ++++++++++--------- .../laminar/titaniaSynthesis/system/fvSchemes | 24 +++++++++--------- .../titaniaSynthesisSurface/system/fvSchemes | 24 +++++++++--------- 29 files changed, 226 insertions(+), 224 deletions(-) diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes index 7a7af8b8df..c5fb517518 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes @@ -29,7 +29,7 @@ divSchemes div(rhoPhi,U) Gauss upwind; div(phi,alpha) Gauss vanLeer; div(phirb,alpha) Gauss linear; - "div\(phi,.*rho.*\)" Gauss upwind; + div(phi,rho) Gauss upwind; div(rhoPhi,T) Gauss upwind; div(rhoPhi,K) Gauss upwind; div(phi,p) Gauss upwind; diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSchemes index bb0a92c2c7..50415d8162 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSchemes +++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSchemes @@ -30,8 +30,8 @@ divSchemes div(rhoPhi,U) Gauss linearUpwind grad(U); div(tauDm) Gauss linear; - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phirb,alpha.*\)" Gauss linear; + div(phi,alpha) Gauss vanLeer; + div(phirb,alpha) Gauss linear; div(rhoPhi,k) Gauss limitedLinear 1; div(rhoPhi,epsilon) Gauss limitedLinear 1; diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2DMRF/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2DMRF/system/fvSchemes index cd23cb1bb8..0a22f1ea19 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2DMRF/system/fvSchemes +++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2DMRF/system/fvSchemes @@ -30,8 +30,8 @@ divSchemes div(rhoPhi,U) Gauss linearUpwind grad(U); div(tauDm) Gauss linear; - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phirb,alpha.*\)" Gauss linear; + div(phi,alpha) Gauss vanLeer; + div(phirb,alpha) Gauss linear; div(rhoPhi,k) Gauss limitedLinear 1; div(rhoPhi,epsilon) Gauss limitedLinear 1; div(phi,k) Gauss limitedLinear 1; diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSchemes index 2b275e3cdc..300f6e8a32 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSchemes +++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSchemes @@ -30,8 +30,8 @@ divSchemes div(rhoPhi,U) Gauss linearUpwind grad(U); div(tauDm) Gauss linear; - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phirb,alpha.*\)" Gauss linear; + div(phi,alpha) Gauss vanLeer; + div(phirb,alpha) Gauss linear; div(rhoPhi,k) Gauss limitedLinear 1; div(rhoPhi,epsilon) Gauss limitedLinear 1; diff --git a/tutorials/multiphase/multiphaseEulerFoam/LES/bubbleColumn/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/LES/bubbleColumn/system/fvSchemes index 33d4a28047..d2a812e29c 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/LES/bubbleColumn/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/LES/bubbleColumn/system/fvSchemes @@ -33,15 +33,15 @@ divSchemes div(phir,alpha.water,alpha.air) Gauss vanLeer; div(phir,alpha.air,alpha.water) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + div(alphaRhoPhi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinearV 1; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,k.*\)" Gauss limitedLinear 1; + "div\(alphaRhoPhi,(h|e)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,K) Gauss limitedLinear 1; + div(alphaRhoPhi,(p|rho)) Gauss limitedLinear 1; + div(alphaRhoPhi,k) Gauss limitedLinear 1; - "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/fvSchemes index 9789eb74ec..9a43361489 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/fvSchemes @@ -29,22 +29,22 @@ divSchemes { default none; - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*\)" Gauss vanLeer; + div(phi,alpha) Gauss vanLeer; + div(phir,alpha) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss linearUpwind limited; - "div\(phi.*,U.*\)" Gauss linearUpwind limited; + div(alphaRhoPhi,U) Gauss linearUpwind limited; + div(phi,U) Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,Yi\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,f.*\)" Gauss upwind; - "div\(alphaRhoPhi.*,K.*\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss linearUpwind limited; - "div\(phi.*,kappai.*\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,(k|epsilon|omega).*\)" Gauss upwind; + div(alphaRhoPhi,Yi) Gauss linearUpwind limited; + // "div\(alphaRhoPhi,(h|e)\)" Gauss linearUpwind limited; + div(alphaRhoPhi,f) Gauss upwind; + div(alphaRhoPhi,K) Gauss linearUpwind limited; + div(alphaRhoPhi,(p|rho)) Gauss linearUpwind limited; + div(phi,kappai) Gauss linearUpwind limited; + "div\(alphaRhoPhi,(k|epsilon|omega)\)" Gauss upwind; "div\(phim,(k|epsilon)m\)" Gauss upwind; - "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/system/fvSchemes index 5cdc288013..9f10ebbab4 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/system/fvSchemes @@ -28,19 +28,19 @@ divSchemes { default none; - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*\)" Gauss vanLeer; + div(phi,alpha) Gauss vanLeer; + div(phir,alpha) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + div(alphaRhoPhi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinearV 1; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1; + "div\(alphaRhoPhi,(h|e)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,K) Gauss limitedLinear 1; + div(alphaRhoPhi,(p|rho)) Gauss limitedLinear 1; div(alphaRhoPhi.solids,Theta.solids) Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,(k|epsilon).*\)" Gauss limitedLinear 1; + "div\(alphaRhoPhi,(k|epsilon)\)" Gauss limitedLinear 1; div((((alpha.gas*rho.gas)*nuEff.gas)*dev2(T(grad(U.gas))))) Gauss linear; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumn/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumn/system/fvSchemes index 1ac169aee3..1fdc427538 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumn/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumn/system/fvSchemes @@ -33,17 +33,17 @@ divSchemes div(phir,alpha.water,alpha.air) Gauss vanLeer; div(phir,alpha.air,alpha.water) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + div(alphaRhoPhi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinearV 1; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1; + "div\(alphaRhoPhi,(h|e)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,K) Gauss limitedLinear 1; + div(alphaRhoPhi,(p|rho)) Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,(k|epsilon).*\)" Gauss limitedLinear 1; + "div\(alphaRhoPhi,(k|epsilon)\)" Gauss limitedLinear 1; "div\(phim,(k|epsilon)m\)" Gauss limitedLinear 1; - "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes index 99c704bbc5..ef93c2b353 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes @@ -28,21 +28,21 @@ divSchemes { default none; - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*\)" Gauss vanLeer; + div(phi,alpha) Gauss vanLeer; + div(phir,alpha) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + div(alphaRhoPhi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinearV 1; - "div\(alphaRhoPhi.*,Yi\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,Yi) Gauss limitedLinear 1; + "div\(alphaRhoPhi,(h|e)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,K) Gauss limitedLinear 1; + div(alphaRhoPhi,(p|rho)) Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,(k|epsilon).*\)" Gauss limitedLinear 1; + "div\(alphaRhoPhi,(k|epsilon)\)" Gauss limitedLinear 1; "div\(phim,(k|epsilon)m\)" Gauss limitedLinear 1; - "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/fvSchemes index 0a3c6dd58b..fa10772b17 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/fvSchemes @@ -28,15 +28,15 @@ divSchemes { default none; - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*,alpha.*\)" Gauss vanLeer; + div(phi,alpha) Gauss vanLeer; + div(phir,alpha,alpha) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss linearUpwind limited; - "div\(phi.*,U.*\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,(k|epsilon|omega).*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,f.*\)" Gauss limitedLinear 1; + div(alphaRhoPhi,U) Gauss linearUpwind limited; + div(phi,U) Gauss linearUpwind limited; + "div\(alphaRhoPhi,(k|epsilon|omega)\)" Gauss limitedLinear 1; + "div\(alphaPhi,f.*\)" Gauss limitedLinear 1; - "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/system/fvSchemes index b469f284ec..b1330c5eb9 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/system/fvSchemes @@ -28,19 +28,19 @@ divSchemes { default none; - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*\)" Gauss vanLeer; + div(phi,alpha) Gauss vanLeer; + div(phir,alpha) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + div(alphaRhoPhi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinearV 1; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1; + "div\(alphaRhoPhi,(h|e)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,K) Gauss limitedLinear 1; + div(alphaRhoPhi,(p|rho)) Gauss limitedLinear 1; div(alphaRhoPhi.particles,Theta.particles) Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,(k|epsilon).*\)" Gauss limitedLinear 1; + "div\(alphaRhoPhi,(k|epsilon)\)" Gauss limitedLinear 1; div((((alpha.air*rho.air)*nuEff.air)*dev2(T(grad(U.air))))) Gauss linear; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/pipeBend/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/pipeBend/system/fvSchemes index d1c62b4a3f..d2d76ae34f 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/pipeBend/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/pipeBend/system/fvSchemes @@ -25,19 +25,20 @@ gradSchemes divSchemes { - default none; + default none; - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*\)" Gauss vanLeer; + div(phi,alpha) Gauss vanLeer; + div(phir,alpha) Gauss vanLeer; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinearV 1; + div(alphaRhoPhi,U) Gauss limitedLinearV 1; - "div\(alphaPhi.*,f.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,p\)" Gauss limitedLinear 1; + "div\(alphaPhi,f.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,(h|e|k|epsilon).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; + div(alphaPhi,p) Gauss limitedLinear 1; + + "div\(alphaRhoPhi,(h|e|k|epsilon)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,K) Gauss limitedLinear 1; div(alphaRhoPhi.water,(p|rho.water)) Gauss limitedLinear 1; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/fvSchemes index cd6491a111..efe3ba5926 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/fvSchemes @@ -29,20 +29,20 @@ divSchemes { default none; - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*\)" Gauss vanLeer; + div(phi,alpha) Gauss vanLeer; + div(phir,alpha) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss linearUpwind limited; - "div\(phi.*,U.*\)" Gauss linearUpwind limited; + div(alphaRhoPhi,U) Gauss linearUpwind limited; + div(phi,U) Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,Yi\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,K.*\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,(k|epsilon|omega).*\)" Gauss linearUpwind limited; + div(alphaRhoPhi,Yi) Gauss linearUpwind limited; + "div\(alphaRhoPhi,(h|e)\)" Gauss linearUpwind limited; + div(alphaRhoPhi,K) Gauss linearUpwind limited; + div(alphaRhoPhi,(p|rho)) Gauss linearUpwind limited; + "div\(alphaRhoPhi,(k|epsilon|omega)\)" Gauss linearUpwind limited; "div\(phim,(k|epsilon)m\)" Gauss linearUpwind limited; - "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes index 75c9523ac2..2702e50cf5 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes @@ -29,21 +29,21 @@ divSchemes { default none; - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*\)" Gauss vanLeer; + div(phi,alpha) Gauss vanLeer; + div(phir,alpha) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss linearUpwind limited; - "div\(phi.*,U.*\)" Gauss linearUpwind limited; + div(alphaRhoPhi,U) Gauss linearUpwind limited; + div(phi,U) Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,Yi\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,K.*\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss linearUpwind limited; - "div\(phi.*,kappai.*\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,(k|epsilon|omega).*\)" Gauss linearUpwind limited; + div(alphaRhoPhi,Yi) Gauss linearUpwind limited; + "div\(alphaRhoPhi,(h|e)\)" Gauss linearUpwind limited; + div(alphaRhoPhi,K) Gauss linearUpwind limited; + div(alphaRhoPhi,(p|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; - "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/fvSchemes index d47a8848fd..32c2c67901 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/fvSchemes @@ -29,21 +29,21 @@ divSchemes { default none; - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*\)" Gauss vanLeer; + div(phi,alpha) Gauss vanLeer; + div(phir,alpha) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss linearUpwind limited; - "div\(phi.*,U.*\)" Gauss linearUpwind limited; + div(alphaRhoPhi,U) Gauss linearUpwind limited; + div(phi,U) Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,Yi\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss linearUpwind limited; - "div\(alphaPhi.*,f.*\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,K.*\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,(k|epsilon|omega).*\)" Gauss linearUpwind limited; + div(alphaRhoPhi,Yi) Gauss linearUpwind limited; + "div\(alphaRhoPhi,(h|e)\)" Gauss linearUpwind limited; + "div\(alphaPhi,f.*\)" Gauss linearUpwind limited; + div(alphaRhoPhi,K) Gauss linearUpwind limited; + div(alphaRhoPhi,(p|rho)) Gauss linearUpwind limited; + "div\(alphaRhoPhi,(k|epsilon|omega)\)" Gauss linearUpwind limited; "div\(phim,(k|epsilon)m\)" Gauss linearUpwind limited; - "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/fvSchemes index d47a8848fd..32c2c67901 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/fvSchemes @@ -29,21 +29,21 @@ divSchemes { default none; - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*\)" Gauss vanLeer; + div(phi,alpha) Gauss vanLeer; + div(phir,alpha) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss linearUpwind limited; - "div\(phi.*,U.*\)" Gauss linearUpwind limited; + div(alphaRhoPhi,U) Gauss linearUpwind limited; + div(phi,U) Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,Yi\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss linearUpwind limited; - "div\(alphaPhi.*,f.*\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,K.*\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss linearUpwind limited; - "div\(alphaRhoPhi.*,(k|epsilon|omega).*\)" Gauss linearUpwind limited; + div(alphaRhoPhi,Yi) Gauss linearUpwind limited; + "div\(alphaRhoPhi,(h|e)\)" Gauss linearUpwind limited; + "div\(alphaPhi,f.*\)" Gauss linearUpwind limited; + div(alphaRhoPhi,K) Gauss linearUpwind limited; + div(alphaRhoPhi,(p|rho)) Gauss linearUpwind limited; + "div\(alphaRhoPhi,(k|epsilon|omega)\)" Gauss linearUpwind limited; "div\(phim,(k|epsilon)m\)" Gauss linearUpwind limited; - "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/system/fvSchemes index d4ebbb4908..62900ecf0b 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/system/fvSchemes @@ -28,17 +28,17 @@ divSchemes { default none; - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*,alpha.*\)" Gauss vanLeer; + div(phi,alpha) Gauss vanLeer; + div(phir,alpha,alpha) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + div(alphaRhoPhi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinearV 1; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1; + "div\(alphaRhoPhi,(h|e)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,K) Gauss limitedLinear 1; + div(alphaRhoPhi,(p|rho)) Gauss limitedLinear 1; - "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes index 777d7b8e7c..1a411a1dc8 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes @@ -34,7 +34,7 @@ divSchemes div(alphaRhoPhi,U) Gauss limitedLinearV 1; div(phi,U) Gauss limitedLinearV 1; - div(alphaRhoPhi,e) Gauss limitedLinear 1; + "div\(alphaRhoPhi,(h|e)\)" Gauss limitedLinear 1; div(alphaRhoPhi,K) Gauss limitedLinear 1; div(alphaRhoPhi,(p|rho)) Gauss limitedLinear 1; diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes index e944a6e4d7..830c0f096b 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes @@ -28,18 +28,18 @@ divSchemes { default none; - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*\)" Gauss vanLeer; + div(phi,alpha) Gauss vanLeer; + div(phir,alpha) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + div(alphaRhoPhi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinearV 1; - "div\(alphaRhoPhi.*,Yi\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,Yi) Gauss limitedLinear 1; + "div\(alphaRhoPhi,(h|e)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,K) Gauss limitedLinear 1; + div(alphaRhoPhi,(p|rho)) Gauss limitedLinear 1; - "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes index e944a6e4d7..830c0f096b 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes @@ -28,18 +28,18 @@ divSchemes { default none; - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*\)" Gauss vanLeer; + div(phi,alpha) Gauss vanLeer; + div(phir,alpha) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + div(alphaRhoPhi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinearV 1; - "div\(alphaRhoPhi.*,Yi\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,Yi) Gauss limitedLinear 1; + "div\(alphaRhoPhi,(h|e)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,K) Gauss limitedLinear 1; + div(alphaRhoPhi,(p|rho)) Gauss limitedLinear 1; - "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes index 7ac132b1cb..adb14fb6cb 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes @@ -33,16 +33,16 @@ divSchemes div(phir,alpha.water,alpha.air) Gauss vanLeer; div(phir,alpha.air,alpha.water) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + div(alphaRhoPhi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinearV 1; div(phi.air,kappai.air) Gauss vanLeer; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1; + "div\(alphaRhoPhi,(h|e)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,K) Gauss limitedLinear 1; + div(alphaRhoPhi,(p|rho)) Gauss limitedLinear 1; - "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/system/fvSchemes index 4ee38f178c..e67ebefe62 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/system/fvSchemes @@ -26,17 +26,17 @@ gradSchemes divSchemes { - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*,alpha.*\)" Gauss vanLeer; + div(phi,alpha) Gauss vanLeer; + div(phir,alpha,alpha) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + div(alphaRhoPhi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinearV 1; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1; + "div\(alphaRhoPhi,(h|e)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,K) Gauss limitedLinear 1; + div(alphaRhoPhi,(p|rho)) Gauss limitedLinear 1; - "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/system/fvSchemes index 4300dde9e2..77583df879 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/system/fvSchemes @@ -28,15 +28,15 @@ divSchemes { default none; - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*\)" Gauss vanLeer; + div(phi,alpha) Gauss vanLeer; + div(phir,alpha) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + div(alphaRhoPhi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinearV 1; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1; + "div\(alphaRhoPhi,(h|e)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,K) Gauss limitedLinear 1; + div(alphaRhoPhi,(p|rho)) Gauss limitedLinear 1; div((((alpha.air*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 33e37f4a2f..26c508094b 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/system/fvSchemes @@ -33,14 +33,14 @@ divSchemes div(phir,alpha.water,alpha.air) Gauss vanLeer; div(phir,alpha.air,alpha.water) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + div(alphaRhoPhi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinearV 1; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1; + "div\(alphaRhoPhi,(h|e)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,K) Gauss limitedLinear 1; + div(alphaRhoPhi,(p|rho)) Gauss limitedLinear 1; - "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes index 4ee38f178c..e67ebefe62 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes @@ -26,17 +26,17 @@ gradSchemes divSchemes { - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*,alpha.*\)" Gauss vanLeer; + div(phi,alpha) Gauss vanLeer; + div(phir,alpha,alpha) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + div(alphaRhoPhi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinearV 1; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1; + "div\(alphaRhoPhi,(h|e)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,K) Gauss limitedLinear 1; + div(alphaRhoPhi,(p|rho)) Gauss limitedLinear 1; - "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2DMRF/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2DMRF/system/fvSchemes index 4ee38f178c..e67ebefe62 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2DMRF/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2DMRF/system/fvSchemes @@ -26,17 +26,17 @@ gradSchemes divSchemes { - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*,alpha.*\)" Gauss vanLeer; + div(phi,alpha) Gauss vanLeer; + div(phir,alpha,alpha) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + div(alphaRhoPhi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinearV 1; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1; + "div\(alphaRhoPhi,(h|e)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,K) Gauss limitedLinear 1; + div(alphaRhoPhi,(p|rho)) Gauss limitedLinear 1; - "div\(\(\(\(alpha.*\*rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/system/fvSchemes index d7cd5cfdfe..15a1984e69 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/system/fvSchemes @@ -26,23 +26,24 @@ gradSchemes divSchemes { - default none; + default none; - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*\)" Gauss vanLeer; + div(phi,alpha) Gauss vanLeer; + div(phir,alpha) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + div(alphaRhoPhi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinearV 1; - "div\(alphaRhoPhi.*,Yi\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,Yi) Gauss limitedLinear 1; + "div\(alphaRhoPhi,(h|e)\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,(k|epsilon).*\)" Gauss limitedLinear 1; - "div\(phim,(k|epsilon)m\)" Gauss limitedLinear 1; + div(alphaRhoPhi,K) Gauss limitedLinear 1; + div(alphaRhoPhi,(p|rho)) Gauss limitedLinear 1; - "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + "div\(alphaRhoPhi,(k|epsilon)\)" Gauss limitedLinear 1; + "div\(phim,(k|epsilon)m\)" Gauss limitedLinear 1; + + div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/fvSchemes index 4d61e622bd..743153c7d7 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/fvSchemes @@ -27,23 +27,23 @@ gradSchemes divSchemes { - default none; + default none; - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*\)" Gauss vanLeer; + div(phi,alpha) Gauss vanLeer; + div(phir,alpha) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + div(alphaRhoPhi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinearV 1; - "div\(alphaRhoPhi.*,(k|epsilon|h|e).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,Y.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1; + "div\(alphaRhoPhi,(k|epsilon|h|e)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,K) Gauss limitedLinear 1; + div(alphaRhoPhi,Yi) Gauss limitedLinear 1; + div(alphaRhoPhi,(p|rho)) Gauss limitedLinear 1; - "div\(alphaPhi.*,f.*\)" Gauss upwind; - "div\(fAlphaPhi.*,kappa.*\)" Gauss linearUpwind limited; + "div\(alphaPhi,f.*\)" Gauss upwind; + "div\(fAlphaPhi,kappa.*\)" Gauss linearUpwind limited; - "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/fvSchemes index 4d61e622bd..743153c7d7 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/fvSchemes @@ -27,23 +27,23 @@ gradSchemes divSchemes { - default none; + default none; - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*\)" Gauss vanLeer; + div(phi,alpha) Gauss vanLeer; + div(phir,alpha) Gauss vanLeer; - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + div(alphaRhoPhi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss limitedLinearV 1; - "div\(alphaRhoPhi.*,(k|epsilon|h|e).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,Y.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,\(p\|rho.*\)\)" Gauss limitedLinear 1; + "div\(alphaRhoPhi,(k|epsilon|h|e)\)" Gauss limitedLinear 1; + div(alphaRhoPhi,K) Gauss limitedLinear 1; + div(alphaRhoPhi,Yi) Gauss limitedLinear 1; + div(alphaRhoPhi,(p|rho)) Gauss limitedLinear 1; - "div\(alphaPhi.*,f.*\)" Gauss upwind; - "div\(fAlphaPhi.*,kappa.*\)" Gauss linearUpwind limited; + "div\(alphaPhi,f.*\)" Gauss upwind; + "div\(fAlphaPhi,kappa.*\)" Gauss linearUpwind limited; - "div\(\(\(\(alpha.*\*rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + div((((alpha*rho)*nuEff)*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes