diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index c143dba2d1..3af90199a6 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -506,7 +506,8 @@ Foam::tmp Foam::kineticTheoryModel::divDevRhoReff - fvc::div ( (this->rho_*this->nut_)*dev2(T(fvc::grad(U))) - + ((this->rho_*lambda_)*fvc::div(this->phi_))*symmTensor::I + + ((this->rho_*lambda_)*fvc::div(this->phi_)) + *dimensioned("I", dimless, symmTensor::I) ) ); } diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes index ef63a5dd4c..549178c4c6 100644 --- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes +++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes @@ -27,18 +27,17 @@ gradSchemes divSchemes { - default none; + default none; - div(phi,alpha.air) Gauss vanLeer; - div(phir,alpha.air) Gauss vanLeer; + div(phi,alpha.air) Gauss vanLeer; + div(phir,alpha.air) Gauss vanLeer; - "div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; - "div\(\(alpha.*Rc\)\)" Gauss linear; - "div\(phi.*,.*rho.*\)" Gauss linear; + "div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1; + "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + "div\(phi.*,.*rho.*\)" Gauss linear; - "div\(alphaPhi.*,h.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,K.*\)" Gauss limitedLinear 1; + "div\(alphaPhi.*,(h|e).*\)" Gauss limitedLinear 1; + "div\(alphaPhi.*,(K.*|p)\)" Gauss limitedLinear 1; "div\(\(\(alpha.*nuEff.*\)*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; } diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes index 93e6cddd22..9fc65bf8cb 100644 --- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes +++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes @@ -27,25 +27,19 @@ 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\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1; "div\(phi.*,U.*\)" Gauss limitedLinearV 1; - "div\(\(alpha.*Rc\)\)" Gauss linear; "div\(phi.*,.*rho.*\)" Gauss linear; - div(alphaPhi.particles,Theta.particles) Gauss limitedLinear 1; - div(alphaPhi.air,k.air) Gauss limitedLinear 1; - div(alphaPhi.air,epsilon.air) Gauss limitedLinear 1; "div\(alphaPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaPhi.*,(K.*|p)\)" Gauss limitedLinear 1; "div\(\(\(alpha.*nuEff.*\)*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; - - div(((nut.particles*dev2(T(grad(U.particles))))+((lambda.particles*div(phi.particles))*(1,0,0,1,0,1)))) Gauss linear; } laplacianSchemes diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes index faed9fcacb..c29b10072a 100644 --- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes +++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes @@ -27,18 +27,17 @@ gradSchemes divSchemes { - default none; + default none; - div(phi,alpha.air) Gauss vanLeer; - div(phir,alpha.air) Gauss vanLeer; + div(phi,alpha.air) Gauss vanLeer; + div(phir,alpha.air) Gauss vanLeer; - "div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; - "div\(\(alpha.*Rc\)\)" Gauss linear; - "div\(phi.*,.*rho.*\)" Gauss linear; + "div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1; + "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + "div\(phi.*,.*rho.*\)" Gauss linear; - "div\(alphaPhi.*,h.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,K.*\)" Gauss limitedLinear 1; + "div\(alphaPhi.*,(h|e).*\)" Gauss limitedLinear 1; + "div\(alphaPhi.*,(K.*|p)\)" Gauss limitedLinear 1; "div\(\(\(alpha.*nuEff.*\)*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; } @@ -62,7 +61,6 @@ fluxRequired { default no; p ; - alpha1; } diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/ras/bubbleColumn/system/fvSchemes b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/ras/bubbleColumn/system/fvSchemes index 9393e5c97e..f55c52ee56 100644 --- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/ras/bubbleColumn/system/fvSchemes +++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/ras/bubbleColumn/system/fvSchemes @@ -27,18 +27,17 @@ gradSchemes divSchemes { - default none; + default none; - div(phi,alpha.air) Gauss vanLeer; - div(phir,alpha.air) Gauss vanLeer; + div(phi,alpha.air) Gauss vanLeer; + div(phir,alpha.air) Gauss vanLeer; - "div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; - "div\(\(alpha.*Rc\)\)" Gauss linear; - "div\(phi.*,.*rho.*\)" Gauss linear; + "div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1; + "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + "div\(phi.*,.*rho.*\)" Gauss linear; - "div\(alphaPhi.*,h.*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,K.*\)" Gauss limitedLinear 1; + "div\(alphaPhi.*,(h|e).*\)" Gauss limitedLinear 1; + "div\(alphaPhi.*,(K.*|p)\)" Gauss limitedLinear 1; "div\(alphaPhi.*,(k|epsilon).*\)" Gauss limitedLinear 1; diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/ras/fluidisedBed/system/fvSchemes b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/ras/fluidisedBed/system/fvSchemes index 93e6cddd22..2546db4112 100644 --- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/ras/fluidisedBed/system/fvSchemes +++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/ras/fluidisedBed/system/fvSchemes @@ -27,25 +27,25 @@ 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\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1; "div\(phi.*,U.*\)" Gauss limitedLinearV 1; - "div\(\(alpha.*Rc\)\)" Gauss linear; "div\(phi.*,.*rho.*\)" Gauss linear; - div(alphaPhi.particles,Theta.particles) Gauss limitedLinear 1; - div(alphaPhi.air,k.air) Gauss limitedLinear 1; - div(alphaPhi.air,epsilon.air) Gauss limitedLinear 1; "div\(alphaPhi.*,(h|e).*\)" Gauss limitedLinear 1; "div\(alphaPhi.*,(K.*|p)\)" Gauss limitedLinear 1; + div(alphaPhi.particles,Theta.particles) Gauss limitedLinear 1; + + "div\(alphaPhi.*,(k|epsilon).*\)" Gauss limitedLinear 1; + "div\(\(\(alpha.*nuEff.*\)*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; - div(((nut.particles*dev2(T(grad(U.particles))))+((lambda.particles*div(phi.particles))*(1,0,0,1,0,1)))) Gauss linear; + div(((nut.particles*dev2(T(grad(U.particles))))+((lambda.particles*div(phi.particles))*I))) Gauss linear; } laplacianSchemes