diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleAlphaEqnSubCycle.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleAlphaEqnSubCycle.H index f7cf0188d9..8739d46244 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleAlphaEqnSubCycle.H +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleAlphaEqnSubCycle.H @@ -1,3 +1,5 @@ +#include "alphaControls.H" + tmp talphaPhi1(alphaPhi10); if (nAlphaSubCycles > 1) diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C index 15d3a77fcc..fb5101a537 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -105,7 +105,6 @@ int main(int argc, char *argv[]) // --- Pressure-velocity PIMPLE corrector loop while (pimple.loop()) { - #include "alphaControls.H" #include "compressibleAlphaEqnSubCycle.H" turbulence.correctPhasePhi(); diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C index ccc76a6e14..91518f9167 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -138,7 +138,6 @@ int main(int argc, char *argv[]) divU = fvc::div(fvc::absolute(phi, U)); - #include "alphaControls.H" #include "compressibleAlphaEqnSubCycle.H" turbulence.correctPhasePhi(); diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H index d7b58a0f09..1d9c39f736 100644 --- a/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H +++ b/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H @@ -1,3 +1,5 @@ +#include "alphaControls.H" + { surfaceScalarField alphaPhi ( diff --git a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C index 8881fde170..bc2148b8bb 100644 --- a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C +++ b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C @@ -83,8 +83,6 @@ int main(int argc, char *argv[]) // --- Pressure-velocity PIMPLE corrector loop while (pimple.loop()) { - #include "alphaControls.H" - UdmModel.correct(); #include "alphaEqnSubCycle.H" diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C index 6c88a77924..4d979a8e5b 100644 --- a/applications/solvers/multiphase/interFoam/interFoam.C +++ b/applications/solvers/multiphase/interFoam/interFoam.C @@ -134,7 +134,6 @@ int main(int argc, char *argv[]) } } - #include "alphaControls.H" #include "alphaEqnSubCycle.H" mixture.correct(); diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnSubCycle.H index 0a5a81a6aa..1f395d424e 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnSubCycle.H +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnSubCycle.H @@ -1,3 +1,5 @@ +#include "alphaControls.H" + if (nAlphaSubCycles > 1) { dimensionedScalar totalDeltaT = runTime.deltaT(); diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C index ca2898e563..0879f49c20 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C @@ -125,7 +125,6 @@ int main(int argc, char *argv[]) } } - #include "alphaControls.H" #include "alphaEqnSubCycle.H" mixture.correct(); diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/alphaControls.H b/applications/solvers/multiphase/interPhaseChangeFoam/alphaControls.H index cc9d99e5e7..b443bfb348 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/alphaControls.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/alphaControls.H @@ -14,8 +14,8 @@ bool MULESCorr(alphaControls.lookupOrDefault("MULESCorr", false)); // alphaControls.lookupOrDefault("alphaApplyPrevCorr", false) //); -// Isotropic compression coefficient -scalar icAlpha +// compression coefficient +scalar cAlpha ( - alphaControls.lookupOrDefault("icAlpha", 0) + alphaControls.lookupOrDefault("cAlpha", 0) ); diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H index 534ed4a670..cfde37b000 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H @@ -1,13 +1,8 @@ +#include "alphaControls.H" + { // Standard face-flux compression coefficient - surfaceScalarField phic(mixture.cAlpha()*mag(phi/mesh.magSf())); - - // Add the optional isotropic compression contribution - if (icAlpha > 0) - { - phic *= (1.0 - icAlpha); - phic += (mixture.cAlpha()*icAlpha)*fvc::interpolate(mag(U)); - } + surfaceScalarField phic(cAlpha*mag(phi/mesh.magSf())); if (nAlphaSubCycles > 1) { diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C index 493525e6ad..39c4cb8f7b 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C @@ -140,7 +140,6 @@ int main(int argc, char *argv[]) dimensionedScalar(dimMass/dimTime, 0) ); - #include "alphaControls.H" #include "alphaEqnSubCycle.H" mixture.correct(); diff --git a/src/finiteVolume/cfdTools/general/include/alphaControls.H b/src/finiteVolume/cfdTools/general/include/alphaControls.H deleted file mode 100644 index 17d80a1a3f..0000000000 --- a/src/finiteVolume/cfdTools/general/include/alphaControls.H +++ /dev/null @@ -1,27 +0,0 @@ -const dictionary& alphaControls = mesh.solverDict(alpha1.name()); - -label nAlphaCorr(alphaControls.lookup