From 82a18e4cd9d2532db140645f0513c2790b93dc4e Mon Sep 17 00:00:00 2001
From: Prashant <prashantS.sonakar@esi-group.com>
Date: Mon, 28 Aug 2017 10:21:47 +0530
Subject: [PATCH] ENH: Print info on zones only if present

---
 .../manipulation/checkMesh/checkTopology.C    | 148 ++++++++++--------
 1 file changed, 82 insertions(+), 66 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index 7874204aa1..81a18770ae 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -588,44 +588,51 @@ Foam::label Foam::checkTopology
 
         Pout.setf(ios_base::left);
 
-        Info<< "    "
-            << setw(20) << "FaceZone"
-            << setw(9) << "Faces"
-            << setw(9) << "Points"
-            << setw(13) << "BoundingBox" <<endl;
-
-        const pointField& points = mesh.points();
-        const faceList& faces = mesh.faces();
-
         const faceZoneMesh& faceZones = mesh.faceZones();
-        DynamicList<point> localPoints;
-        forAll(faceZones, zoneI)
+
+        if (faceZones.size())
         {
-            const faceZone& fZone = faceZones[zoneI];
-            localPoints.setCapacity(10*faces.size());
-
-            forAll(fZone, i)
-            {
-                const label faceI = fZone[i];
-                const face& f = faces[faceI];
-                const pointField facePoints(f.points(points));
-
-                forAll(facePoints, pointI)
-                {
-                    const point& pt = facePoints[pointI];
-                    localPoints.append(pt);
-                }
-            }
-            boundBox bb(localPoints, true);
-
             Info<< "    "
-                << setw(20) << fZone.name()
-                << setw(9) << returnReduce(fZone.size(), sumOp<label>())
-                << setw(9) << returnReduce(localPoints.size(), sumOp<label>())
-                << setw(3) << bb;
+                << setw(20) << "FaceZone"
+                << setw(9) << "Faces"
+                << setw(9) << "Points"
+                << setw(13) << "BoundingBox" <<endl;
 
+            const pointField& points = mesh.points();
+            const faceList& faces = mesh.faces();
+
+            DynamicList<point> localPoints;
+            forAll(faceZones, zoneI)
+            {
+                const faceZone& fZone = faceZones[zoneI];
+                localPoints.setCapacity(10*faces.size());
+
+                forAll(fZone, i)
+                {
+                    const label faceI = fZone[i];
+                    const face& f = faces[faceI];
+                    const pointField facePoints(f.points(points));
+
+                    forAll(facePoints, pointI)
+                    {
+                        const point& pt = facePoints[pointI];
+                        localPoints.append(pt);
+                    }
+                }
+                boundBox bb(localPoints, true);
+
+                Info<< "    "
+                    << setw(20) << fZone.name()
+                    << setw(9) << returnReduce(fZone.size(), sumOp<label>())
+                    << setw(9) 
+                    << returnReduce(localPoints.size(), sumOp<label>())
+                    << setw(3) << bb << endl;
+            }
+        }
+        else
+        {
+            Info<< "    No faceZones found."<<endl;
         }
-        Info<< endl;
     }
 
     {
@@ -633,45 +640,54 @@ Foam::label Foam::checkTopology
 
         Pout.setf(ios_base::left);
 
-        Info<< "    "
-            << setw(20) << "CellZone"
-            << setw(9) << "Cells"
-            << setw(9) << "Points"
-            << setw(13) << "BoundingBox" <<endl;
-
-        const pointField& points = mesh.points();
-        const cellList& cells = mesh.cells();
-        const faceList& faces = mesh.faces();
-
         const cellZoneMesh& cellZones = mesh.cellZones();
-        DynamicList<point> localPoints;
-        forAll(cellZones, zoneI)
+
+        if (cellZones.size())
         {
-            const cellZone& cZone = cellZones[zoneI];
-            localPoints.setCapacity(10*faces.size());
-
-            forAll(cZone, i)
-            {
-                const label cellI = cZone[i];
-                const cell& c = cells[cellI];
-                const pointField cellPoints(c.points(faces, points));
-
-                forAll(cellPoints, pointI)
-                {
-                    const point& pt = cellPoints[pointI];
-                    localPoints.append(pt);
-                }
-            }
-            boundBox bb(localPoints, true);
 
             Info<< "    "
-                << setw(20) << cZone.name()
-                << setw(9) << returnReduce(cZone.size(), sumOp<label>())
-                << setw(9) << returnReduce(localPoints.size(), sumOp<label>())
-                << setw(3) << bb;
+                << setw(20) << "CellZone"
+                << setw(9) << "Cells"
+                << setw(9) << "Points"
+                << setw(13) << "BoundingBox" <<endl;
 
+            const pointField& points = mesh.points();
+            const cellList& cells = mesh.cells();
+            const faceList& faces = mesh.faces();
+
+            DynamicList<point> localPoints;
+            forAll(cellZones, zoneI)
+            {
+                const cellZone& cZone = cellZones[zoneI];
+                localPoints.setCapacity(10*faces.size());
+
+                forAll(cZone, i)
+                {
+                    const label cellI = cZone[i];
+                    const cell& c = cells[cellI];
+                    const pointField cellPoints(c.points(faces, points));
+
+                    forAll(cellPoints, pointI)
+                    {
+                        const point& pt = cellPoints[pointI];
+                        localPoints.append(pt);
+                    }
+                }
+                boundBox bb(localPoints, true);
+
+                Info<< "    "
+                    << setw(20) << cZone.name()
+                    << setw(9) << returnReduce(cZone.size(), sumOp<label>())
+                    << setw(9) 
+                    << returnReduce(localPoints.size(), sumOp<label>())
+                    << setw(3) << bb << endl;
+
+            }
+        }
+        else
+        {
+            Info<< "    No cellZones found."<<endl;
         }
-        Info<< endl;
     }
 
     // Force creation of all addressing if requested.