Backported steadyUniversalFoam, steadyUniversalMRFFoam and tutorials (vanilla OF 3.0.1)

applications/solvers/compressible/steadyUniversalFoam/UEqn.H

@@ -10,9 +10,4 @@
 
     UEqn.relax();
 
-    eqnResidual = solve
+    solve(UEqn == -fvc::grad(p));
-    (
-        UEqn == -fvc::grad(p)
-    ).initialResidual();
-
-    maxResidual = max(eqnResidual, maxResidual);

applications/solvers/compressible/steadyUniversalFoam/convergenceCheck.H

@@ -1,9 +0,0 @@
-// check convergence
-
-if (maxResidual < convergenceCriterion)
-{
-    Info<< "reached convergence criterion: " << convergenceCriterion << endl;
-    runTime.writeAndEnd();
-    Info<< "latestTime = " << runTime.timeName() << endl;
-}
-

applications/solvers/compressible/steadyUniversalFoam/createFields.H

@@ -39,3 +39,5 @@
             thermo
         )
     );
+
+    mesh.schemesDict().setFluxRequired(p.name());

applications/solvers/compressible/steadyUniversalFoam/hEqn.H

@@ -23,8 +23,7 @@
 
     hEqn.relax();
 
-    eqnResidual = hEqn.solve().initialResidual();
+    hEqn.solve();
-    maxResidual = max(eqnResidual, maxResidual);
 
     // Bounding of enthalpy taken out
     thermo.correct();

applications/solvers/compressible/steadyUniversalFoam/initConvergenceCheck.H

@@ -1,7 +0,0 @@
-// initialize values for convergence checks
-
-    scalar eqnResidual = 1, maxResidual = 0;
-    scalar convergenceCriterion = 0;
-
-    pimple.readIfPresent("convergence", convergenceCriterion);
-

applications/solvers/compressible/steadyUniversalFoam/pEqn.H

@@ -7,7 +7,7 @@
     // Needs to be outside of loop since p is changing, but psi and rho are not
     surfaceScalarField rhoReff = rhof - psisf*fvc::interpolate(p);
 
-    for (int corr = 0; corr < nCorr; corr++)
+    while (pimple.correct())
     {
         U = rUA*UEqn.H();
 
@@ -20,7 +20,7 @@
 
         p.storePrevIter();
 
-        for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+        while (pimple.correctNonOrthogonal())
         {
             fvScalarMatrix pEqn
             (
@@ -30,16 +30,10 @@
               - fvm::laplacian(rho*rUA, p)
             );
 
-            // Retain the residual from the first pressure solution
+            pEqn.solve();
-            eqnResidual = pEqn.solve().initialResidual();
-
-            if (corr == 0 && nonOrth == 0)
-            {
-                maxResidual = max(eqnResidual, maxResidual);
-            }
 
             // Calculate the flux
-            if (nonOrth == nNonOrthCorr)
+            if (pimple.finalNonOrthogonalIter())
             {
                 phi = phid2 + pEqn.flux();
             }

applications/solvers/compressible/steadyUniversalFoam/steadyUniversalFoam.C

@@ -36,6 +36,7 @@ Author
 #include "basicPsiThermo.H"
 #include "basicRhoThermo.H"
 #include "RASModel.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,9 +47,11 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "createThermo.H"
 #   include "createFields.H"
-#   include "readPIMPLEControls.H"
 #   include "initContinuityErrs.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -59,11 +62,8 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readPIMPLEControls.H"
 #       include "readFieldBounds.H"
 
-#       include "initConvergenceCheck.H"
-
 #       include "UEqn.H"
 #       include "pEqn.H"
 
@@ -79,8 +79,6 @@ int main(int argc, char *argv[])
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
             << nl << endl;
-
-#       include "convergenceCheck.H"
     }
 
 #   include "clearThermo.H"

applications/solvers/compressible/steadyUniversalMRFFoam/UEqn.H

@@ -13,9 +13,4 @@
 
     UEqn.relax();
 
-    eqnResidual = solve
+    solve(UEqn == -fvc::grad(p));
-    (
-        UEqn == -fvc::grad(p)
-    ).initialResidual();
-
-    maxResidual = max(eqnResidual, maxResidual);

applications/solvers/compressible/steadyUniversalMRFFoam/convergenceCheck.H

@@ -1,9 +0,0 @@
-// check convergence
-
-if (maxResidual < convergenceCriterion)
-{
-    Info<< "reached convergence criterion: " << convergenceCriterion << endl;
-    runTime.writeAndEnd();
-    Info<< "latestTime = " << runTime.timeName() << endl;
-}
-

applications/solvers/compressible/steadyUniversalMRFFoam/createFields.H

@@ -80,3 +80,5 @@
         mesh 
     );
     i == h - 0.5*(magSqr(Urot) - magSqr(Urel));
