From 853b9abb79ef65e0ad29160dd6977d22cdc610eb Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Tue, 16 Jan 2018 12:10:20 +0000
Subject: [PATCH] ENH: Utilities - add -region option when creating meshes

---
 applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C          | 2 +-
 .../utilities/mesh/advanced/collapseEdges/collapseEdges.C       | 2 +-
 applications/utilities/mesh/advanced/removeFaces/removeFaces.C  | 2 +-
 .../utilities/mesh/conversion/ccm/foamToCcm/foamToCcm.C         | 2 +-
 .../utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C | 2 +-
 .../foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C     | 2 +-
 .../utilities/mesh/manipulation/deformedGeom/deformedGeom.C     | 2 +-
 applications/utilities/mesh/manipulation/moveMesh/moveMesh.C    | 2 +-
 .../utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C  | 2 +-
 .../utilities/mesh/manipulation/rotateMesh/rotateMesh.C         | 2 +-
 .../dataConversion/foamDataToFluent/foamDataToFluent.C          | 2 +-
 .../postProcessing/dataConversion/foamToGMV/foamToGMV.C         | 2 +-
 .../dataConversion/foamToTetDualMesh/foamToTetDualMesh.C        | 2 +-
 .../postProcessing/dataConversion/smapToFoam/smapToFoam.C       | 2 +-
 .../postProcessing/miscellaneous/postChannel/postChannel.C      | 2 +-
 applications/utilities/preProcessing/boxTurb/boxTurb.C          | 2 +-
 .../utilities/preProcessing/dsmcInitialise/dsmcInitialise.C     | 2 +-
 applications/utilities/preProcessing/engineSwirl/engineSwirl.C  | 2 +-
 .../utilities/preProcessing/mdInitialise/mdInitialise.C         | 2 +-
 .../utilities/preProcessing/setAlphaField/setAlphaField.C       | 2 +-
 .../preProcessing/wallFunctionTable/wallFunctionTable.C         | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index 5fd3b34781..5c42c08107 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -625,7 +625,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     runTime.functionObjects().off();
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
 
     // Read control dictionary
     // ~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
index f1fcb114b2..05e77ddc3b 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
+++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
     runTime.functionObjects().off();
     instantList timeDirs = timeSelector::selectIfPresent(runTime, args);
 
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
 
     const word oldInstance = mesh.pointsInstance();
 
diff --git a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
index bb78ffc827..a590b8bc35 100644
--- a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
+++ b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     runTime.functionObjects().off();
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
     const word oldInstance = mesh.pointsInstance();
 
     const word setName = args[1];
diff --git a/applications/utilities/mesh/conversion/ccm/foamToCcm/foamToCcm.C b/applications/utilities/mesh/conversion/ccm/foamToCcm/foamToCcm.C
index f2b2fff920..db76532030 100644
--- a/applications/utilities/mesh/conversion/ccm/foamToCcm/foamToCcm.C
+++ b/applications/utilities/mesh/conversion/ccm/foamToCcm/foamToCcm.C
@@ -202,7 +202,7 @@ int main(int argc, char *argv[])
     else
     {
         // convert fields with or without converting mesh
-        #include "createMesh.H"
+        #include "createNamedMesh.H"
 
         // #include "checkHasMovingMesh.H"
         // #include "checkHasLagrangian.H"
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 34d5f2b5c6..a19d87ad10 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -380,7 +380,7 @@ int main(int argc, char *argv[])
             sourceCaseDir
         );
 
-        #include "createMesh.H"
+        #include "createNamedMesh.H"
 
         const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
