Final iteration information now available in mesh::data (used to be mesh::fvData)

Relaxation and solution parameters for the final iteration in PIMPLE loops are
now selected according to the value of the "finalIteration" entry in the
mesh::data dictionary.

rhoPimpleFoam significantly updates and now replaces rhoPisoFoam.

applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/files

@@ -0,0 +1,3 @@
+buoyantBoussinesqPimpleFoam.C
+
+EXE = $(FOAM_APPBIN)/buoyantBoussinesqPimpleFoam

applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/TEqn.H

@@ -13,7 +13,6 @@
     );
 
     TEqn.relax();
-
     TEqn.solve();
 
     rhok = 1.0 - beta*(T - TRef);

applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C

@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    buoyantBoussinesqPisoFoam
+    buoyantBoussinesqPimpleFoam
 
 Description
     Transient solver for buoyant, turbulent flow of incompressible fluids
@@ -72,20 +72,40 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         #include "readTimeControls.H"
-        #include "readPISOControls.H"
+        #include "readPIMPLEControls.H"
         #include "CourantNo.H"
         #include "setDeltaT.H"
 
-        #include "UEqn.H"
-        #include "TEqn.H"
-
-        // --- PISO loop
-        for (int corr=0; corr<nCorr; corr++)
+        // --- Pressure-velocity PIMPLE corrector loop
+        for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
         {
-            #include "pEqn.H"
-        }
+            bool finalIter = oCorr == nOuterCorr-1;
+            if (finalIter)
+            {
+                mesh.data::add("finalIteration", true);
+            }
 
-        turbulence->correct();
+            if (nOuterCorr != 1)
+            {
+                p.storePrevIter();
+            }
+
+            #include "UEqn.H"
+            #include "TEqn.H"
+
+            // --- PISO loop
+            for (int corr=0; corr<nCorr; corr++)
+            {
+                #include "pEqn.H"
+            }
+
+            turbulence->correct();
+
+            if (finalIter)
+            {
+                mesh.data::remove("finalIteration");
+            }
+        }
 
         runTime.write();
 

applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H

@@ -42,9 +42,9 @@
         mesh
     );
 
-#   include "createPhi.H"
+    #include "createPhi.H"
 
-#   include "readTransportProperties.H"
+    #include "readTransportProperties.H"
 
     Info<< "Creating turbulence model\n" << endl;
     autoPtr<incompressible::RASModel> turbulence
@@ -57,7 +57,7 @@
     setRefCell
     (
         p,
-        mesh.solutionDict().subDict("PISO"),
+        mesh.solutionDict().subDict("PIMPLE"),
         pRefCell,
         pRefValue
     );

applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H

@@ -0,0 +1,52 @@
+{
+    volScalarField rUA("rUA", 1.0/UEqn.A());
+    surfaceScalarField rUAf("(1|A(U))", fvc::interpolate(rUA));
+
+    U = rUA*UEqn.H();
+
+    phi = (fvc::interpolate(U) & mesh.Sf())
+        + fvc::ddtPhiCorr(rUA, U, phi);
+
+    surfaceScalarField buoyancyPhi =
+        rUAf*fvc::interpolate(rhok)*(g & mesh.Sf());
+    phi += buoyancyPhi;
+
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    {
+        fvScalarMatrix pEqn
+        (
+            fvm::laplacian(rUAf, p) == fvc::div(phi)
+        );
+
+        pEqn.solve
+        (
+            mesh.solver
+            (
+                p.select
+                (
+                    (
+                        finalIter
+                     && corr == nCorr-1
+                     && nonOrth == nNonOrthCorr
+                    )
+                )
+            )
+        );
+
+        if (nonOrth == nNonOrthCorr)
+        {
+            // Calculate the conservative fluxes
+            phi -= pEqn.flux();
+
+            // Explicitly relax pressure for momentum corrector
+            p.relax();
+
+            // Correct the momentum source with the pressure gradient flux
+            // calculated from the relaxed pressure
+            U += rUA*fvc::reconstruct((buoyancyPhi - pEqn.flux())/rUAf);
+            U.correctBoundaryConditions();
+        }
+    }
+
+    #include "continuityErrs.H"
+}

applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/Make/files

@@ -1,3 +0,0 @@
-buoyantBoussinesqPisoFoam.C
-
-EXE = $(FOAM_APPBIN)/buoyantBoussinesqPisoFoam

applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/pEqn.H

@@ -1,41 +0,0 @@
-{
-    volScalarField rUA("rUA", 1.0/UEqn.A());
-    surfaceScalarField rUAf("(1|A(U))", fvc::interpolate(rUA));
-
-    U = rUA*UEqn.H();
-
-    surfaceScalarField phiU
-    (
-        (fvc::interpolate(U) & mesh.Sf())
-      + fvc::ddtPhiCorr(rUA, U, phi)
-    );
-
-    phi = phiU + rUAf*fvc::interpolate(rhok)*(g & mesh.Sf());
-
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
-    {
-        fvScalarMatrix pEqn
-        (
-            fvm::laplacian(rUAf, p) == fvc::div(phi)
-        );
-
-        if (corr == nCorr-1 && nonOrth == nNonOrthCorr)
-        {
-            pEqn.solve(mesh.solver(p.name() + "Final"));
-        }
-        else
-        {
-            pEqn.solve(mesh.solver(p.name()));
-        }
-
-        if (nonOrth == nNonOrthCorr)
-        {
-            phi -= pEqn.flux();
-        }
-    }
-
-    U += rUA*fvc::reconstruct((phi - phiU)/rUAf);
-    U.correctBoundaryConditions();
-
-    #include "continuityErrs.H"
-}

