From f0be8679f66e0b25e9877e8921ecd2160802b68e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 16 Jan 2020 13:24:23 +0100
Subject: [PATCH] ENH: provide defaultName() static method for patches, zones

- consistent way of writing "patch" + Foam::name(id) etc.
---
 .../mesh/conversion/ansysToFoam/ansysToFoam.L |  4 ++--
 .../mesh/conversion/gmshToFoam/gmshToFoam.C   |  3 ++-
 .../netgenNeutralToFoam/netgenNeutralToFoam.C |  3 ++-
 .../conversion/tetgenToFoam/tetgenToFoam.C    |  8 +++----
 .../createBoxTurb/createBlockMesh.H           |  6 +++---
 .../searchableSurfaceModifier/cut.C           |  2 +-
 .../surfaceSplitByPatch/surfaceSplitByPatch.C |  5 +++--
 .../Identifiers/patch/patchIdentifier.H       | 14 +++++++++++++
 .../surface/geometricSurfacePatch.H           | 14 +++++++++++++
 .../Identifiers/surface/surfZoneIdentifier.H  | 14 +++++++++++++
 src/conversion/ccm/reader/ccmReaderMesh.C     |  4 ++--
 src/dynamicMesh/boundaryMesh/boundaryMesh.C   |  4 ++--
 src/fileFormats/stl/STLReader.C               | 13 ++++++------
 .../trackingInverseDistance/voxelMeshSearch.C |  4 ++--
 .../sampledTriSurfaceMesh.C                   | 12 +++++++----
 .../surface/triSurfaceMesh/discreteSurface.C  | 21 +++++++------------
 .../MeshedSurface/MeshedSurfaceZones.C        |  4 ++--
 .../UnsortedMeshedSurface.C                   |  6 +++---
 .../surfaceFormats/ac3d/AC3DsurfaceFormat.C   |  4 ++--
 .../surfaceFormats/gts/GTSsurfaceFormat.C     | 10 ++++-----
 .../surfaceFormats/nas/NASsurfaceFormat.C     |  4 ++--
 .../surfaceFormats/obj/OBJsurfaceFormat.C     |  2 +-
 .../surfaceFormats/vtk/VTKsurfaceFormat.C     |  4 ++--
 src/surfMesh/triSurface/triSurface.C          |  2 +-
 24 files changed, 105 insertions(+), 62 deletions(-)

diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
index 8f097f17b7..33e06e70a8 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -521,7 +521,7 @@ int main(int argc, char *argv[])
         }
 
         boundary[patchi] = patchFaces;
-        patchNames[patchi] = "patch" + Foam::name(patchi + 1);
+        patchNames[patchi] = polyPatch::defaultName(patchi + 1);
     }
 
 
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
index 40e4a9c9cb..02a17f4235 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -1465,7 +1466,7 @@ int main(int argc, char *argv[])
             physicalNames.lookup
             (
                 patchToPhys[patchi],
-                "patch" + Foam::name(patchi) // default name
+                polyPatch::defaultName(patchi)
             );
 
         Info<< "Patch " << patchi << " gets name "
diff --git a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
index 724979c6cc..cbae422f00 100644
--- a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
+++ b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -263,7 +264,7 @@ int main(int argc, char *argv[])
 
     forAll(patchNames, patchi)
     {
-        patchNames[patchi] = word("patch") + name(patchi);
+        patchNames[patchi] = polyPatch::defaultName(patchi);
     }
 
     wordList patchTypes(nPatches, polyPatch::typeName);
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index d70a2d4a74..55ac13b40c 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2019 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -483,8 +483,8 @@ int main(int argc, char *argv[])
 
         forAllConstIters(regionToPatch, iter)
         {
-            Info<< "    region:" << iter.key() << '\t' << "patch:"
-                << iter() << endl;
+            Info<< "    region:" << iter.key()
+                << '\t' << "patch:" << iter.val() << nl;
         }
         Info<< endl;
 
