STYLE: more consistent use of labelUList and labelUIndList typedefs

applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C

@@ -443,7 +443,6 @@ int main(int argc, char *argv[])
         }
 
 
-
         indirectPrimitivePatch extrudePatch
         (
             IndirectList<face>

applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C

@@ -521,8 +521,8 @@ labelListList globalEdgeFaces
 label findUncoveredPatchFace
 (
     const fvMesh& mesh,
-    const UIndirectList<label>& extrudeMeshFaces,// mesh faces that are extruded
-    const label meshEdgeI                       // mesh edge
+    const labelUIndList& extrudeMeshFaces,  // mesh faces that are extruded
+    const label meshEdgeI                   // mesh edge
 )
 {
     // Make set of extruded faces.
@@ -549,6 +549,7 @@ label findUncoveredPatchFace
             return facei;
         }
     }
+
     return -1;
 }
 
@@ -557,8 +558,8 @@ label findUncoveredPatchFace
 label findUncoveredCyclicPatchFace
 (
     const fvMesh& mesh,
-    const UIndirectList<label>& extrudeMeshFaces,// mesh faces that are extruded
-    const label meshEdgeI                       // mesh edge
+    const labelUIndList& extrudeMeshFaces,  // mesh faces that are extruded
+    const label meshEdgeI                   // mesh edge
 )
 {
     // Make set of extruded faces.
@@ -585,6 +586,7 @@ label findUncoveredCyclicPatchFace
             return facei;
         }
     }
+
     return -1;
 }
 
@@ -712,7 +714,7 @@ void countExtrudePatches
             label facei = findUncoveredPatchFace
             (
                 mesh,
-                UIndirectList<label>(extrudeMeshFaces, eFaces),
+                labelUIndList(extrudeMeshFaces, eFaces),
                 extrudeMeshEdges[edgeI]
             );
 
@@ -934,7 +936,7 @@ void addCoupledPatches
                 label facei = findUncoveredCyclicPatchFace
                 (
                     mesh,
-                    UIndirectList<label>(extrudeMeshFaces, eFaces),
+                    labelUIndList(extrudeMeshFaces, eFaces),
                     extrudeMeshEdges[edgeI]
                 );
 
@@ -2242,7 +2244,7 @@ int main(int argc, char *argv[])
             label facei = findUncoveredPatchFace
             (
                 mesh,
-                UIndirectList<label>(extrudeMeshFaces, eFaces),
+                labelUIndList(extrudeMeshFaces, eFaces),
                 extrudeMeshEdges[edgeI]
             );
 

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C

@@ -299,7 +299,7 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance)
 //                IOobject::AUTO_WRITE,
 //                false
 //            ),
-//            UIndirectList<label>
+//            labelUIndList
 //            (
 //                vertexToDualAddressing,
 //                pointToDelaunayVertex

applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C

@@ -71,7 +71,7 @@ void Foam::meshDualiser::checkPolyTopoChange(const polyTopoChange& meshMod)
                 FatalErrorInFunction
                     << "duplicate verts:" << newToOld[newI]
                     << " coords:"
-                    << UIndirectList<point>(points, newToOld[newI])()
+                    << UIndirectList<point>(points, newToOld[newI])
                     << abort(FatalError);
             }
         }
@@ -275,7 +275,7 @@ Foam::label Foam::meshDualiser::addInternalFace
         //n /= mag(n);
         //Pout<< "Generated internal dualFace:" << dualFacei
         //    << " verts:" << newFace
-        //    << " points:" << UIndirectList<point>(meshMod.points(), newFace)()
+        //    << " points:" << UIndirectList<point>(meshMod.points(), newFace)
         //    << " n:" << n
         //    << " between dualowner:" << dualCell0
         //    << " dualneigbour:" << dualCell1
@@ -302,7 +302,7 @@ Foam::label Foam::meshDualiser::addInternalFace
         //n /= mag(n);
         //Pout<< "Generated internal dualFace:" << dualFacei
         //    << " verts:" << newFace
-        //    << " points:" << UIndirectList<point>(meshMod.points(), newFace)()
+        //    << " points:" << UIndirectList<point>(meshMod.points(), newFace)
         //    << " n:" << n
         //    << " between dualowner:" << dualCell1
         //    << " dualneigbour:" << dualCell0
