diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H b/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H index 817a0c91..d56b3716 100644 --- a/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H +++ b/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H @@ -17,6 +17,11 @@ phi, upwind(mesh, phi) ).fvmDiv(phi, alpha1) + ); + + solve + ( + alpha1Eqn - fv::gaussLaplacianScheme ( mesh, @@ -25,8 +30,6 @@ ).fvmLaplacian(fvc::interpolate(mut/rho), alpha1) ); - alpha1Eqn.solve(); - Info<< "Phase-1 volume fraction = " << alpha1.weightedAverage(mesh.Vsc()).value() << " Min(alpha1) = " << min(alpha1).value() diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C b/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C index 494acaf0..33d83161 100644 --- a/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C +++ b/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,14 +82,11 @@ int main(int argc, char *argv[]) { #include "alphaControls.H" - if (pimple.firstIter() || alphaOuterCorrectors) - { - twoPhaseProperties.correct(); + twoPhaseProperties.correct(); - #define LTSSOLVE - #include "alphaEqnSubCycle.H" - #undef LTSSOLVE - } + #define LTSSOLVE + #include "alphaEqnSubCycle.H" + #undef LTSSOLVE turbulence->correct(); diff --git a/applications/solvers/multiphase/interFoam/MRFInterFoam/MRFInterFoam.C b/applications/solvers/multiphase/interFoam/MRFInterFoam/MRFInterFoam.C index ccf89e54..f6386bde 100644 --- a/applications/solvers/multiphase/interFoam/MRFInterFoam/MRFInterFoam.C +++ b/applications/solvers/multiphase/interFoam/MRFInterFoam/MRFInterFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -86,14 +86,11 @@ int main(int argc, char *argv[]) { #include "alphaControls.H" - if (pimple.firstIter() || alphaOuterCorrectors) - { - twoPhaseProperties.correct(); + twoPhaseProperties.correct(); - #include "alphaEqnSubCycle.H" - interface.correct(); - #include "zonePhaseVolumes.H" - } + #include "alphaEqnSubCycle.H" + interface.correct(); + #include "zonePhaseVolumes.H" #include "UEqn.H" diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C index 83398509..32ee5aee 100644 --- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C +++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -132,13 +132,10 @@ int main(int argc, char *argv[]) #include "alphaControls.H" - if (pimple.firstIter() || alphaOuterCorrectors) - { - twoPhaseProperties.correct(); + twoPhaseProperties.correct(); - #include "alphaEqnSubCycle.H" - interface.correct(); - } + #include "alphaEqnSubCycle.H" + interface.correct(); #include "UEqn.H" diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C index f221ff9a..8c59d0f9 100644 --- a/applications/solvers/multiphase/interFoam/interFoam.C +++ b/applications/solvers/multiphase/interFoam/interFoam.C @@ -85,13 +85,10 @@ int main(int argc, char *argv[]) { #include "alphaControls.H" - if (pimple.firstIter() || alphaOuterCorrectors) - { - twoPhaseProperties.correct(); + twoPhaseProperties.correct(); - #include "alphaEqnSubCycle.H" - interface.correct(); - } + #include "alphaEqnSubCycle.H" + interface.correct(); #include "UEqn.H" diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnsSubCycle.H b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnsSubCycle.H index 259ebb9c..72a9af2c 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnsSubCycle.H +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnsSubCycle.H @@ -1,5 +1,3 @@ -#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 fad22244..edeab9ac 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -79,15 +79,12 @@ int main(int argc, char *argv[]) { #include "alphaControls.H" - if (pimple.firstIter() || alphaOuterCorrectors) - { - threePhaseProperties.correct(); + threePhaseProperties.correct(); - #include "alphaEqnsSubCycle.H" - interface.correct(); + #include "alphaEqnsSubCycle.H" + interface.correct(); - #define twoPhaseProperties threePhaseProperties - } + #define twoPhaseProperties threePhaseProperties #include "UEqn.H" diff --git a/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C b/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C index d81f5c93..c3018878 100644 --- a/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C +++ b/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -88,13 +88,10 @@ int main(int argc, char *argv[]) { #include "alphaControls.H" - if (pimple.firstIter() || alphaOuterCorrectors) - { - twoPhaseProperties.correct(); + twoPhaseProperties.correct(); - #include "alphaEqnSubCycle.H" - interface.correct(); - } + #include "alphaEqnSubCycle.H" + interface.correct(); #include "UEqn.H" diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C index 247d4e2c..86b19912 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C @@ -154,13 +154,10 @@ int main(int argc, char *argv[]) dimensionedScalar("0", dimMass/dimTime, 0) ); - if (pimple.firstIter() || alphaOuterCorrectors) - { - twoPhaseProperties->correct(); + twoPhaseProperties->correct(); - #include "alphaEqnSubCycle.H" - interface.correct(); - } + #include "alphaEqnSubCycle.H" + interface.correct(); #include "UEqn.H" diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C index 2a653dcf..bea114da 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -100,13 +100,10 @@ int main(int argc, char *argv[]) dimensionedScalar("0", dimMass/dimTime, 0) ); - if (pimple.firstIter() || alphaOuterCorrectors) - { - twoPhaseProperties->correct(); + twoPhaseProperties->correct(); - #include "alphaEqnSubCycle.H" - interface.correct(); - } + #include "alphaEqnSubCycle.H" + interface.correct(); #include "UEqn.H" diff --git a/src/finiteVolume/cfdTools/general/include/alphaControls.H b/src/finiteVolume/cfdTools/general/include/alphaControls.H index 636e13d8..3819789a 100644 --- a/src/finiteVolume/cfdTools/general/include/alphaControls.H +++ b/src/finiteVolume/cfdTools/general/include/alphaControls.H @@ -6,11 +6,6 @@ label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles"))); bool MULESCorr(alphaControls.lookupOrDefault("MULESCorr", false)); -bool alphaOuterCorrectors -( - alphaControls.lookupOrDefault("alphaOuterCorrectors", false) -); - // Apply the compression correction from the previous iteration // Improves efficiency for steady-simulations but can only be applied // once the alpha field is reasonably steady, i.e. fully developed diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSolution index 4ae9d683..42c3d9f0 100644 --- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/fvSolution @@ -24,8 +24,6 @@ solvers cAlpha 1; icAlpha 0; - alphaOuterCorrectors yes; - MULESCorr yes; nLimiterIter 10; alphaApplyPrevCorr yes; diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution index 1b06dc03..39ce379d 100644 --- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution @@ -23,8 +23,6 @@ solvers nAlphaSubCycles 1; cAlpha 1; - alphaOuterCorrectors yes; - MULESCorr yes; nLimiterIter 5; alphaApplyPrevCorr true; diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution index 40b5297c..063da65f 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution @@ -21,7 +21,6 @@ solvers { nAlphaCorr 2; nAlphaSubCycles 1; - alphaOuterCorrectors yes; cAlpha 1; MULESCorr yes; diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution index 01414d4e..c5151b23 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution +++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution @@ -21,7 +21,6 @@ solvers { nAlphaCorr 2; nAlphaSubCycles 1; - alphaOuterCorrectors yes; cAlpha 1; MULESCorr yes; diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution index 01414d4e..c5151b23 100644 --- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution +++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution @@ -21,7 +21,6 @@ solvers { nAlphaCorr 2; nAlphaSubCycles 1; - alphaOuterCorrectors yes; cAlpha 1; MULESCorr yes;