+
+    mesh.schemesDict().setFluxRequired(p.name());

applications/solvers/compressible/steadyUniversalMRFFoam/iEqn.H

@@ -18,8 +18,7 @@
 
     iEqn.relax();
 
-    eqnResidual = iEqn.solve().initialResidual();
+    iEqn.solve();
-    maxResidual = max(eqnResidual, maxResidual);
 
     // From rothalpy, calculate enthalpy after solution of rothalpy equation
     h = i + 0.5*(magSqr(Urot) - magSqr(Urel));

applications/solvers/compressible/steadyUniversalMRFFoam/initConvergenceCheck.H

@@ -1,7 +0,0 @@
-// initialize values for convergence checks
-
-    scalar eqnResidual = 1, maxResidual = 0;
-    scalar convergenceCriterion = 0;
-
-    pimple.readIfPresent("convergence", convergenceCriterion);
-

applications/solvers/compressible/steadyUniversalMRFFoam/pEqn.H

@@ -7,7 +7,7 @@
     // Needs to be outside of loop since p is changing, but psi and rho are not
     surfaceScalarField rhoReff = rhof - psisf*fvc::interpolate(p);
 
-    for (int corr = 0; corr < nCorr; corr++)
+    while (pimple.correct())
     {
         U = rUA*UEqn.H();
 
@@ -20,7 +20,7 @@
 
         p.storePrevIter();
 
-        for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
+        while (pimple.correctNonOrthogonal())
         {
             fvScalarMatrix pEqn
             (
@@ -30,16 +30,10 @@
               - fvm::laplacian(rho*rUA, p)
             );
 
-            // Retain the residual from the first pressure solution
+            pEqn.solve();
-            eqnResidual = pEqn.solve().initialResidual();
-
-            if (corr == 0 && nonOrth == 0)
-            {
-                maxResidual = max(eqnResidual, maxResidual);
-            }
 
             // Calculate the flux
-            if (nonOrth == nNonOrthCorr)
+            if (pimple.finalNonOrthogonalIter())
             {
                 phi = phid2 + pEqn.flux();
             }

applications/solvers/compressible/steadyUniversalMRFFoam/steadyUniversalMRFFoam.C

@@ -43,6 +43,7 @@ GE CONFIDENTIAL INFORMATION 2016 General Electric Company. All Rights Reserved
 #include "basicRhoThermo.H"
 #include "RASModel.H"
 #include "MRFZones.H"
+#include "pimpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -53,9 +54,11 @@ int main(int argc, char *argv[])
 
 #   include "createTime.H"
 #   include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
 #   include "createThermo.H"
 #   include "createFields.H"
-#   include "readPIMPLEControls.H"
 #   include "initContinuityErrs.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -66,11 +69,8 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readPIMPLEControls.H"
 #       include "readFieldBounds.H"
 
-#       include "initConvergenceCheck.H"
-
 #       include "UEqn.H"
 #       include "pEqn.H"
 
@@ -86,8 +86,6 @@ int main(int argc, char *argv[])
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
             << nl << endl;
-
-#       include "convergenceCheck.H"
     }
 
 #   include "clearThermo.H"

tutorials/compressible/steadyUniversalMRFFoam/axialTurbineGgiJump/system/fvSchemes

@@ -72,12 +72,6 @@ snGradSchemes
     default           limited 0.5;
 }
 
-fluxRequired
-{
-    default           no;
-    p;
-}
-
 mixingPlane
 {
 	default	areaAveraging;
@@ -86,22 +80,4 @@ mixingPlane
 	omega	areaAveraging;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 // ************************************************************************* //

tutorials/compressible/steadyUniversalMRFFoam/axialTurbineMixingPlane/system/fvSchemes

@@ -72,12 +72,6 @@ snGradSchemes
     default           limited 0.5;
 }
 
-fluxRequired
-{
-    default           no;
-    p;
-}
-
 mixingPlane
 {
 	default	areaAveraging;