@@ -359,7 +359,7 @@ Foam::label Foam::meshDualiser::addBoundaryFace
     //n /= mag(n);
     //Pout<< "Generated boundary dualFace:" << dualFacei
     //    << " verts:" << newFace
-    //    << " points:" << UIndirectList<point>(meshMod.points(), newFace)()
+    //    << " points:" << UIndirectList<point>(meshMod.points(), newFace)
     //    << " n:" << n
     //    << " on dualowner:" << dualCelli
     //    << endl;
@@ -554,7 +554,7 @@ void Foam::meshDualiser::createFaceFromInternalFace
 
     //Pout<< "createFaceFromInternalFace : At face:" << facei
     //    << " verts:" << f
-    //    << " points:" << UIndirectList<point>(mesh_.points(), f)()
+    //    << " points:" << UIndirectList<point>(mesh_.points(), f)
     //    << " started walking at edge:" << fEdges[fp]
     //    << " verts:" << mesh_.edges()[fEdges[fp]]
     //    << endl;
@@ -603,7 +603,7 @@ void Foam::meshDualiser::createFaceFromInternalFace
             {
                 FatalErrorInFunction
                     << "face:" << facei << " verts:" << f
-                    << " points:" << UIndirectList<point>(mesh_.points(), f)()
+                    << " points:" << UIndirectList<point>(mesh_.points(), f)
                     << " no feature edge between " << f[fp]
                     << " and " << f[nextFp] << " although have different"
                     << " dual cells." << endl

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

@@ -497,8 +497,8 @@ autoPtr<mapPolyMesh> reorderMesh
             sortedOrder(newAddressing, newToOld);
             fZone.resetAddressing
             (
-                UIndirectList<label>(newAddressing, newToOld)(),
-                UIndirectList<bool>(newFlipMap, newToOld)()
+                labelUIndList(newAddressing, newToOld)(),
+                boolUIndList(newFlipMap, newToOld)()
             );
         }
     }
@@ -508,7 +508,7 @@ autoPtr<mapPolyMesh> reorderMesh
         cellZones.clearAddressing();
         forAll(cellZones, zoneI)
         {
-            cellZones[zoneI] = UIndirectList<label>
+            cellZones[zoneI] = labelUIndList
             (
                 reverseCellOrder,
                 cellZones[zoneI]
@@ -1074,7 +1074,7 @@ int main(int argc, char *argv[])
         );
 
         // Combine point reordering into map.
-        const_cast<labelList&>(map().pointMap()) = UIndirectList<label>
+        const_cast<labelList&>(map().pointMap()) = labelUIndList
         (
             map().pointMap(),
             pointOrderMap().pointMap()
@@ -1101,7 +1101,7 @@ int main(int argc, char *argv[])
 
             cellProcAddressing = labelList
             (
-                UIndirectList<label>(cellProcAddressing, map().cellMap())
+                labelUIndList(cellProcAddressing, map().cellMap())
             );
         }
         else
@@ -1125,7 +1125,7 @@ int main(int argc, char *argv[])
 
             faceProcAddressing = labelList
             (
-                UIndirectList<label>(faceProcAddressing, map().faceMap())
+                labelUIndList(faceProcAddressing, map().faceMap())
             );
 
             // Detect any flips.
@@ -1165,7 +1165,7 @@ int main(int argc, char *argv[])
 
             pointProcAddressing = labelList
             (
-                UIndirectList<label>(pointProcAddressing, map().pointMap())
+                labelUIndList(pointProcAddressing, map().pointMap())
             );
         }
         else

applications/utilities/mesh/manipulation/splitMesh/regionSide.C

@@ -105,7 +105,7 @@ Foam::label Foam::regionSide::otherEdge
         << "Cannot find other edge on face " << facei << " that uses point "
         << pointi << " but not point " << freePointi << endl
         << "Edges on face:" << fEdges
-        << " verts:" << UIndirectList<edge>(mesh.edges(), fEdges)()
+        << " verts:" << UIndirectList<edge>(mesh.edges(), fEdges)
         << " Vertices on face:"
         << mesh.faces()[facei]
         << " Vertices on original edge:" << e << abort(FatalError);

applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C

@@ -453,7 +453,7 @@ int main(int argc, char *argv[])
             region,
             1,
             exposedFaces,
