STYLE: update iterator looping

- use range-for when iterating over HashSet

- prefer forAllIters(), forAllConstIters() with automatic decltype

meshLibrary/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPolyMesh.C

@@ -154,8 +154,7 @@ void cartesianMeshExtractor::createPolyMesh()
         label nProcBoundaries(nFaces), patchI(0);
 
         // allocate memory for processor patches
-        std::map<label, labelLongList>::const_iterator iter;
-        for (iter = procFaces.begin(); iter!=procFaces.end(); ++iter)
+        forAllConstIters(procFaces, iter)
         {
             const label procI = iter->first;
 
@@ -182,7 +181,7 @@ void cartesianMeshExtractor::createPolyMesh()
         // create processor faces
         // they need to be created here because of the correct ordering
         patchI = 0;
-        for (iter = procFaces.begin(); iter!=procFaces.end(); ++iter)
+        forAllConstIters(procFaces, iter)
         {
             procBoundaries[patchI].patchStart() = nProcBoundaries;
 

meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayerCells.C

@@ -203,12 +203,7 @@ void boundaryLayers::createLayerCells(const labelList& patchLabels)
         const Map<label>& globalToLocal = mse.globalToLocalBndPointAddressing();
         const labelList& bPoints = mse.boundaryPoints();
 
-        for
-        (
-            Map<label>::const_iterator iter = globalToLocal.begin();
-            iter!=globalToLocal.end();
-            ++iter
-        )
+        forAllConstIters(globalToLocal, iter)
         {
             const label bpI = iter();
             procPoint[bPoints[bpI]] = true;
@@ -376,8 +371,6 @@ void boundaryLayers::createLayerCells(const labelList& patchLabels)
     }
 
     // create cells for corner nodes
-    typedef std::map<std::pair<label, label>, label> mPairToLabelType;
-    typedef std::map<label, mPairToLabelType> mPointsType;
     typedef std::map<label, DynList<label, 3>> ppType;
 
     ppType nodePatches;
@@ -397,7 +390,7 @@ void boundaryLayers::createLayerCells(const labelList& patchLabels)
         ppfType parPointFaces;
         ppType parPointPatches;
 
-        forAllConstIter(mPointsType, otherVrts_, iter)
+        forAllConstIters(otherVrts_, iter)
         {
             // skip points on feature edges
             if (iter->second.size() == 2)
@@ -504,7 +497,7 @@ void boundaryLayers::createLayerCells(const labelList& patchLabels)
         }
 
         // sort faces sharing corners at the parallel boundaries
-        forAllIter(ppfType, parPointFaces, iter)
+        forAllIters(parPointFaces, iter)
         {
             DynList<DynList<label, 8>, 8>& pFaces = iter->second;
             DynList<label, 3>& fPatches = parPointPatches[iter->first];
@@ -545,7 +538,7 @@ void boundaryLayers::createLayerCells(const labelList& patchLabels)
     }
 
     // sort out point which are not at inter-processor boundaries
-    forAllConstIter(mPointsType, otherVrts_, iter)
+    forAllConstIters(otherVrts_, iter)
     {
         if (iter->second.size() == 2)
         {
@@ -598,7 +591,7 @@ void boundaryLayers::createLayerCells(const labelList& patchLabels)
     }
 
     // create layer cells for corner nodes
-    forAllIter(ppType, nodePatches, iter)
+    forAllIters(nodePatches, iter)
     {
         const DynList<label, 3>& patchIDs = iter->second;
         DynList<label, 3> pKeys;
@@ -812,13 +805,7 @@ void boundaryLayers::createNewFacesFromPointsParallel
     help::exchangeMap(exchangeData, receivedMap);
     exchangeData.clear();
 
-    for
-    (
-        std::map<label, List<labelledPair>>::const_iterator
-        iter = receivedMap.begin();
-        iter!=receivedMap.end();
-        ++iter
-    )
+    forAllConstIters(receivedMap, iter)
     {
         const List<labelledPair>& receivedData = iter->second;
 

meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayers.C

@@ -97,10 +97,8 @@ void boundaryLayers::findPatchesToBeTreatedTogether()
     // patches must be treated together if there exist a corner where
     // more than three patches meet
     const labelHashSet& corners = mPart.corners();
-    forAllConstIter(labelHashSet, corners, it)
+    for (const label bpI : corners)
     {
-        const label bpI = it.key();
-
         if (mPart.numberOfFeatureEdgesAtPoint(bpI) > 3)
         {
             labelHashSet commonPatches;
@@ -227,7 +225,7 @@ void boundaryLayers::findPatchesToBeTreatedTogether()
         }
 
         // store faces for sending
-        forAllConstIter(Map<label>, otherFaceProc, it)
+        forAllConstIters(otherFaceProc, it)
         {
             const label beI = it.key();
 
@@ -359,8 +357,7 @@ void boundaryLayers::findPatchesToBeTreatedTogether()
         mesh_.points().setSize(nPoints_);
     }
 
-    std::map<std::pair<label, label>, Pair<label>>::const_iterator it;
-    for (it = edgeClassification.begin(); it!=edgeClassification.end(); ++it)
+    forAllConstIters(edgeClassification, it)
     {
         const std::pair<label, label>& edgePair = it->first;
         const Pair<label>& nConvexAndConcave = it->second;
@@ -481,12 +478,12 @@ void boundaryLayers::findPatchesToBeTreatedTogether()
             }
         }
 
-        forAllConstIter(std::set<label>, commonPatches, it)
+        forAllConstIters(commonPatches, it)
         {
             const label patchJ = *it;
 
             treatPatchesWithPatch_[patchJ].clear();
-            forAllConstIter(std::set<label>, commonPatches, iter)
+            forAllConstIters(commonPatches, iter)
             {
                 treatPatchesWithPatch_[patchJ].append(*iter);
             }
@@ -494,7 +491,7 @@ void boundaryLayers::findPatchesToBeTreatedTogether()
     }
 
     # ifdef DEBUGLayer
-    for (it = edgeClassification.begin(); it!=edgeClassification.end(); ++it)
+    forAllConstIters(edgeClassification, it)
     {
         const std::pair<label, label>& edgePair = it->first;
         const Pair<label>& nConvexAndConcave = it->second;

meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayersFacesAndCells.C

@@ -212,12 +212,7 @@ void boundaryLayers::createNewFacesParallel
 
     label nTreatedEdges(0);
     boolList treatEdge(edgeFaces.size(), false);
-    for
-    (
-        Map<label>::const_iterator iter = globalToLocal.begin();
-        iter!=globalToLocal.end();
-        ++iter
-    )
+    forAllConstIters(globalToLocal, iter)
     {
         const label beI = iter();
 

meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayersI.H

@@ -45,12 +45,11 @@ label boundaryLayers::findNewNodeLabel
 
     if (it != otherVrts_.end())
     {
-        const std::map<std::pair<label, label>, label>& m = it->second;
+        const auto& m = it->second;
 
-        std::map<std::pair<label, label>, label>::const_iterator mit;
         if (m.size() == 2)
         {
-            for (mit = m.begin(); mit!=m.end(); ++mit)
+            forAllConstIters(m, mit)
             {
                 if (mit->first.first != pKey)
                 {
@@ -60,7 +59,7 @@ label boundaryLayers::findNewNodeLabel
         }
         else
         {
-            for (mit = m.begin(); mit!=m.end(); ++mit)
+            forAllConstIters(m, mit)
             {
                 if (mit->first.first == pKey)
                 {
@@ -101,13 +100,12 @@ inline void boundaryLayers::createNewCellFromEdge
     Info<< "Creating cell for edge with nodes " << e << endl;
     Info<< "pKeyI " << pKeyI << endl;
     Info<< "pKeyJ " << pKeyJ << endl;
-    std::map<std::pair<label, label>, label>::const_iterator iter;
-    for (iter = ms.begin(); iter!=ms.end(); ++iter)
+    forAllConstIters(ms, iter)
     {
         Info<< "1. Pair(" << iter->first.first << ", "
             << iter->first.second << ") has value " << iter->second << endl;
     }
-    for (iter = me.begin(); iter!=me.end(); ++iter)
+    forAllConstIters(me, iter)
     {
         Info<< "2. Pair(" << iter->first.first << ", "
             << iter->first.second << ") has value " << iter->second << endl;
@@ -124,8 +122,7 @@ inline void boundaryLayers::createNewCellFromEdge
     }
     else
     {
-        std::map<std::pair<label, label>, label>::const_iterator it;
-        for (it = ms.begin(); it!=ms.end(); ++it)
+        forAllConstIters(ms, it)
         {
             if
             (
@@ -161,8 +158,7 @@ inline void boundaryLayers::createNewCellFromEdge
     }
     else
     {
-        std::map<std::pair<label, label>, label>::const_iterator it;
-        for (it = me.begin(); it!=me.end(); ++it)
+        forAllConstIters(me, it)
         {
             if
             (

meshLibrary/utilities/boundaryLayers/detectBoundaryLayers/detectBoundaryLayersFunctions.C

@@ -154,7 +154,7 @@ public:
             exchangeData[mse_.beNeiProcs()[procI]].clear();
         }
 
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             const label beI = it();
 
@@ -467,12 +467,7 @@ void detectBoundaryLayers::analyseLayers()
         layerAtPatch_[i].clear();
     }
 
-    for
-    (
-        patchToLayerType::const_iterator it = patchToLayer.begin();
-        it!=patchToLayer.end();
-        ++it
-    )
+    forAllConstIters(patchToLayer, it)
     {
         const DynList<label>& layersAtPatch = it->second;
 

meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C

@@ -260,7 +260,7 @@ void extrudeLayer::createNewVertices()
         }
 
         // collect the information about markes points at processor boundaries
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             if (frontPoints[it()] & FRONTVERTEX)
             {
@@ -331,7 +331,7 @@ void extrudeLayer::createNewVertices()
         dualEdgesMap procPointsDual;
 
         // fill in local data
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             if (frontPoints[it()] & FRONTVERTEXPROCBND)
             {
@@ -364,7 +364,7 @@ void extrudeLayer::createNewVertices()
         {
             if (Pstream::myProcNo() == procI)
             {
-                forAllConstIter(dualEdgesMap, procPointsDual, it)
+                forAllConstIters(procPointsDual, it)
                 {
                     Pout<< "Point " << it->first
                         << " local dual edges " << it->second << endl;
@@ -461,7 +461,7 @@ void extrudeLayer::createNewVertices()
         }
 
         // fill in the exchangeData map
-        forAllConstIter(dualEdgesMap, procPointsDual, dIter)
+        forAllConstIters(procPointsDual, dIter)
         {
             const label pointI = dIter->first;
 
@@ -516,7 +516,7 @@ void extrudeLayer::createNewVertices()
         {
             if (Pstream::myProcNo() == procI)
             {
-                forAllConstIter(dualEdgesMap, procPointsDual, it)
+                forAllConstIters(procPointsDual, it)
                 {
                     Pout<< "Point " << it->first
                         << " dual edges " << it->second << endl;
@@ -529,7 +529,7 @@ void extrudeLayer::createNewVertices()
         // Finally, find groups of faces and create new vertices
         returnReduce(1, sumOp<label>());
         Pout << "Finding groups of edges at vertex" << endl;
-        forAllConstIter(dualEdgesMap, procPointsDual, dIter)
+        forAllConstIters(procPointsDual, dIter)
         {
             const label pointI = dIter->first;
             const DynList<edge>& dEdges = dIter->second;
@@ -834,7 +834,7 @@ void extrudeLayer::movePoints()
         }
 
         // create displacements from local data
-        forAllConstIter(Map<label>, globalToLocal, it)
+        forAllConstIters(globalToLocal, it)
         {
             if (it() >= nOrigPoints_)
             {
@@ -910,17 +910,12 @@ void extrudeLayer::movePoints()
         }
 
         // calculate displacements of vertices at processor boundaries
-        for
-        (
-            std::map<label, vector>::const_iterator it = normals.begin();
-            it!=normals.end();
-            ++it
-        )
+        forAllConstIters(normals, it)
         {
             vector n = it->second;
             if (mag(n) > VSMALL)
             {
-                    n /= mag(n);
+                n /= mag(n);
             }
             displacements[it->first - nOrigPoints_] = n*distances[it->first];
         }

meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayers.C

@@ -301,12 +301,7 @@ void refineBoundaryLayers::activateSpecialMode()
 void refineBoundaryLayers::refineLayers()
 {
     bool refinePatch(false);
-    for
-    (
-        std::map<word, label>::const_iterator it = numLayersForPatch_.begin();
-        it!=numLayersForPatch_.end();
-        ++it
-    )
+    forAllConstIters(numLayersForPatch_, it)
     {
         if (it->second > 1)
         {

meshLibrary/utilities/checkMeshDict/checkMeshDict.C

@@ -1074,13 +1074,7 @@ void checkMeshDict::updateRenameBoundary
                 // current state of the dictionary
                 const dictionary& patchDicts = dict.subDict("newPatchNames");
 
-                std::map<word, wordList>::const_iterator it;
-                for
-                (
-                    it = patchesFromPatch.begin();
-                    it!=patchesFromPatch.end();
-                    ++it
-                )
+                forAllConstIters(patchesFromPatch, it)
                 {
                     const word& pName = it->first;
                     const wordList& newNames = it->second;
@@ -1154,8 +1148,7 @@ void checkMeshDict::updateRenameBoundary
                     }
                 }
 
-                std::map<word, wordList>::const_iterator it;
-                for (it = patchesFromPatch.begin(); it!=patchesFromPatch.end(); ++it)
+                forAllConstIters(patchesFromPatch, it)
                 {
                     const word& pName = it->first;
                     const wordList& newNames = it->second;
@@ -1186,8 +1179,7 @@ void checkMeshDict::updateRenameBoundary
             // newPatchNames is not used
             dictionary& newPatchesDict = newDict.subDict("newPatchNames");
 
-            std::map<word, wordList>::const_iterator it;
-            for (it = patchesFromPatch.begin(); it!=patchesFromPatch.end(); ++it)
+            forAllConstIters(patchesFromPatch, it)
             {
                 const wordList& newPatchNames = it->second;
 
@@ -1213,8 +1205,7 @@ void checkMeshDict::updateRenameBoundary
         // create the dictionary if it has not existed before
         dictionary& newPatchesDict = newDict.subDict("newPatchNames");