@@ -495,7 +495,7 @@ int main(int argc, char *argv[])
 
         forAll(patchNames, patchi)
         {
-            patchNames[patchi] = "patch" + Foam::name(patchi);
+            patchNames[patchi] = polyPatch::defaultName(patchi);
         }
 
         wordList patchTypes(nPatches, polyPatch::typeName);
diff --git a/applications/utilities/preProcessing/createBoxTurb/createBlockMesh.H b/applications/utilities/preProcessing/createBoxTurb/createBlockMesh.H
index e85661a40d..3e22ad2f1f 100644
--- a/applications/utilities/preProcessing/createBoxTurb/createBlockMesh.H
+++ b/applications/utilities/preProcessing/createBoxTurb/createBlockMesh.H
@@ -58,7 +58,7 @@ Info<< "Creating patch dictionaries" << endl;
 wordList patchNames(boundary.size());
 forAll(patchNames, patchi)
 {
-    patchNames[patchi] = "patch" + Foam::name(patchi);
+    patchNames[patchi] = polyPatch::defaultName(patchi);
 }
 
 PtrList<dictionary> boundaryDicts(boundary.size());
@@ -69,11 +69,11 @@ forAll(boundaryDicts, patchi)
     word nbrPatchName;
     if (patchi % 2 == 0)
     {
-        nbrPatchName = "patch" + Foam::name(patchi + 1);
+        nbrPatchName = polyPatch::defaultName(patchi + 1);
     }
     else
     {
-        nbrPatchName = "patch" + Foam::name(patchi - 1);
+        nbrPatchName = polyPatch::defaultName(patchi - 1);
     }
 
     patchDict.add("type", cyclicPolyPatch::typeName);
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.C b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.C
index e90c555508..73d630018f 100644
--- a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.C
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.C
@@ -78,7 +78,7 @@ void Foam::searchableSurfaceModifiers::cut::triangulate
     {
         patches[patchi] = geometricSurfacePatch
         (
-            "patch" + Foam::name(patchi),
+            geometricSurfacePatch::defaultName(patchi),
             patchi
         );
     }
