Merge remote branch 'OpenCFD/master' into olesenm

applications/solvers/compressible/rhoPorousSimpleFoam/UEqn.H

@@ -34,12 +34,7 @@
     {
         pZones.addResistance(UEqn());
 
-        eqnResidual = solve
-        (
-            UEqn() == -fvc::grad(p)
-        ). initialResidual();
-
-        maxResidual = max(eqnResidual, maxResidual);
+        solve(UEqn() == -fvc::grad(p));
 
         trAU = 1.0/UEqn().A();
         trAU().rename("rAU");

applications/solvers/compressible/rhoPorousSimpleFoam/convergenceCheck.H

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

applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H

@@ -13,8 +13,7 @@
 
     hEqn.relax();
 
-    eqnResidual = hEqn.solve().initialResidual();
-    maxResidual = max(eqnResidual, maxResidual);
+    hEqn.solve();
 
     thermo.correct();
 }

applications/solvers/compressible/rhoPorousSimpleFoam/initConvergenceCheck.H

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

applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H

@@ -29,8 +29,7 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     // retain the residual from the first iteration
     if (nonOrth == 0)
     {
-        eqnResidual = tpEqn().solve().initialResidual();
-        maxResidual = max(eqnResidual, maxResidual);
+        tpEqn().solve();
     }
     else
     {

applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C

@@ -54,7 +54,6 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         #include "readSIMPLEControls.H"
-        #include "initConvergenceCheck.H"
 
         p.storePrevIter();
         rho.storePrevIter();
@@ -72,8 +71,6 @@ int main(int argc, char *argv[])
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
             << nl << endl;
-
-        #include "convergenceCheck.H"
     }
 
     Info<< "End\n" << endl;

applications/solvers/compressible/rhoSimpleFoam/UEqn.H

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

applications/solvers/compressible/rhoSimpleFoam/convergenceCheck.H

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

applications/solvers/compressible/rhoSimpleFoam/hEqn.H

@@ -11,8 +11,7 @@
 
     hEqn.relax();
 
-    eqnResidual = hEqn.solve().initialResidual();
-    maxResidual = max(eqnResidual, maxResidual);
+    hEqn.solve();
 
     thermo.correct();
 }

applications/solvers/compressible/rhoSimpleFoam/initConvergenceCheck.H

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

applications/solvers/compressible/rhoSimpleFoam/pEqn.H

@@ -33,8 +33,7 @@ if (transonic)
         // Retain the residual from the first iteration
         if (nonOrth == 0)
         {
-            eqnResidual = pEqn.solve().initialResidual();
-            maxResidual = max(eqnResidual, maxResidual);
+            pEqn.solve();
         }
         else
         {
@@ -64,8 +63,7 @@ else
         // Retain the residual from the first iteration
         if (nonOrth == 0)
         {
-            eqnResidual = pEqn.solve().initialResidual();
-            maxResidual = max(eqnResidual, maxResidual);
+            pEqn.solve();
         }
         else
         {

applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C

@@ -53,7 +53,6 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         #include "readSIMPLEControls.H"
-        #include "initConvergenceCheck.H"
 
         p.storePrevIter();
         rho.storePrevIter();
@@ -72,8 +71,6 @@ int main(int argc, char *argv[])
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
             << nl << endl;
-
-        #include "convergenceCheck.H"
     }
 
     Info<< "End\n" << endl;

applications/solvers/compressible/rhoSimplecFoam/UEqn.H

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

applications/solvers/compressible/rhoSimplecFoam/hEqn.H

@@ -11,8 +11,7 @@
 
     hEqn.relax();
 
-    eqnResidual = hEqn.solve().initialResidual();
-    maxResidual = max(eqnResidual, maxResidual);
+    hEqn.solve();
 
     thermo.correct();
 

applications/solvers/compressible/rhoSimplecFoam/pEqn.H

@@ -41,8 +41,7 @@ if (transonic)
         // Retain the residual from the first iteration
         if (nonOrth == 0)
         {
-            eqnResidual = pEqn.solve().initialResidual();
-            maxResidual = max(eqnResidual, maxResidual);
+            pEqn.solve();
         }
         else
         {
@@ -75,8 +74,7 @@ else
         // Retain the residual from the first iteration
         if (nonOrth == 0)
         {
-            eqnResidual = pEqn.solve().initialResidual();
-            maxResidual = max(eqnResidual, maxResidual);
+            pEqn.solve();
         }
         else
         {

applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C

@@ -55,7 +55,6 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         #include "readSIMPLEControls.H"
-        #include "initConvergenceCheck.H"
 
         p.storePrevIter();
 
@@ -78,8 +77,6 @@ int main(int argc, char *argv[])
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
             << nl << endl;
-
-        #include "convergenceCheck.H"
     }
 
     Info<< "End\n" << endl;

applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/TEqn.H

@@ -14,8 +14,7 @@
 
     TEqn.relax();
 
-    eqnResidual = TEqn.solve().initialResidual();
-    maxResidual = max(eqnResidual, maxResidual);
+    TEqn.solve();
 
     rhok = 1.0 - beta*(T - TRef);
 }

applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/UEqn.H

@@ -8,7 +8,7 @@
 
     UEqn().relax();
 
-    eqnResidual = solve
+    solve
     (
         UEqn()
       ==
@@ -19,6 +19,4 @@
               - fvc::snGrad(p)*mesh.magSf()
             )
         )
-    ).initialResidual();
-
-    maxResidual = max(eqnResidual, maxResidual);
+    );

applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C

@@ -69,7 +69,6 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         #include "readSIMPLEControls.H"
-        #include "initConvergenceCheck.H"
 
         p.storePrevIter();
 
@@ -87,8 +86,6 @@ int main(int argc, char *argv[])
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
             << nl << endl;
-
-        #include "convergenceCheck.H"
     }
 
     Info<< "End\n" << endl;

applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/convergenceCheck.H

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