-            UIndirectList<label>(nearestExposedPatch, exposedFaces)(),
+            labelUIndList(nearestExposedPatch, exposedFaces)(),
             true
         );
     }

applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C

@@ -396,7 +396,7 @@ void writeCellDistance
     forAll(cellProcAddressing, proci)
     {
         const labelList& pCells = cellProcAddressing[proci];
-        UIndirectList<label>(cellDecomposition, pCells) = proci;
+        labelUIndList(cellDecomposition, pCells) = proci;
     }
 
     cellDecomposition.write();

applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C

@@ -588,7 +588,7 @@ label dupNonManifoldPoints(triSurface& s, labelList& pointMap)
 
         //s.transfer(dupSurf);
         s = dupSurf;
-        pointMap = UIndirectList<label>(pointMap, dupPointMap)();
+        pointMap = labelUIndList(pointMap, dupPointMap)();
     }
 
     return nNonManifold;

applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C

@@ -219,11 +219,11 @@ int main(int argc, char *argv[])
 
             }
             Info<< "Additionally triangulating faceZones "
-                << UIndirectList<word>
-                  (
-                      allZoneNames,
-                      includeFaceZones.sortedToc()
-                  )
+                <<  UIndirectList<word>
+                    (
+                        allZoneNames,
+                        includeFaceZones.sortedToc()
+                    )
                 << endl;
         }
 

applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C

@@ -305,7 +305,7 @@ label findEdge
 
     FatalErrorInFunction
         << ' ' << v1 << " in candidates " << edgeLabels
-        << " with vertices:" << UIndirectList<edge>(surf.edges(), edgeLabels)()
+        << " with vertices:" << UIndirectList<edge>(surf.edges(), edgeLabels)
         << abort(FatalError);
 
     return -1;
@@ -345,7 +345,7 @@ label otherEdge
     FatalErrorInFunction
         << " verts:" << surf.localPoints()[facei]
         << " connected to point " << pointi
-        << " faceEdges:" << UIndirectList<edge>(surf.edges(), fEdges)()
+        << " faceEdges:" << UIndirectList<edge>(surf.edges(), fEdges)
         << abort(FatalError);
 
     return -1;

src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H

@@ -81,13 +81,9 @@ protected:
 
     // Member Functions
 
-      // Access
-
         //- Return the list addressing
         inline const List<label>& addressing() const;
 
-      // Edit
-
         //- Reset addressing
         inline void resetAddressing(const labelUList& addr);
         inline void resetAddressing(const Xfer<List<label>>& addr);
@@ -141,14 +137,9 @@ public:
 
     // Member Functions
 
-      // Access
-
         //- Return the list addressing
         using UIndirectList<T>::addressing;
 
-
-      // Edit
-
         //- Reset addressing
         using IndirectListAddressing::resetAddressing;
 

src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C

@@ -198,7 +198,7 @@ Foam::label Foam::PackedBoolList::set(const labelUList& indices)
 }
 
 
-Foam::label Foam::PackedBoolList::set(const UIndirectList<label>& indices)
+Foam::label Foam::PackedBoolList::set(const labelUIndList& indices)
 {
     return setIndices(indices);
 }
@@ -226,7 +226,7 @@ Foam::label Foam::PackedBoolList::unset(const labelUList& indices)
 }
 
 
-Foam::label Foam::PackedBoolList::unset(const UIndirectList<label>& indices)
+Foam::label Foam::PackedBoolList::unset(const labelUIndList& indices)
 {
     return unsetIndices(indices);
 }
@@ -259,7 +259,7 @@ Foam::label Foam::PackedBoolList::subset(const labelUList& indices)
 }
 
 
-Foam::label Foam::PackedBoolList::subset(const UIndirectList<label>& indices)
+Foam::label Foam::PackedBoolList::subset(const labelUIndList& indices)
 {
     return subsetIndices(indices);
 }

src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H

@@ -115,18 +115,10 @@ public:
         inline PackedBoolList(const Xfer<PackedList<1>>& lst);
 
         //- Construct with given size and list of labels to set as true.
-        inline PackedBoolList
-        (
-            const label size,
-            const labelUList& indices
-        );
+        inline PackedBoolList(const label size, const labelUList& indices);
 
         //- Construct with given size and list of labels to set as true.
