ENH: checkMesh: -allRegions. See #2072

applications/utilities/mesh/manipulation/checkMesh/checkMesh.C

@@ -50,6 +50,9 @@ Usage
       - \par -region \<name\>
         Specify an alternative mesh region.
 
+      - \par -allRegions
+        Check all regions in regionProperties.
+
     \param -writeSets \<surfaceFormat\> \n
     Reconstruct all cellSets and faceSets geometry and write to postProcessing
     directory according to surfaceFormat (e.g. vtk or ensight). Additionally
@@ -74,6 +77,8 @@ Usage
 #include "vtkSetWriter.H"
 #include "vtkSurfaceWriter.H"
 #include "IOdictionary.H"
+#include "regionProperties.H"
+#include "polyMeshTools.H"
 
 #include "checkTools.H"
 #include "checkTopology.H"
@@ -93,7 +98,8 @@ int main(int argc, char *argv[])
     );
 
     timeSelector::addOptions();
-    #include "addRegionOption.H"
+    #include "addAllRegionOptions.H"
+
     argList::addBoolOption
     (
         "noTopology",
@@ -139,8 +145,9 @@ int main(int argc, char *argv[])
 
     #include "setRootCase.H"
     #include "createTime.H"
+    #include "getAllRegionOptions.H"
     instantList timeDirs = timeSelector::select0(runTime, args);
-    #include "createNamedMesh.H"
+    #include "createNamedMeshes.H"
 
     const bool noTopology  = args.found("noTopology");
     const bool allGeometry = args.found("allGeometry");
@@ -230,24 +237,28 @@ int main(int argc, char *argv[])
     }
 
 
-    autoPtr<IOdictionary> qualDict;
+    PtrList<IOdictionary> qualDict(meshes.size());
     if (meshQuality)
     {
-        qualDict.reset
+        forAll(meshes, meshi)
+        {
+            qualDict.set
             (
+                meshi,
                 new IOdictionary
                 (
                     IOobject
                     (
                         "meshQualityDict",
-                    mesh.time().system(),
+                        meshes[meshi].time().system(),
-                    mesh,
+                        meshes[meshi],
                         IOobject::MUST_READ,
                         IOobject::NO_WRITE
                     )
                 )
             );
         }
+    }
 
 
     autoPtr<surfaceWriter> surfWriter;