applications/solvers/heatTransfer/buoyantPimpleFoam/Make/files

@@ -0,0 +1,3 @@
+buoyantPimpleFoam.C
+
+EXE = $(FOAM_APPBIN)/buoyantPimpleFoam

applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C

@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    buoyantPisoFoam
+    buoyantPimpleFoam
 
 Description
     Transient solver for buoyant, turbulent flow of compressible fluids for
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
         #include "readTimeControls.H"
-        #include "readPISOControls.H"
+        #include "readPIMPLEControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
 
@@ -69,21 +69,39 @@ int main(int argc, char *argv[])
 
         #include "rhoEqn.H"
 
-        #include "UEqn.H"
-
-        #include "hEqn.H"
-
-        // --- PISO loop
-
-        for (int corr=0; corr<nCorr; corr++)
+        // --- Pressure-velocity PIMPLE corrector loop
+        for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
         {
-            #include "pEqn.H"
+            bool finalIter = oCorr == nOuterCorr-1;
+            if (finalIter)
+            {
+                mesh.data::add("finalIteration", true);
+            }
+
+            if (nOuterCorr != 1)
+            {
+                p.storePrevIter();
+            }
+
+            #include "UEqn.H"
+            #include "hEqn.H"
+
+            // --- PISO loop
+            for (int corr=0; corr<nCorr; corr++)
+            {
+                #include "pEqn.H"
+            }
+
+            turbulence->correct();
+
+            rho = thermo.rho();
+
+            if (finalIter)
+            {
+                mesh.data::remove("finalIteration");
+            }
         }
 
-        turbulence->correct();
-
-        rho = thermo.rho();
-
         runTime.write();
 
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"

applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H

@@ -12,16 +12,15 @@
 
     U = rUA*UEqn.H();
 
-    surfaceScalarField phiU
+    phi = fvc::interpolate(rho)*
     (
-        fvc::interpolate(rho)
-       *(
-            (fvc::interpolate(U) & mesh.Sf())
-          + fvc::ddtPhiCorr(rUA, rho, U, phi)
-        )
+        (fvc::interpolate(U) & mesh.Sf())
+      + fvc::ddtPhiCorr(rUA, rho, U, phi)
     );
 
-    phi = phiU + rhorUAf*fvc::interpolate(rho)*(g & mesh.Sf());
+    surfaceScalarField buoyancyPhi =
+        rhorUAf*fvc::interpolate(rho)*(g & mesh.Sf());
+    phi += buoyancyPhi;
 
     for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
@@ -32,27 +31,39 @@
           - fvm::laplacian(rhorUAf, p)
         );
 
-        if (corr == nCorr-1 && nonOrth == nNonOrthCorr)
-        {
-            pEqn.solve(mesh.solver(p.name() + "Final"));
-        }
-        else
-        {
-            pEqn.solve(mesh.solver(p.name()));
-        }
+        pEqn.solve
+        (
+            mesh.solver
+            (
+                p.select
+                (
+                    (
+                        finalIter
+                     && corr == nCorr-1
+                     && nonOrth == nNonOrthCorr
+                    )
+                )
+            )
+        );
 
         if (nonOrth == nNonOrthCorr)
         {
+            // Calculate the conservative fluxes
             phi += pEqn.flux();
+
+            // Explicitly relax pressure for momentum corrector
+            p.relax();
+
+            // Correct the momentum source with the pressure gradient flux
+            // calculated from the relaxed pressure
+            U += rUA*fvc::reconstruct((buoyancyPhi + pEqn.flux())/rhorUAf);
+            U.correctBoundaryConditions();
         }
     }
 
     // Second part of thermodynamic density update
     thermo.rho() += psi*p;
 
-    U += rUA*fvc::reconstruct((phi - phiU)/rhorUAf);
-    U.correctBoundaryConditions();
-
     DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
 
     #include "rhoEqn.H"

applications/solvers/heatTransfer/buoyantPisoFoam/Make/files

@@ -1,3 +0,0 @@
-buoyantPisoFoam.C
-
-EXE = $(FOAM_APPBIN)/buoyantPisoFoam

applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H

@@ -22,16 +22,7 @@
         );
 
         pEqn.setReference(pRefCell, pRefValue);
-
-        // retain the residual from the first iteration
-        if (nonOrth == 0)
-        {
-            pEqn.solve();
-        }
-        else
-        {
-            pEqn.solve();
-        }
+        pEqn.solve();
 
         if (nonOrth == nNonOrthCorr)
         {