-        inline PackedBoolList
-        (
-            const label size,
-            const UIndirectList<label>& indices
-        );
+        inline PackedBoolList(const label size, const labelUIndList& indices);
 
         //- Construct from a list of bools
         explicit inline PackedBoolList(const UList<bool>& lst);
@@ -137,7 +129,7 @@ public:
 
         //- Construct from a list of labels
         //  using the labels as indices to indicate which bits are set
-        explicit inline PackedBoolList(const UIndirectList<label>& indices);
+        explicit inline PackedBoolList(const labelUIndList& indices);
 
         //- Clone
         inline autoPtr<PackedBoolList> clone() const;
@@ -159,7 +151,7 @@ public:
 
         //- Set the listed indices. Return number of elements changed.
         //  Does auto-vivify for non-existent entries.
-        label set(const UIndirectList<label>& indices);
+        label set(const labelUIndList& indices);
 
         //- Unset specified bits.
         void unset(const PackedList<1>& lst);
@@ -170,7 +162,7 @@ public:
 
         //- Unset the listed indices. Return number of elements changed.
         //  Never auto-vivify entries.
-        label unset(const UIndirectList<label>& indices);
+        label unset(const labelUIndList& indices);
 
         //- Subset with the specified list.
         void subset(const PackedList<1>& lst);
@@ -181,7 +173,7 @@ public:
 
         //- Subset with the listed indices.
         //  Return number of elements subsetted.
-        label subset(const UIndirectList<label>& indices);
+        label subset(const labelUIndList& indices);
 
 
         //- Return indices of the used (true) elements as a list of labels
@@ -222,7 +214,7 @@ public:
 
         //- Assignment operator,
         //  using the labels as indices to indicate which bits are set
-        inline void operator=(const UIndirectList<label>& indices);
+        inline void operator=(const labelUIndList& indices);
 
         //- Complement operator
         inline PackedBoolList operator~() const;
@@ -236,7 +228,7 @@ public:
 
         //- And operator (lists may be dissimilar sizes)
         //  using the labels as indices to indicate which bits are set
-        inline PackedBoolList& operator&=(const UIndirectList<label>& indices);
+        inline PackedBoolList& operator&=(const labelUIndList& indices);
 
         //- Xor operator (lists may be dissimilar sizes)
         //  Retains unique entries
@@ -251,7 +243,7 @@ public:
 
         //- Or operator (lists may be dissimilar sizes),
         //  using the labels as indices to indicate which bits are set
-        inline PackedBoolList& operator|=(const UIndirectList<label>& indices);
+        inline PackedBoolList& operator|=(const labelUIndList& indices);
 
 
         //- Add entries to this list, synonymous with the or operator
@@ -261,7 +253,7 @@ public:
         inline PackedBoolList& operator+=(const labelUList& indices);
 
         //- Add entries to this list, synonymous with the or operator
-        inline PackedBoolList& operator+=(const UIndirectList<label>& indices);
+        inline PackedBoolList& operator+=(const labelUIndList& indices);
 
         //- Remove entries from this list - unset the specified bits
         inline PackedBoolList& operator-=(const PackedList<1>& lst);
@@ -270,7 +262,7 @@ public:
         inline PackedBoolList& operator-=(const labelUList& indices);
 
         //- Remove entries from this list - unset the specified bits
-        inline PackedBoolList& operator-=(const UIndirectList<label>& indices);
+        inline PackedBoolList& operator-=(const labelUIndList& indices);
 };
 
 

src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H

@@ -96,7 +96,7 @@ inline Foam::PackedBoolList::PackedBoolList(const labelUList& indices)
 {}
 
 
-inline Foam::PackedBoolList::PackedBoolList(const UIndirectList<label>& indices)
+inline Foam::PackedBoolList::PackedBoolList(const labelUIndList& indices)
 :
     PackedBoolList(indices.size(), indices)
 {}
@@ -117,7 +117,7 @@ inline Foam::PackedBoolList::PackedBoolList
 inline Foam::PackedBoolList::PackedBoolList
 (
     const label size,
-    const UIndirectList<label>& indices
+    const labelUIndList& indices
 )
 :
     PackedList<1>(size)
