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

applications/solvers/incompressible/simpleFoam/Allwmake

@@ -0,0 +1,8 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+wmake
+wmake porousSimpleFoam
+
+# ----------------------------------------------------------------- end-of-file

applications/solvers/incompressible/simpleFoam/porousSimpleFoam/createPorousZones.H

@@ -0,0 +1,26 @@
+    porousZones pZones(mesh);
+    Switch pressureImplicitPorosity(false);
+
+    // nUCorrectors used for pressureImplicitPorosity
+    int 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;
+        }
+    }

src/engine/include/createEngineMesh.H

@@ -9,7 +9,8 @@
             (
                 engineMesh::defaultRegion,
                 runTime.timeName(),
-                runTime
+                runTime,
+                Foam::IOobject::MUST_READ
             )
         )
     );

tutorials/combustion/engineFoam/kivaTest/system/fvSchemes

@@ -60,7 +60,7 @@ laplacianSchemes
     laplacian(DepsilonEff,epsilon) Gauss linear limited 0.5;
     laplacian(DREff,R) Gauss linear limited 0.5;
     laplacian((rho*(1|A(U))),p) Gauss linear limited 0.5;
-    laplacian(muEff,b) Gauss linear limited 0.5;
+    laplacian(alphaEff,b) Gauss linear limited 0.5;
     laplacian(muEff,ft) Gauss linear limited 0.5;
     laplacian(alphaEff,h) Gauss linear limited 0.5;
     laplacian(alphaEff,hu) Gauss linear limited 0.5;

tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes

@@ -53,6 +53,7 @@ snGradSchemes
 fluxRequired
 {
     default         no;
+    pcorr           ;
     p;
 }
 

tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution

@@ -16,11 +16,11 @@ FoamFile
 
 solvers
 {
-    p
+    pcorr
     {
         solver           GAMG;
-        tolerance        1e-7;
+        tolerance        0.02;
-        relTol           0.01;
+        relTol           0;
         smoother         GaussSeidel;
         nPreSweeps       0;
         nPostSweeps      2;
@@ -30,6 +30,13 @@ solvers
         mergeLevels      1;
     }
 
+    p
+    {
+        $pcorr
+        tolerance        1e-7;
+        relTol           0.01;
+    }
+
     pFinal
     {
         $p;