@@ -263,7 +274,13 @@ int main(int argc, char *argv[])
     {
         runTime.setTime(timeDirs[timeI], timeI);
 
-        polyMesh::readUpdateState state = mesh.readUpdate();
+        // Get most changed of all meshes
+        polyMesh::readUpdateState state = polyMesh::UNCHANGED;
+        for (auto& mesh : meshes)
+        {
+            state = polyMeshTools::combine(state, mesh.readUpdate());
+        }
+
 
         if
         (
@@ -274,6 +291,10 @@ int main(int argc, char *argv[])
         {
             Info<< "Time = " << runTime.timeName() << nl << endl;
 
+            forAll(meshes, meshi)
+            {
+                const auto& mesh = meshes[meshi];
+
                 // Reconstruct globalMeshData
                 mesh.globalData();
 
@@ -303,12 +324,14 @@ int main(int argc, char *argv[])
 
                 if (meshQuality)
                 {
-                nFailedChecks += checkMeshQuality(mesh, qualDict(), surfWriter);
+                    nFailedChecks +=
+                        checkMeshQuality(mesh, qualDict[meshi], surfWriter);
                 }
 
 
                 // Note: no reduction in nFailedChecks necessary since is
-            //       counter of checks, not counter of failed cells,faces etc.
+                //       counter of checks, not counter of failed cells,faces
+                //       etc.
 
                 if (nFailedChecks == 0)
                 {
@@ -324,10 +347,15 @@ int main(int argc, char *argv[])
                 // Write selected fields
                 Foam::writeFields(mesh, selectedFields, writeFaceFields);
             }
+        }
         else if (state == polyMesh::POINTS_MOVED)
         {
             Info<< "Time = " << runTime.timeName() << nl << endl;
 
+            forAll(meshes, meshi)
+            {
+                const auto& mesh = meshes[meshi];
+
                 label nFailedChecks = checkGeometry
                 (
                     mesh,
@@ -338,7 +366,8 @@ int main(int argc, char *argv[])
 
                 if (meshQuality)
                 {
-                nFailedChecks += checkMeshQuality(mesh, qualDict(), surfWriter);
+                    nFailedChecks +=
+                        checkMeshQuality(mesh, qualDict[meshi], surfWriter);
                 }
 
 
@@ -357,6 +386,7 @@ int main(int argc, char *argv[])
                 Foam::writeFields(mesh, selectedFields, writeFaceFields);
             }
         }
+    }
 
     Info<< "End\n" << endl;
 

applications/utilities/mesh/manipulation/checkMesh/checkTools.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2020 OpenCFD Ltd.
+    Copyright (C) 2015-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -50,10 +50,18 @@ License
 
 void Foam::printMeshStats(const polyMesh& mesh, const bool allTopology)
 {
-    Info<< "Mesh stats" << nl
+    if (mesh.name() == Foam::polyMesh::defaultRegion)
-        << "    points:           "
+    {
+        Info<< "Mesh stats" << nl;
+    }
+    else
+    {
+        Info<< "Mesh " << mesh.name() << " stats" << nl;
+    }
+    Info<< "    points:           "
         << returnReduce(mesh.points().size(), sumOp<label>()) << nl;
 
+
     // Count number of internal points (-1 if not sorted; 0 if no internal
     // points)
     const label minInt = returnReduce(mesh.nInternalPoints(), minOp<label>());

applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C

@@ -57,6 +57,8 @@ Description
 #include "pointSet.H"
 #include "processorMeshes.H"
 #include "hexRef8Data.H"
+#include "regionProperties.H"
+#include "polyMeshTools.H"
 
 #ifdef HAVE_ZOLTAN
     #include "zoltanRenumber.H"
@@ -613,7 +615,7 @@ int main(int argc, char *argv[])
         "Renumber mesh cells to reduce the bandwidth"
     );
 
-    #include "addRegionOption.H"
+    #include "addAllRegionOptions.H"
     #include "addOverwriteOption.H"
     #include "addTimeOptions.H"
 
@@ -629,7 +631,7 @@ int main(int argc, char *argv[])
 
     #include "setRootCase.H"
     #include "createTime.H"
-
+    #include "getAllRegionOptions.H"
 
     // Force linker to include zoltan symbols. This section is only needed since
     // Zoltan is a static library
@@ -638,7 +640,6 @@ int main(int argc, char *argv[])
         (void)zoltanRenumber::typeName;
     #endif
 
-
     // Get times list
     instantList Times = runTime.times();
 
@@ -647,14 +648,20 @@ int main(int argc, char *argv[])
 
     runTime.setTime(Times[startTime], startTime);
 
-    #include "createNamedMesh.H"
+    #include "createNamedMeshes.H"
-
-    const word oldInstance = mesh.pointsInstance();
 
     const bool readDict = args.found("dict");
     const bool doFrontWidth = args.found("frontWidth");
     const bool overwrite = args.found("overwrite");
 
+
+    for (fvMesh& mesh : meshes)
+    {
+        // Reset time in case of multiple meshes and not overwrite
+        runTime.setTime(Times[startTime], startTime);
+
+        const word oldInstance = mesh.pointsInstance();
+
         label band;
         scalar profile;
         scalar sumSqrIntersect;
@@ -680,7 +687,8 @@ int main(int argc, char *argv[])
             )/mesh.globalData().nTotalCells()
         );
 
-    Info<< "Mesh size: " << mesh.globalData().nTotalCells() << nl
+        Info<< "Mesh " << mesh.name()
+            << " size: " << mesh.globalData().nTotalCells() << nl
             << "Before renumbering :" << nl
             << "    band           : " << band << nl
             << "    profile        : " << profile << nl;
@@ -729,7 +737,8 @@ int main(int argc, char *argv[])
             {
                 Info<< "Ordering cells into regions of size " << blockSize
                     << " (using decomposition);"
-                << " ordering faces into region-internal and region-external."
+                    << " ordering faces into region-internal"
+                    << " and region-external."
                     << nl << endl;
 
                 if (blockSize < 0 || blockSize >= mesh.nCells())
@@ -745,7 +754,8 @@ int main(int argc, char *argv[])
             orderPoints = renumberDict.getOrDefault("orderPoints", false);
             if (orderPoints)
             {
-            Info<< "Ordering points into internal and boundary points." << nl
+                Info<< "Ordering points into internal and boundary points."
+                    << nl
                     << endl;
             }
 
@@ -763,7 +773,8 @@ int main(int argc, char *argv[])
             renumberPtr.reset(new CuthillMcKeeRenumber(renumberDict));
         }
 
-    Info<< "Selecting renumberMethod " << renumberPtr().type() << nl << endl;
+        Info<< "Selecting renumberMethod " << renumberPtr().type() << nl
+            << endl;
 
 
 
@@ -996,7 +1007,8 @@ int main(int argc, char *argv[])
                             if (reverseCellOrder[celli] != -1)
                             {
                                 bndCells[nBndCells] = celli;
-                            bndCellMap[nBndCells++] = reverseCellOrder[celli];
+                                bndCellMap[nBndCells++] =
+                                    reverseCellOrder[celli];
                                 reverseCellOrder[celli] = -1;
                             }
                         }
@@ -1018,7 +1030,8 @@ int main(int argc, char *argv[])
                     newReverseCellOrder[origCelli] = --sortedI;
                 }
 
