From 09f5d38fb451cf1060a37f1fa316f9aa3c00bfaa Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Wed, 13 Aug 2008 12:40:48 +0100
Subject: [PATCH] Minor consistency changes.

---
 .../solvers/compressible/rhoPimpleFoam/UEqn.H | 49 ++++++++++++-------
 .../solvers/compressible/rhoPimpleFoam/pEqn.H | 17 +++++--
 .../rhoPimpleFoam/rhoPimpleFoam.C             |  8 ++-
 3 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
index 2cd4c5d2d3..9c12cf9585 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
@@ -1,25 +1,36 @@
-    // Solve the Momentum equation
+// Solve the Momentum equation
 
-    tmp<fvVectorMatrix> UEqn
-    (
-        fvm::ddt(rho, U)
-      + fvm::div(phi, U)
-      + turbulence->divDevRhoReff(U)
-    );
+tmp<fvVectorMatrix> UEqn
+(
+    fvm::ddt(rho, U)
+  + fvm::div(phi, U)
+  + turbulence->divDevRhoReff(U)
+);
 
-//if (oCorr != nOuterCorr-1)
+if (oCorr == nOuterCorr-1)
+{
+    UEqn().relax(1);
+}
+else
+{
+    UEqn().relax();
+}
+
+volScalarField rUA = 1.0/UEqn().A();
+
+if (momentumPredictor)
+{
+    if (oCorr == nOuterCorr-1)
     {
-        UEqn().relax();
+        solve(UEqn() == -fvc::grad(p), mesh.solver("UFinal"));
     }
-
-    if (momentumPredictor)
+    else
     {
-        if (oCorr == nOuterCorr-1)
-        {
-            solve(UEqn() == -fvc::grad(p), mesh.solver("UFinal"));
-        }
-        else
-        {
-            solve(UEqn() == -fvc::grad(p));
-        }
+        solve(UEqn() == -fvc::grad(p));
     }
+}
+else
+{
+    U = rUA*(UEqn().H() - fvc::grad(p));
+    U.correctBoundaryConditions();
+}
diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
index a08812cee0..7918618404 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
@@ -29,7 +29,12 @@ if (transonic)
           - fvm::laplacian(rho*rUA, p)
         );
 
-        if (oCorr == nOuterCorr-1 && corr == nCorr-1 && nonOrth == nNonOrthCorr)
+        if
+        (
+            oCorr == nOuterCorr-1
+            && corr == nCorr-1
+            && nonOrth == nNonOrthCorr
+        )
         {
             pEqn.solve(mesh.solver("pFinal"));
         }
@@ -46,7 +51,7 @@ if (transonic)
 }
 else
 {
-    phi = 
+    phi =
         fvc::interpolate(rho)*
         (
             (fvc::interpolate(U) & mesh.Sf())
@@ -57,6 +62,7 @@ else
 
     for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
+        // Pressure corrector
         fvScalarMatrix pEqn
         (
             fvm::ddt(psi, p)
@@ -64,7 +70,12 @@ else
           - fvm::laplacian(rho*rUA, p)
         );
 
-        if (oCorr == nOuterCorr-1 && corr == nCorr-1 && nonOrth == nNonOrthCorr)
+        if
+        (
+            oCorr == nOuterCorr-1
+         && corr == nCorr-1
+         && nonOrth == nNonOrthCorr
+        )
         {
             pEqn.solve(mesh.solver("pFinal"));
         }
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index d13027da55..9b09d73bbe 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@@ -68,9 +68,8 @@ int main(int argc, char *argv[])
             rho.storePrevIter();
         }
 
-        // --- PIMPLE loop
-        int oCorr=0;
-        do
+        // --- Pressure-velocity PIMPLE corrector loop
+        for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
         {
             #include "UEqn.H"
             #include "hEqn.H"
@@ -82,8 +81,7 @@ int main(int argc, char *argv[])
             }
 
             turbulence->correct();
-
-        } while (++oCorr < nOuterCorr);
+        }
 
         runTime.write();