Merge remote-tracking branch 'origin/enhancement-emptyPatches' into development

meshLibrary/cartesian2DMesh/cartesian2DMeshGenerator/cartesian2DMeshGenerator.C

@@ -188,7 +188,7 @@ void cartesian2DMeshGenerator::refBoundaryLayers()
 
 void cartesian2DMeshGenerator::replaceBoundaries()
 {
-    renameBoundaryPatches rbp(mesh_, meshDict_);
+    renameBoundaryPatches rbp(mesh_, meshDict_, true);
 }
 
 void cartesian2DMeshGenerator::renumberMesh()

meshLibrary/utilities/surfaceTools/renameBoundaryPatches/renameBoundaryPatches.C

@@ -248,19 +248,40 @@ void renameBoundaryPatches::calculateNewBoundary()
     Info << "Finished renaming boundary patches" << endl;
 }
 
+void renameBoundaryPatches::checkEmptyPatches()
+{
+    polyMeshGenModifier meshModifier(mesh_);
+
+    forAll(mesh_.boundaries(), patchI)
+    {
+        boundaryPatch& patch = meshModifier.boundariesAccess()[patchI];
+        if( patch.patchType() == "empty" )
+        {
+            patch.patchType() = "wall";
+        }
+    }
+}
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 renameBoundaryPatches::renameBoundaryPatches
 (
     polyMeshGen& mesh,
-    const IOdictionary& meshDict
+    const IOdictionary& meshDict,
+    const bool allowEmptyPatches
 )
 :
     mesh_(mesh),
     meshDict_(meshDict)
 {
+    if( !allowEmptyPatches )
+    {
+        checkEmptyPatches();
+    }
+
     if( meshDict.found("renameBoundary") )
         calculateNewBoundary();
+
 }
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //

meshLibrary/utilities/surfaceTools/renameBoundaryPatches/renameBoundaryPatches.H

@@ -61,6 +61,9 @@ class renameBoundaryPatches
     // Private member functions
         //- calculate new boundary and replace the existing one
         void calculateNewBoundary();
+
+        //- find empty patches in 3D meshes and change them to wall
+        void checkEmptyPatches();
         
         //- Disallow default bitwise copy construct
         renameBoundaryPatches(const renameBoundaryPatches&);
@@ -76,7 +79,8 @@ public:
         renameBoundaryPatches
         (
             polyMeshGen& mesh,
-            const IOdictionary& meshDict
+            const IOdictionary& meshDict,
+            const bool allowEmptyPatches = false
         );
 
     // Destructor