Merge branch 'master' into combustionModel

applications/solvers/heatTransfer/buoyantBaffleSimpleFoam/Make/options

@@ -1,5 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basicSolidThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \

applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -757,9 +757,23 @@ int main(int argc, char *argv[])
         "retain raw orientation for prisms/hexs"
     );
 
+#   include "addRegionOption.H"
+
 #   include "setRootCase.H"
 #   include "createTime.H"
 
+    Foam::word regionName;
+
+    if (args.optionReadIfPresent("region", regionName))
+    {
+        Foam::Info
+            << "Creating polyMesh for region " << regionName << endl;
+    }
+    else
+    {
+        regionName = Foam::polyMesh::defaultRegion;
+    }
+
     const bool keepOrientation = args.optionFound("keepOrientation");
     IFstream inFile(args[1]);
 
@@ -894,7 +908,7 @@ int main(int argc, char *argv[])
     (
         IOobject
         (
-            polyMesh::defaultRegion,
+            regionName,
             runTime.constant(),
             runTime
         ),
@@ -984,6 +998,7 @@ int main(int argc, char *argv[])
 
 
     //Get polyMesh to write to constant
+
     runTime.setTime(instant(runTime.constant()), 0);
 
     repatcher.repatch();
@@ -1079,6 +1094,32 @@ int main(int argc, char *argv[])
         mesh.addZones(List<pointZone*>(0), fz, cz);
     }
 
+    // Remove empty defaultFaces
+    label defaultPatchID = mesh.boundaryMesh().findPatchID(defaultFacesName);
+    if (mesh.boundaryMesh()[defaultPatchID].size() == 0)
+    {
+        List<polyPatch*> newPatchPtrList((mesh.boundaryMesh().size() - 1));
+        label newPatchI = 0;
+        forAll(mesh.boundaryMesh(), patchI)
+        {
+            if (patchI != defaultPatchID)
+            {
+                const polyPatch& patch = mesh.boundaryMesh()[patchI];
+
+                newPatchPtrList[newPatchI] = patch.clone
+                (
+                    mesh.boundaryMesh(),
+                    newPatchI,
+                    patch.size(),
+                    patch.start()
+                ).ptr();
+
+                newPatchI++;
+            }
+        }
+        repatcher.changePatches(newPatchPtrList);
+    }
+
     mesh.write();
 
     Info<< "End\n" << endl;

applications/utilities/postProcessing/sampling/sample/sampleDict

@@ -49,6 +49,9 @@ formatOptions
 //      cell          : use cell-centre value only; constant over cells (default)
 //      cellPoint     : use cell-centre and vertex values
 //      cellPointFace : use cell-centre, vertex and face values.
+//      pointMVC      : use point values only (Mean Value Coordinates)
+//      cellPatchConstrained : use cell-centre except on boundary faces where
+//        it uses the boundary value. For use with e.g. patchCloudSet.
 // 1] vertex values determined from neighbouring cell-centre values
 // 2] face values determined using the current face interpolation scheme
 //    for the field (linear, gamma, etc.)
@@ -83,6 +86,7 @@ fields
 //      uniform, face, midPoint, midPointAndFace : start and end coordinate
 //      uniform: extra number of sampling points
 //      polyLine, cloud: list of coordinates
+//      patchCloud: list of coordinates and set of patches to look for nearest
 sets
 (
     lineX1
@@ -113,8 +117,21 @@ sets
         points  ((0.049 0.049 0.00501)(0.051 0.049 0.00501));
     }
 
+    somePatchPoints
+    {
+        // Sample nearest points on selected patches. Use with
+        // interpolations:
+        // - cell (cell value)
+        // - cellPatchConstrained (boundary value)
+        // - cellPoint (interpolated boundary value)
+        type    patchCloud;
+        axis    xyz;
+        points  ((0.049 0.099 0.005)(0.051 0.054 0.005));
+        patches (".*Wall.*");
+    }
 );
 
+
 // Surface sampling definition
 //
 // 1] patches are not triangulated by default
@@ -241,4 +258,5 @@ surfaces
     }
 );
 
+
 // *********************************************************************** //