From a45b422b756937ad544d95fd11d4928e4b52193e Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Wed, 11 Oct 2017 23:04:42 +0100 Subject: [PATCH] STYLE: DPMFoam, MPPICFoam: Renamed alphaPhic -> alphaPhi. for consistency with multiphase solvers and compatibility with the generalized TurbulenceModels library. --- .../solvers/lagrangian/DPMFoam/createFields.H | 11 ++++++++++- .../lagrangian/DPMFoam/Goldschmidt/system/fvSchemes | 2 +- .../lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes | 2 +- .../lagrangian/MPPICFoam/column/system/fvSchemes | 2 +- .../lagrangian/MPPICFoam/cyclone/system/fvSchemes | 6 +++--- .../MPPICFoam/injectionChannel/system/fvSchemes | 2 +- 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/applications/solvers/lagrangian/DPMFoam/createFields.H b/applications/solvers/lagrangian/DPMFoam/createFields.H index f135bc791c..ea19bf758c 100644 --- a/applications/solvers/lagrangian/DPMFoam/createFields.H +++ b/applications/solvers/lagrangian/DPMFoam/createFields.H @@ -151,7 +151,16 @@ alphac = max(1.0 - kinematicCloud.theta(), alphacMin); alphac.correctBoundaryConditions(); surfaceScalarField alphacf("alphacf", fvc::interpolate(alphac)); -surfaceScalarField alphaPhic("alphaPhic", alphacf*phic); + +surfaceScalarField alphaPhic +( + IOobject::groupName + ( + "alphaPhi", + continuousPhaseName + ), + alphacf*phic +); autoPtr> continuousPhaseTurbulence diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSchemes b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSchemes index 2b3c1c544d..3b93d556d1 100644 --- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSchemes +++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSchemes @@ -28,7 +28,7 @@ divSchemes { default none; - div(alphaPhic,U.air) Gauss linearUpwindV unlimited; + div(alphaPhi.air,U.air) Gauss linearUpwindV unlimited; div(((alpha.air*nuEff.air)*dev2(T(grad(U.air))))) Gauss linear; } diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes index f43c6da9e0..ed385170de 100644 --- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes +++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes @@ -28,7 +28,7 @@ divSchemes { default none; - div(alphaPhic,U.air) Gauss linearUpwindV unlimited; + div(alphaPhi.air,U.air) Gauss linearUpwindV unlimited; div(((alpha.air*nuEff.air)*dev2(T(grad(U.air))))) Gauss linear; div(phiGByA,kinematicCloud:alpha) Gauss linear; diff --git a/tutorials/lagrangian/MPPICFoam/column/system/fvSchemes b/tutorials/lagrangian/MPPICFoam/column/system/fvSchemes index 4954006515..04a6ca6039 100644 --- a/tutorials/lagrangian/MPPICFoam/column/system/fvSchemes +++ b/tutorials/lagrangian/MPPICFoam/column/system/fvSchemes @@ -33,7 +33,7 @@ divSchemes { default none; - div(alphaPhic,U.air) Gauss linearUpwindV unlimited; + div(alphaPhi.air,U.air) Gauss linearUpwindV unlimited; div(((alpha.air*nuEff.air)*dev2(T(grad(U.air))))) Gauss linear; div(phiGByA,kinematicCloud:alpha) Gauss linear; diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSchemes b/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSchemes index 0eee4c9171..b1cf5b6762 100644 --- a/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSchemes +++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSchemes @@ -27,11 +27,11 @@ gradSchemes divSchemes { default none; - div(alphaPhic,U.air) Gauss linearUpwindV unlimited; + div(alphaPhi.air,U.air) Gauss linearUpwindV unlimited; div(((alpha.air*nuEff.air)*dev2(T(grad(U.air))))) Gauss linear; div(phiGByA,kinematicCloud:alpha) Gauss linear; - div(alphaPhic,epsilon.air) Gauss limitedLinear 1; - div(alphaPhic,k.air) Gauss limitedLinear 1; + div(alphaPhi.air,epsilon.air) Gauss limitedLinear 1; + div(alphaPhi.air,k.air) Gauss limitedLinear 1; } laplacianSchemes diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes index e9423356d4..84a4cb5c39 100644 --- a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes +++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes @@ -28,7 +28,7 @@ divSchemes { default none; - div(alphaPhic,U.air) Gauss linearUpwindV unlimited; + div(alphaPhi.air,U.air) Gauss linearUpwindV unlimited; div(((alpha.air*nuEff.air)*dev2(T(grad(U.air))))) Gauss linear; }