BUG: liquidFilmFoam - corrected double looping

applications/solvers/finiteArea/liquidFilmFoam/liquidFilmFoam.C

@@ -38,6 +38,7 @@ Author
 
 #include "fvCFD.H"
 #include "faCFD.H"
+#include "loopControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -67,7 +68,7 @@ int main(int argc, char *argv[])
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        while (runTime.loop())
+        while (iters.loop())
         {
             phi2s = fac::interpolate(h)*phis;
 
@@ -91,11 +92,10 @@ int main(int argc, char *argv[])
             Us = UsEqn.H()/UsA;
             Us.correctBoundaryConditions();
 
-            phis = (fac::interpolate(Us) & aMesh.Le())
+            phis =
-              - fac::interpolate(1.0/(rhol*UsA))
+                (fac::interpolate(Us) & aMesh.Le())
-               *fac::lnGrad(ps*h)*aMesh.magLe()
+              - fac::interpolate(1.0/(rhol*UsA))*fac::lnGrad(ps*h)*aMesh.magLe()
-              + fac::interpolate(ps/(rhol*UsA))
+              + fac::interpolate(ps/(rhol*UsA))*fac::lnGrad(h)*aMesh.magLe();
-               *fac::lnGrad(h)*aMesh.magLe();
 
             faScalarMatrix hEqn
             (
@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
                 (
                     h.primitiveField(),
                     fac::average(max(h, h0))().primitiveField()
-                    *pos(h0.value() - h.primitiveField())
+                   *pos(h0.value() - h.primitiveField())
                 ),
                 h0.value()
             );

applications/solvers/finiteArea/liquidFilmFoam/readSolutionControls.H

@@ -1,13 +1 @@
-int nCorr = 0;
+loopControl iters(runTime, aMesh.solutionDict(), "solution");
-
-if (aMesh.solutionDict().found("nOuterCorrectors"))
-{
-    nCorr =
-        readInt(aMesh.solutionDict().lookup("nOuterCorrectors"));
-}
-else
-{
-    FatalErrorIn(args.executable())
-        << "Cannot find number of correctors"
-        << abort(FatalError);
-}

tutorials/finiteArea/liquidFilmFoam/cylinder/system/faSolution

@@ -34,7 +34,11 @@ solvers
     }
 }
 
-nOuterCorrectors 15;
+solution
+{
+    iterations 15;
+}
+//nOuterCorrectors 15;
 
 relaxationFactors
 {