From 0b4174e6b6f87ab515881abf5147325cfe885761 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 29 Oct 2013 13:27:11 +0000
Subject: [PATCH] PIMPLE updates

---
 .../multiphase/MRFInterFoam/MRFInterFoam.C    | 33 +++++++++++--------
 .../porousInterFoam/porousInterFoam.C         | 33 +++++++++++--------
 2 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/applications/solvers/multiphase/MRFInterFoam/MRFInterFoam.C b/applications/solvers/multiphase/MRFInterFoam/MRFInterFoam.C
index e9415bf3e..c0fb4a2c5 100644
--- a/applications/solvers/multiphase/MRFInterFoam/MRFInterFoam.C
+++ b/applications/solvers/multiphase/MRFInterFoam/MRFInterFoam.C
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "readGravitationalAcceleration.H"
-    #include "readPISOControls.H"
+    #include "readPIMPLEControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
     #include "createMRFZones.H"
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readPISOControls.H"
+        #include "readPIMPLEControls.H"
         #include "readTimeControls.H"
         #include "CourantNo.H"
         #include "setDeltaT.H"
@@ -77,21 +77,26 @@ int main(int argc, char *argv[])
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        twoPhaseProperties.correct();
-
-        #include "alphaEqnSubCycle.H"
-
-        #include "UEqn.H"
-
-        // --- PISO loop
-        for (int corr=0; corr<nCorr; corr++)
+        // Pressure-velocity corrector
+        int oCorr = 0;
+        do
         {
-            #include "pEqn.H"
-        }
+            twoPhaseProperties.correct();
 
-        #include "continuityErrs.H"
+#           include "alphaEqnSubCycle.H"
 
-        turbulence->correct();
+#           include "UEqn.H"
+
+            // --- PISO loop
+            for (int corr=0; corr<nCorr; corr++)
+            {
+#               include "pEqn.H"
+            }
+
+#           include "continuityErrs.H"
+
+            turbulence->correct();
+        } while (++oCorr < nOuterCorr);
 
         runTime.write();
 
diff --git a/applications/solvers/multiphase/porousInterFoam/porousInterFoam.C b/applications/solvers/multiphase/porousInterFoam/porousInterFoam.C
index 2bb542920..c3c2cc436 100644
--- a/applications/solvers/multiphase/porousInterFoam/porousInterFoam.C
+++ b/applications/solvers/multiphase/porousInterFoam/porousInterFoam.C
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 #   include "createMesh.H"
 #   include "readGravitationalAcceleration.H"
-#   include "readPISOControls.H"
+#   include "readPIMPLEControls.H"
 #   include "initContinuityErrs.H"
 #   include "createFields.H"
 #   include "createPorousZones.H"
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-#       include "readPISOControls.H"
+#       include "readPIMPLEControls.H"
 #       include "readTimeControls.H"
 #       include "CourantNo.H"
 #       include "setDeltaT.H"
@@ -79,21 +79,26 @@ int main(int argc, char *argv[])
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        twoPhaseProperties.correct();
-
-#       include "alphaEqnSubCycle.H"
-
-#       include "UEqn.H"
-
-        // --- PISO loop
-        for (int corr = 0; corr < nCorr; corr++)
+        // Pressure-velocity corrector
+        int oCorr = 0;
+        do
         {
-#           include "pEqn.H"
-        }
+            twoPhaseProperties.correct();
 
-#       include "continuityErrs.H"
+#           include "alphaEqnSubCycle.H"
 
-        turbulence->correct();
+#           include "UEqn.H"
+
+            // --- PISO loop
+            for (int corr = 0; corr < nCorr; corr++)
+            {
+#               include "pEqn.H"
+            }
+
+#           include "continuityErrs.H"
+
+            turbulence->correct();
+        } while (++oCorr < nOuterCorr);
 
         runTime.write();