Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C

@@ -47,9 +47,6 @@ Usage
       - \par -name \<name\>
         Provide alternative base name for export. Default is <tt>meshExport</tt>.
 
-      - \par -combine
-        Combine identically named patches
-
       - \par -noBaffles
         Remove any baffles by merging the faces.
 
@@ -93,8 +90,9 @@ int main(int argc, char *argv[])
 {
     argList::addNote
     (
-        "Reads CCM files as written by PROSTAR/STARCCM and writes an"
-        " OPENFOAM polyMesh."
+        "Reads CCM files as written by PROSTAR/STARCCM and writes an OPENFOAM "
+        " polyMesh. Multi-region support for PROSTAR meshes should be stable."
+        " Multi-region merging for STARCCM meshes will not always be successful."
     );
 
     argList::noParallel();
@@ -127,11 +125,12 @@ int main(int argc, char *argv[])
         "provide alternative base name when re-exporting (implies -export). "
         "Default is <meshExport>."
     );
-    argList::addBoolOption
-    (
-        "combine",
-        "combine identically named patches"
-    );
+    // This often works, but is not entirely stable
+    //     argList::addBoolOption
+    //     (
+    //         "combine",
+    //         "combine identically named patches"
+    //     );
     argList::addBoolOption
     (
         "noBaffles",
@@ -155,7 +154,7 @@ int main(int argc, char *argv[])
     );
     argList::addBoolOption
     (
-        "withSolid",
+        "solids",
         "treat any solid cells present just like fluid cells. "
         "the default is to remove them."
     );

src/conversion/ccm/reader/ccmReaderMesh.C

@@ -1919,7 +1919,7 @@ void Foam::ccm::reader::mergeInplaceInterfaces()
             Info<<"Warning : skip interface " << interI << " " << ifentry
                 <<" on patches " << patchPair << nl
                 <<"   has zero or different number of faces: ("
-                << patchSizes_[patchPair[0]]  << " " << patchSizes_[patchPair[0]] << ")"
+                << patchSizes_[patchPair[0]]  << " " << patchSizes_[patchPair[1]] << ")"
                 << endl;
         }
         else
@@ -1985,6 +1985,9 @@ void Foam::ccm::reader::mergeInplaceInterfaces()
 
         const UIndirectList<point> pointsToMerge(points_, addr);
 
+        Info<< "    patch "  << patch0 << ", " << patch1 << ": ("
+            << nPatch0Faces << " and " << nPatch1Faces << " faces) " << flush;
+
         label nMerged = mergePoints
         (
             true,
@@ -1994,8 +1997,7 @@ void Foam::ccm::reader::mergeInplaceInterfaces()
             mergedPointMap
         );
 
-        Info<< "    patch "  << patch0 << ", " << patch1 << ": "
-            << nMerged << " from " << pointsToMerge.size() << " points"
+        Info<< nMerged << " from " << pointsToMerge.size() << " points"
             << endl;
 
         if (nMerged)