diff --git a/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C b/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C
index 081c3e198d..f49d334e5b 100644
--- a/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C
+++ b/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -72,11 +73,11 @@ int main(int argc, char *argv[])
     {
         const geometricSurfacePatch& pp = patches[patchi];
 
-        word patchName = pp.name();
+        word patchName(pp.name());
 
         if (patchName.empty())
         {
-            patchName = "patch" + Foam::name(patchi);
+            patchName = geometricSurfacePatch::defaultName(patchi);
         }
 
         fileName outFile(surfBase + '_' + patchName + '.' + extension);
diff --git a/src/OpenFOAM/meshes/Identifiers/patch/patchIdentifier.H b/src/OpenFOAM/meshes/Identifiers/patch/patchIdentifier.H
index 57244522fa..e34a456f7d 100644
--- a/src/OpenFOAM/meshes/Identifiers/patch/patchIdentifier.H
+++ b/src/OpenFOAM/meshes/Identifiers/patch/patchIdentifier.H
@@ -70,6 +70,20 @@ class patchIdentifier
 
 public:
 
+    // Static Member Functions
+
+        //- Default patch name: "patch" or "patchN"
+        static word defaultName(const label n = -1)
+        {
+            return
+            (
+                n < 0
+              ? word("patch", false)
+              : word("patch" + std::to_string(n), false)
+            );
+        }
+
+
     // Generated Methods
 
         //- Copy construct
diff --git a/src/OpenFOAM/meshes/Identifiers/surface/geometricSurfacePatch.H b/src/OpenFOAM/meshes/Identifiers/surface/geometricSurfacePatch.H
index 9d466c3e3c..773807b468 100644
--- a/src/OpenFOAM/meshes/Identifiers/surface/geometricSurfacePatch.H
+++ b/src/OpenFOAM/meshes/Identifiers/surface/geometricSurfacePatch.H
@@ -71,6 +71,20 @@ public:
         static constexpr const char* const emptyType = "empty";
 
 
+    // Static Member Functions
+
+        //- Default patch name: "patch" or "patchN"
+        static word defaultName(const label n = -1)
+        {
+            return
+            (
+                n < 0
+              ? word("patch", false)
+              : word("patch" + std::to_string(n), false)
+            );
+        }
+
+
     // Public Classes
 
         //- Helper to convert identifier types as an operation
diff --git a/src/OpenFOAM/meshes/Identifiers/surface/surfZoneIdentifier.H b/src/OpenFOAM/meshes/Identifiers/surface/surfZoneIdentifier.H
index f28a6290b1..670d164f4a 100644
--- a/src/OpenFOAM/meshes/Identifiers/surface/surfZoneIdentifier.H
+++ b/src/OpenFOAM/meshes/Identifiers/surface/surfZoneIdentifier.H
@@ -78,6 +78,20 @@ public:
         static constexpr const char* const emptyType = "empty";
 
 
+    // Static Member Functions
+
+        //- Default zone name: "zone" or "zoneN"
+        static word defaultName(const label n = -1)
+        {
+            return
+            (
+                n < 0
+              ? word("zone", false)
+              : word("zone" + std::to_string(n), false)
+            );
+        }
+
+
     // Generated Methods
 
         //- Copy construct
diff --git a/src/conversion/ccm/reader/ccmReaderMesh.C b/src/conversion/ccm/reader/ccmReaderMesh.C
index 60120270fb..7eeb2b1537 100644
--- a/src/conversion/ccm/reader/ccmReaderMesh.C
+++ b/src/conversion/ccm/reader/ccmReaderMesh.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -2419,7 +2419,7 @@ void Foam::ccm::reader::addPatches
     // provide some fallback values
     forAll(newPatches, patchI)
     {
-        const word fallbackName("patch" + Foam::name(patchI));
+        const word fallbackName(polyPatch::defaultName(patchI));
         word patchName;
         word patchType;
 
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.C b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
index 7439f40732..99da7db453 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.C
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
@@ -680,11 +680,11 @@ void Foam::boundaryMesh::readTriSurface(const fileName& fName)
                 patchi,
                 new boundaryPatch
                 (
-                    "patch" + name(patchi),
+                    geometricSurfacePatch::defaultName(patchi),
                     patchi,
                     0,
                     0,
-                    "empty"
+                    geometricSurfacePatch::emptyType
                 )
             );
         }
diff --git a/src/fileFormats/stl/STLReader.C b/src/fileFormats/stl/STLReader.C
index cf39ad788b..2d7f75418e 100644
--- a/src/fileFormats/stl/STLReader.C
+++ b/src/fileFormats/stl/STLReader.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2017 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -128,15 +128,14 @@ bool Foam::fileFormats::STLReader::readBINARY
         // interpret STL attribute as a zone
         const label origId = stlTri.attrib();
 
