Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

applications/solvers/compressible/rhoSimpleFoam/pEqn.H

@@ -30,15 +30,7 @@ if (transonic)
 
         pEqn.setReference(pRefCell, pRefValue);
 
-        // Retain the residual from the first iteration
-        if (nonOrth == 0)
-        {
-            pEqn.solve();
-        }
-        else
-        {
-            pEqn.solve();
-        }
+        pEqn.solve();
 
         if (nonOrth == nNonOrthCorr)
         {
@@ -60,15 +52,7 @@ else
 
         pEqn.setReference(pRefCell, pRefValue);
 
-        // Retain the residual from the first iteration
-        if (nonOrth == 0)
-        {
-            pEqn.solve();
-        }
-        else
-        {
-            pEqn.solve();
-        }
+        pEqn.solve();
 
         if (nonOrth == nNonOrthCorr)
         {

applications/solvers/incompressible/porousSimpleFoam/createFields.H

@@ -43,16 +43,28 @@
 
 
     porousZones pZones(mesh);
+    Switch pressureImplicitPorosity(false);
 
     // nUCorrectors used for pressureImplicitPorosity
     int nUCorr = 0;
-    const bool pressureImplicitPorosity =
-    (
-        pZones.size()
-     && mesh.solutionDict().subDict("SIMPLE").readIfPresent
-        (
-            "nUCorrectors",
-            nUCorr
-        )
-     && (nUCorr > 0)
-    );
+    if (pZones.size())
+    {
+        // nUCorrectors for pressureImplicitPorosity
+        if (mesh.solutionDict().subDict("SIMPLE").found("nUCorrectors"))
+        {
+            nUCorr = readInt
+            (
+                mesh.solutionDict().subDict("SIMPLE").lookup("nUCorrectors")
+            );
+        }
+
+        if (nUCorr > 0)
+        {
+            pressureImplicitPorosity = true;
+            Info<< "Using pressure implicit porosity" << endl;
+        }
+        else
+        {
+            Info<< "Using pressure explicit porosity" << endl;
+        }
+    }

applications/solvers/incompressible/simpleFoam/pEqn.H

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

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/makeCellSets.setSet

-cellSet heater new boxToCell (-0.01    0 -100 )(0.01 0.01 100)
-cellSet heater add boxToCell (-0.01 -100 -0.01)(0.01 0.01 0.01)
+cellSet heater new boxToCell (-0.01001    0 -100 )(0.01001 0.00999 100)
+cellSet heater add boxToCell (-0.01001 -100 -0.01001)(0.01001 0.00999 0.01001)
 cellZoneSet heater new setToCellZone heater
-cellSet leftSolid new boxToCell (-100 0 -100 )(-0.01 0.01 100)
+cellSet leftSolid new boxToCell (-100 0 -100 )(-0.01001 0.00999 100)
 cellZoneSet leftSolid new setToCellZone leftSolid
-cellSet rightSolid new boxToCell (0.01 0 -100 )(100 0.01 100)
+cellSet rightSolid new boxToCell (0.01001 0 -100 )(100 0.00999 100)
 cellZoneSet rightSolid new setToCellZone rightSolid
-cellSet topAir new boxToCell (-100 0.01 -100 )(100 100 100)
+cellSet topAir new boxToCell (-100 0.00999 -100 )(100 100 100)
 cellZoneSet topAir new setToCellZone topAir
 cellSet bottomAir clear
 cellSet bottomAir add cellToCell heater

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution

@@ -18,9 +18,16 @@ solvers
 {
     rho
     {
-        solver          PCG
+        solver          PCG;
         preconditioner  DIC;
         tolerance       1e-8;
+        relTol          0.1;
+    }
+
+    rhoFinal
+    {
+        $rho;
+        tolerance       1e-8;
         relTol          0;
     }
 

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution

@@ -18,9 +18,16 @@ solvers
 {
     rho
     {
-        solver          PCG
+        solver          PCG;
         preconditioner  DIC;
         tolerance       1e-7;
+        relTol          0.1;
+    }
+
+    rhoFinal
+    {
+        $rho;
+        tolerance       1e-7;
         relTol          0;
     }