STYLE: DPMFoam, MPPICFoam: Renamed alphaPhic -> alphaPhi.<continuous phase name>

for consistency with multiphase solvers and compatibility with the generalized
TurbulenceModels library.
This commit is contained in:
Henry Weller
2017-10-11 23:04:42 +01:00
committed by Andrew Heather
parent efe4a9a4b7
commit a45b422b75
6 changed files with 17 additions and 8 deletions

View File

@ -151,7 +151,16 @@ alphac = max(1.0 - kinematicCloud.theta(), alphacMin);
alphac.correctBoundaryConditions(); alphac.correctBoundaryConditions();
surfaceScalarField alphacf("alphacf", fvc::interpolate(alphac)); surfaceScalarField alphacf("alphacf", fvc::interpolate(alphac));
surfaceScalarField alphaPhic("alphaPhic", alphacf*phic);
surfaceScalarField alphaPhic
(
IOobject::groupName
(
"alphaPhi",
continuousPhaseName
),
alphacf*phic
);
autoPtr<PhaseIncompressibleTurbulenceModel<singlePhaseTransportModel>> autoPtr<PhaseIncompressibleTurbulenceModel<singlePhaseTransportModel>>
continuousPhaseTurbulence continuousPhaseTurbulence

View File

@ -28,7 +28,7 @@ divSchemes
{ {
default none; 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(((alpha.air*nuEff.air)*dev2(T(grad(U.air))))) Gauss linear;
} }

View File

@ -28,7 +28,7 @@ divSchemes
{ {
default none; 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(((alpha.air*nuEff.air)*dev2(T(grad(U.air))))) Gauss linear;
div(phiGByA,kinematicCloud:alpha) Gauss linear; div(phiGByA,kinematicCloud:alpha) Gauss linear;

View File

@ -33,7 +33,7 @@ divSchemes
{ {
default none; 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(((alpha.air*nuEff.air)*dev2(T(grad(U.air))))) Gauss linear;
div(phiGByA,kinematicCloud:alpha) Gauss linear; div(phiGByA,kinematicCloud:alpha) Gauss linear;

View File

@ -27,11 +27,11 @@ gradSchemes
divSchemes divSchemes
{ {
default none; 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(((alpha.air*nuEff.air)*dev2(T(grad(U.air))))) Gauss linear;
div(phiGByA,kinematicCloud:alpha) Gauss linear; div(phiGByA,kinematicCloud:alpha) Gauss linear;
div(alphaPhic,epsilon.air) Gauss limitedLinear 1; div(alphaPhi.air,epsilon.air) Gauss limitedLinear 1;
div(alphaPhic,k.air) Gauss limitedLinear 1; div(alphaPhi.air,k.air) Gauss limitedLinear 1;
} }
laplacianSchemes laplacianSchemes

View File

@ -28,7 +28,7 @@ divSchemes
{ {
default none; 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(((alpha.air*nuEff.air)*dev2(T(grad(U.air))))) Gauss linear;
} }