-            Info<< "Ordered all " << nBndCells << " cells with a coupled face"
+                Info<< "Ordered all " << nBndCells
+                    << " cells with a coupled face"
                     << " to the end of the cell list, starting at " << sortedI
                     << endl;
 
@@ -1139,7 +1152,8 @@ int main(int argc, char *argv[])
                     if (masterFacei == 0)
                     {
                         FatalErrorInFunction
-                        << " masterFacei:" << masterFacei << exit(FatalError);
+                            << " masterFacei:" << masterFacei
+                            << exit(FatalError);
                     }
                 }
             }
@@ -1254,8 +1268,8 @@ int main(int argc, char *argv[])
 
         if (orderPoints)
         {
-        // Force edge calculation (since only reason that points would need to
+            // Force edge calculation (since only reason that points would
-        // be sorted)
+            // need to be sorted)
             (void)mesh.edges();
 
             label nTotPoints = returnReduce
@@ -1364,9 +1378,9 @@ int main(int argc, char *argv[])
                 identity(mesh.nCells())
             )().write();
 
-        Info<< nl << "Written current cellID and origCellID as volScalarField"
+            Info<< nl
-            << " for use in postprocessing."
+                << "Written current cellID and origCellID as volScalarField"
-            << nl << endl;
+                << " for use in postprocessing." << nl << endl;
 
             labelIOList
             (
@@ -1413,7 +1427,7 @@ int main(int argc, char *argv[])
                 map().pointMap()
             ).write();
         }
-
+    }
 
     Info<< "End\n" << endl;
 

src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshTools.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -280,4 +281,35 @@ Foam::tmp<Foam::scalarField> Foam::polyMeshTools::volRatio
 }
 
 
+Foam::polyMesh::readUpdateState Foam::polyMeshTools::combine
+(
+    const polyMesh::readUpdateState& state0,
+    const polyMesh::readUpdateState& state1
+)
+{
+    if
+    (
+        (
+            state0 == polyMesh::UNCHANGED
+         && state1 != polyMesh::UNCHANGED
+        )
+     || (
+            state0 == polyMesh::POINTS_MOVED
+         && (state1 != polyMesh::UNCHANGED && state1 != polyMesh::POINTS_MOVED)
+        )
+     || (
+            state0 == polyMesh::TOPO_CHANGE
+         && state1 == polyMesh::TOPO_PATCH_CHANGE
+        )
+    )
+    {
+        return state1;
+    }
+    else
+    {
+        return state0;
+    }
+}
+
+
 // ************************************************************************* //

src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshTools.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2013 OpenFOAM Foundation
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -92,6 +93,13 @@ public:
         const scalarField& vol
     );
 
+    //- Combine readUpdateState. topo change trumps geom-only
+    //  change etc.
+    static polyMesh::readUpdateState combine
+    (
+        const polyMesh::readUpdateState& state0,
+        const polyMesh::readUpdateState& state1
+    );
 };