-        Map<label>::const_iterator fnd = lookup.find(origId);
-        if (fnd != lookup.end())
+        auto fnd = lookup.cfind(origId);
+        if (fnd.found())
         {
-            if (zoneI != fnd())
+            if (zoneI != *fnd)
             {
-                // group appeared out of order
-                sorted_ = false;
+                sorted_ = false; // Group appeared out of order
             }
-            zoneI = fnd();
+            zoneI = *fnd;
         }
         else
         {
diff --git a/src/overset/cellCellStencil/trackingInverseDistance/voxelMeshSearch.C b/src/overset/cellCellStencil/trackingInverseDistance/voxelMeshSearch.C
index 5d1d306d33..66bcce889b 100644
--- a/src/overset/cellCellStencil/trackingInverseDistance/voxelMeshSearch.C
+++ b/src/overset/cellCellStencil/trackingInverseDistance/voxelMeshSearch.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2019 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -542,7 +542,7 @@ Foam::autoPtr<Foam::fvMesh> Foam::voxelMeshSearch::makeMesh
     wordList patchNames(boundary.size());
     forAll(patchNames, patchi)
     {
-        patchNames[patchi] = "patch" + Foam::name(patchi);
+        patchNames[patchi] = polyPatch::defaultName(patchi);
     }
 
     PtrList<dictionary> boundaryDicts(boundary.size());
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
index 5c59750449..11e74c7c7f 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2018 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -313,7 +313,7 @@ bool Foam::sampledTriSurfaceMesh::update(const meshSearch& meshSearcher)
                 patchi,
                 (
                     patches[patchi].name().empty()
-                  ? word::printf("patch%d", patchi)
+                  ? geometricSurfacePatch::defaultName(patchi)
                   : patches[patchi].name()
                 )
             );
@@ -343,7 +343,11 @@ bool Foam::sampledTriSurfaceMesh::update(const meshSearch& meshSearcher)
                 {
                     // This shouldn't happen
                     zoneSizes.insert(regionid, 1);
-                    zoneNames.set(regionid, word::printf("patch%d", regionid));
+                    zoneNames.set
+                    (
+                        regionid,
+                        geometricSurfacePatch::defaultName(regionid)
+                    );
                 }
 
                 // Store new faces compact
@@ -388,7 +392,7 @@ bool Foam::sampledTriSurfaceMesh::update(const meshSearch& meshSearcher)
         }
         if (name.empty())
         {
-            name = word::printf("patch%d", regionid);
+            name = geometricSurfacePatch::defaultName(regionid);
         }
 
         zoneLst[zoneI] = surfZone
diff --git a/src/sampling/surface/triSurfaceMesh/discreteSurface.C b/src/sampling/surface/triSurfaceMesh/discreteSurface.C
index 1e3022f40c..700899d419 100644
--- a/src/sampling/surface/triSurfaceMesh/discreteSurface.C
+++ b/src/sampling/surface/triSurfaceMesh/discreteSurface.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -307,7 +307,7 @@ bool Foam::discreteSurface::update(const meshSearch& meshSearcher)
                 patchi,
                 (
                     patches[patchi].name().empty()
-                  ? word::printf("patch%d", patchi)
+                  ? geometricSurfacePatch::defaultName(patchi)
                   : patches[patchi].name()
                 )
             );
@@ -328,10 +328,10 @@ bool Foam::discreteSurface::update(const meshSearch& meshSearcher)
                 const triSurface::FaceType& f = s[facei];
                 const label regionid = f.region();
 
-                Map<label>::iterator fnd = zoneSizes.find(regionid);
-                if (fnd != zoneSizes.end())
+                auto fnd = zoneSizes.find(regionid);
+                if (fnd.found())
                 {
-                    fnd()++;
+                    ++(*fnd);
                 }
                 else
                 {
@@ -340,7 +340,7 @@ bool Foam::discreteSurface::update(const meshSearch& meshSearcher)
                     zoneNames.set
                     (
                         regionid,
-                        word::printf("patch%d", regionid)
+                        geometricSurfacePatch::defaultName(regionid)
                     );
                 }
 
@@ -380,15 +380,10 @@ bool Foam::discreteSurface::update(const meshSearch& meshSearcher)
         // No negative regionids, so Map<label> sorts properly
         const label regionid = iter.key();
 