index 7103362970..f916acb3a5 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
@@ -514,7 +514,7 @@ int main(int argc, char *argv[])
     // Distribute the initial mesh
     if (Pstream::parRun())
     {
-        #include "createMesh.H"
+        #include "createNamedMesh.H"
         Info<< "Loaded mesh:" << endl;
         printMeshData(mesh);
 
diff --git a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
index 705683e40b..0e5c4941aa 100644
--- a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
+++ b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
     const scalar scaleFactor = args.read<scalar>(1);
 
     #include "createTime.H"
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
 
     volPointInterpolation pInterp(mesh);
 
diff --git a/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C b/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
index 3c51933dbd..d368859170 100644
--- a/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
+++ b/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 
     #include "setRootCase.H"
     #include "createTime.H"
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
 
     autoPtr<motionSolver> motionPtr = motionSolver::New(mesh);
 
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
index c8128127a1..1a1b0b6d3f 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
@@ -383,7 +383,7 @@ int main(int argc, char *argv[])
 
     #include "setRootCase.H"
     #include "createTime.H"
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
 
     const word oldInstance = mesh.pointsInstance();
 
diff --git a/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C b/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
index fe4790116b..23bd20e1ba 100644
--- a/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
+++ b/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
@@ -118,7 +118,7 @@ int main(int argc, char *argv[])
 
     instantList timeDirs = timeSelector::select0(runTime, args);
 
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
 
     forAll(timeDirs, timeI)
     {
diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
index 40afbf1af8..f079ccc3e9 100644
--- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
+++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
 
     instantList timeDirs = timeSelector::select0(runTime, args);
 
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
 
     // make a directory called proInterface in the case
     mkDir(runTime.rootPath()/runTime.caseName()/"fluentInterface");
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C b/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C
index 036217d15c..78ece90dc0 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
 
     #include "createTime.H"
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
 
     #include "readConversionProperties.H"
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
index 3ba6940575..0af1e031fe 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
@@ -154,7 +154,7 @@ int main(int argc, char *argv[])
 
 
     // Read the mesh
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
 
     // Read the tetDualMesh
     Info<< "Create tetDualMesh for time = "
diff --git a/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C b/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
index 0a025f116d..af9ea39187 100644
--- a/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
+++ b/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
     if (fieldNameDict.found("epsilon")) nameMap.add("ED", word("epsilon"));
     if (fieldNameDict.found("nuEff")) nameMap.add("VIS", word("nuEff"));
 
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
 
     IFstream smapFile(args[1]);
 
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C
index 7533203900..c5602a6496 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
     // Get times list
     instantList timeDirs = timeSelector::select0(runTime, args);
 
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
     #include "readTransportProperties.H"
 
     const word& gFormat = runTime.graphFormat();
diff --git a/applications/utilities/preProcessing/boxTurb/boxTurb.C b/applications/utilities/preProcessing/boxTurb/boxTurb.C
index 9e67ab8a57..faa9b37e43 100644
--- a/applications/utilities/preProcessing/boxTurb/boxTurb.C
+++ b/applications/utilities/preProcessing/boxTurb/boxTurb.C
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
 
     #include "createTime.H"
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
     #include "createFields.H"
     #include "readBoxTurbDict.H"
 
diff --git a/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C b/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C
index 183fa0f325..666311ea50 100644
--- a/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C
+++ b/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
 {
     #include "setRootCase.H"
     #include "createTime.H"
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/utilities/preProcessing/engineSwirl/engineSwirl.C b/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
index f59d166d68..200d04f759 100644
--- a/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
+++ b/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
 
     #include "setRootCase.H"
     #include "createTime.H"
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
     #include "createFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/preProcessing/mdInitialise/mdInitialise.C b/applications/utilities/preProcessing/mdInitialise/mdInitialise.C
index 34aa3aaecc..2c04a689c2 100644
--- a/applications/utilities/preProcessing/mdInitialise/mdInitialise.C
+++ b/applications/utilities/preProcessing/mdInitialise/mdInitialise.C
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
 {
     #include "setRootCase.H"
     #include "createTime.H"
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
 
     IOdictionary mdInitialiseDict
     (
diff --git a/applications/utilities/preProcessing/setAlphaField/setAlphaField.C b/applications/utilities/preProcessing/setAlphaField/setAlphaField.C
index 58fde7f78d..f40f62e22c 100644
--- a/applications/utilities/preProcessing/setAlphaField/setAlphaField.C
+++ b/applications/utilities/preProcessing/setAlphaField/setAlphaField.C
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
 {
     #include "setRootCase.H"
     #include "createTime.H"
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
 
     Info<< "Reading setAlphaFieldDict\n" << endl;
 
diff --git a/applications/utilities/preProcessing/wallFunctionTable/wallFunctionTable.C b/applications/utilities/preProcessing/wallFunctionTable/wallFunctionTable.C
index 6e2da72660..e31e42e738 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/wallFunctionTable.C
+++ b/applications/utilities/preProcessing/wallFunctionTable/wallFunctionTable.C
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
 {
     #include "setRootCase.H"
     #include "createTime.H"
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
 
     IOdictionary dict
     (