@@ -180,7 +180,7 @@ inline void Foam::PackedBoolList::operator=(const labelUList& indices)
 }
 
 
-inline void Foam::PackedBoolList::operator=(const UIndirectList<label>& indices)
+inline void Foam::PackedBoolList::operator=(const labelUIndList& indices)
 {
     clear();
     set(indices);
@@ -214,7 +214,7 @@ Foam::PackedBoolList::operator&=(const labelUList& indices)
 
 
 inline Foam::PackedBoolList&
-Foam::PackedBoolList::operator&=(const UIndirectList<label>& indices)
+Foam::PackedBoolList::operator&=(const labelUIndList& indices)
 {
     subset(indices);
     return *this;
@@ -238,7 +238,7 @@ Foam::PackedBoolList::operator|=(const labelUList& indices)
 
 
 inline Foam::PackedBoolList&
-Foam::PackedBoolList::operator|=(const UIndirectList<label>& indices)
+Foam::PackedBoolList::operator|=(const labelUIndList& indices)
 {
     set(indices);
     return *this;
@@ -260,7 +260,7 @@ Foam::PackedBoolList::operator+=(const labelUList& indices)
 
 
 inline Foam::PackedBoolList&
-Foam::PackedBoolList::operator+=(const UIndirectList<label>& indices)
+Foam::PackedBoolList::operator+=(const labelUIndList& indices)
 {
     return operator|=(indices);
 }
@@ -283,7 +283,7 @@ Foam::PackedBoolList::operator-=(const labelUList& indices)
 
 
 inline Foam::PackedBoolList&
-Foam::PackedBoolList::operator-=(const UIndirectList<label>& indices)
+Foam::PackedBoolList::operator-=(const labelUIndList& indices)
 {
     unset(indices);
     return *this;

src/OpenFOAM/containers/Lists/PackedList/PackedList.C

@@ -536,7 +536,7 @@ void Foam::PackedList<nBits>::operator=(const labelUList& lst)
 
 
 template<unsigned nBits>
-void Foam::PackedList<nBits>::operator=(const UIndirectList<label>& lst)
+void Foam::PackedList<nBits>::operator=(const labelUIndList& lst)
 {
     setCapacity(lst.size());
     size_ = lst.size();

src/OpenFOAM/containers/Lists/PackedList/PackedList.H

@@ -245,7 +245,7 @@ public:
         explicit inline PackedList(const labelUList& lst);
 
         //- Construct from an indirect list of labels
-        explicit inline PackedList(const UIndirectList<label>& lst);
+        explicit inline PackedList(const labelUIndList& lst);
 
         //- Clone
         inline autoPtr<PackedList<nBits>> clone() const;
@@ -414,7 +414,7 @@ public:
         void operator=(const labelUList& lst);
 
         //- Assignment operator.
-        void operator=(const UIndirectList<label>& lst);
+        void operator=(const labelUIndList& lst);
 
 
     // Iterators and helpers

src/OpenFOAM/containers/Lists/PackedList/PackedListI.H

@@ -239,7 +239,7 @@ inline Foam::PackedList<nBits>::PackedList(const labelUList& lst)
 
 
 template<unsigned nBits>
-inline Foam::PackedList<nBits>::PackedList(const UIndirectList<label>& lst)
+inline Foam::PackedList<nBits>::PackedList(const labelUIndList& lst)
 :
     PackedListCore(),
     StorageList(packedLength(lst.size()), 0u),

src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H

@@ -52,6 +52,10 @@ namespace Foam
 template<class T> class UIndirectList;
 template<class T> Ostream& operator<<(Ostream&, const UIndirectList<T>&);
 
+// Commonly required list types
+typedef UIndirectList<bool> boolUIndList;
+typedef UIndirectList<label> labelUIndList;
+
 /*---------------------------------------------------------------------------*\
                         Class UIndirectList Declaration
 \*---------------------------------------------------------------------------*/

src/OpenFOAM/containers/Lists/UList/UList.H

@@ -67,6 +67,7 @@ template<class T> class UList;
 template<class T> Ostream& operator<<(Ostream&, const UList<T>&);
 template<class T> Istream& operator>>(Istream&, UList<T>&);
 
+// Commonly required list types
 typedef UList<char> charUList;
 typedef UList<label> labelUList;