Minor consistency changes.

applications/solvers/compressible/rhoPimpleFoam/UEqn.H

@@ -1,19 +1,25 @@
-    // Solve the Momentum equation
+// Solve the Momentum equation
 
-    tmp<fvVectorMatrix> UEqn
+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();
-    }
+}
 
-    if (momentumPredictor)
+volScalarField rUA = 1.0/UEqn().A();
-    {
+
+if (momentumPredictor)
+{
     if (oCorr == nOuterCorr-1)
     {
         solve(UEqn() == -fvc::grad(p), mesh.solver("UFinal"));
@@ -22,4 +28,9 @@
     {
         solve(UEqn() == -fvc::grad(p));
     }
-    }
+}
+else
+{
+    U = rUA*(UEqn().H() - fvc::grad(p));
+    U.correctBoundaryConditions();
+}

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"));
         }
@@ -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"));
         }

applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C

@@ -68,9 +68,8 @@ int main(int argc, char *argv[])
             rho.storePrevIter();
         }
 
-        // --- PIMPLE loop
+        // --- Pressure-velocity PIMPLE corrector loop
-        int oCorr=0;
+        for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
-        do
         {
             #include "UEqn.H"
             #include "hEqn.H"
@@ -82,8 +81,7 @@ int main(int argc, char *argv[])
             }
 
             turbulence->correct();
-
+        }
-        } while (++oCorr < nOuterCorr);
 
         runTime.write();