From 76f0eb0253565225a86914674d9522b6624e1a50 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Thu, 19 Apr 2012 12:55:44 +0100
Subject: [PATCH 1/5] ENH: Update the surfaceFeatureExtract default dictionary

---
 .../surface/surfaceFeatureExtract/surfaceFeatureExtractDict    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
index b5084ec103..e9741543bd 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractDict
@@ -30,9 +30,6 @@ surface1.stl
 
     // Write options
 
-        // Write .eMesh file (for snappyHexMesh)
-        writeFeatureEdgeMesh    yes;
-
         // Write features to obj format for postprocessing
         writeObj                yes;
 }

From 9d6def688fc2a97e86ae98728bdf7d2bb4e01d82 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Thu, 19 Apr 2012 14:07:51 +0100
Subject: [PATCH 2/5] ENH: Adding extrudePatchMesh, re-location of extrudeModel
 and createShellMesh and introducing io::READ_IF_PRESENT option in polyMesh
 constructor from components

---
 .../mesh/generation/cv2DMesh/Make/options     |   2 +-
 .../mesh/generation/extrude/Allwclean         |   1 -
 .../mesh/generation/extrude/Allwmake          |   3 -
 .../extrude/extrudeMesh/Make/options          |   4 +-
 .../extrude/extrudeToRegionMesh/Make/options  |  10 +-
 .../generation/extrude2DMesh/Make/options     |   2 +-
 .../extrude2DMesh/extrude2DMesh/Make/options  |   2 +-
 src/Allwmake                                  |   2 +
 src/OpenFOAM/matrices/solution/solution.C     |   2 +
 .../polyBoundaryMesh/polyBoundaryMesh.C       |  78 +++++
 .../polyBoundaryMesh/polyBoundaryMesh.H       |   8 +
 src/OpenFOAM/meshes/polyMesh/polyMesh.C       |  24 +-
 .../meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C |  26 ++
 .../meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H |   9 +
 src/dynamicMesh/Make/files                    |   5 +
 src/dynamicMesh/Make/options                  |   6 +-
 .../dynamicMesh}/createShellMesh/Make/files   |   0
 .../dynamicMesh}/createShellMesh/Make/options |   0
 .../createShellMesh/createShellMesh.C         |   0
 .../createShellMesh/createShellMesh.H         |   0
 .../extrudePatchMesh/extrudePatchMesh.C       | 283 ++++++++++++++++++
 .../extrudePatchMesh/extrudePatchMesh.H       | 177 +++++++++++
 .../finiteVolume/fvSchemes/fvSchemes.C        |   2 +
 src/finiteVolume/fvMesh/fvMesh.C              |   2 +-
 src/mesh/Allwmake                             |   1 +
 .../mesh}/extrudeModel/Make/files             |   0
 .../mesh}/extrudeModel/Make/options           |   3 +-
 .../extrudeModel/extrudeModel/extrudeModel.C  |   0
 .../extrudeModel/extrudeModel/extrudeModel.H  |   0
 .../extrudeModel/extrudeModelNew.C            |   0
 .../linearDirection/linearDirection.C         |   0
 .../linearDirection/linearDirection.H         |   0
 .../extrudeModel/linearNormal/linearNormal.C  |   0
 .../extrudeModel/linearNormal/linearNormal.H  |   0
 .../extrudeModel/linearRadial/linearRadial.C  |   0
 .../extrudeModel/linearRadial/linearRadial.H  |   0
 .../extrudeModel/sigmaRadial/sigmaRadial.C    |   0
 .../extrudeModel/sigmaRadial/sigmaRadial.H    |   0
 .../mesh}/extrudeModel/wedge/wedge.C          |   0
 .../mesh}/extrudeModel/wedge/wedge.H          |   0
 40 files changed, 620 insertions(+), 32 deletions(-)
 rename {applications/utilities/mesh/generation/extrude/extrudeToRegionMesh => src/dynamicMesh}/createShellMesh/Make/files (100%)
 rename {applications/utilities/mesh/generation/extrude/extrudeToRegionMesh => src/dynamicMesh}/createShellMesh/Make/options (100%)
 rename {applications/utilities/mesh/generation/extrude/extrudeToRegionMesh => src/dynamicMesh}/createShellMesh/createShellMesh.C (100%)
 rename {applications/utilities/mesh/generation/extrude/extrudeToRegionMesh => src/dynamicMesh}/createShellMesh/createShellMesh.H (100%)
 create mode 100644 src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
 create mode 100644 src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/Make/files (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/Make/options (74%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/extrudeModel/extrudeModel.C (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/extrudeModel/extrudeModel.H (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/extrudeModel/extrudeModelNew.C (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/linearDirection/linearDirection.C (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/linearDirection/linearDirection.H (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/linearNormal/linearNormal.C (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/linearNormal/linearNormal.H (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/linearRadial/linearRadial.C (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/linearRadial/linearRadial.H (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/sigmaRadial/sigmaRadial.C (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/sigmaRadial/sigmaRadial.H (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/wedge/wedge.C (100%)
 rename {applications/utilities/mesh/generation/extrude => src/mesh}/extrudeModel/wedge/wedge.H (100%)

diff --git a/applications/utilities/mesh/generation/cv2DMesh/Make/options b/applications/utilities/mesh/generation/cv2DMesh/Make/options
index 82659091b6..cd2a9a5107 100755
--- a/applications/utilities/mesh/generation/cv2DMesh/Make/options
+++ b/applications/utilities/mesh/generation/cv2DMesh/Make/options
@@ -10,7 +10,6 @@ EXE_INC = \
     ${EXE_NDEBUG} \
     ${CGAL_INC} \
     -I$(FOAM_APP)/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/lnInclude \
-    -I$(FOAM_APP)/utilities/mesh/generation/extrude/extrudeModel/lnInclude \
     -IconformalVoronoi2DMesh/lnInclude \
     -I$(FOAM_APP)/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -18,6 +17,7 @@ EXE_INC = \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/extrudeModel/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude
 
 EXE_LIBS = \
diff --git a/applications/utilities/mesh/generation/extrude/Allwclean b/applications/utilities/mesh/generation/extrude/Allwclean
index c1c94a806b..253b4b4d6d 100755
--- a/applications/utilities/mesh/generation/extrude/Allwclean
+++ b/applications/utilities/mesh/generation/extrude/Allwclean
@@ -2,7 +2,6 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wclean libso extrudeModel
 wclean extrudeMesh
 wclean extrudeToRegionMesh
 
diff --git a/applications/utilities/mesh/generation/extrude/Allwmake b/applications/utilities/mesh/generation/extrude/Allwmake
index 5f09893321..3fd3d2314a 100755
--- a/applications/utilities/mesh/generation/extrude/Allwmake
+++ b/applications/utilities/mesh/generation/extrude/Allwmake
@@ -2,10 +2,7 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wmake libso extrudeModel
 wmake extrudeMesh
-
-wmake libso extrudeToRegionMesh/createShellMesh
 wmake extrudeToRegionMesh
 
 
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/Make/options b/applications/utilities/mesh/generation/extrude/extrudeMesh/Make/options
index 3445b811ea..94b355be3c 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/Make/options
@@ -1,10 +1,10 @@
 EXE_INC = \
     -IextrudedMesh \
-    -I../extrudeModel/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/extrudeModel/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
index 5732f9761d..9a1bd9942c 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
@@ -1,13 +1,11 @@
 EXE_INC = \
-    -I../extrudeModel/lnInclude \
-    -IcreateShellMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/extrudeModel/lnInclude
 
 EXE_LIBS = \
-    -lextrudeModel \
-    -lcreateShellMesh \
     -lfiniteVolume \
     -lmeshTools \
-    -ldynamicMesh
+    -ldynamicMesh \
+    -lextrudeModel
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/Make/options b/applications/utilities/mesh/generation/extrude2DMesh/Make/options
index 8adfe67b36..3be2f34c18 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude2DMesh/Make/options
@@ -3,7 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -Iextrude2DMesh/lnInclude \
-    -I../extrude/extrudeModel/lnInclude
+    -I$(LIB_SRC)/mesh/extrudeModel/lnInclude
 
 EXE_LIBS = \
     -lsurfMesh \
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/Make/options b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/Make/options
index 8ace7c50da..f1db60d53f 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/Make/options
@@ -4,7 +4,7 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
-    -I$(FOAM_APP)/utilities/mesh/generation/extrude/extrudeModel/lnInclude
+    -I$(LIB_SRC)/mesh/extrudeModel/lnInclude
 
 LIB_LIBS = \
     -lmeshTools \
diff --git a/src/Allwmake b/src/Allwmake
index c4cbe16c95..a61c7a2e3e 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -52,6 +52,8 @@ wmake $makeType conversion
 
 wmake $makeType sampling
 
+wmake $makeType mesh/extrudeModel
+
 wmake $makeType dynamicMesh
 wmake $makeType dynamicFvMesh
 wmake $makeType topoChangerFvMesh
diff --git a/src/OpenFOAM/matrices/solution/solution.C b/src/OpenFOAM/matrices/solution/solution.C
index 50eb2fb96c..0b770b7daa 100644
--- a/src/OpenFOAM/matrices/solution/solution.C
+++ b/src/OpenFOAM/matrices/solution/solution.C
@@ -130,6 +130,7 @@ Foam::solution::solution
             obr,
             (
                 obr.readOpt() == IOobject::MUST_READ
+             || obr.readOpt() == IOobject::READ_IF_PRESENT
               ? IOobject::MUST_READ_IF_MODIFIED
               : obr.readOpt()
             ),
@@ -148,6 +149,7 @@ Foam::solution::solution
     (
         readOpt() == IOobject::MUST_READ
      || readOpt() == IOobject::MUST_READ_IF_MODIFIED
+     || (readOpt() == IOobject::READ_IF_PRESENT && headerOk())
     )
     {
         read(solutionDict());
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index ab13b34444..d5670fa331 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -132,6 +132,84 @@ Foam::polyBoundaryMesh::polyBoundaryMesh
 {}
 
 
+Foam::polyBoundaryMesh::polyBoundaryMesh
+(
+    const IOobject& io,
+    const polyMesh& pm,
+    const polyPatchList& ppl
+)
+:
+    polyPatchList(),
+    regIOobject(io),
+    mesh_(pm)
+{
+    if
+    (
+        (this->readOpt() == IOobject::READ_IF_PRESENT && this->headerOk())
+     || this->readOpt() == IOobject::MUST_READ
+     || this->readOpt() == IOobject::MUST_READ_IF_MODIFIED
+    )
+    {
+
+        if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
+        {
+            WarningIn
+            (
+                "polyBoundaryMesh::polyBoundaryMesh\n"
+                "(\n"
+                "    const IOobject&,\n"
+                "    const polyMesh&\n"
+                "    const polyPatchList&\n"
+                ")"
+            )   << "Specified IOobject::MUST_READ_IF_MODIFIED but class"
+                << " does not support automatic rereading."
+                << endl;
+        }
+
+        polyPatchList& patches = *this;
+
+        // Read polyPatchList
+        Istream& is = readStream(typeName);
+
+        PtrList<entry> patchEntries(is);
+        patches.setSize(patchEntries.size());
+
+        forAll(patches, patchI)
+        {
+            patches.set
+            (
+                patchI,
+                polyPatch::New
+                (
+                    patchEntries[patchI].keyword(),
+                    patchEntries[patchI].dict(),
+                    patchI,
+                    *this
+                )
+            );
+        }
+
+        // Check state of IOstream
+        is.check
+        (
+            "polyBoundaryMesh::polyBoundaryMesh"
+            "(const IOobject&, const polyMesh&, const polyPatchList&)"
+        );
+
+        close();
+    }
+    else
+    {
+        polyPatchList& patches = *this;
+        patches.setSize(ppl.size());
+        forAll (patches, patchI)
+        {
+            patches.set(patchI, ppl[patchI].clone(*this).ptr());
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::polyBoundaryMesh::~polyBoundaryMesh()
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
index 62d6f4a5e1..999b3815bf 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
@@ -119,6 +119,14 @@ public:
             const label size
         );
 
+        //- Construct given polyPatchList
+        polyBoundaryMesh
+        (
+            const IOobject&,
+            const polyMesh&,
+            const polyPatchList&
+        );
+
 
     //- Destructor
     ~polyBoundaryMesh();
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 8877cdafcf..7a470bc9ff 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -338,7 +338,7 @@ Foam::polyMesh::polyMesh
             instance(),
             meshSubDir,
             *this,
-            IOobject::NO_READ,
+            io.readOpt(),
             IOobject::AUTO_WRITE
         ),
         points
@@ -351,7 +351,7 @@ Foam::polyMesh::polyMesh
             instance(),
             meshSubDir,
             *this,
-            IOobject::NO_READ,
+            io.readOpt(),
             IOobject::AUTO_WRITE
         ),
         faces
@@ -364,7 +364,7 @@ Foam::polyMesh::polyMesh
             instance(),
             meshSubDir,
             *this,
-            IOobject::NO_READ,
+            io.readOpt(),
             IOobject::AUTO_WRITE
         ),
         owner
@@ -377,7 +377,7 @@ Foam::polyMesh::polyMesh
             instance(),
             meshSubDir,
             *this,
-            IOobject::NO_READ,
+            io.readOpt(),
             IOobject::AUTO_WRITE
         ),
         neighbour
@@ -391,11 +391,11 @@ Foam::polyMesh::polyMesh
             instance(),
             meshSubDir,
             *this,
-            IOobject::NO_READ,
+            io.readOpt(),
             IOobject::AUTO_WRITE
         ),
         *this,
-        0
+        polyPatchList()
     ),
     bounds_(points_, syncPar),
     geometricD_(Vector<label>::zero),
@@ -410,11 +410,11 @@ Foam::polyMesh::polyMesh
             instance(),
             meshSubDir,
             *this,
-            IOobject::NO_READ,
+            io.readOpt(),
             IOobject::NO_WRITE
         ),
         *this,
-        0
+        PtrList<pointZone>()
     ),
     faceZones_
     (
@@ -424,11 +424,11 @@ Foam::polyMesh::polyMesh
             instance(),
             meshSubDir,
             *this,
-            IOobject::NO_READ,
+            io.readOpt(),
             IOobject::NO_WRITE
         ),
         *this,
-        0
+        PtrList<faceZone>()
     ),
     cellZones_
     (
@@ -438,11 +438,11 @@ Foam::polyMesh::polyMesh
             instance(),
             meshSubDir,
             *this,
-            IOobject::NO_READ,
+            io.readOpt(),
             IOobject::NO_WRITE
         ),
         *this,
-        0
+        PtrList<cellZone>()
     ),
     globalMeshDataPtr_(NULL),
     moving_(false),
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
index 2497592ee8..33e17117c4 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
@@ -162,6 +162,32 @@ Foam::ZoneMesh<ZoneType, MeshType>::ZoneMesh
 {}
 
 
+template<class ZoneType, class MeshType>
+Foam::ZoneMesh<ZoneType, MeshType>::ZoneMesh
+(
+    const IOobject& io ,
+    const MeshType& mesh,
+    const PtrList<ZoneType>& pzm
+)
+:
+    PtrList<ZoneType>(),
+    regIOobject(io),
+    mesh_(mesh),
+    zoneMapPtr_(NULL)
+{
+    ZoneMesh<ZoneType, MeshType>(io, mesh);
+
+    if (this->size() == 0)
+    {
+        PtrList<ZoneType>& zones = *this;
+        zones.setSize(pzm.size());
+        forAll (zones, zoneI)
+        {
+            zones.set(zoneI, pzm[zoneI].clone(*this).ptr());
+        }
+    }
+}
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class ZoneType, class MeshType>
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
index 08ef19b4fc..96868c359a 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
@@ -106,6 +106,15 @@ public:
             const label size
         );
 
+         //- Construct given a PtrList
+        ZoneMesh
+        (
+            const IOobject&,
+            const MeshType&,
+            const PtrList<ZoneType>&
+        );
+
+
     //- Destructor
     ~ZoneMesh();
 
diff --git a/src/dynamicMesh/Make/files b/src/dynamicMesh/Make/files
index 02e9ad7ce4..a7f72ef9fa 100644
--- a/src/dynamicMesh/Make/files
+++ b/src/dynamicMesh/Make/files
@@ -86,4 +86,9 @@ motionSmoother/polyMeshGeometry/polyMeshGeometry.C
 
 motionSolver/motionSolver.C
 
+createShellMesh/createShellMesh.C
+
+extrudePatchMesh/extrudePatchMesh.C
+
+
 LIB = $(FOAM_LIBBIN)/libdynamicMesh
diff --git a/src/dynamicMesh/Make/options b/src/dynamicMesh/Make/options
index f168589ead..0757c29678 100644
--- a/src/dynamicMesh/Make/options
+++ b/src/dynamicMesh/Make/options
@@ -1,8 +1,10 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/triSurface/lnInclude
+    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/mesh/extrudeModel/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
-    -ltriSurface
+    -ltriSurface \
+    -lextrudeModel
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/Make/files b/src/dynamicMesh/createShellMesh/Make/files
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/Make/files
rename to src/dynamicMesh/createShellMesh/Make/files
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/Make/options b/src/dynamicMesh/createShellMesh/Make/options
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/Make/options
rename to src/dynamicMesh/createShellMesh/Make/options
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/createShellMesh.C b/src/dynamicMesh/createShellMesh/createShellMesh.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/createShellMesh.C
rename to src/dynamicMesh/createShellMesh/createShellMesh.C
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/createShellMesh.H b/src/dynamicMesh/createShellMesh/createShellMesh.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh/createShellMesh.H
rename to src/dynamicMesh/createShellMesh/createShellMesh.H
diff --git a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
new file mode 100644
index 0000000000..860536ea30
--- /dev/null
+++ b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
@@ -0,0 +1,283 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012-2012 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "extrudePatchMesh.H"
+
+#include "createShellMesh.H"
+#include "polyTopoChange.H"
+#include "wallPolyPatch.H"
+#include "emptyPolyPatch.H"
+#include "wedgePolyPatch.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(extrudePatchMesh, 0);
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+extrudePatchMesh::extrudePatchMesh
+(
+    const fvMesh& mesh,
+    const fvPatch& patch,
+    const dictionary& dict
+)
+:
+    fvMesh
+    (
+        IOobject
+        (
+            dict.lookup("region"),
+            mesh.facesInstance(),
+            mesh,
+            IOobject::READ_IF_PRESENT,
+            IOobject::NO_WRITE,
+            true
+        ),
+        xferCopy(pointField()),
+        xferCopy(faceList()),
+        xferCopy(labelList()),
+        xferCopy(labelList()),
+        false
+    ),
+    extrudedPatch_(patch.patch())
+{
+    if (this->boundaryMesh().size() == 0)
+    {
+        bool columnCells = readBool(dict.lookup("columnCells"));
+
+        PackedBoolList nonManifoldEdge(extrudedPatch_.nEdges());
+        for (label edgeI = 0; edgeI < extrudedPatch_.nInternalEdges(); edgeI++)
+        {
+            if (columnCells)
+            {
+                nonManifoldEdge[edgeI] = true;
+            }
+        }
+
+        autoPtr<extrudeModel> model_(extrudeModel::New(dict));
+
+        faceList pointGlobalRegions;
+        faceList pointLocalRegions;
+        labelList localToGlobalRegion;
+
+        const primitiveFacePatch pp
+        (
+            extrudedPatch_, extrudedPatch_.points()
+        );
+
+        createShellMesh::calcPointRegions
+        (
+            this->globalData(),
+            pp,
+            nonManifoldEdge,
+            false,
+
+            pointGlobalRegions,
+            pointLocalRegions,
+            localToGlobalRegion
+        );
+
+
+        // Per local region an originating point
+        labelList localRegionPoints(localToGlobalRegion.size());
+        forAll(pointLocalRegions, faceI)
+        {
+            const face& f = extrudedPatch_.localFaces()[faceI];
+            const face& pRegions = pointLocalRegions[faceI];
+            forAll(pRegions, fp)
+            {
+                localRegionPoints[pRegions[fp]] = f[fp];
+            }
+        }
+
+        // Calculate region normals by reducing local region normals
+        pointField localRegionNormals(localToGlobalRegion.size());
+        {
+            pointField localSum(localToGlobalRegion.size(), vector::zero);
+
+            forAll(pointLocalRegions, faceI)
+            {
+                const face& pRegions = pointLocalRegions[faceI];
+                forAll(pRegions, fp)
+                {
+                    label localRegionI = pRegions[fp];
+                    localSum[localRegionI] +=
+                        extrudedPatch_.faceNormals()[faceI];
+                }
+            }
+
+            Map<point> globalSum(2*localToGlobalRegion.size());
+
+            forAll(localSum, localRegionI)
+            {
+                label globalRegionI = localToGlobalRegion[localRegionI];
+                globalSum.insert(globalRegionI, localSum[localRegionI]);
+            }
+
+            // Reduce
+            Pstream::mapCombineGather(globalSum, plusEqOp<point>());
+            Pstream::mapCombineScatter(globalSum);
+
+            forAll(localToGlobalRegion, localRegionI)
+            {
+                label globalRegionI = localToGlobalRegion[localRegionI];
+                localRegionNormals[localRegionI] = globalSum[globalRegionI];
+            }
+            localRegionNormals /= mag(localRegionNormals);
+        }
+
+
+        // Per local region an extrusion direction
+        vectorField firstDisp(localToGlobalRegion.size());
+        forAll(firstDisp, regionI)
+        {
+            //const point& regionPt = regionCentres[regionI];
+            const point& regionPt = extrudedPatch_.points()
+            [
+                extrudedPatch_.meshPoints()
+                [
+                    localRegionPoints[regionI]
+                ]
+            ];
+            const vector& n = localRegionNormals[regionI];
+            firstDisp[regionI] = model_()(regionPt, n, 1) - regionPt;
+        }
+
+
+        // Extrude engine
+        createShellMesh extruder
+        (
+            pp,
+            pointLocalRegions,
+            localRegionPoints
+        );
+
+        List<polyPatch*> regionPatches(3);
+        List<word> patchNames(regionPatches.size());
+        List<word> patchTypes(regionPatches.size());
+        PtrList<dictionary> dicts(regionPatches.size());
+
+        forAll (dicts, patchI)
+        {
+            if (!dicts.set(patchI))
+            {
+                dicts.set(patchI, new dictionary());
+            }
+        }
+
+        dicts[bottomPatchID] = dict.subDict("bottomCoeffs");
+        dicts[sidePatchID] = dict.subDict("sideCoeffs");
+        dicts[topPatchID] = dict.subDict("topCoeffs");
+
+        forAll (dicts, patchI)
+        {
+            dicts[patchI].lookup("name") >> patchNames[patchI];
+            dicts[patchI].lookup("type") >> patchTypes[patchI];
+        }
+
+        forAll (regionPatches, patchI)
+        {
+            dictionary&  patchDict = dicts[patchI];
+            patchDict.set("nFaces", 0);
+            patchDict.set("startFace", 0);
+
+            regionPatches[patchI] = polyPatch::New
+                (
+                    patchNames[patchI],
+                    patchDict,
+                    patchI,
+                    mesh.boundaryMesh()
+                ).ptr();
+
+        }
+
+        this->clearOut();
+        this->removeFvBoundary();
+        this->addFvPatches(regionPatches, true);
+
+
+        // At this point we have a valid mesh with 3 patches and zero cells.
+        // Determine:
+        // - per face the top and bottom patch (topPatchID, bottomPatchID)
+        // - per edge, per face on edge the side patch (edgePatches)
+        labelListList edgePatches(extrudedPatch_.nEdges());
+        forAll(edgePatches, edgeI)
+        {
+            const labelList& eFaces = extrudedPatch_.edgeFaces()[edgeI];
+
+            if (eFaces.size() != 2 || nonManifoldEdge[edgeI])
+            {
+                edgePatches[edgeI].setSize(eFaces.size(), sidePatchID);
+            }
+        }
+
+        polyTopoChange meshMod(regionPatches.size());
+
+        extruder.setRefinement
+        (
+            firstDisp,                              // first displacement
+            model_().expansionRatio(),
+            model_().nLayers(),                       // nLayers
+            labelList(extrudedPatch_.size(), topPatchID),
+            labelList(extrudedPatch_.size(), bottomPatchID),
+            edgePatches,
+            meshMod
+        );
+
+        autoPtr<mapPolyMesh> map = meshMod.changeMesh
+        (
+            *this,              // mesh to change
+            false               // inflate
+        );
+
+        // Update numbering on extruder.
+        extruder.updateMesh(map);
+
+        this->setInstance(this->thisDb().time().constant());
+        this->write();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+extrudePatchMesh::~extrudePatchMesh()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H
new file mode 100644
index 0000000000..b13d957c5d
--- /dev/null
+++ b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.H
@@ -0,0 +1,177 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012-2012 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    extrudePatchMesh
+
+Description
+    Mesh at a patch created on the fly. The following entried should be used
+    on the field boundary dictionary:
+
+        // New Shell mesh data
+
+        region          "regionMesh";
+        extrudeModel    linearNormal;
+        linearNormalCoeffs
+        {
+            thickness       40e-6;
+        }
+        nLayers         50;
+        expansionRatio  1;
+        columnCells      true;
+
+        // Patch information
+        bottomCoeffs
+        {
+            name        "bottom";
+            type        mappedWall;
+            sampleMode  nearestPatchFace;
+            samplePatch fixedWalls;
+            offsetMode  uniform;
+            offset      (0 0 0);
+        }
+
+        topCoeffs
+        {
+            name        "top";
+            type        patch;
+        }
+
+        sideCoeffs
+        {
+            name        "side";
+            type        empty;
+        }
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef extrudePatchMesh_H
+#define extrudePatchMesh_H
+
+#include "extrudeModel.H"
+#include "autoPtr.H"
+
+#include "fvMesh.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+/*---------------------------------------------------------------------------*\
+                        Class extrudePatchMesh Declaration
+\*---------------------------------------------------------------------------*/
+
+class extrudePatchMesh
+:
+    public fvMesh
+{
+
+private:
+
+    // Private data
+
+        //- Enumeration of patch IDs
+        enum patchID
+        {
+            bottomPatchID,
+            topPatchID,
+            sidePatchID
+        };
+
+        //- Const reference to the patch from which this mesh is extruded
+        const polyPatch& extrudedPatch_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("extrudePatchMesh");
+
+
+    // Constructors
+
+        //- Construct from mesh, patch and dictionary
+        extrudePatchMesh
+        (
+            const fvMesh&,
+            const fvPatch&,
+            const dictionary&
+        );
+
+
+    //- Destructor
+    virtual ~extrudePatchMesh();
+
+
+    // Member functions
+
+
+        // Access functions
+
+            //- Return region mesh
+            const fvMesh& regionMesh() const
+            {
+                return *this;
+            }
+
+            //- Return bottom patch
+            const polyPatch& bottomPatch() const
+            {
+                return this->boundaryMesh()[bottomPatchID];
+            }
+
+            //- Return top patch
+            const polyPatch& topPatch() const
+            {
+                 return this->boundaryMesh()[topPatchID];
+            }
+
+            //- Return sides patch
+            const polyPatch& sidesPatch() const
+            {
+                 return this->boundaryMesh()[sidePatchID];
+            }
+
+            //- Return extruded patch
+            const polyPatch& extrudedPatch() const
+            {
+                return extrudedPatch_;
+            }
+
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
+
diff --git a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
index 303eb42b80..bdbe5db092 100644
--- a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
+++ b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
@@ -258,6 +258,7 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
             obr,
             (
                 obr.readOpt() == IOobject::MUST_READ
+             || obr.readOpt() == IOobject::READ_IF_PRESENT
               ? IOobject::MUST_READ_IF_MODIFIED
               : obr.readOpt()
             ),
@@ -372,6 +373,7 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
     (
         readOpt() == IOobject::MUST_READ
      || readOpt() == IOobject::MUST_READ_IF_MODIFIED
+     || (readOpt() == IOobject::READ_IF_PRESENT && headerOk())
     )
     {
         read(schemesDict());
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 98346e4c77..0889270894 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -295,7 +295,7 @@ Foam::fvMesh::fvMesh
     fvSchemes(static_cast<const objectRegistry&>(*this)),
     fvSolution(static_cast<const objectRegistry&>(*this)),
     data(static_cast<const objectRegistry&>(*this)),
-    boundary_(*this),
+    boundary_(*this, boundaryMesh()),
     lduPtr_(NULL),
     curTimeIndex_(time().timeIndex()),
     VPtr_(NULL),
diff --git a/src/mesh/Allwmake b/src/mesh/Allwmake
index 712094055c..4653b1d3c4 100755
--- a/src/mesh/Allwmake
+++ b/src/mesh/Allwmake
@@ -5,5 +5,6 @@ set -x
 
 wmake $makeType autoMesh
 wmake $makeType blockMesh
+wmake $makeType extrudeModel
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/Make/files b/src/mesh/extrudeModel/Make/files
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/Make/files
rename to src/mesh/extrudeModel/Make/files
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/Make/options b/src/mesh/extrudeModel/Make/options
similarity index 74%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/Make/options
rename to src/mesh/extrudeModel/Make/options
index 1618ab57ec..eabd0b53a8 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeModel/Make/options
+++ b/src/mesh/extrudeModel/Make/options
@@ -3,5 +3,4 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/lnInclude
 
 LIB_LIBS = \
-    -lmeshTools \
-    -ldynamicMesh
+    -lmeshTools
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModel.C b/src/mesh/extrudeModel/extrudeModel/extrudeModel.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModel.C
rename to src/mesh/extrudeModel/extrudeModel/extrudeModel.C
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModel.H b/src/mesh/extrudeModel/extrudeModel/extrudeModel.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModel.H
rename to src/mesh/extrudeModel/extrudeModel/extrudeModel.H
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModelNew.C b/src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/extrudeModel/extrudeModelNew.C
rename to src/mesh/extrudeModel/extrudeModel/extrudeModelNew.C
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/linearDirection/linearDirection.C b/src/mesh/extrudeModel/linearDirection/linearDirection.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/linearDirection/linearDirection.C
rename to src/mesh/extrudeModel/linearDirection/linearDirection.C
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/linearDirection/linearDirection.H b/src/mesh/extrudeModel/linearDirection/linearDirection.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/linearDirection/linearDirection.H
rename to src/mesh/extrudeModel/linearDirection/linearDirection.H
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/linearNormal/linearNormal.C b/src/mesh/extrudeModel/linearNormal/linearNormal.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/linearNormal/linearNormal.C
rename to src/mesh/extrudeModel/linearNormal/linearNormal.C
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/linearNormal/linearNormal.H b/src/mesh/extrudeModel/linearNormal/linearNormal.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/linearNormal/linearNormal.H
rename to src/mesh/extrudeModel/linearNormal/linearNormal.H
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/linearRadial/linearRadial.C b/src/mesh/extrudeModel/linearRadial/linearRadial.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/linearRadial/linearRadial.C
rename to src/mesh/extrudeModel/linearRadial/linearRadial.C
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/linearRadial/linearRadial.H b/src/mesh/extrudeModel/linearRadial/linearRadial.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/linearRadial/linearRadial.H
rename to src/mesh/extrudeModel/linearRadial/linearRadial.H
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/sigmaRadial/sigmaRadial.C b/src/mesh/extrudeModel/sigmaRadial/sigmaRadial.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/sigmaRadial/sigmaRadial.C
rename to src/mesh/extrudeModel/sigmaRadial/sigmaRadial.C
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/sigmaRadial/sigmaRadial.H b/src/mesh/extrudeModel/sigmaRadial/sigmaRadial.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/sigmaRadial/sigmaRadial.H
rename to src/mesh/extrudeModel/sigmaRadial/sigmaRadial.H
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/wedge/wedge.C b/src/mesh/extrudeModel/wedge/wedge.C
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/wedge/wedge.C
rename to src/mesh/extrudeModel/wedge/wedge.C
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/wedge/wedge.H b/src/mesh/extrudeModel/wedge/wedge.H
similarity index 100%
rename from applications/utilities/mesh/generation/extrude/extrudeModel/wedge/wedge.H
rename to src/mesh/extrudeModel/wedge/wedge.H

From 28762dc468d0680c2108b165c6ffbb2ac4a0bbe9 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 19 Apr 2012 14:17:30 +0100
Subject: [PATCH 3/5] Removed trailing whitespace

---
 applications/solvers/DNS/dnsFoam/dnsFoam.C    |  4 +-
 .../solvers/combustion/fireFoam/pEqn.H        |  2 +-
 .../buoyantBoussinesqPimpleFoam/pEqn.H        |  2 +-
 .../buoyantBoussinesqSimpleFoam/pEqn.H        |  2 +-
 .../heatTransfer/buoyantPimpleFoam/pEqn.H     |  2 +-
 .../heatTransfer/buoyantSimpleFoam/pEqn.H     |  2 +-
 .../chtMultiRegionSimpleFoam/fluid/pEqn.H     |  8 ++--
 .../chtMultiRegionFoam/fluid/pEqn.H           |  2 +-
 .../potentialFreeSurfaceFoam/pEqn.H           |  2 +-
 .../lagrangian/reactingParcelFilmFoam/pEqn.H  |  2 +-
 .../solvers/multiphase/bubbleFoam/pEqn.H      | 46 ++++++++++++-------
 .../solvers/multiphase/cavitatingFoam/pEqn.H  |  2 +-
 .../DNS/dnsFoam/boxTurb16/system/fvSchemes    |  2 +-
 .../constant/thermophysicalProperties         |  1 +
 .../constant/thermophysicalProperties         |  3 +-
 .../hotRoom/system/fvSchemes                  |  2 +-
 .../hotRoom/system/fvSchemes                  |  2 +-
 .../iglooWithFridges/system/fvSchemes         |  2 +-
 .../hotRoom/system/fvSchemes                  |  2 +-
 .../buoyantCavity/system/fvSchemes            |  2 +-
 .../circuitBoardCooling/system/fvSchemes      |  2 +-
 .../hotRoom/system/fvSchemes                  |  2 +-
 .../hotRadiationRoom/system/fvSchemes         |  2 +-
 .../hotRadiationRoomFvDOM/system/fvSchemes    |  2 +-
 .../system/bottomAir/fvSchemes                |  2 +-
 .../multiRegionHeater/system/topAir/fvSchemes |  2 +-
 .../system/bottomWater/fvSchemes              |  2 +-
 .../system/topAir/fvSchemes                   |  2 +-
 .../system/bottomAir/fvSchemes                |  2 +-
 .../system/topAir/fvSchemes                   |  2 +-
 .../system/bottomAir/fvSchemes                |  2 +-
 .../multiRegionHeater/system/topAir/fvSchemes |  2 +-
 .../system/bottomAir/fvSchemes                |  2 +-
 .../system/topAir/fvSchemes                   |  2 +-
 .../pimpleFoam/TJunctionFan/0/epsilon         | 14 +++---
 .../pimpleFoam/TJunctionFan/0/k               | 14 +++---
 .../pimpleFoam/TJunctionFan/0/p               | 21 ++++++---
 .../elipsekkLOmega/constant/polyMesh/boundary | 16 +++++--
 .../bubbleFoam/bubbleColumn/0.org/p           |  5 +-
 .../multiphase/bubbleFoam/bubbleColumn/0/p    |  5 +-
 .../bubbleFoam/bubbleColumn/system/fvSchemes  |  2 +-
 .../les/throttle/system/fvSchemes             |  2 +-
 .../les/throttle3D/system/fvSchemes           |  2 +-
 .../ras/throttle/system/fvSchemes             |  2 +-
 44 files changed, 116 insertions(+), 87 deletions(-)

diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C
index 0733802b08..08073398a7 100644
--- a/applications/solvers/DNS/dnsFoam/dnsFoam.C
+++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
 
         for (int corr=1; corr<=1; corr++)
         {
-            volScalarField rAU(1.0/UEqn.A());
+            volScalarField rAU("Dp", 1.0/UEqn.A());
             volVectorField HbyA("HbyA", U);
             HbyA = rAU*UEqn.H();
 
diff --git a/applications/solvers/combustion/fireFoam/pEqn.H b/applications/solvers/combustion/fireFoam/pEqn.H
index b6f5ef47b1..3f4f485cf6 100644
--- a/applications/solvers/combustion/fireFoam/pEqn.H
+++ b/applications/solvers/combustion/fireFoam/pEqn.H
@@ -1,7 +1,7 @@
 rho = thermo.rho();
 
 volScalarField rAU(1.0/UEqn.A());
-surfaceScalarField rhorAUf(rAU.name() + 'f', fvc::interpolate(rho*rAU));
+surfaceScalarField rhorAUf("Dp", fvc::interpolate(rho*rAU));
 volVectorField HbyA("HbyA", U);
 HbyA = rAU*UEqn.H();
 
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
index ce822ff21b..06997e52ec 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
@@ -1,6 +1,6 @@
 {
     volScalarField rAU("rAU", 1.0/UEqn.A());
-    surfaceScalarField rAUf("(1|A(U))", fvc::interpolate(rAU));
+    surfaceScalarField rAUf("Dp", fvc::interpolate(rAU));
 
     volVectorField HbyA("HbyA", U);
     HbyA = rAU*UEqn.H();
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
index 32076b4dd1..c07a344017 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
@@ -1,6 +1,6 @@
 {
     volScalarField rAU("rAU", 1.0/UEqn().A());
-    surfaceScalarField rAUf("(1|A(U))", fvc::interpolate(rAU));
+    surfaceScalarField rAUf("Dp", fvc::interpolate(rAU));
 
     volVectorField HbyA("HbyA", U);
     HbyA = rAU*UEqn().H();
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
index 462b96b17d..96389fee7b 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
@@ -6,7 +6,7 @@
     thermo.rho() -= psi*p_rgh;
 
     volScalarField rAU(1.0/UEqn.A());
-    surfaceScalarField rhorAUf("(rho*(1|A(U)))", fvc::interpolate(rho*rAU));
+    surfaceScalarField rhorAUf("Dp", fvc::interpolate(rho*rAU));
 
     volVectorField HbyA("HbyA", U);
     HbyA = rAU*UEqn.H();
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
index a7f873c2f1..f63e12f363 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
@@ -3,7 +3,7 @@
     rho.relax();
 
     volScalarField rAU(1.0/UEqn().A());
-    surfaceScalarField rhorAUf("(rho*(1|A(U)))", fvc::interpolate(rho*rAU));
+    surfaceScalarField rhorAUf("Dp", fvc::interpolate(rho*rAU));
 
     volVectorField HbyA("HbyA", U);
     HbyA = rAU*UEqn().H();
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
index 73b72af316..d23390edeb 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
@@ -5,7 +5,7 @@
     rho.relax();
 
     volScalarField rAU(1.0/UEqn().A());
-    surfaceScalarField rhorAUf("(rho*(1|A(U)))", fvc::interpolate(rho*rAU));
+    surfaceScalarField rhorAUf("Dp", fvc::interpolate(rho*rAU));
 
     U = rAU*UEqn().H();
     UEqn.clear();
@@ -15,8 +15,8 @@
     dimensionedScalar compressibility = fvc::domainIntegrate(psi);
     bool compressible = (compressibility.value() > SMALL);
 
-    surfaceScalarField buoyancyPhi(rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
-    phi -= buoyancyPhi;
+    surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
+    phi += phig;
 
     // Solve pressure
     for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
@@ -44,7 +44,7 @@
 
             // Correct the momentum source with the pressure gradient flux
             // calculated from the relaxed pressure
-            U -= rAU*fvc::reconstruct((buoyancyPhi + p_rghEqn.flux())/rhorAUf);
+            U += rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rhorAUf);
             U.correctBoundaryConditions();
         }
     }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
index 76f6f8e30e..f260acc514 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
@@ -6,7 +6,7 @@
     rho = thermo.rho();
 
     volScalarField rAU(1.0/UEqn().A());
-    surfaceScalarField rhorAUf("(rho*(1|A(U)))", fvc::interpolate(rho*rAU));
+    surfaceScalarField rhorAUf("Dp", fvc::interpolate(rho*rAU));
 
     volVectorField HbyA("HbyA", U);
     HbyA = rAU*UEqn().H();
diff --git a/applications/solvers/incompressible/potentialFreeSurfaceFoam/pEqn.H b/applications/solvers/incompressible/potentialFreeSurfaceFoam/pEqn.H
index 2271e85d9b..5a521a04ff 100644
--- a/applications/solvers/incompressible/potentialFreeSurfaceFoam/pEqn.H
+++ b/applications/solvers/incompressible/potentialFreeSurfaceFoam/pEqn.H
@@ -1,5 +1,5 @@
 volScalarField rAU(1.0/UEqn().A());
-surfaceScalarField rAUf(rAU.name() + 'f', fvc::interpolate(rAU));
+surfaceScalarField rAUf("Dp", fvc::interpolate(rAU));
 
 volVectorField HbyA("HbyA", U);
 HbyA = rAU*(UEqn() == sources(U))().H();
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
index b6f5ef47b1..3f4f485cf6 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
@@ -1,7 +1,7 @@
 rho = thermo.rho();
 
 volScalarField rAU(1.0/UEqn.A());
-surfaceScalarField rhorAUf(rAU.name() + 'f', fvc::interpolate(rho*rAU));
+surfaceScalarField rhorAUf("Dp", fvc::interpolate(rho*rAU));
 volVectorField HbyA("HbyA", U);
 HbyA = rAU*UEqn.H();
 
diff --git a/applications/solvers/multiphase/bubbleFoam/pEqn.H b/applications/solvers/multiphase/bubbleFoam/pEqn.H
index 5f868f3da9..631c9cbba6 100644
--- a/applications/solvers/multiphase/bubbleFoam/pEqn.H
+++ b/applications/solvers/multiphase/bubbleFoam/pEqn.H
@@ -8,16 +8,21 @@
     surfaceScalarField rAU1f(fvc::interpolate(rAU1));
     surfaceScalarField rAU2f(fvc::interpolate(rAU2));
 
-    U1 = rAU1*U1Eqn.H();
-    U2 = rAU2*U2Eqn.H();
+    volVectorField HbyA1("HbyA1", U1);
+    HbyA1 = rAU1*U1Eqn.H();
+
+    volVectorField HbyA2("HbyA2", U2);
+    HbyA2 = rAU2*U2Eqn.H();
 
     surfaceScalarField phiDrag1
     (
-        fvc::interpolate(alpha2/rho1*dragCoef*rAU1)*phi2 + rAU1f*(g & mesh.Sf())
+        fvc::interpolate(alpha2/rho1*dragCoef*rAU1)*phi2
+      + rAU1f*(g & mesh.Sf())
     );
     surfaceScalarField phiDrag2
     (
-        fvc::interpolate(alpha1/rho2*dragCoef*rAU2)*phi1 + rAU2f*(g & mesh.Sf())
+        fvc::interpolate(alpha1/rho2*dragCoef*rAU2)*phi1
+      + rAU2f*(g & mesh.Sf())
     );
 
     forAll(p.boundaryField(), patchi)
@@ -29,16 +34,25 @@
         }
     }
 
-    phi1 = (fvc::interpolate(U1) & mesh.Sf()) + fvc::ddtPhiCorr(rAU1, U1, phi1)
-        + phiDrag1;
-    phi2 = (fvc::interpolate(U2) & mesh.Sf()) + fvc::ddtPhiCorr(rAU2, U2, phi2)
-        + phiDrag2;
+    surfaceScalarField phiHbyA1
+    (
+        (fvc::interpolate(HbyA1) & mesh.Sf())
+      + fvc::ddtPhiCorr(rAU1, U1, phi1)
+      + phiDrag1
+    );
 
-    phi = alpha1f*phi1 + alpha2f*phi2;
+    surfaceScalarField phiHbyA2
+    (
+        (fvc::interpolate(HbyA2) & mesh.Sf())
+      + fvc::ddtPhiCorr(rAU2, U2, phi2)
+      + phiDrag2
+    );
+
+    surfaceScalarField phiHbyA("phiHbyA", alpha1f*phiHbyA1 + alpha2f*phiHbyA2);
 
     surfaceScalarField Dp
     (
-        "(rho*(1|A(U)))",
+        "Dp",
         alpha1f*rAU1f/rho1 + alpha2f*rAU2f/rho2
     );
 
@@ -46,7 +60,7 @@
     {
         fvScalarMatrix pEqn
         (
-            fvm::laplacian(Dp, p) == fvc::div(phi)
+            fvm::laplacian(Dp, p) == fvc::div(phiHbyA)
         );
 
         pEqn.setReference(pRefCell, pRefValue);
@@ -57,19 +71,17 @@
         {
             surfaceScalarField SfGradp(pEqn.flux()/Dp);
 
-            phi1 -= rAU1f*SfGradp/rho1;
-            phi2 -= rAU2f*SfGradp/rho2;
+            phi1 = phiHbyA1 - rAU1f*SfGradp/rho1;
+            phi2 = phiHbyA2 - rAU2f*SfGradp/rho2;
             phi = alpha1f*phi1 + alpha2f*phi2;
 
             p.relax();
             SfGradp = pEqn.flux()/Dp;
 
-            U1 += (fvc::reconstruct(phiDrag1 - rAU1f*SfGradp/rho1));
-            //U1 += rAU1*(fvc::reconstruct(phiDrag1/rAU1f - SfGradp/rho1));
+            U1 = HbyA1 + (fvc::reconstruct(phiDrag1 - rAU1f*SfGradp/rho1));
             U1.correctBoundaryConditions();
 
-            U2 += (fvc::reconstruct(phiDrag2 - rAU2f*SfGradp/rho2));
-            //U2 += rAU2*(fvc::reconstruct(phiDrag2/rAU2f - SfGradp/rho2));
+            U2 = HbyA2 + (fvc::reconstruct(phiDrag2 - rAU2f*SfGradp/rho2));
             U2.correctBoundaryConditions();
 
             U = alpha1*U1 + alpha2*U2;
diff --git a/applications/solvers/multiphase/cavitatingFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
index 34898172ce..ea35f79fa1 100644
--- a/applications/solvers/multiphase/cavitatingFoam/pEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
@@ -12,7 +12,7 @@
     surfaceScalarField rhof("rhof", fvc::interpolate(rho));
 
     volScalarField rAU(1.0/UEqn.A());
-    surfaceScalarField rAUf("rAUf", rhof*fvc::interpolate(rAU));
+    surfaceScalarField rAUf("Dp", rhof*fvc::interpolate(rAU));
 
     volVectorField HbyA("HbyA", U);
     HbyA = rAU*UEqn.H();
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes
index 1f665c977f..21be868783 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes
+++ b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes
@@ -37,7 +37,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(nu,U) Gauss linear corrected;
-    laplacian((1|A(U)),p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
 }
 
 interpolationSchemes
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
index e6838dcf7a..2ff1fabbda 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
@@ -33,6 +33,7 @@ mixture
     {
         As              1.458e-06;
         Ts              110.4;
+        Pr              1;
     }
 }
 
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
index a3c1437dc0..1e8492f320 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
@@ -15,8 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Pr              0.72;
-
 thermoType      ePsiThermo<pureMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
 
 mixture
@@ -38,6 +36,7 @@ mixture
     {
         As              1.458e-06;
         Ts              110;
+        Pr              0.72;
     }
 }
 
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
index ceb6aa0497..b7ff9739c1 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
@@ -41,7 +41,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(nuEff,U) Gauss linear uncorrected;
-    laplacian((1|A(U)),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
     laplacian(kappaEff,T) Gauss linear uncorrected;
     laplacian(DkEff,k) Gauss linear uncorrected;
     laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
index 3fa205e5e3..6fc42b1ca7 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
@@ -39,7 +39,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(nuEff,U) Gauss linear corrected;
-    laplacian((1|A(U)),p_rgh) Gauss linear corrected;
+    laplacian(Dp,p_rgh) Gauss linear corrected;
     laplacian(kappaEff,T) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
index 364987d87f..b36bd5f8fc 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
@@ -41,7 +41,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(nuEff,U) Gauss linear limited 0.333;
-    laplacian((1|A(U)),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
     laplacian(kappaEff,T) Gauss linear limited 0.333;
     laplacian(DkEff,k) Gauss linear limited 0.333;
     laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
index 3a7b6154e5..a6897b72d5 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
@@ -42,7 +42,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear corrected;
+    laplacian(Dp,p_rgh) Gauss linear corrected;
     laplacian(alphaEff,h) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
index cdaadf4c30..599b1530bc 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
@@ -40,7 +40,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear orthogonal;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear orthogonal;
+    laplacian(Dp,p_rgh) Gauss linear orthogonal;
     laplacian(alphaEff,h) Gauss linear orthogonal;
     laplacian(DkEff,k) Gauss linear orthogonal;
     laplacian(DepsilonEff,epsilon) Gauss linear orthogonal;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes
index 02edc9816b..46f978cc82 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes
@@ -40,7 +40,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear uncorrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
     laplacian(alphaEff,h) Gauss linear uncorrected;
     laplacian(DkEff,k) Gauss linear uncorrected;
     laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes
index f0019f6690..991a5277f6 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes
@@ -42,7 +42,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear uncorrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
     laplacian(alphaEff,h) Gauss linear uncorrected;
     laplacian(DkEff,k) Gauss linear uncorrected;
     laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes
index 572a6207d2..3b6deefb69 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes
@@ -42,7 +42,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear corrected;
+    laplacian(Dp,p_rgh) Gauss linear corrected;
     laplacian(alphaEff,h) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes
index 3cbd118408..817fe7274b 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes
@@ -43,7 +43,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear corrected;
+    laplacian(Dp,p_rgh) Gauss linear corrected;
     laplacian(alphaEff,h) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
index e4be18c50c..148fdb45eb 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
@@ -41,7 +41,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
     laplacian(alphaEff,h) Gauss linear limited 0.333;
     laplacian(DkEff,k) Gauss linear limited 0.333;
     laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
index 865dfd9f99..5694ac1f59 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
@@ -41,7 +41,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
     laplacian(alphaEff,h) Gauss linear limited 0.333;
     laplacian(DkEff,k) Gauss linear limited 0.333;
     laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes
index 865dfd9f99..5694ac1f59 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes
@@ -41,7 +41,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
     laplacian(alphaEff,h) Gauss linear limited 0.333;
     laplacian(DkEff,k) Gauss linear limited 0.333;
     laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes
index 865dfd9f99..5694ac1f59 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes
@@ -41,7 +41,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
     laplacian(alphaEff,h) Gauss linear limited 0.333;
     laplacian(DkEff,k) Gauss linear limited 0.333;
     laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
index 865dfd9f99..5694ac1f59 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
@@ -41,7 +41,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
     laplacian(alphaEff,h) Gauss linear limited 0.333;
     laplacian(DkEff,k) Gauss linear limited 0.333;
     laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
index 865dfd9f99..5694ac1f59 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
@@ -41,7 +41,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
     laplacian(alphaEff,h) Gauss linear limited 0.333;
     laplacian(DkEff,k) Gauss linear limited 0.333;
     laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSchemes
index 17ab97ec96..09a66a2658 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSchemes
@@ -42,7 +42,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear uncorrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
     laplacian(alphaEff,h) Gauss linear uncorrected;
     laplacian(DkEff,k) Gauss linear uncorrected;
     laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes
index cf4192a4de..9b8eac50b5 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes
@@ -42,7 +42,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear uncorrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
     laplacian(alphaEff,h) Gauss linear uncorrected;
     laplacian(DkEff,k) Gauss linear uncorrected;
     laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
index 7f3767d179..ca25b1d27c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
@@ -43,7 +43,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear uncorrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
     laplacian(alphaEff,h) Gauss linear uncorrected;
     laplacian(DkEff,k) Gauss linear uncorrected;
     laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSchemes
index 7f3767d179..ca25b1d27c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSchemes
@@ -43,7 +43,7 @@ laplacianSchemes
 {
     default         none;
     laplacian(muEff,U) Gauss linear uncorrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
     laplacian(alphaEff,h) Gauss linear uncorrected;
     laplacian(DkEff,k) Gauss linear uncorrected;
     laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0/epsilon b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/epsilon
index 7448f8e544..b972d9f1d2 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/0/epsilon
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/epsilon
@@ -27,19 +27,19 @@ boundaryField
         mixingLength    0.01;
         phi             phi;
         k               k;
-        value           $internalField;
+        value           uniform 200;
     }
     outlet1
     {
         type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
+        inletValue      uniform 200;
+        value           uniform 200;
     }
     outlet2
     {
         type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
+        inletValue      uniform 200;
+        value           uniform 200;
     }
     baffles
     {
@@ -47,7 +47,7 @@ boundaryField
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
-        value           $internalField;
+        value           uniform 0;
     }
     fan_half0
     {
@@ -63,7 +63,7 @@ boundaryField
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
-        value           $internalField;
+        value           uniform 200;
     }
 }
 
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0/k b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/k
index 9684d73a55..a58acefeab 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/0/k
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/k
@@ -27,24 +27,24 @@ boundaryField
         intensity       0.05;
         U               U;
         phi             phi;
-        value           $internalField;
+        value           uniform 0.375;
     }
     outlet1
     {
         type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
+        inletValue      uniform 0.375;
+        value           uniform 0.375;
     }
     outlet2
     {
         type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
+        inletValue      uniform 0.375;
+        value           uniform 0.375;
     }
     baffles
     {
         type            kqRWallFunction;
-        value           $internalField;
+        value           uniform 0;
     }
     fan_half0
     {
@@ -57,7 +57,7 @@ boundaryField
     defaultFaces
     {
         type            kqRWallFunction;
-        value           $internalField;
+        value           uniform 0.375;
     }
 }
 
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0/p b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/p
index dd968b84c5..16a8bb50ed 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/0/p
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/p
@@ -29,10 +29,13 @@ boundaryField
         gamma           1;
         p0              40;
         pressure        table
-        (
-            (0 10)
-            (1 40)
-        );
+
+2
+(
+(0 10)
+(1 40)
+)
+;
         value           uniform 40;
     }
     outlet1
@@ -54,7 +57,14 @@ boundaryField
         type            fan;
         patchType       cyclic;
         jump            uniform 0;
-        f               2(100 -0.1);
+        jumpTable       polynomial
+
+2
+(
+(100 0)
+(-0.1 1)
+)
+;
         value           uniform 0;
     }
     fan_half1
@@ -62,7 +72,6 @@ boundaryField
         type            fan;
         patchType       cyclic;
         jump            uniform 0;
-        f               2(100 -0.1);
         value           uniform 0;
     }
     defaultFaces
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary
index ff3254a0cb..5370728b89 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary
@@ -15,31 +15,37 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-4
+5
 (
+    left
+    {
+        type            symmetryPlane;
+        nFaces          320;
+        startFace       99210;
+    }
     outlet
     {
         type            patch;
         nFaces          320;
-        startFace       99370;
+        startFace       99530;
     }
     up
     {
         type            symmetryPlane;
         nFaces          380;
-        startFace       99690;
+        startFace       99850;
     }
     hole
     {
         type            wall;
         nFaces          560;
-        startFace       100070;
+        startFace       100230;
     }
     frontAndBack
     {
         type            empty;
         nFaces          100000;
-        startFace       100630;
+        startFace       100790;
     }
 )
 
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
index 07744fc101..536747ce3f 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
@@ -22,7 +22,8 @@ boundaryField
 {
     inlet
     {
-        type            zeroGradient;
+        type            fixedFluxPressure;
+        value           uniform 0;
     }
 
     outlet
@@ -33,7 +34,7 @@ boundaryField
 
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
index 709bf07cef..5fffa73a19 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
@@ -1901,7 +1901,8 @@ boundaryField
 {
     inlet
     {
-        type            zeroGradient;
+        type            fixedFluxPressure;
+        value           uniform 0;
     }
 
     outlet
@@ -1912,7 +1913,7 @@ boundaryField
 
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes
index 9e465b4262..0779f1ea22 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes
@@ -42,7 +42,7 @@ laplacianSchemes
     default         none;
     laplacian(nuEff1,U1) Gauss linear corrected;
     laplacian(nuEff2,U2) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
 }
 
 interpolationSchemes
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
index 4dd3e2bcc8..0c8bf54bb5 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
@@ -43,7 +43,7 @@ laplacianSchemes
     default         none;
     laplacian(nuf,rhoU) Gauss linear corrected;
     laplacian(muEff,U) Gauss linear corrected;
-    laplacian(rAUf,p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(1,p)  Gauss linear corrected;
 }
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
index 4dd3e2bcc8..0c8bf54bb5 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
@@ -43,7 +43,7 @@ laplacianSchemes
     default         none;
     laplacian(nuf,rhoU) Gauss linear corrected;
     laplacian(muEff,U) Gauss linear corrected;
-    laplacian(rAUf,p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(1,p)  Gauss linear corrected;
 }
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
index 7134b5cb39..633e4a749e 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
@@ -44,7 +44,7 @@ laplacianSchemes
     default         none;
     laplacian(nuf,rhoU) Gauss linear corrected;
     laplacian(muEff,U) Gauss linear corrected;
-    laplacian(rAUf,p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
     laplacian(DomegaEff,omega) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(1,p)  Gauss linear corrected;

From 12d560aa035f2ce002fb53203bfb0e98409a85bf Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Thu, 19 Apr 2012 14:37:31 +0100
Subject: [PATCH 4/5] BUG: Add surfaceFeatureExtract dictionaries to the
 tutorials

---
 .../pimpleDyMFoam/propeller/Allrun.pre        | 16 +----
 .../system/surfaceFeatureExtractDict          | 59 +++++++++++++++++++
 tutorials/mesh/cvMesh/flange/Allrun           |  2 +-
 .../flange/system/surfaceFeatureExtractDict   |  3 -
 tutorials/mesh/cvMesh/simpleShapes/Allrun     |  8 +--
 .../system/surfaceFeatureExtractDict          | 57 ++++++++++++++++++
 tutorials/mesh/snappyHexMesh/flange/Allrun    |  2 +-
 .../flange/system/surfaceFeatureExtractDict   | 38 ++++++++++++
 8 files changed, 159 insertions(+), 26 deletions(-)
 create mode 100644 tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDict
 create mode 100644 tutorials/mesh/cvMesh/simpleShapes/system/surfaceFeatureExtractDict
 create mode 100644 tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict

diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
index 917bec1fac..472c03a6f7 100755
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
@@ -12,21 +12,7 @@ cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/
 
 runApplication blockMesh
 
-surfaces="
-    innerCylinder
-    innerCylinderSmall
-    outerCylinder
-    propellerTip
-    propellerStem1
-    propellerStem2
-    propellerStem3
-"
-
-for s in $surfaces; do
-    runApplication surfaceFeatureExtract -includedAngle 150 -minElem 10        \
-        constant/triSurface/$s.obj $s
-    mv log.surfaceFeatureExtract log.surfaceFeatureExtract.$s
-done
+runApplication surfaceFeatureExtract
 
 runApplication snappyHexMesh -overwrite
 # force removal of fields generated by snappy
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDict b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDict
new file mode 100644
index 0000000000..b6333ec29b
--- /dev/null
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDict
@@ -0,0 +1,59 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      surfaceFeatureExtractDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+innerCylinder.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+innerCylinderSmall.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+outerCylinder.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+propellerStem1.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+propellerStem2.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+propellerStem3.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+propellerTip.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/cvMesh/flange/Allrun b/tutorials/mesh/cvMesh/flange/Allrun
index d4e853bb3f..dcbbfb47d4 100755
--- a/tutorials/mesh/cvMesh/flange/Allrun
+++ b/tutorials/mesh/cvMesh/flange/Allrun
@@ -8,7 +8,7 @@ cd ${0%/*} || exit 1    # run from this directory
 nProc=`grep numberOfSubdomains system/decomposeParDict \
      | sed s/"numberOfSubdomains *\(.*\);"/"\1"/`
 
-runApplication surfaceFeatureExtract constant/triSurface/flange.obj flange -includedAngle 155
+runApplication surfaceFeatureExtract
 
 # Create tight-fitting background mesh
 runApplication blockMesh
diff --git a/tutorials/mesh/cvMesh/flange/system/surfaceFeatureExtractDict b/tutorials/mesh/cvMesh/flange/system/surfaceFeatureExtractDict
index a4c24aa610..ca6dfb9e7c 100644
--- a/tutorials/mesh/cvMesh/flange/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/cvMesh/flange/system/surfaceFeatureExtractDict
@@ -30,9 +30,6 @@ flange.obj
 
     // Write options
 
-        // Write .eMesh file (for snappyHexMesh)
-        writeFeatureEdgeMesh    no;
-
         // Write features to obj format for postprocessing
         writeObj                yes;
 }
diff --git a/tutorials/mesh/cvMesh/simpleShapes/Allrun b/tutorials/mesh/cvMesh/simpleShapes/Allrun
index 5de37ba569..f1259d32d2 100755
--- a/tutorials/mesh/cvMesh/simpleShapes/Allrun
+++ b/tutorials/mesh/cvMesh/simpleShapes/Allrun
@@ -30,15 +30,11 @@ surfaceOrient \
     constant/triSurface/domain_clean_orient.stl
     > log.surfaceOrient.domain 2>&1
 
-runApplication surfaceFeatureExtract \
-    constant/triSurface/coneAndSphere_clean_orient.obj \
-    coneAndSphere -includedAngle 125
+runApplication surfaceFeatureExtract
 mv log.surfaceFeatureExtract log.surfaceFeatureExtract.coneAndSphere_clean
 
 unset FOAM_SIGFPE
-runApplication surfaceFeatureExtract \
-    constant/triSurface/domain_clean_orient.stl \
-    domain -includedAngle 125
+runApplication surfaceFeatureExtract
 mv log.surfaceFeatureExtract log.surfaceFeatureExtract.domain
 
 # Generate aligned points (in constant/internalDelaunayVertices) and a
diff --git a/tutorials/mesh/cvMesh/simpleShapes/system/surfaceFeatureExtractDict b/tutorials/mesh/cvMesh/simpleShapes/system/surfaceFeatureExtractDict
new file mode 100644
index 0000000000..850a4ea41f
--- /dev/null
+++ b/tutorials/mesh/cvMesh/simpleShapes/system/surfaceFeatureExtractDict
@@ -0,0 +1,57 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      surfaceFeatureExtractDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+coneAndSphere_clean_orient.obj
+{
+    extractionMethod    extractFromSurface;
+
+    extractFromSurfaceCoeffs
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   125;
+    }
+
+    // Write options
+
+        // Write features to obj format for postprocessing
+        writeObj                no;
+}
+
+
+domain_clean_orient.stl
+{
+    extractionMethod    extractFromSurface;
+
+    extractFromSurfaceCoeffs
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   125;
+    }
+
+    // Write options
+
+        // Write features to obj format for postprocessing
+        writeObj                no;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/flange/Allrun b/tutorials/mesh/snappyHexMesh/flange/Allrun
index 5d808c1f55..365020d19d 100755
--- a/tutorials/mesh/snappyHexMesh/flange/Allrun
+++ b/tutorials/mesh/snappyHexMesh/flange/Allrun
@@ -6,5 +6,5 @@
 cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
 
 runApplication blockMesh
-runApplication surfaceFeatureExtract -includedAngle 150 -writeObj constant/triSurface/flange.stl flange
+runApplication surfaceFeatureExtract
 runApplication snappyHexMesh -overwrite
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict b/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
new file mode 100644
index 0000000000..21384ba40c
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
@@ -0,0 +1,38 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      surfaceFeatureExtractDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+flange.stl
+{
+    // How to obtain raw features (extractFromFile || extractFromSurface)
+    extractionMethod    extractFromSurface;
+
+    extractFromSurfaceCoeffs
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   150;
+    }
+
+    // Write options
+
+        // Write features to obj format for postprocessing
+        writeObj                yes;
+}
+
+
+// ************************************************************************* //

From dfac320401dab7d638a5fcd17f24a27744306a4c Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Thu, 19 Apr 2012 15:04:51 +0100
Subject: [PATCH 5/5] BUG: Add surfaceFeatureExtract dictionary defaults

---
 .../system/surfaceFeatureExtractDictDefaults    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults

diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
new file mode 100644
index 0000000000..52258ae692
--- /dev/null
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
@@ -0,0 +1,17 @@
+// How to obtain raw features (extractFromFile || extractFromSurface)
+extractionMethod    extractFromSurface;
+
+extractFromSurfaceCoeffs
+{
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle   150;
+}
+
+trimFeatures
+{
+    // Remove features with fewer than the specified number of edges
+    minElem         10;
+}