diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C b/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C
index 494acaf05fd83d7cc934cb0dd737d1d90af1b4af..33d83161ce04ce0d5b392aed7f71943fcae681e3 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 ccf89e5467dc309e2162679dd8d1445a7fa46329..f6386bde4851f4f833533a055cb277d816b45c6f 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 83398509e7846f971a1e59cdd4790bcce76f957a..32ee5aee06f9b298a7f56d95db03b428704e995b 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 f221ff9ad392adecef1637c88d4cf96a2acb75b4..8c59d0f9d4e89d462783e2ffea6ad07c5939e623 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 259ebb9cef6c986ee2bd2861ac1ff997a7dfb6ac..72a9af2c66b85a04f11ec0b0a142c9ffdf6a48d2 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 fad22244619414c05db570ecc9ebc26b5d81c500..edeab9ac703687044804a91a905f09d3228bac3d 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 d81f5c93d383300994b3827f11559d6d55935a79..c30188784418303ee074e5f36ead2e4de87633ce 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 247d4e2cc91882af303e34e3defc1ff8385a6b0d..86b19912cfff0992026970c571ccc8ba991c03eb 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 2a653dcf37fb115d9ad1dc5c4de7552f168bea0f..bea114da8040e6b9a01dcd656dd3d0beddfe673f 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 636e13d8484cbf5d7ddb22a47b33442580cad54b..3819789af46b732be8dde30fa32c64fc324435a3 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<Switch>("MULESCorr", false));
-bool alphaOuterCorrectors
-(
- alphaControls.lookupOrDefault<Switch>("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 4ae9d6836f504857fc37a1015f514dc4a02a204d..42c3d9f049863a40ebcc2f44b871c267a5e84376 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 1b06dc03d20c9fe4e3a47a1ee276abca80998988..39ce379d62452884244685a2def76b3e95621175 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 40b5297c9df0cb4ce63ac9b2831afc14e182f743..063da65f351245f4ddf5f7594f62a39c6c4fb5bc 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 01414d4e21b0dc4ae5dc2e1b3a40cfb60a4d1762..c5151b237664efd0380a0897abc535c35b864cf7 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 01414d4e21b0dc4ae5dc2e1b3a40cfb60a4d1762..c5151b237664efd0380a0897abc535c35b864cf7 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;