Merge branch 'master' into cvm

applications/utilities/mesh/generation/blockMesh/blockMeshApp.C

@@ -158,7 +158,7 @@ int main(int argc, char *argv[])
     blockMesh::verbose(true);
 
     IOdictionary meshDict(meshDictIoPtr());
-    blockMesh blocks(meshDict);
+    blockMesh blocks(meshDict, regionName);
 
 
     if (args.optionFound("blockTopology"))

applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C

@@ -321,7 +321,7 @@ void Foam::vtkPV3blockMesh::updateFoamMesh()
             )
         );
 
-        meshPtr_ = new blockMesh(meshDict);
+        meshPtr_ = new blockMesh(meshDict, polyMesh::defaultRegion);
     }
 
 

src/lagrangian/dieselSpray/spray/sprayOps.C

@@ -28,7 +28,7 @@ License
 #include "breakupModel.H"
 #include "collisionModel.H"
 #include "dispersionModel.H"
-#include "interpolationCellPoint.H"
+#include "interpolation.H"
 #include "processorPolyPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C

@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "ThermoCloud.H"
-#include "interpolationCellPoint.H"
 #include "ThermoParcel.H"
 
 #include "HeatTransferModel.H"

src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H

@@ -48,7 +48,7 @@ SourceFiles
 #include "Particle.H"
 #include "IOstream.H"
 #include "autoPtr.H"
-#include "interpolationCellPoint.H"
+#include "interpolation.H"
 #include "contiguous.H"
 
 #include "KinematicCloud.H"

src/mesh/blockMesh/blockMesh/blockMesh.C

@@ -32,11 +32,11 @@ bool Foam::blockMesh::blockMesh::verboseOutput(false);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::blockMesh::blockMesh(IOdictionary& dict)
+Foam::blockMesh::blockMesh(const IOdictionary& dict, const word& regionName)
 :
     blockPointField_(dict.lookup("vertices")),
     scaleFactor_(1.0),
-    topologyPtr_(createTopology(dict))
+    topologyPtr_(createTopology(dict, regionName))
 {
     calcMergeInfo();
 }

src/mesh/blockMesh/blockMesh/blockMesh.H

@@ -128,7 +128,7 @@ class blockMesh
 
         void createCellShapes(cellShapeList& tmpBlockCells);
 
-        polyMesh* createTopology(IOdictionary&);
+        polyMesh* createTopology(const IOdictionary&, const word& regionName);
         void checkBlockMesh(const polyMesh&) const;
 
         //- Determine the merge info and the final number of cells/points
@@ -149,7 +149,7 @@ public:
     // Constructors
 
         //- Construct from IOdictionary
-        blockMesh(IOdictionary&);
+        blockMesh(const IOdictionary&, const word& regionName);
 
 
     //- Destructor

src/mesh/blockMesh/blockMesh/blockMeshTopology.C

@@ -261,7 +261,11 @@ void Foam::blockMesh::createCellShapes
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-Foam::polyMesh* Foam::blockMesh::createTopology(IOdictionary& meshDescription)
+Foam::polyMesh* Foam::blockMesh::createTopology
+(
+    const IOdictionary& meshDescription,
+    const word& regionName
+)
 {
     bool topologyOK = true;
 
@@ -514,7 +518,7 @@ Foam::polyMesh* Foam::blockMesh::createTopology(IOdictionary& meshDescription)
         (
             IOobject
             (
-                "blockMesh",
+                regionName,
                 meshDescription.time().constant(),
                 meshDescription.time(),
                 IOobject::NO_READ,
@@ -563,7 +567,7 @@ Foam::polyMesh* Foam::blockMesh::createTopology(IOdictionary& meshDescription)
         (
             IOobject
             (
-                "blockMesh",
+                regionName,
                 meshDescription.time().constant(),
                 meshDescription.time(),
                 IOobject::NO_READ,