-        word name;
-        Map<word>::const_iterator fnd = zoneNames.find(regionid);
-        if (fnd != zoneNames.end())
-        {
-            name = fnd();
-        }
+        word name(zoneNames.lookup(regionid, word::null));
         if (name.empty())
         {
-            name = word::printf("patch%d", regionid);
+            name = geometricSurfacePatch::defaultName(regionid);
         }
 
         zoneLst[zoneI] = surfZone
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C b/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
index 658bf9f3ac..bbc475c6d7 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -175,7 +175,7 @@ void Foam::MeshedSurface<Face>::addZones
         {
             zones[nZone] = surfZone
             (
-                word("zone") + ::Foam::name(nZone),
+                surfZone::defaultName(nZone),
                 sizes[zoneI],
                 start,
                 nZone
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
index 4fc6ff9b16..aa58937454 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -368,7 +368,7 @@ void Foam::UnsortedMeshedSurface<Face>::setZones
     {
         zoneToc_[zonei] = surfZoneIdentifier
         (
-            "zone" + ::Foam::name(zonei),
+            surfZoneIdentifier::defaultName(zonei),
             zonei
         );
 
@@ -496,7 +496,7 @@ Foam::surfZoneList Foam::UnsortedMeshedSurface<Face>::sortedZones
             zoneNames.lookup
             (
                 origId,
-                "zone" + ::Foam::name(zonei)  // default name
+                surfZoneIdentifier::defaultName(zonei)
             );
 
         zoneLst[zonei] = surfZone
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
index 24d4f25516..67bc8c8230 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2017 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -102,7 +102,7 @@ bool Foam::fileFormats::AC3DsurfaceFormat<Face>::read
 
     for (label zoneI = 0; zoneI < nZones; ++zoneI)
     {
-        names[zoneI] = word("zone") + Foam::name(zoneI);
+        names[zoneI] = surfZone::defaultName(zoneI);
 
         args = cueToOrDie(is, "OBJECT", "while reading " + names[zoneI]);
 
diff --git a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
index 10868f08f1..ab61ba73ff 100644
--- a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2017 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -228,12 +228,12 @@ bool Foam::fileFormats::GTSsurfaceFormat<Face>::read
 
 
     List<surfZoneIdentifier> newZones(maxZone+1);
-    forAll(newZones, zoneI)
+    forAll(newZones, zonei)
     {
-        newZones[zoneI] = surfZoneIdentifier
+        newZones[zonei] = surfZoneIdentifier
         (
-            "zone" + ::Foam::name(zoneI),
-            zoneI
+            surfZoneIdentifier::defaultName(zonei),
+            zonei
         );
     }
 
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
index 51518df49c..f4a2fe779b 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -398,7 +398,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
         }
         else
         {
-            names[zoneId] = word("zone") + ::Foam::name(zoneId);
+            names[zoneId] = surfZone::defaultName(zoneId);
         }
     }
 
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
index 3ad0d802f6..390d1a2e0e 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
@@ -125,7 +125,7 @@ bool Foam::fileFormats::OBJsurfaceFormat<Face>::read
             {
                 if (zoneId != *iterGroup)
                 {
-                    sorted = false; // group appeared out of order
+                    sorted = false; // Group appeared out of order
                 }
                 zoneId = *iterGroup;
             }
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
index 1ea8934cb0..f6fa335b82 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -160,7 +160,7 @@ bool Foam::fileFormats::VTKsurfaceFormat<Face>::read
     wordList zoneNames(nZones);
     forAll(zoneNames, i)
     {
-        zoneNames[i] = "zone" + Foam::name(i);
+        zoneNames[i] = surfZone::defaultName(i);
     }
 
 
diff --git a/src/surfMesh/triSurface/triSurface.C b/src/surfMesh/triSurface/triSurface.C
index 27dead1994..db8c29b2b7 100644
--- a/src/surfMesh/triSurface/triSurface.C
+++ b/src/surfMesh/triSurface/triSurface.C
@@ -358,7 +358,7 @@ Foam::triSurface::calcPatches(labelList& faceMap) const
         }
         else
         {
-            newPatch.name() = word("patch") + Foam::name(newPatchi);
+            newPatch.name() = surfacePatch::defaultName(newPatchi);
         }
 
         if