From 638e9c8e27fc8c28044bad08f55f2dd42441137e Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 28 Nov 2011 13:02:11 +0000
Subject: [PATCH] interDyMFoam: Corrected handling of relative and absolute
 fluxes in correctPhi

---
 applications/solvers/multiphase/interFoam/interDyMFoam/correctPhi.H | 4 ++--
 .../solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/correctPhi.H b/applications/solvers/multiphase/interFoam/interDyMFoam/correctPhi.H
index 0e373e1f..ce1d2982 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/correctPhi.H
@@ -36,7 +36,7 @@
 
     fvc::makeAbsolute(phi, U);
 
-    while (pimple.correctNonOrthogonal())
+    for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
     {
         fvScalarMatrix pcorrEqn
         (
@@ -46,7 +46,7 @@
         pcorrEqn.setReference(pRefCell, pRefValue);
         pcorrEqn.solve();
 
-        if (pimple.finalNonOrthogonalIter())
+        if (nonOrth == pimple.nNonOrthCorr())
         {
             phi -= pcorrEqn.flux();
             phiAbs = phi;
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
index 1face6dd..4d50a031 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
@@ -54,13 +54,13 @@ int main(int argc, char *argv[])
 
     pimpleControl pimple(mesh);
 
+    surfaceScalarField phiAbs("phiAbs", phi);
+    fvc::makeAbsolute(phiAbs, U);
+
     #include "correctPhi.H"
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
-    surfaceScalarField phiAbs("phiAbs", phi);
-    fvc::makeAbsolute(phiAbs, U);
-
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
     Info<< "\nStarting time loop\n" << endl;
 
-- 
2.11.4.GIT