diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 731e38f67bd9fd37d33766823bdbd7462feddeaa..194e185ac55a11e8e6fe7865e3312ee6254b7d89 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -443,7 +443,6 @@ int main(int argc, char *argv[])
}
-
indirectPrimitivePatch extrudePatch
(
IndirectList<face>
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index c36844e47ddd574731148c56580017b063945ff5..3ac79b9be5a05ea59cfcac855a73ccafc5a2ce97 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/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]
);
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index c589f071d85ab4fce671bd602850218b360719d5..cbfa624275d4509913ffb5843938880c3168ebcc 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/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
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
index 52198fb3053df09b9f6d179912188bc651f3955f..61d22ce8702c71b9ac8fcff82c26930c8ecbe229 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
+++ b/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
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 42752388157aabe26cf316b9419bb15f544371d3..21796ed9d6974230c9b2e1995892d2f43a91b9e9 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/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
diff --git a/applications/utilities/mesh/manipulation/splitMesh/regionSide.C b/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
index 23456aaa0b7e685cbc60ff1a640ae1b7f7554a9f..fb7c83057335c30a3d236f7302626d910b397fca 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
+++ b/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);
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
index 2846045f6883f12f48fb39b3dd08ce49a8f54b04..fd373c8140c1289b582902ddd3fda0c71158fbb7 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
+++ b/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
);
}
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index 476954964688492510f3fa34b118956ac5bf8d2c..9051ab86a5f3dcf3f28d019486928811ae40b8c9 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/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();
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index 6588632eb9ef38c984e4e0e68f54e36fec11203b..b09313259e453a2ea080d99f73f0915ac0ee81c5 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/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;
diff --git a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
index 8637ebd9f544dbd44b81890a28fab2327970cdf6..ae957a2b3b67a602ae26994d961ea5886027d169 100644
--- a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
+++ b/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;
}
diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
index d844e0bb631f969efcb664b5d0264f608aeeb1ea..befa5a67fd4084750e6ed534058803e35c36bbad 100644
--- a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
+++ b/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;
diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
index aa6c222ec262ba80be29e1aad69e7cda15c89f35..84a35f814695fabeea55fafe248cb71990dcaad7 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
+++ b/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;
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C
index 543c5b855843521d521ef93079106683bc03ebb0..db6036d715194a70ebbbb89898c83e1cb15cedac 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C
+++ b/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);
}
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
index a667e8aecf17f4d3ea49b4f3c67b242a84c22ce7..05836769ba9d6d2514e34962722a2f7106901273 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
+++ b/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);
};
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
index 4c713dc005d4358aa4210ab47e3d9edf7883f869..db40fab00b272cbf6501984bd39fb3e6dcf6b8a7 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
+++ b/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;
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
index b862792b1270a3a2b82e409fa8ecc6dba529794a..b8069fe3e01ab7bb31d69f1edf3d19f9adaed9be 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
+++ b/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();
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
index 842a1a100a7d2b3b1e8e0afd4490e90cfdefc3ba..1d41bd14245eee9bad5c4f26613cf4e141845489 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
+++ b/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
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
index 4f9c58644ad29ef91da1fbfba10b911db1196df8..00d1d54b6e754f928805cd6b66cdf87591f33fde 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+++ b/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),
diff --git a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
index eac9eaf4151235a2837672ff46659408a9253547..2fb26f4a36a0866b6a76ce9f7ab4100c353a8613 100644
--- a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
+++ b/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
\*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H
index e0893960df8975cff4b958d3d94dca77a9b1ccc9..76e5362d3a5894d4940c6910af98308d862ecc49 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.H
+++ b/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;
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
index a03966c1ee690dd268bdf3ddcb02679ccbebcfa1..bc3699370d1539ab5c7873e90c002150b6ffe59e 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
@@ -192,7 +192,7 @@ Foam::procFacesGAMGProcAgglomeration::processorAgglomeration
sortedOrder(coarseToMaster, newToOld);
labelList oldToNew(invert(newToOld.size(), newToOld));
- fineToCoarse = UIndirectList<label>(oldToNew, fineToCoarse)();
+ fineToCoarse = labelUIndList(oldToNew, fineToCoarse)();
}
Pstream::scatter(fineToCoarse, Pstream::msgType(), mesh.comm());
diff --git a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
index 3475700bc921259dce88bd77e9d4e81f972777d9..78c97acedf486e3fe1b2dbcab5b05e4f72cc365c 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
+++ b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
@@ -328,7 +328,7 @@ Foam::lduPrimitiveMesh::lduPrimitiveMesh
<< " agglomerates to " << procAgglomMap[procIDs[i]]
<< " whereas other processors " << procIDs
<< " agglomerate to "
- << UIndirectList<label>(procAgglomMap, procIDs)
+ << labelUIndList(procAgglomMap, procIDs)
<< exit(FatalError);
}
}
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
index f469a6876b2ebc1e6139fc78d74a8a574e200e07..83d99861f7fd387b17e1cd3df951f37260d2fd5d 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
@@ -170,7 +170,7 @@ protected:
template<class T, class CombineOp, class negateOp>
static void flipAndCombine
(
- const UList<label>& map,
+ const labelUList& map,
const bool hasFlip,
const UList<T>& rhs,
const CombineOp& cop,
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
index 7e58126c4d41f7ec07003644c9ebef8439bbbb8d..6622bfd41d16d9a4131878ca6395592c60abec31 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
@@ -33,7 +33,7 @@ License
template<class T, class CombineOp, class negateOp>
void Foam::mapDistributeBase::flipAndCombine
(
- const UList<label>& map,
+ const labelUList& map,
const bool hasFlip,
const UList<T>& rhs,
const CombineOp& cop,
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index 6544881f4a2f01e49a581af998b70f93bae0a1ab..20c7f599d14b976b36c10c4051e1a247f672c20d 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -1415,7 +1415,7 @@ bool Foam::cyclicPolyPatch::order
<< " : "
<< "Cannot find point on face " << pp[oldFacei]
<< " with vertices "
- << IndirectList<point>(pp.points(), pp[oldFacei])()
+ << UIndirectList<point>(pp.points(), pp[oldFacei])
<< " that matches point " << wantedAnchor
<< " when matching the halves of processor patch " << name()
<< "Continuing with incorrect face ordering from now on!"
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
index 5001f6e238febd9068df60cc54fe7398769eaf8c..80714b0bb471e8e7ace2b5a72da25eed90406fce 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
@@ -497,7 +497,7 @@ bool Foam::oldCyclicPolyPatch::matchAnchors
<< "Patch:" << name() << " : "
<< "Cannot find point on face " << f
<< " with vertices:"
- << UIndirectList<point>(pp.points(), f)()
+ << UIndirectList<point>(pp.points(), f)
<< " that matches point " << wantedAnchor
<< " when matching the halves of cyclic patch " << name()
<< endl
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index 9c27fada85100eb122c5e1955f55ce165dffab91..0c5b72846590123370748dae59c8b23701fcdf07 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -293,7 +293,7 @@ void Foam::processorPolyPatch::calcGeometry(PstreamBuffers& pBufs)
<< endl
<< "Mesh face:" << start()+facei
<< " vertices:"
- << UIndirectList<point>(points(), operator[](facei))()
+ << UIndirectList<point>(points(), operator[](facei))
<< endl
<< "If you are certain your matching is correct"
<< " you can increase the 'matchTolerance' setting"
@@ -1084,7 +1084,7 @@ bool Foam::processorPolyPatch::order
<< " : "
<< "Cannot find point on face " << pp[oldFacei]
<< " with vertices "
- << UIndirectList<point>(pp.points(), pp[oldFacei])()
+ << UIndirectList<point>(pp.points(), pp[oldFacei])
<< " that matches point " << wantedAnchor
<< " when matching the halves of processor patch "
<< name()
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsEdgeOwner.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsEdgeOwner.C
index 95f49cea1266bb0b86cef1f231e5ac9be8e7a33e..2fbcd25f87583e9f6465a13ebfc32bbf9a3a3bbd 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsEdgeOwner.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsEdgeOwner.C
@@ -77,7 +77,7 @@ Foam::PatchTools::edgeOwner
<< "Edge " << edgeI << " vertices:" << edges[edgeI]
<< " is used by faces " << nbrFaces
<< " vertices:"
- << UIndirectList<Face>(localFaces, nbrFaces)()
+ << UIndirectList<Face>(localFaces, nbrFaces)
<< " none of which use the edge vertices in the same order"
<< nl << "I give up" << abort(FatalError);
}
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortEdges.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortEdges.C
index 0877a50b5faef71566ebad338a770b01eb751979..4f70b4ca8515f91848acd9944230812b3c6942df 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortEdges.C
@@ -142,7 +142,7 @@ Foam::PatchTools::sortedEdgeFaces
faceAngles.sort();
- sortedEdgeFaces[edgeI] = UIndirectList<label>
+ sortedEdgeFaces[edgeI] = labelUIndList
(
faceNbs,
faceAngles.indices()
diff --git a/src/OpenFOAM/primitives/bools/lists/boolList.H b/src/OpenFOAM/primitives/bools/lists/boolList.H
index 82c5ae27ab3bfd7338e45718a2c78a6f97e8c32a..83135d7a4a5ee2da025c7050be35a475165bb709 100644
--- a/src/OpenFOAM/primitives/bools/lists/boolList.H
+++ b/src/OpenFOAM/primitives/bools/lists/boolList.H
@@ -21,17 +21,23 @@ License
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+Typedef
+ Foam::boolList
+
+Description
+ A List of bools.
+
Typedef
Foam::boolUList
Description
- A UList of bool
+ A UList of bools.
Typedef
- Foam::boolList
+ Foam::boolListList
Description
- Bool container classes
+ A List of boolList.
\*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/primitives/ints/lists/labelIndList.H b/src/OpenFOAM/primitives/ints/lists/labelIndList.H
index 3a20c2469cc06cdcee6eb75dffbd62e7f1d59fa3..1f5dd2dd0ef87dd8bf76c1d19f33d8b99a324a42 100644
--- a/src/OpenFOAM/primitives/ints/lists/labelIndList.H
+++ b/src/OpenFOAM/primitives/ints/lists/labelIndList.H
@@ -47,8 +47,8 @@ Description
namespace Foam
{
+ // NB: labelUIndList is defined in UIndirectList itself
typedef IndirectList<label> labelIndList;
- typedef UIndirectList<label> labelUIndList;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/ints/lists/labelList.H b/src/OpenFOAM/primitives/ints/lists/labelList.H
index 30536a59a91fc4ff02fb63f0db37ef98d91810fe..a25fc5767a9f3c8476fdcd4000dd8c91f5a1269f 100644
--- a/src/OpenFOAM/primitives/ints/lists/labelList.H
+++ b/src/OpenFOAM/primitives/ints/lists/labelList.H
@@ -33,6 +33,12 @@ Typedef
Description
A SubList of labels.
+Typedef
+ Foam::labelUList
+
+Description
+ A UList of labels.
+
Typedef
Foam::labelListList
@@ -58,8 +64,7 @@ Description
namespace Foam
{
- // Note: frequently used labelUList is defined in UList itself
-
+ // NB: labelUList is defined in UList itself
typedef List<label> labelList;
typedef SubList<label> labelSubList;
typedef List<labelList> labelListList;
diff --git a/src/conversion/vtk/output/foamVtkOutputFields.H b/src/conversion/vtk/output/foamVtkOutputFields.H
index 116aadbfeb18d24b860d67b8ff3dcff96cc6bcd6..22f9a8d60f3a122f2604f575f1bdd030e5491fd5 100644
--- a/src/conversion/vtk/output/foamVtkOutputFields.H
+++ b/src/conversion/vtk/output/foamVtkOutputFields.H
@@ -63,7 +63,7 @@ namespace vtk
(
vtk::formatter& fmt,
const DimensionedField<Type, volMesh>& fld,
- const UList<label>& cellMap
+ const labelUList& cellMap
);
//- Write internalField for mesh
@@ -82,7 +82,7 @@ namespace vtk
(
vtk::formatter& fmt,
const GeometricField<Type, fvPatchField, volMesh>& fld,
- const UList<label>& cellMap
+ const labelUList& cellMap
);
diff --git a/src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C b/src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C
index b462922416f9e86b88cf2b5fdd3de074b3b05b41..b3852dad2b3c5f8aa3d3d5b1ff6fb5cc8e6b204d 100644
--- a/src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C
+++ b/src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C
@@ -50,7 +50,7 @@ void Foam::vtk::writeField
(
vtk::formatter& fmt,
const DimensionedField<Type, volMesh>& fld,
- const UList<label>& cellMap
+ const labelUList& cellMap
)
{
const uint64_t payLoad =
@@ -89,7 +89,7 @@ void Foam::vtk::writeField
(
vtk::formatter& fmt,
const GeometricField<Type, fvPatchField, volMesh>& fld,
- const UList<label>& cellMap
+ const labelUList& cellMap
)
{
const uint64_t payLoad =
diff --git a/src/conversion/vtk/part/foamVtkMeshMaps.C b/src/conversion/vtk/part/foamVtkMeshMaps.C
index badc422df5065e3e0082cd3cf3442b181b6e22a3..121d0099fe712f247c19c026cb3a815312b6d85f 100644
--- a/src/conversion/vtk/part/foamVtkMeshMaps.C
+++ b/src/conversion/vtk/part/foamVtkMeshMaps.C
@@ -28,14 +28,14 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void Foam::foamVtkMeshMaps::renumberCells(const UList<label>& mapping)
+void Foam::foamVtkMeshMaps::renumberCells(const labelUList& mapping)
{
inplaceRenumber(mapping, cellMap_);
inplaceRenumber(mapping, additionalIds_);
}
-void Foam::foamVtkMeshMaps::renumberPoints(const UList<label>& mapping)
+void Foam::foamVtkMeshMaps::renumberPoints(const labelUList& mapping)
{
inplaceRenumber(mapping, pointMap_);
}
diff --git a/src/conversion/vtk/part/foamVtkMeshMaps.H b/src/conversion/vtk/part/foamVtkMeshMaps.H
index 737f02a2edfbf4f202eca1c291ea0af6cb4755ea..00eb195676a5ae3ef92ac818b77603db37016101 100644
--- a/src/conversion/vtk/part/foamVtkMeshMaps.H
+++ b/src/conversion/vtk/part/foamVtkMeshMaps.H
@@ -105,10 +105,10 @@ public:
//- Renumber cell ids (cellMap and additionalIds) to account for
// subset meshes
- void renumberCells(const UList<label>& mapping);
+ void renumberCells(const labelUList& mapping);
//- Renumber point ids (pointMap) to account for subset meshes
- void renumberPoints(const UList<label>& mapping);
+ void renumberPoints(const labelUList& mapping);
//- Original cell ids for all cells (regular and decomposed).
diff --git a/src/conversion/vtk/part/foamVtuCells.C b/src/conversion/vtk/part/foamVtuCells.C
index 962fa9b0ee8d49b99e03181741cf2cc8dce9fcac..ca134c23c733240d8dd2b8810bec161ce3c52a73 100644
--- a/src/conversion/vtk/part/foamVtuCells.C
+++ b/src/conversion/vtk/part/foamVtuCells.C
@@ -171,13 +171,13 @@ void Foam::vtk::vtuCells::reset
}
-void Foam::vtk::vtuCells::renumberCells(const UList<label>& mapping)
+void Foam::vtk::vtuCells::renumberCells(const labelUList& mapping)
{
maps_.renumberCells(mapping);
}
-void Foam::vtk::vtuCells::renumberPoints(const UList<label>& mapping)
+void Foam::vtk::vtuCells::renumberPoints(const labelUList& mapping)
{
maps_.renumberPoints(mapping);
}
diff --git a/src/conversion/vtk/part/foamVtuCells.H b/src/conversion/vtk/part/foamVtuCells.H
index 6c4c71c52424a52264ba58364eb8aff8652c4087..3c79ce8a33b40d1c6eb8c31f98f9b70e96da2911 100644
--- a/src/conversion/vtk/part/foamVtuCells.H
+++ b/src/conversion/vtk/part/foamVtuCells.H
@@ -194,10 +194,10 @@ public:
);
//- Renumber cell ids to account for subset meshes
- void renumberCells(const UList<label>& mapping);
+ void renumberCells(const labelUList& mapping);
//- Renumber point ids to account for subset meshes
- void renumberPoints(const UList<label>& mapping);
+ void renumberPoints(const labelUList& mapping);
// Storage Access
diff --git a/src/conversion/vtk/part/foamVtuSizing.C b/src/conversion/vtk/part/foamVtuSizing.C
index 7ef84a08d50008d19f2e033bab1dc153cacd2fb1..6d12f7447c69250b4082990699d1a06ad0841cce 100644
--- a/src/conversion/vtk/part/foamVtuSizing.C
+++ b/src/conversion/vtk/part/foamVtuSizing.C
@@ -272,7 +272,7 @@ void Foam::vtk::vtuSizing::populateLegacy
(
const polyMesh& mesh,
UList<uint8_t>& cellTypes,
- UList<label>& vertLabels,
+ labelUList& vertLabels,
foamVtkMeshMaps& maps
) const
{
@@ -301,10 +301,10 @@ void Foam::vtk::vtuSizing::populateXml
(
const polyMesh& mesh,
UList<uint8_t>& cellTypes,
- UList<label>& connectivity,
- UList<label>& offsets,
- UList<label>& faces,
- UList<label>& facesOffsets,
+ labelUList& connectivity,
+ labelUList& offsets,
+ labelUList& faces,
+ labelUList& facesOffsets,
foamVtkMeshMaps& maps
) const
{
@@ -421,8 +421,8 @@ void Foam::vtk::vtuSizing::populateInternal
UList<int>& offsets,
UList<int>& faces,
UList<int>& facesOffsets,
- UList<label>& cellMap,
- UList<label>& addPointsIds
+ labelUList& cellMap,
+ labelUList& addPointsIds
) const
{
populateArrays
@@ -449,8 +449,8 @@ void Foam::vtk::vtuSizing::populateInternal
UList<long>& offsets,
UList<long>& faces,
UList<long>& facesOffsets,
- UList<label>& cellMap,
- UList<label>& addPointsIds
+ labelUList& cellMap,
+ labelUList& addPointsIds
) const
{
populateArrays
@@ -477,8 +477,8 @@ void Foam::vtk::vtuSizing::populateInternal
UList<long long>& offsets,
UList<long long>& faces,
UList<long long>& facesOffsets,
- UList<label>& cellMap,
- UList<label>& addPointsIds
+ labelUList& cellMap,
+ labelUList& addPointsIds
) const
{
populateArrays
diff --git a/src/conversion/vtk/part/foamVtuSizing.H b/src/conversion/vtk/part/foamVtuSizing.H
index a14209807a9a1945fb20fae37e5f7d620a021c8b..d09d486f04552d4b588d58cbed63f4a7cded45a6 100644
--- a/src/conversion/vtk/part/foamVtuSizing.H
+++ b/src/conversion/vtk/part/foamVtuSizing.H
@@ -288,7 +288,7 @@ public:
(
const polyMesh& mesh,
UList<uint8_t>& cellTypes,
- UList<label>& connectivity,
+ labelUList& connectivity,
foamVtkMeshMaps& maps
) const;
@@ -297,10 +297,10 @@ public:
(
const polyMesh& mesh,
UList<uint8_t>& cellTypes,
- UList<label>& connectivity,
- UList<label>& offsets,
- UList<label>& faces,
- UList<label>& facesOffsets,
+ labelUList& connectivity,
+ labelUList& offsets,
+ labelUList& faces,
+ labelUList& facesOffsets,
foamVtkMeshMaps& maps
) const;
@@ -349,8 +349,8 @@ public:
UList<int>& offsets,
UList<int>& faces,
UList<int>& facesOffsets,
- UList<label>& cellMap,
- UList<label>& addPointsIds
+ labelUList& cellMap,
+ labelUList& addPointsIds
) const;
//- Populate lists for Internal VTK format
@@ -362,8 +362,8 @@ public:
UList<long>& offsets,
UList<long>& faces,
UList<long>& facesOffsets,
- UList<label>& cellMap,
- UList<label>& addPointsIds
+ labelUList& cellMap,
+ labelUList& addPointsIds
) const;
//- Populate lists for Internal VTK format
@@ -375,8 +375,8 @@ public:
UList<long long>& offsets,
UList<long long>& faces,
UList<long long>& facesOffsets,
- UList<label>& cellMap,
- UList<label>& addPointsIds
+ labelUList& cellMap,
+ labelUList& addPointsIds
) const;
diff --git a/src/dummyThirdParty/kahipDecomp/dummyKahipDecomp.C b/src/dummyThirdParty/kahipDecomp/dummyKahipDecomp.C
index d3844087e44b3ecfb8ba75bf6ccb749fad073250..96e0bdc16b94a0f21116f0e6ad9e91f3903851d4 100644
--- a/src/dummyThirdParty/kahipDecomp/dummyKahipDecomp.C
+++ b/src/dummyThirdParty/kahipDecomp/dummyKahipDecomp.C
@@ -56,8 +56,8 @@ namespace Foam
Foam::label Foam::kahipDecomp::decomposeSerial
(
- const UList<label>& adjncy,
- const UList<label>& xadj,
+ const labelUList& adjncy,
+ const labelUList& xadj,
const UList<scalar>& cellWeights,
List<label>& decomp
)
diff --git a/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C b/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
index aabfa95fee9eecc17f91c2e4d756bb06c707bde2..3743cc1bae6d85c61ae7152cacf26f133e5d99ee 100644
--- a/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
+++ b/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
@@ -56,8 +56,8 @@ namespace Foam
Foam::label Foam::metisDecomp::decomposeSerial
(
- const UList<label>& adjncy,
- const UList<label>& xadj,
+ const labelUList& adjncy,
+ const labelUList& xadj,
const UList<scalar>& cellWeights,
List<label>& decomp
)
diff --git a/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C b/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C
index d924b711b64464740db829e2f450b1dddc3a0321..decacb6c10c33a511f0d9f5e62ba0a232e5240e5 100644
--- a/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C
+++ b/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C
@@ -64,8 +64,8 @@ void Foam::ptscotchDecomp::check(const int retVal, const char* str)
Foam::label Foam::ptscotchDecomp::decompose
(
- const UList<label>& initxadj,
- const UList<label>& initadjncy,
+ const labelUList& initxadj,
+ const labelUList& initadjncy,
const UList<scalar>& initcWeights,
List<label>& finalDecomp
) const
diff --git a/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C b/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
index e5102774b5e74b146810ab2915340fd5b88adefc..582c770253787518931eb78edac5df564c14a6f7 100644
--- a/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
+++ b/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
@@ -63,8 +63,8 @@ void Foam::scotchDecomp::check(const int retVal, const char* str)
Foam::label Foam::scotchDecomp::decomposeSerial
(
- const UList<label>& adjncy,
- const UList<label>& xadj,
+ const labelUList& adjncy,
+ const labelUList& xadj,
const UList<scalar>& cWeights,
List<label>& decomp
)
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 0e546f1b3efc02a8ab210d154c5e42d5d6828e2e..ef9bde3c1d1b3886b5b02cbe48c9ab01bbd99c4f 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -789,7 +789,7 @@ void Foam::fvMeshDistribute::getNeighbourData
// Which processor they will end up on
SubList<label>(nbrNewNbrProc, pp.size(), offset) =
- UIndirectList<label>(distribution, pp.faceCells())();
+ labelUIndList(distribution, pp.faceCells())();
}
}
@@ -1413,7 +1413,7 @@ void Foam::fvMeshDistribute::sendMesh
//
// forAll(cellZones, zoneI)
// {
- // UIndirectList<label>(cellZoneID, cellZones[zoneI]) = zoneI;
+ // labelUIndList(cellZoneID, cellZones[zoneI]) = zoneI;
// }
//}
diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
index 3af15d40af5ab0633e1019c0d18dc261a575a020..dfb166aeb974d18a79de78dd7027f507e17437a6 100644
--- a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
@@ -1384,14 +1384,14 @@ void Foam::fvMeshSubset::setLargeCellSubset
void Foam::fvMeshSubset::setLargeCellSubset
(
- const UList<label>& globalCellMap,
+ const labelUList& globalCellMap,
const label patchID,
const bool syncPar
)
{
labelList region(baseMesh().nCells(), 0);
- for (auto cellId : globalCellMap)
+ for (const label cellId : globalCellMap)
{
region[cellId] = 1;
}
@@ -1408,9 +1408,9 @@ void Foam::fvMeshSubset::setLargeCellSubset
{
labelList region(baseMesh().nCells(), 0);
- forAllConstIter(labelHashSet, globalCellMap, iter)
+ for (const label cellId : globalCellMap)
{
- region[iter.key()] = 1;
+ region[cellId] = 1;
}
setLargeCellSubset(region, 1, patchID, syncPar);
}
diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H
index 3f057d2d574a6ae46fedf8cff309ebeebe4eef65..8e49da9f1f90a669758518ad39aba992fcfbb648 100644
--- a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H
@@ -180,7 +180,7 @@ public:
//- setLargeCellSubset but only marking certain cells
void setLargeCellSubset
(
- const UList<label>& globalCellMap,
+ const labelUList& globalCellMap,
const label patchID = -1,
const bool syncPar = true
);
diff --git a/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C b/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C
index 2e39889ab27cf8364d12d07f3dc24aab7883119b..86159aa38f134ecdf1b96abc0fcfe4a59917404c 100644
--- a/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C
@@ -261,7 +261,7 @@ bool Foam::hexCellLooper::cut
{
FatalErrorInFunction
<< " on points:" << facePoints << endl
- << UIndirectList<point>(facePoints, faceVerts)()
+ << UIndirectList<point>(facePoints, faceVerts)
<< abort(FatalError);
}
}
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
index e7d6f558d19a09ba45c6c03f2cc52b396c38f174..0b5945d31df5bf9612b53105525be09e1fc4f652 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
@@ -92,12 +92,12 @@ void Foam::motionSmootherAlgo::checkFld(const pointScalarField& fld)
Foam::labelHashSet Foam::motionSmootherAlgo::getPoints
(
- const UList<label>& faceLabels
+ const labelUList& faceLabels
) const
{
labelHashSet usedPoints(mesh_.nPoints()/100);
- for (auto faceId : faceLabels)
+ for (const label faceId : faceLabels)
{
usedPoints.insert(mesh_.faces()[faceId]);
}
@@ -113,9 +113,9 @@ Foam::labelHashSet Foam::motionSmootherAlgo::getPoints
{
labelHashSet usedPoints(mesh_.nPoints()/100);
- forAllConstIter(labelHashSet, faceLabels, iter)
+ for (const label faceId : faceLabels)
{
- usedPoints.insert(mesh_.faces()[iter.key()]);
+ usedPoints.insert(mesh_.faces()[faceId]);
}
return usedPoints;
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
index d1b53c32677c7dc7b8f5683c6da2ad7947bcb7f4..05175adb3d401e25443e925b42f82a45d84a5ce5 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
@@ -209,7 +209,7 @@ class motionSmootherAlgo
static void checkFld(const pointScalarField&);
//- Get points used by given faces
- labelHashSet getPoints(const UList<label>& faceLabels) const;
+ labelHashSet getPoints(const labelUList& faceLabels) const;
//- Get points used by given faces
labelHashSet getPoints(const labelHashSet& faceLabels) const;
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
index 79bc1bf688798f5244cd21fe39a6a87f241c721f..e1c8a08e64d28814dc4273c964bbf3edb0e57685 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
@@ -392,7 +392,7 @@ Foam::label Foam::faceCoupleInfo::mostAlignedCutEdge
if (report)
{
Pout<< "mostAlignedEdge : finding nearest edge among "
- << UIndirectList<edge>(cutFaces().edges(), pEdges)()
+ << UIndirectList<edge>(cutFaces().edges(), pEdges)
<< " connected to point " << pointi
<< " coord:" << localPoints[pointi]
<< " running between " << edgeStart << " coord:"
@@ -603,7 +603,7 @@ void Foam::faceCoupleInfo::setCutEdgeToPoints(const labelList& cutToMasterEdges)
FatalErrorInFunction
<< " unsplitEdge:" << unsplitEdge
<< " does not correspond to split edges "
- << UIndirectList<edge>(cutEdges, stringedEdges)()
+ << UIndirectList<edge>(cutEdges, stringedEdges)
<< abort(FatalError);
}
}
@@ -615,7 +615,7 @@ void Foam::faceCoupleInfo::setCutEdgeToPoints(const labelList& cutToMasterEdges)
// (
// cutFaces().localPoints(),
// splitPoints.shrink()
- // )()
+ // )
// << endl;
cutEdgeToPoints_.insert(unsplitEdge, splitPoints.shrink());
@@ -638,9 +638,9 @@ Foam::label Foam::faceCoupleInfo::matchFaces
{
FatalErrorInFunction
<< "Different sizes for supposedly matching faces." << nl
- << "f0:" << f0 << " coords:" << UIndirectList<point>(points0, f0)()
+ << "f0:" << f0 << " coords:" << UIndirectList<point>(points0, f0)
<< nl
- << "f1:" << f1 << " coords:" << UIndirectList<point>(points1, f1)()
+ << "f1:" << f1 << " coords:" << UIndirectList<point>(points1, f1)
<< abort(FatalError);
}
@@ -691,9 +691,9 @@ Foam::label Foam::faceCoupleInfo::matchFaces
FatalErrorInFunction
<< "No unique match between two faces" << nl
<< "Face " << f0 << " coords "
- << UIndirectList<point>(points0, f0)() << nl
+ << UIndirectList<point>(points0, f0) << nl
<< "Face " << f1 << " coords "
- << UIndirectList<point>(points1, f1)()
+ << UIndirectList<point>(points1, f1)
<< "when using tolerance " << absTol
<< " and forwardMatching:" << sameOrientation
<< abort(FatalError);
@@ -1841,7 +1841,7 @@ void Foam::faceCoupleInfo::subDivisionMatch
FatalErrorInFunction
<< "Did not match all of cutFaces to a master face" << nl
<< "First unmatched cut face:" << cutFacei << " with points:"
- << UIndirectList<point>(cutFaces().points(), cutF)()
+ << UIndirectList<point>(cutFaces().points(), cutF)
<< nl
<< "This usually means that the slave patch is not a"
<< " subdivision of the master patch"
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
index edd8818ff6f7237caab97d4031544e6f9fa3d601..c3ce66f3a2429dbab0e33ab56644e191654c46ea 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
@@ -1183,8 +1183,8 @@ void Foam::polyMeshAdder::mergeFaceZones
labelList order;
sortedOrder(fzFaces[i], order);
- fzFaces[i] = UIndirectList<label>(fzFaces[i], order)();
- fzFlips[i] = UIndirectList<bool>(fzFlips[i], order)();
+ fzFaces[i] = labelUIndList(fzFaces[i], order)();
+ fzFlips[i] = boolUIndList(fzFlips[i], order)();
}
}
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
index 5135d80e9823148ff512ae0678086d84e0db7bf7..fafbba3b038fa7391f84a0bb89e6eaf4a6173754 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
@@ -520,7 +520,7 @@ void Foam::addPatchCellLayer::findZoneFace
const polyMesh& mesh,
const indirectPrimitivePatch& pp,
const label ppEdgeI,
- const UIndirectList<label>& excludeFaces,
+ const labelUIndList& excludeFaces,
const labelList& meshFaces,
label& inflateFaceI,
@@ -789,7 +789,7 @@ void Foam::addPatchCellLayer::calcExtrudeInfo
{
if (edgePatchID[edgei] == -1)
{
- UIndirectList<label> ppFaces(pp.addressing(), edgeFaces[edgei]);
+ labelUIndList ppFaces(pp.addressing(), edgeFaces[edgei]);
label meshEdgei = meshEdges[edgei];
const labelList& meshFaces = mesh.edgeFaces
@@ -1113,7 +1113,7 @@ void Foam::addPatchCellLayer::setRefinement
{
labelList n(mesh_.nPoints(), 0);
- UIndirectList<label>(n, meshPoints) = nPointLayers;
+ labelUIndList(n, meshPoints) = nPointLayers;
syncTools::syncPointList(mesh_, n, maxEqOp<label>(), label(0));
// Non-synced
@@ -1916,7 +1916,7 @@ void Foam::addPatchCellLayer::setRefinement
stringedVerts
) << nl
<< "stringNLayers:"
- << UIndirectList<label>
+ << labelUIndList
(
nPointLayers,
stringedVerts
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
index 485ee56ee2af2f31af1065276269ab8a452a7678..9e6e2235ccaad16fa467b843b9ef3934f2586ac2 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
@@ -270,7 +270,7 @@ class addPatchCellLayer
const polyMesh& mesh,
const indirectPrimitivePatch& pp,
const label ppEdgeI,
- const UIndirectList<label>& excludeFaces,
+ const labelUIndList& excludeFaces,
const labelList& meshFaces,
label& inflateFaceI,
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
index 43bb04496721e3381744dc36a7754f959d92f443..1f87a21ef11d55f2ac7f3d2398dda245c7c51ddd 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
@@ -475,7 +475,7 @@ Foam::scalar Foam::hexRef8::getLevel0EdgeLength() const
if (debug)
{
Pout<< "hexRef8::getLevel0EdgeLength() :"
- << " Crappy Edgelengths (squared) per refinementlevel:"
+ << " Poor Edgelengths (squared) per refinementlevel:"
<< maxEdgeLenSqr << endl;
}
@@ -756,7 +756,7 @@ Foam::label Foam::hexRef8::findLevel
FatalErrorInFunction
<< "face:" << f
- << " level:" << UIndirectList<label>(pointLevel_, f)()
+ << " level:" << labelUIndList(pointLevel_, f)
<< " startFp:" << startFp
<< " wantedLevel:" << wantedLevel
<< abort(FatalError);
@@ -784,7 +784,7 @@ Foam::label Foam::hexRef8::findLevel
FatalErrorInFunction
<< "face:" << f
- << " level:" << UIndirectList<label>(pointLevel_, f)()
+ << " level:" << labelUIndList(pointLevel_, f)
<< " startFp:" << startFp
<< " wantedLevel:" << wantedLevel
<< abort(FatalError);
@@ -1318,11 +1318,11 @@ void Foam::hexRef8::createInternalFaces
<< "cell:" << celli << " cLevel:" << cLevel
<< " cell points:" << cPoints
<< " pointLevel:"
- << UIndirectList<label>(pointLevel_, cPoints)()
+ << labelUIndList(pointLevel_, cPoints)
<< " face:" << facei
<< " f:" << f
<< " pointLevel:"
- << UIndirectList<label>(pointLevel_, f)()
+ << labelUIndList(pointLevel_, f)
<< " faceAnchorLevel:" << faceAnchorLevel[facei]
<< " faceMidPoint:" << faceMidPoint[facei]
<< " faceMidPointi:" << faceMidPointi
@@ -1391,11 +1391,11 @@ void Foam::hexRef8::createInternalFaces
<< "cell:" << celli << " cLevel:" << cLevel
<< " cell points:" << cPoints
<< " pointLevel:"
- << UIndirectList<label>(pointLevel_, cPoints)()
+ << labelUIndList(pointLevel_, cPoints)
<< " face:" << facei
<< " f:" << f
<< " pointLevel:"
- << UIndirectList<label>(pointLevel_, f)()
+ << labelUIndList(pointLevel_, f)
<< " faceAnchorLevel:" << faceAnchorLevel[facei]
<< " faceMidPoint:" << faceMidPoint[facei]
<< " faceMidPointi:" << faceMidPointi
@@ -3725,7 +3725,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
<< " lower level" << endl
<< "cellPoints:" << cPoints << endl
<< "pointLevels:"
- << UIndirectList<label>(pointLevel_, cPoints)() << endl
+ << labelUIndList(pointLevel_, cPoints) << endl
<< abort(FatalError);
}
}
@@ -4692,7 +4692,7 @@ void Foam::hexRef8::checkMesh() const
<< "Coupled face " << facei
<< " on patch " << patchi
<< " " << mesh_.boundaryMesh()[patchi].name()
- << " coords:" << UIndirectList<point>(mesh_.points(), f)()
+ << " coords:" << UIndirectList<point>(mesh_.points(), f)
<< " has face area:" << magArea
<< " (coupled) neighbour face area differs:"
<< neiFaceAreas[i]
@@ -4734,7 +4734,7 @@ void Foam::hexRef8::checkMesh() const
<< "Coupled face " << facei
<< " on patch " << patchi
<< " " << mesh_.boundaryMesh()[patchi].name()
- << " coords:" << UIndirectList<point>(mesh_.points(), f)()
+ << " coords:" << UIndirectList<point>(mesh_.points(), f)
<< " has size:" << f.size()
<< " (coupled) neighbour face has size:"
<< nVerts[i]
@@ -4784,7 +4784,7 @@ void Foam::hexRef8::checkMesh() const
<< "Coupled face " << facei
<< " on patch " << patchi
<< " " << mesh_.boundaryMesh()[patchi].name()
- << " coords:" << UIndirectList<point>(mesh_.points(), f)()
+ << " coords:" << UIndirectList<point>(mesh_.points(), f)
<< " has anchor vector:" << anchorVec
<< " (coupled) neighbour face anchor vector differs:"
<< anchorPoints[i]
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
index b8631f8edbbe354d01e0b753f1edda6e568be6a5..7b3f9e7526228da6655b3b661fb28e4b2d501135 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
@@ -115,7 +115,7 @@ Foam::hexRef8Data::hexRef8Data
new labelIOList
(
rio,
- UIndirectList<label>(data.cellLevelPtr_(), cellMap)()
+ labelUIndList(data.cellLevelPtr_(), cellMap)()
)
);
}
@@ -129,7 +129,7 @@ Foam::hexRef8Data::hexRef8Data
new labelIOList
(
rio,
- UIndirectList<label>(data.pointLevelPtr_(), pointMap)()
+ labelUIndList(data.pointLevelPtr_(), pointMap)()
)
);
}
@@ -176,7 +176,7 @@ Foam::hexRef8Data::hexRef8Data
forAll(procDatas, procI)
{
const labelList& procCellLevel = procDatas[procI].cellLevelPtr_();
- UIndirectList<label>(cellLevel, cellMaps[procI]) = procCellLevel;
+ labelUIndList(cellLevel, cellMaps[procI]) = procCellLevel;
}
}
@@ -194,7 +194,7 @@ Foam::hexRef8Data::hexRef8Data
forAll(procDatas, procI)
{
const labelList& procPointLevel = procDatas[procI].pointLevelPtr_();
- UIndirectList<label>(pointLevel, pointMaps[procI]) = procPointLevel;
+ labelUIndList(pointLevel, pointMaps[procI]) = procPointLevel;
}
}
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
index 4c1fd310968a35b53cb22789410ae3bfbcd8d757..4484c7f85241d3b795d77ebb57819d91fa1e4a54 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
@@ -215,7 +215,7 @@ void Foam::enrichedPatch::calcCutFaces() const
const labelList& nextPoints = pp[curPointLabel];
// Pout<< "nextPoints: "
- // << UIndirectList<label>(mp, nextPoints)
+ // << labelUIndList(mp, nextPoints)
// << endl;
// Get the vector along the edge and the right vector
diff --git a/src/fileFormats/ensight/part/ensightCells.C b/src/fileFormats/ensight/part/ensightCells.C
index 13781f0e863df943ffd73c7c60fc95b0d3e6c144..039f62c1cc1fb736cc20487d1401b63c7709999a 100644
--- a/src/fileFormats/ensight/part/ensightCells.C
+++ b/src/fileFormats/ensight/part/ensightCells.C
@@ -230,7 +230,7 @@ void Foam::ensightCells::classify
}
// eg, the processor local cellId
- UList<label> slice = address_[slices_[what]];
+ labelUList slice = address_[slices_[what]];
slice[sizes_[what]] = id;
sizes_[what]++;
diff --git a/src/fileFormats/vtk/output/foamVtkOutput.H b/src/fileFormats/vtk/output/foamVtkOutput.H
index c3632a11913c324ef48890691f1848ae41cc565c..0ad5f384887ca70b9e99991691b375453ec70c34 100644
--- a/src/fileFormats/vtk/output/foamVtkOutput.H
+++ b/src/fileFormats/vtk/output/foamVtkOutput.H
@@ -114,7 +114,7 @@ namespace vtk
(
vtk::formatter& fmt,
const UList<Type>& lst,
- const UList<label>& addressing
+ const labelUList& addressing
);
diff --git a/src/fileFormats/vtk/output/foamVtkOutputTemplates.C b/src/fileFormats/vtk/output/foamVtkOutputTemplates.C
index f28d458378e1fc64d6f7beddd1388f61b0a4b64b..3cc030a3bc3d5c985a41aa9726b82923040faba9 100644
--- a/src/fileFormats/vtk/output/foamVtkOutputTemplates.C
+++ b/src/fileFormats/vtk/output/foamVtkOutputTemplates.C
@@ -73,7 +73,7 @@ void Foam::vtk::writeList
(
vtk::formatter& fmt,
const UList<Type>& lst,
- const UList<label>& addressing
+ const labelUList& addressing
)
{
forAll(addressing, i)
diff --git a/src/functionObjects/field/fluxSummary/fluxSummary.C b/src/functionObjects/field/fluxSummary/fluxSummary.C
index 652f2e414fff1cae5bef6a2b95318d52673e62a9..3b365baa85545897c192f83a18953207b4ffe96e 100644
--- a/src/functionObjects/field/fluxSummary/fluxSummary.C
+++ b/src/functionObjects/field/fluxSummary/fluxSummary.C
@@ -412,7 +412,7 @@ void Foam::functionObjects::fluxSummary::initialiseCellZoneAndDirection
labelList cellAddr(mesh_.nCells(), -1);
const labelList& cellIDs = mesh_.cellZones()[cellZonei];
- UIndirectList<label>(cellAddr, cellIDs) = identity(cellIDs.size());
+ labelUIndList(cellAddr, cellIDs) = identity(cellIDs.size());
labelList nbrFaceCellAddr(mesh_.nFaces() - nInternalFaces, -1);
forAll(pbm, patchi)
diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
index 6a1a6525f6508f3829d507b80ef91f49d2f3ffde..30c327b8ca90eea29e9e856e578be62e7b6c4223 100644
--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
@@ -229,8 +229,7 @@ class regionSizeDistribution
//- Get data in order
template<class Type>
- List<Type> extractData(const UList<label>& keys, const Map<Type>&)
- const;
+ List<Type> extractData(const labelUList& keys, const Map<Type>&) const;
void writeGraph
(
diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistributionTemplates.C b/src/functionObjects/field/regionSizeDistribution/regionSizeDistributionTemplates.C
index 6dd27d8613ef56cf11c4fcfbdf90ba0dd1d6609d..261116779e7b7907a81f6e72c58c82e0e5bcd3aa 100644
--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistributionTemplates.C
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistributionTemplates.C
@@ -63,7 +63,7 @@ Foam::Map<Type> Foam::functionObjects::regionSizeDistribution::regionSum
template<class Type>
Foam::List<Type> Foam::functionObjects::regionSizeDistribution::extractData
(
- const UList<label>& keys,
+ const labelUList& keys,
const Map<Type>& regionData
) const
{
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
index c36123833a3010471984b4dd75492cc0b829f301..73ad3e2c899bff295f96c00b89e7b136e56e6ad3 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
@@ -140,7 +140,7 @@ void Foam::fv::rotorDiskSource::setFaceArea(vector& axis, const bool correct)
// Calculate cell addressing for selected cells
labelList cellAddr(mesh_.nCells(), -1);
- UIndirectList<label>(cellAddr, cells_) = identity(cells_.size());
+ labelUIndList(cellAddr, cells_) = identity(cells_.size());
labelList nbrFaceCellAddr(mesh_.nFaces() - nInternalFaces, -1);
forAll(pbm, patchi)
{
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
index f807ad2dcfe77c5bed11ea30c7a17b4aad64bbb6..1e641cb2e9e285db530b58acf9174d0743b090c3 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
@@ -1353,7 +1353,7 @@ public:
// Pick up faces of cells of faces in set.
labelList growFaceCellFace
(
- const UList<label>& set
+ const labelUList& set
) const;
// Pick up faces of cells of faces in set.
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index b18fcdc66d2572b26b5cfc6b1d000c69600b5140..0503b996b232517e15e6729dddab6edcd4266213 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -693,10 +693,9 @@ Foam::List<Foam::labelPair> Foam::meshRefinement::subsetBaffles
// Mark zone per face
labelList faceToZone(mesh.nFaces(), -1);
- forAll(zoneIDs, i)
+ for (const label zoneID : zoneIDs)
{
- label zoneID = zoneIDs[i];
- UIndirectList<label>(faceToZone, faceZones[zoneID]) = zoneID;
+ labelUIndList(faceToZone, faceZones[zoneID]) = zoneID;
}
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C
index dc87b9376facd72386d0c05a7c13d2d86429c1f8..a98e8822a4ceffdec98a76e09369d9c63500de26 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C
@@ -651,7 +651,7 @@ Foam::label Foam::meshRefinement::markSurfaceGapRefinement
// map.setSize(compactI);
// oppositeInfo.setSize(compactI);
//
-// nearMap = UIndirectList<label>(nearMap, map)();
+// nearMap = labelUIndList(nearMap, map)();
// nearGap = UIndirectList<scalar>(nearGap, map)();
// nearInfo = UIndirectList<pointIndexHit>(nearInfo, map)();
// nearNormal = UIndirectList<vector>(nearNormal, map)();
@@ -675,7 +675,7 @@ Foam::label Foam::meshRefinement::markSurfaceGapRefinement
// << returnReduce(map.size(), sumOp<label>()) << endl;
// map.setSize(compactI);
//
-// nearMap = UIndirectList<label>(nearMap, map)();
+// nearMap = labelUIndList(nearMap, map)();
// nearGap = UIndirectList<scalar>(nearGap, map)();
// nearInfo = UIndirectList<pointIndexHit>(nearInfo, map)();
// oppositeInfo = UIndirectList<pointIndexHit>(oppositeInfo, map)();
@@ -1025,7 +1025,7 @@ void Foam::meshRefinement::selectGapCandidates
shells_.findHigherGapLevel
(
pointField(cellCentres, cellMap),
- UIndirectList<label>(cellLevel, cellMap)(),
+ labelUIndList(cellLevel, cellMap)(),
shellGapInfo,
shellGapMode
);
@@ -1047,7 +1047,7 @@ void Foam::meshRefinement::selectGapCandidates
<< mesh_.globalData().nTotalCells() << endl;
map.setSize(compactI);
- cellMap = UIndirectList<label>(cellMap, map)();
+ cellMap = labelUIndList(cellMap, map)();
shellGapInfo = UIndirectList<FixedList<label, 3>>(shellGapInfo, map)();
shellGapMode = UIndirectList<volumeType>(shellGapMode, map)();
}
@@ -1248,7 +1248,7 @@ Foam::label Foam::meshRefinement::markInternalGapRefinement
rayEnd2.shrink();
gapSize2.shrink();
- cellMap = UIndirectList<label>(cellMap, map)();
+ cellMap = labelUIndList(cellMap, map)();
nearNormal = UIndirectList<vector>(nearNormal, map)();
shellGapInfo.clear();
shellGapMode.clear();
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
index ba70983f591c2c957e9eaa5b15965f0164b064b9..3027ac71f12fbccfd6d0c1b0467800d1c588ed94 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
@@ -826,7 +826,7 @@ namespace Foam
// Pick up faces of cells of faces in set.
Foam::labelList Foam::meshRefinement::growFaceCellFace
(
- const UList<label>& set
+ const labelUList& set
) const
{
boolList selected(mesh_.nFaces(), false);
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
index a9cdcb1f16df1e3839c636a80b8d5be0bafce2b9..e7f9994f869e5935a7b44a31acd19573edbed5dc 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
@@ -1219,7 +1219,7 @@ Foam::label Foam::meshRefinement::markSurfaceCurvatureRefinement
sortedOrder(pNormals, visitOrder, normalLess(pNormals));
pNormals = List<point>(pNormals, visitOrder);
- pLevel = UIndirectList<label>(pLevel, visitOrder);
+ pLevel = labelUIndList(pLevel, visitOrder);
}
// Clear out unnecessary data
diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
index 59d772a5691fa2ba267cf7d125b5de35a5b26491..e30ab66c215e9b03f3954aec5edfa55bb83df570 100644
--- a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -103,7 +103,7 @@ Foam::labelList Foam::refinementSurfaces::findHigherLevel
shells.findHigherLevel
(
samples,
- UIndirectList<label>(surfaceLevel, retestSet)(),
+ labelUIndList(surfaceLevel, retestSet)(),
shellLevel
);
forAll(retestSet, i)
@@ -1435,7 +1435,7 @@ void Foam::refinementSurfaces::findNearest
List<pointIndexHit>& hitInfo
) const
{
- labelList geometries(UIndirectList<label>(surfaces_, surfacesToTest));
+ labelList geometries(labelUIndList(surfaces_, surfacesToTest));
// Do the tests. Note that findNearest returns index in geometries.
searchableSurfacesQueries::findNearest
@@ -1468,7 +1468,7 @@ void Foam::refinementSurfaces::findNearestRegion
labelList& hitRegion
) const
{
- labelList geometries(UIndirectList<label>(surfaces_, surfacesToTest));
+ labelList geometries(labelUIndList(surfaces_, surfacesToTest));
// Do the tests. Note that findNearest returns index in geometries.
List<pointIndexHit> hitInfo;
@@ -1533,7 +1533,7 @@ void Foam::refinementSurfaces::findNearestRegion
vectorField& hitNormal
) const
{
- labelList geometries(UIndirectList<label>(surfaces_, surfacesToTest));
+ labelList geometries(labelUIndList(surfaces_, surfacesToTest));
// Do the tests. Note that findNearest returns index in geometries.
searchableSurfacesQueries::findNearest
@@ -1718,7 +1718,7 @@ void Foam::refinementSurfaces::findNearest
List<pointIndexHit>& hitInfo
) const
{
- labelList geometries(UIndirectList<label>(surfaces_, surfacesToTest));
+ labelList geometries(labelUIndList(surfaces_, surfacesToTest));
// Do the tests. Note that findNearest returns index in geometries.
searchableSurfacesQueries::findNearest
@@ -1757,7 +1757,7 @@ void Foam::refinementSurfaces::findNearestRegion
vectorField& hitNormal
) const
{
- labelList geometries(UIndirectList<label>(surfaces_, surfacesToTest));
+ labelList geometries(labelUIndList(surfaces_, surfacesToTest));
// Do the tests. Note that findNearest returns index in geometries.
searchableSurfacesQueries::findNearest
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index 8516c3db43c9a4ed342387eee045387d4a03d60a..749428302e0ce79d2bad404111fd4658967efcda 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -4347,7 +4347,7 @@ void Foam::snappyLayerDriver::addLayers
{
labelList meshPoints
(
- UIndirectList<label>(candidates, oldPoints)
+ labelUIndList(candidates, oldPoints)
);
label masteri = min(meshPoints);
forAll(meshPoints, i)
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
index fb9190add352cdd27d954bd2e150ba20da047773..4179310609a7aa2e773b97beffa5810cf2076966 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
@@ -679,7 +679,7 @@ void Foam::snappySnapDriver::calcNearestFacePointProperties
pNormals = List<point>(pNormals, visitOrder);
pDisp = List<point>(pDisp, visitOrder);
pFc = List<point>(pFc, visitOrder);
- pFid = UIndirectList<label>(pFid, visitOrder)();
+ pFid = labelUIndList(pFid, visitOrder)();
}
}
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
index 8758a9662ae6928346167f011a4e8e66f5d7c1b1..be1a3b4bbee5def9b893b99faafa84cca260169f 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
@@ -1693,7 +1693,7 @@ void Foam::extendedEdgeMesh::autoMap
const labelList& eNormals = edgeNormals()[edgeI];
labelList& subNormals = subEdgeNormals[subEdgeI];
- subNormals = UIndirectList<label>(reverseNormalMap, eNormals);
+ subNormals = labelUIndList(reverseNormalMap, eNormals);
}
labelListList subPointNormals(pointMap.size());
@@ -1703,7 +1703,7 @@ void Foam::extendedEdgeMesh::autoMap
const labelList& pNormals = featurePointNormals()[pointI];
labelList& subNormals = subPointNormals[subPointI];
- subNormals = UIndirectList<label>(reverseNormalMap, pNormals);
+ subNormals = labelUIndList(reverseNormalMap, pNormals);
}
// Use compaction map to compact normal data
@@ -1793,8 +1793,8 @@ void Foam::extendedEdgeMesh::trim
select(surf, volType, subPointMap, subEdgeMap);
// Update overall point maps
- pointMap = UIndirectList<label>(allPointMap, subPointMap);
- edgeMap = UIndirectList<label>(allEdgeMap, subEdgeMap);
+ pointMap = labelUIndList(allPointMap, subPointMap);
+ edgeMap = labelUIndList(allEdgeMap, subEdgeMap);
// Extract current point and edge status
List<edgeStatus> edgeStat(edges().size());
@@ -1836,8 +1836,8 @@ void Foam::extendedEdgeMesh::trim
);
// Update the overall pointMap, edgeMap
- pointMap = UIndirectList<label>(pointMap, sortedToOriginalPoint)();
- edgeMap = UIndirectList<label>(edgeMap, sortedToOriginalEdge)();
+ pointMap = labelUIndList(pointMap, sortedToOriginalPoint)();
+ edgeMap = labelUIndList(edgeMap, sortedToOriginalEdge)();
}
@@ -1992,7 +1992,7 @@ bool Foam::extendedEdgeMesh::mergePointsAndSort
sortedToOriginalPoint,
edgeMap // point merging above did not affect edge order
);
- pointMap = UIndirectList<label>(pointMap, sortedToOriginalPoint)();
+ pointMap = labelUIndList(pointMap, sortedToOriginalPoint)();
return nNewPoints != nOldPoints;
}
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index bf2a0801932536844c4ab31094d6a8126ba65a8c..b3bd43d4b38cb07f3797b790d3eeeb7dc706c611 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
@@ -634,8 +634,8 @@ void Foam::mappedPatchBase::calcMapping() const
);
// Insert
- UIndirectList<label>(sampleProcs, subMap) = subSampleProcs;
- UIndirectList<label>(sampleIndices, subMap) = subSampleIndices;
+ labelUIndList(sampleProcs, subMap) = subSampleProcs;
+ labelUIndList(sampleIndices, subMap) = subSampleIndices;
UIndirectList<point>(sampleLocations, subMap) = subSampleLocations;
}
}
@@ -697,16 +697,8 @@ void Foam::mappedPatchBase::calcMapping() const
forAll(subMap, proci)
{
- subMap[proci] = UIndirectList<label>
- (
- sampleIndices,
- subMap[proci]
- );
- constructMap[proci] = UIndirectList<label>
- (
- patchFaces,
- constructMap[proci]
- );
+ subMap[proci] = labelUIndList(sampleIndices, subMap[proci]);
+ constructMap[proci] = labelUIndList(patchFaces, constructMap[proci]);
//if (debug)
//{
diff --git a/src/meshTools/meshTools/meshTools.C b/src/meshTools/meshTools/meshTools.C
index dca4246471c5d0d07b6c426c363a42a85f57e8a5..cb90a991c9995729a236f7edcc0ef7a367180f8e 100644
--- a/src/meshTools/meshTools/meshTools.C
+++ b/src/meshTools/meshTools/meshTools.C
@@ -550,7 +550,7 @@ Foam::label Foam::meshTools::otherEdge
FatalErrorInFunction
<< "Can not find edge in "
- << UIndirectList<edge>(mesh.edges(), edgeLabels)()
+ << UIndirectList<edge>(mesh.edges(), edgeLabels)
<< " connected to edge "
<< thisEdgeI << " with vertices " << mesh.edges()[thisEdgeI]
<< " on side " << thisVertI << abort(FatalError);
diff --git a/src/meshTools/sets/topoSets/cellSet.C b/src/meshTools/sets/topoSets/cellSet.C
index 32a9506f3925db3c58382deef656ad9143ff4390..d98ab34dfeacb47589ba090f1d8ff5e4749c8131 100644
--- a/src/meshTools/sets/topoSets/cellSet.C
+++ b/src/meshTools/sets/topoSets/cellSet.C
@@ -104,7 +104,7 @@ Foam::cellSet::cellSet
(
const polyMesh& mesh,
const word& name,
- const UList<label>& set,
+ const labelUList& set,
writeOption w
)
:
diff --git a/src/meshTools/sets/topoSets/cellSet.H b/src/meshTools/sets/topoSets/cellSet.H
index da1dc407d26b0170e4fc9967cd2c5195e6d88b72..adb7f8edb1d718bd7e7aa64b4f2d944788556b89 100644
--- a/src/meshTools/sets/topoSets/cellSet.H
+++ b/src/meshTools/sets/topoSets/cellSet.H
@@ -108,7 +108,7 @@ public:
(
const polyMesh& mesh,
const word& name,
- const UList<label>& set,
+ const labelUList& set,
writeOption w=NO_WRITE
);
diff --git a/src/meshTools/sets/topoSets/cellZoneSet.C b/src/meshTools/sets/topoSets/cellZoneSet.C
index 4892ff617a5a2736609493bda56cf2474a873e17..2e08f62348bf4f6d5f2cfd415ee8354ce1395b7a 100644
--- a/src/meshTools/sets/topoSets/cellZoneSet.C
+++ b/src/meshTools/sets/topoSets/cellZoneSet.C
@@ -29,23 +29,20 @@ License
#include "addToRunTimeSelectionTable.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
defineTypeNameAndDebug(cellZoneSet, 0);
addToRunTimeSelectionTable(topoSet, cellZoneSet, word);
addToRunTimeSelectionTable(topoSet, cellZoneSet, size);
addToRunTimeSelectionTable(topoSet, cellZoneSet, set);
-
+}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-void cellZoneSet::updateSet()
+void Foam::cellZoneSet::updateSet()
{
labelList order;
sortedOrder(addressing_, order);
@@ -60,9 +57,9 @@ void cellZoneSet::updateSet()
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-cellZoneSet::cellZoneSet
+Foam::cellZoneSet::cellZoneSet
(
const polyMesh& mesh,
const word& name,
@@ -94,7 +91,7 @@ cellZoneSet::cellZoneSet
}
-cellZoneSet::cellZoneSet
+Foam::cellZoneSet::cellZoneSet
(
const polyMesh& mesh,
const word& name,
@@ -110,7 +107,7 @@ cellZoneSet::cellZoneSet
}
-cellZoneSet::cellZoneSet
+Foam::cellZoneSet::cellZoneSet
(
const polyMesh& mesh,
const word& name,
@@ -128,13 +125,13 @@ cellZoneSet::cellZoneSet
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-cellZoneSet::~cellZoneSet()
+Foam::cellZoneSet::~cellZoneSet()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void cellZoneSet::invert(const label maxLen)
+void Foam::cellZoneSet::invert(const label maxLen)
{
// Count
label n = 0;
@@ -164,7 +161,7 @@ void cellZoneSet::invert(const label maxLen)
}
-void cellZoneSet::subset(const topoSet& set)
+void Foam::cellZoneSet::subset(const topoSet& set)
{
DynamicList<label> newAddressing(addressing_.size());
@@ -185,7 +182,7 @@ void cellZoneSet::subset(const topoSet& set)
}
-void cellZoneSet::addSet(const topoSet& set)
+void Foam::cellZoneSet::addSet(const topoSet& set)
{
DynamicList<label> newAddressing(addressing_);
@@ -206,7 +203,7 @@ void cellZoneSet::addSet(const topoSet& set)
}
-void cellZoneSet::deleteSet(const topoSet& set)
+void Foam::cellZoneSet::deleteSet(const topoSet& set)
{
DynamicList<label> newAddressing(addressing_.size());
@@ -228,7 +225,7 @@ void cellZoneSet::deleteSet(const topoSet& set)
}
-void cellZoneSet::sync(const polyMesh& mesh)
+void Foam::cellZoneSet::sync(const polyMesh& mesh)
{
cellSet::sync(mesh);
@@ -238,13 +235,13 @@ void cellZoneSet::sync(const polyMesh& mesh)
}
-label cellZoneSet::maxSize(const polyMesh& mesh) const
+Foam::label Foam::cellZoneSet::maxSize(const polyMesh& mesh) const
{
return mesh.nCells();
}
-bool cellZoneSet::writeObject
+bool Foam::cellZoneSet::writeObject
(
IOstream::streamFormat s,
IOstream::versionNumber v,
@@ -289,7 +286,7 @@ bool cellZoneSet::writeObject
}
-void cellZoneSet::updateMesh(const mapPolyMesh& morphMap)
+void Foam::cellZoneSet::updateMesh(const mapPolyMesh& morphMap)
{
// cellZone
labelList newAddressing(addressing_.size());
@@ -313,7 +310,7 @@ void cellZoneSet::updateMesh(const mapPolyMesh& morphMap)
}
-void cellZoneSet::writeDebug
+void Foam::cellZoneSet::writeDebug
(
Ostream& os,
const primitiveMesh& mesh,
@@ -324,8 +321,4 @@ void cellZoneSet::writeDebug
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/meshTools/sets/topoSets/faceSet.C b/src/meshTools/sets/topoSets/faceSet.C
index 4d9c25640be866fb3addf784505c9010b77141a6..afeebccbf4909ef13746be72bd66af1c3aa50f23 100644
--- a/src/meshTools/sets/topoSets/faceSet.C
+++ b/src/meshTools/sets/topoSets/faceSet.C
@@ -104,7 +104,7 @@ Foam::faceSet::faceSet
(
const polyMesh& mesh,
const word& name,
- const UList<label>& set,
+ const labelUList& set,
writeOption w
)
:
diff --git a/src/meshTools/sets/topoSets/faceSet.H b/src/meshTools/sets/topoSets/faceSet.H
index 7653db16208595a46fa3d0930e00dac2af819b7b..02d9f42331989ade3a5101e742654c040e617efe 100644
--- a/src/meshTools/sets/topoSets/faceSet.H
+++ b/src/meshTools/sets/topoSets/faceSet.H
@@ -103,7 +103,7 @@ public:
(
const polyMesh& mesh,
const word& name,
- const UList<label>& set,
+ const labelUList& set,
writeOption w=NO_WRITE
);
diff --git a/src/meshTools/sets/topoSets/faceZoneSet.C b/src/meshTools/sets/topoSets/faceZoneSet.C
index 39561a939e0adba6c416e06554f227dba744b572..1f7d2d103913c2416fc9f70e0c462a61e7b43a4d 100644
--- a/src/meshTools/sets/topoSets/faceZoneSet.C
+++ b/src/meshTools/sets/topoSets/faceZoneSet.C
@@ -32,28 +32,25 @@ License
#include "addToRunTimeSelectionTable.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
defineTypeNameAndDebug(faceZoneSet, 0);
addToRunTimeSelectionTable(topoSet, faceZoneSet, word);
addToRunTimeSelectionTable(topoSet, faceZoneSet, size);
addToRunTimeSelectionTable(topoSet, faceZoneSet, set);
-
+}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-void faceZoneSet::updateSet()
+void Foam::faceZoneSet::updateSet()
{
labelList order;
sortedOrder(addressing_, order);
- addressing_ = UIndirectList<label>(addressing_, order)();
- flipMap_ = UIndirectList<bool>(flipMap_, order)();
+ addressing_ = labelUIndList(addressing_, order)();
+ flipMap_ = boolUIndList(flipMap_, order)();
faceSet::clearStorage();
faceSet::resize(2*addressing_.size());
@@ -64,9 +61,9 @@ void faceZoneSet::updateSet()
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-faceZoneSet::faceZoneSet
+Foam::faceZoneSet::faceZoneSet
(
const polyMesh& mesh,
const word& name,
@@ -100,7 +97,7 @@ faceZoneSet::faceZoneSet
}
-faceZoneSet::faceZoneSet
+Foam::faceZoneSet::faceZoneSet
(
const polyMesh& mesh,
const word& name,
@@ -117,7 +114,7 @@ faceZoneSet::faceZoneSet
}
-faceZoneSet::faceZoneSet
+Foam::faceZoneSet::faceZoneSet
(
const polyMesh& mesh,
const word& name,
@@ -136,13 +133,13 @@ faceZoneSet::faceZoneSet
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-faceZoneSet::~faceZoneSet()
+Foam::faceZoneSet::~faceZoneSet()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void faceZoneSet::invert(const label maxLen)
+void Foam::faceZoneSet::invert(const label maxLen)
{
// Count
label n = 0;
@@ -173,7 +170,7 @@ void faceZoneSet::invert(const label maxLen)
}
-void faceZoneSet::subset(const topoSet& set)
+void Foam::faceZoneSet::subset(const topoSet& set)
{
label nConflict = 0;
@@ -221,7 +218,7 @@ void faceZoneSet::subset(const topoSet& set)
}
-void faceZoneSet::addSet(const topoSet& set)
+void Foam::faceZoneSet::addSet(const topoSet& set)
{
label nConflict = 0;
@@ -272,7 +269,7 @@ void faceZoneSet::addSet(const topoSet& set)
}
-void faceZoneSet::deleteSet(const topoSet& set)
+void Foam::faceZoneSet::deleteSet(const topoSet& set)
{
label nConflict = 0;
@@ -324,7 +321,7 @@ void faceZoneSet::deleteSet(const topoSet& set)
}
-void faceZoneSet::sync(const polyMesh& mesh)
+void Foam::faceZoneSet::sync(const polyMesh& mesh)
{
// Make sure that the faceZone is consistent with the faceSet
{
@@ -453,13 +450,13 @@ void faceZoneSet::sync(const polyMesh& mesh)
}
-label faceZoneSet::maxSize(const polyMesh& mesh) const
+Foam::label Foam::faceZoneSet::maxSize(const polyMesh& mesh) const
{
return mesh.nFaces();
}
-bool faceZoneSet::writeObject
+bool Foam::faceZoneSet::writeObject
(
IOstream::streamFormat s,
IOstream::versionNumber v,
@@ -505,7 +502,7 @@ bool faceZoneSet::writeObject
}
-void faceZoneSet::updateMesh(const mapPolyMesh& morphMap)
+void Foam::faceZoneSet::updateMesh(const mapPolyMesh& morphMap)
{
// faceZone
labelList newAddressing(addressing_.size());
@@ -533,7 +530,7 @@ void faceZoneSet::updateMesh(const mapPolyMesh& morphMap)
}
-void faceZoneSet::writeDebug
+void Foam::faceZoneSet::writeDebug
(
Ostream& os,
const primitiveMesh& mesh,
@@ -544,8 +541,4 @@ void faceZoneSet::writeDebug
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/meshTools/sets/topoSets/pointSet.C b/src/meshTools/sets/topoSets/pointSet.C
index 32d1d90f9b85edde5793b8332fd9f17529af2660..01ffabfca27c5ae90722b75825e2f544188a5fcc 100644
--- a/src/meshTools/sets/topoSets/pointSet.C
+++ b/src/meshTools/sets/topoSets/pointSet.C
@@ -103,7 +103,7 @@ Foam::pointSet::pointSet
(
const polyMesh& mesh,
const word& name,
- const UList<label>& set,
+ const labelUList& set,
writeOption w
)
:
diff --git a/src/meshTools/sets/topoSets/pointSet.H b/src/meshTools/sets/topoSets/pointSet.H
index 4f4025adc8b4aca55c1fc251c7a25fa471b0e804..d9909ed34dc213fe3168ea4e703b1c26c09ac876 100644
--- a/src/meshTools/sets/topoSets/pointSet.H
+++ b/src/meshTools/sets/topoSets/pointSet.H
@@ -104,7 +104,7 @@ public:
(
const polyMesh& mesh,
const word& name,
- const UList<label>& set,
+ const labelUList& set,
writeOption w=NO_WRITE
);
diff --git a/src/meshTools/sets/topoSets/pointZoneSet.C b/src/meshTools/sets/topoSets/pointZoneSet.C
index 3c8989c5f795e15dfef67d729208936bb23ca2b7..91675d815572bf6c7d92fdc061155b0206aee632 100644
--- a/src/meshTools/sets/topoSets/pointZoneSet.C
+++ b/src/meshTools/sets/topoSets/pointZoneSet.C
@@ -31,23 +31,20 @@ License
#include "addToRunTimeSelectionTable.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
defineTypeNameAndDebug(pointZoneSet, 0);
addToRunTimeSelectionTable(topoSet, pointZoneSet, word);
addToRunTimeSelectionTable(topoSet, pointZoneSet, size);
addToRunTimeSelectionTable(topoSet, pointZoneSet, set);
-
+}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-void pointZoneSet::updateSet()
+void Foam::pointZoneSet::updateSet()
{
labelList order;
sortedOrder(addressing_, order);
@@ -62,9 +59,9 @@ void pointZoneSet::updateSet()
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-pointZoneSet::pointZoneSet
+Foam::pointZoneSet::pointZoneSet
(
const polyMesh& mesh,
const word& name,
@@ -96,7 +93,7 @@ pointZoneSet::pointZoneSet
}
-pointZoneSet::pointZoneSet
+Foam::pointZoneSet::pointZoneSet
(
const polyMesh& mesh,
const word& name,
@@ -112,7 +109,7 @@ pointZoneSet::pointZoneSet
}
-pointZoneSet::pointZoneSet
+Foam::pointZoneSet::pointZoneSet
(
const polyMesh& mesh,
const word& name,
@@ -130,13 +127,13 @@ pointZoneSet::pointZoneSet
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-pointZoneSet::~pointZoneSet()
+Foam::pointZoneSet::~pointZoneSet()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void pointZoneSet::invert(const label maxLen)
+void Foam::pointZoneSet::invert(const label maxLen)
{
// Count
label n = 0;
@@ -165,7 +162,7 @@ void pointZoneSet::invert(const label maxLen)
}
-void pointZoneSet::subset(const topoSet& set)
+void Foam::pointZoneSet::subset(const topoSet& set)
{
DynamicList<label> newAddressing(addressing_.size());
@@ -186,7 +183,7 @@ void pointZoneSet::subset(const topoSet& set)
}
-void pointZoneSet::addSet(const topoSet& set)
+void Foam::pointZoneSet::addSet(const topoSet& set)
{
DynamicList<label> newAddressing(addressing_);
@@ -207,7 +204,7 @@ void pointZoneSet::addSet(const topoSet& set)
}
-void pointZoneSet::deleteSet(const topoSet& set)
+void Foam::pointZoneSet::deleteSet(const topoSet& set)
{
DynamicList<label> newAddressing(addressing_.size());
@@ -229,7 +226,7 @@ void pointZoneSet::deleteSet(const topoSet& set)
}
-void pointZoneSet::sync(const polyMesh& mesh)
+void Foam::pointZoneSet::sync(const polyMesh& mesh)
{
pointSet::sync(mesh);
@@ -239,13 +236,13 @@ void pointZoneSet::sync(const polyMesh& mesh)
}
-label pointZoneSet::maxSize(const polyMesh& mesh) const
+Foam::label Foam::pointZoneSet::maxSize(const polyMesh& mesh) const
{
return mesh.nPoints();
}
-bool pointZoneSet::writeObject
+bool Foam::pointZoneSet::writeObject
(
IOstream::streamFormat s,
IOstream::versionNumber v,
@@ -290,7 +287,7 @@ bool pointZoneSet::writeObject
}
-void pointZoneSet::updateMesh(const mapPolyMesh& morphMap)
+void Foam::pointZoneSet::updateMesh(const mapPolyMesh& morphMap)
{
// pointZone
labelList newAddressing(addressing_.size());
@@ -314,7 +311,7 @@ void pointZoneSet::updateMesh(const mapPolyMesh& morphMap)
}
-void pointZoneSet::writeDebug
+void Foam::pointZoneSet::writeDebug
(
Ostream& os,
const primitiveMesh& mesh,
@@ -325,8 +322,4 @@ void pointZoneSet::writeDebug
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/meshTools/sets/topoSets/topoSet.C b/src/meshTools/sets/topoSets/topoSet.C
index b7e574ddcddd1475eb42d301ee0472454fa8e141..fc4ddd2e192b6f5042b1df7e7d1e5d5c2d621cbd 100644
--- a/src/meshTools/sets/topoSets/topoSet.C
+++ b/src/meshTools/sets/topoSets/topoSet.C
@@ -430,7 +430,7 @@ Foam::topoSet::topoSet
(
const polyMesh& mesh,
const word& name,
- const UList<label>& set,
+ const labelUList& set,
writeOption w
)
:
diff --git a/src/meshTools/sets/topoSets/topoSet.H b/src/meshTools/sets/topoSets/topoSet.H
index 7a8ecbae92c98caad0db035226484ff1bc625287..adde26e085a56dc374ec6dade7781c6919fefb36 100644
--- a/src/meshTools/sets/topoSets/topoSet.H
+++ b/src/meshTools/sets/topoSets/topoSet.H
@@ -51,7 +51,6 @@ SourceFiles
namespace Foam
{
-
class mapPolyMesh;
class polyMesh;
class primitiveMesh;
@@ -239,7 +238,7 @@ public:
(
const polyMesh& mesh,
const word& name,
- const UList<label>&,
+ const labelUList& set,
writeOption w=NO_WRITE
);
diff --git a/src/meshTools/triSurface/faceTriangulation/faceTriangulation.C b/src/meshTools/triSurface/faceTriangulation/faceTriangulation.C
index c34dbb1ac5b53dadd1b574ed81810e9dfd6a3bdb..c083f60146787e2f8879ec4aa068542444acfdf6 100644
--- a/src/meshTools/triSurface/faceTriangulation/faceTriangulation.C
+++ b/src/meshTools/triSurface/faceTriangulation/faceTriangulation.C
@@ -418,7 +418,7 @@ bool Foam::faceTriangulation::split
{
WarningInFunction
<< "Illegal face:" << f
- << " with points " << UIndirectList<point>(points, f)()
+ << " with points " << UIndirectList<point>(points, f)
<< endl;
return false;
@@ -494,7 +494,7 @@ bool Foam::faceTriangulation::split
WarningInFunction
<< "Cannot find valid diagonal on face " << f
- << " with points " << UIndirectList<point>(points, f)()
+ << " with points " << UIndirectList<point>(points, f)
<< nl
<< "Returning naive triangulation starting from "
<< f[maxIndex] << " which might not be correct for a"
@@ -521,7 +521,7 @@ bool Foam::faceTriangulation::split
{
WarningInFunction
<< "Cannot find valid diagonal on face " << f
- << " with points " << UIndirectList<point>(points, f)()
+ << " with points " << UIndirectList<point>(points, f)
<< nl
<< "Returning empty triFaceList" << endl;
@@ -553,7 +553,7 @@ bool Foam::faceTriangulation::split
{
FatalErrorInFunction
<< "Illegal split of face:" << f
- << " with points " << UIndirectList<point>(points, f)()
+ << " with points " << UIndirectList<point>(points, f)
<< " at indices " << index1 << " and " << index2
<< abort(FatalError);
}
diff --git a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
index d22979477cf602c50ddaf6318f599d33a75f9af4..85c20494d7038fc188e459cee1d419eb943c0dd1 100644
--- a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
+++ b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
@@ -381,7 +381,7 @@ void Foam::cellCellStencils::cellVolumeWeight::findHoles
Pstream::listCombineScatter(regionType);
// Communicate region status through interpolative cells
- labelList cellRegionType(UIndirectList<label>(regionType, cellRegion));
+ labelList cellRegionType(labelUIndList(regionType, cellRegion));
map.distribute(cellRegionType);
@@ -643,11 +643,7 @@ void Foam::cellCellStencils::cellVolumeWeight::combineCellTypes
{
allWeights[cellI] = weights[subCellI];
allStencil[cellI] =
- UIndirectList<label>
- (
- otherCells,
- addressing[subCellI]
- );
+ labelUIndList(otherCells, addressing[subCellI]);
allDonorID[cellI] = donorZoneID;
}
}
@@ -802,7 +798,7 @@ bool Foam::cellCellStencils::cellVolumeWeight::update()
(
mapper.tgtMap(), // How to get remote data local
mapper.srcToTgtCellAddr(),
- labelList(UIndirectList<label>(allPatchTypes, tgtCellMap)),
+ labelList(labelUIndList(allPatchTypes, tgtCellMap)),
interpolatedTgtPatchTypes
);
@@ -847,7 +843,7 @@ bool Foam::cellCellStencils::cellVolumeWeight::update()
(
mapper.srcMap(), // How to get remote data local
mapper.tgtToSrcCellAddr(),
- labelList(UIndirectList<label>(allPatchTypes, srcCellMap)),
+ labelList(labelUIndList(allPatchTypes, srcCellMap)),
interpolatedSrcPatchTypes
);
@@ -1073,7 +1069,7 @@ bool Foam::cellCellStencils::cellVolumeWeight::update()
Pout<< "cellI:" << cellI << " at:"
<< mesh_.cellCentres()[cellI]
<< " calculated from slots:" << slots
- << " cc:" << UIndirectList<point>(cc, slots)()
+ << " cc:" << UIndirectList<point>(cc, slots)
<< " weights:" << cellInterpolationWeights_[cellI]
<< endl;
diff --git a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
index 8e7c96247e5d21c640bd34a5ea8c45e8e594e56f..eb0d12915947bb00da7d9cb95b247efa0b871bcc 100644
--- a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
+++ b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
@@ -1087,7 +1087,7 @@ void Foam::cellCellStencils::inverseDistance::findHoles
DebugInfo<< FUNCTION_NAME << " : Gathered region type" << endl;
// Communicate region status through interpolative cells
- labelList cellRegionType(UIndirectList<label>(regionType, cellRegion));
+ labelList cellRegionType(labelUIndList(regionType, cellRegion));
map.distribute(cellRegionType);
DebugInfo<< FUNCTION_NAME << " : Interpolated region type" << endl;
diff --git a/src/parallel/decompose/decompositionMethods/metisLikeDecomp/metisLikeDecomp.C b/src/parallel/decompose/decompositionMethods/metisLikeDecomp/metisLikeDecomp.C
index 232a351f5966e0cac4d11079c0ff61789e549805..02d283c5482edf73e2880748b9815757aca93e02 100644
--- a/src/parallel/decompose/decompositionMethods/metisLikeDecomp/metisLikeDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/metisLikeDecomp/metisLikeDecomp.C
@@ -31,8 +31,8 @@ License
Foam::label Foam::metisLikeDecomp::decomposeGeneral
(
- const UList<label>& adjncy,
- const UList<label>& xadj,
+ const labelUList& adjncy,
+ const labelUList& xadj,
const UList<scalar>& cWeights,
List<label>& decomp
)
diff --git a/src/parallel/decompose/decompositionMethods/metisLikeDecomp/metisLikeDecomp.H b/src/parallel/decompose/decompositionMethods/metisLikeDecomp/metisLikeDecomp.H
index 8c8a6c9e87f12fda6e78d7732645eb901450c97c..27b81bf3e68747a7611af162cde9a49b6a41d377 100644
--- a/src/parallel/decompose/decompositionMethods/metisLikeDecomp/metisLikeDecomp.H
+++ b/src/parallel/decompose/decompositionMethods/metisLikeDecomp/metisLikeDecomp.H
@@ -65,8 +65,8 @@ protected:
//- Serial and/or collect/distribute for parallel operation
virtual label decomposeGeneral
(
- const UList<label>& adjncy,
- const UList<label>& xadj,
+ const labelUList& adjncy,
+ const labelUList& xadj,
const UList<scalar>& cellWeights,
List<label>& decomp
);
@@ -74,8 +74,8 @@ protected:
//- Decomposition with metis-like parameters
virtual label decomposeSerial
(
- const UList<label>& adjncy,
- const UList<label>& xadj,
+ const labelUList& adjncy,
+ const labelUList& xadj,
const UList<scalar>& cellWeights,
List<label>& decomp
) = 0;
diff --git a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
index e90406009c96e2319bd7cd636fa069f996ef99c3..1bdc02aea9d1dbc0d89c3b5adb920a788e7e9107 100644
--- a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
@@ -207,7 +207,7 @@ void Foam::multiLevelDecomp::decompose
// Subset point-wise data.
pointField subPoints(points, domainPoints);
scalarField subWeights(pointWeights, domainPoints);
- labelList subPointMap(UIndirectList<label>(pointMap, domainPoints));
+ labelList subPointMap(labelUIndList(pointMap, domainPoints));
// Subset point-point addressing (adapt global numbering)
labelListList subPointPoints;
labelList nOutsideConnections;
diff --git a/src/parallel/decompose/kahipDecomp/kahipDecomp.C b/src/parallel/decompose/kahipDecomp/kahipDecomp.C
index 55cba9cfc38406e1b44a49f8cfb30949cf5b2f47..2bf6d8840577d14f70efacc3909d069e36dcc31d 100644
--- a/src/parallel/decompose/kahipDecomp/kahipDecomp.C
+++ b/src/parallel/decompose/kahipDecomp/kahipDecomp.C
@@ -61,8 +61,8 @@ Foam::kahipDecomp::configNames
Foam::label Foam::kahipDecomp::decomposeSerial
(
- const UList<label>& adjncy,
- const UList<label>& xadj,
+ const labelUList& adjncy,
+ const labelUList& xadj,
const UList<scalar>& cWeights,
List<label>& decomp
)
diff --git a/src/parallel/decompose/kahipDecomp/kahipDecomp.H b/src/parallel/decompose/kahipDecomp/kahipDecomp.H
index 37cd4b574c6c168dd12b3a8ee50baa4fce83190d..c399a68e01043043cc5bd8893b000113af7a6315 100644
--- a/src/parallel/decompose/kahipDecomp/kahipDecomp.H
+++ b/src/parallel/decompose/kahipDecomp/kahipDecomp.H
@@ -78,8 +78,8 @@ class kahipDecomp
//- Call kahip with options from dictionary.
virtual label decomposeSerial
(
- const UList<label>& adjncy,
- const UList<label>& xadj,
+ const labelUList& adjncy,
+ const labelUList& xadj,
const UList<scalar>& cellWeights,
List<label>& decomp
);
diff --git a/src/parallel/decompose/metisDecomp/metisDecomp.C b/src/parallel/decompose/metisDecomp/metisDecomp.C
index 3822a0a31e25c092fdc5cbdab0525683b64f37bd..efd0d64b1fa3165c51bcba85de9efa8411e0d00e 100644
--- a/src/parallel/decompose/metisDecomp/metisDecomp.C
+++ b/src/parallel/decompose/metisDecomp/metisDecomp.C
@@ -47,8 +47,8 @@ namespace Foam
Foam::label Foam::metisDecomp::decomposeSerial
(
- const UList<label>& adjncy,
- const UList<label>& xadj,
+ const labelUList& adjncy,
+ const labelUList& xadj,
const UList<scalar>& cWeights,
List<label>& decomp
)
@@ -174,8 +174,8 @@ Foam::label Foam::metisDecomp::decomposeSerial
(
&numCells, // num vertices in graph
&ncon, // num balancing constraints
- const_cast<UList<label>&>(xadj).begin(), // indexing into adjncy
- const_cast<UList<label>&>(adjncy).begin(), // neighbour info
+ const_cast<labelUList&>(xadj).begin(), // indexing into adjncy
+ const_cast<labelUList&>(adjncy).begin(), // neighbour info
cellWeights.begin(),// vertex wts
nullptr, // vsize: total communication vol
faceWeights.begin(),// edge wts
@@ -193,8 +193,8 @@ Foam::label Foam::metisDecomp::decomposeSerial
(
&numCells, // num vertices in graph
&ncon, // num balancing constraints
- const_cast<UList<label>&>(xadj).begin(), // indexing into adjncy
- const_cast<UList<label>&>(adjncy).begin(), // neighbour info
+ const_cast<labelUList&>(xadj).begin(), // indexing into adjncy
+ const_cast<labelUList&>(adjncy).begin(), // neighbour info
cellWeights.begin(),// vertex wts
nullptr, // vsize: total communication vol
faceWeights.begin(),// edge wts
diff --git a/src/parallel/decompose/metisDecomp/metisDecomp.H b/src/parallel/decompose/metisDecomp/metisDecomp.H
index a851b0496b5cb6d937f94060e43e45128c64b784..d037fab95fecd93e5276f240cb30fcc626cbcdae 100644
--- a/src/parallel/decompose/metisDecomp/metisDecomp.H
+++ b/src/parallel/decompose/metisDecomp/metisDecomp.H
@@ -77,8 +77,8 @@ class metisDecomp
//- Call Metis with options from dictionary.
virtual label decomposeSerial
(
- const UList<label>& adjncy,
- const UList<label>& xadj,
+ const labelUList& adjncy,
+ const labelUList& xadj,
const UList<scalar>& cellWeights,
List<label>& decomp
);
diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
index 0f6d6a05560ed36955e4f5a51f0dc5c9ae997cf6..610de99d68ae08056909258ebf7ebb03e42961f1 100644
--- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
+++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
@@ -253,8 +253,8 @@ void Foam::ptscotchDecomp::check(const int retVal, const char* str)
////- Does prevention of 0 cell domains and calls ptscotch.
//Foam::label Foam::ptscotchDecomp::decomposeZeroDomains
//(
-// const UList<label>& initadjncy,
-// const UList<label>& initxadj,
+// const labelUList& initadjncy,
+// const labelUList& initxadj,
// const UList<scalar>& initcWeights,
// List<label>& finalDecomp
//) const
@@ -441,8 +441,8 @@ void Foam::ptscotchDecomp::check(const int retVal, const char* str)
Foam::label Foam::ptscotchDecomp::decompose
(
- const UList<label>& adjncy,
- const UList<label>& xadj,
+ const labelUList& adjncy,
+ const labelUList& xadj,
const UList<scalar>& cWeights,
List<label>& finalDecomp
) const
diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
index 039dd511d01baae1da7f6c67fcee572e3b64493e..a9146ae9e6ffb920872d42f5f8272b3786765851 100644
--- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
+++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
@@ -81,8 +81,8 @@ class ptscotchDecomp
//- Decompose. Handles size 0 arrays
label decompose
(
- const UList<label>& adjncy,
- const UList<label>& xadj,
+ const labelUList& adjncy,
+ const labelUList& xadj,
const UList<scalar>& cWeights,
List<label>& finalDecomp
) const;
diff --git a/src/parallel/decompose/scotchDecomp/scotchDecomp.C b/src/parallel/decompose/scotchDecomp/scotchDecomp.C
index faea40b866832bcc6d139c3f400a4d2d3f3781b5..88f14fac7caf97de1f98830116d2fc4770bef8ba 100644
--- a/src/parallel/decompose/scotchDecomp/scotchDecomp.C
+++ b/src/parallel/decompose/scotchDecomp/scotchDecomp.C
@@ -178,8 +178,8 @@ void Foam::scotchDecomp::check(const int retVal, const char* str)
Foam::label Foam::scotchDecomp::decomposeSerial
(
- const UList<label>& adjncy,
- const UList<label>& xadj,
+ const labelUList& adjncy,
+ const labelUList& xadj,
const UList<scalar>& cWeights,
List<label>& decomp
)
diff --git a/src/parallel/decompose/scotchDecomp/scotchDecomp.H b/src/parallel/decompose/scotchDecomp/scotchDecomp.H
index 7a44f095f27376f31e492fa31bf6ecf9369e999d..ca182253d7ccce272342dcd07585fa5a835f9772 100644
--- a/src/parallel/decompose/scotchDecomp/scotchDecomp.H
+++ b/src/parallel/decompose/scotchDecomp/scotchDecomp.H
@@ -243,8 +243,8 @@ class scotchDecomp
//- Decompose non-parallel
virtual label decomposeSerial
(
- const UList<label>& adjncy,
- const UList<label>& xadj,
+ const labelUList& adjncy,
+ const labelUList& xadj,
const UList<scalar>& cWeights,
List<label>& decomp
);
diff --git a/src/sampling/graphField/makeGraph.C b/src/sampling/graphField/makeGraph.C
index 3922983fa46f4a7790011bb31276211cf6646485..2229996ccfaf2f94541fdd5125cde24659134885 100644
--- a/src/sampling/graphField/makeGraph.C
+++ b/src/sampling/graphField/makeGraph.C
@@ -38,12 +38,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-void makeGraph
+void Foam::makeGraph
(
const scalarField& x,
const volScalarField& vsf,
@@ -54,7 +49,7 @@ void makeGraph
}
-void makeGraph
+void Foam::makeGraph
(
const scalarField& x,
const volScalarField& vsf,
@@ -76,7 +71,7 @@ void makeGraph
}
-void makeGraph
+void Foam::makeGraph
(
const scalarField& x,
const scalarField& sf,
@@ -96,8 +91,4 @@ void makeGraph
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/sampling/graphField/writeCellGraph.C b/src/sampling/graphField/writeCellGraph.C
index 535e2c3434f7bd0beaf5ff1633c83e1cb30e54b4..4eac282b7aa091411e0039ceadda66af0544b15a 100644
--- a/src/sampling/graphField/writeCellGraph.C
+++ b/src/sampling/graphField/writeCellGraph.C
@@ -5,12 +5,7 @@
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-void writeCellGraph
+void Foam::writeCellGraph
(
const volScalarField& vsf,
const word& graphFormat
@@ -30,8 +25,4 @@ void writeCellGraph
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/sampling/graphField/writePatchGraph.C b/src/sampling/graphField/writePatchGraph.C
index 9b9627f5028d6a73c781bb171130c99f16fb76fa..be2ded336016b068d574b391eb7ed7a900971cb6 100644
--- a/src/sampling/graphField/writePatchGraph.C
+++ b/src/sampling/graphField/writePatchGraph.C
@@ -3,15 +3,9 @@
#include "fvMesh.H"
#include "graph.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-void writePatchGraph
+void Foam::writePatchGraph
(
const volScalarField& vsf,
const label patchLabel,
@@ -30,8 +24,4 @@ void writePatchGraph
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
index 9a49a99fd5e557f9cccc5e484e32d31742005512..cbb3c2c1e2eefd0ffac27641bbccbdd04fd31de1 100644
--- a/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
+++ b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
@@ -377,7 +377,7 @@ void Foam::cellVolumeWeightMethod::calculate
// list to keep track of whether src cell can be mapped
boolList mapFlag(src_.nCells(), false);
- UIndirectList<bool>(mapFlag, srcCellIDs) = true;
+ boolUIndList(mapFlag, srcCellIDs) = true;
// find initial point in tgt mesh
label srcSeedI = -1;
diff --git a/src/sampling/meshToMesh/calcMethod/correctedCellVolumeWeight/correctedCellVolumeWeightMethod.C b/src/sampling/meshToMesh/calcMethod/correctedCellVolumeWeight/correctedCellVolumeWeightMethod.C
index 384198ca850e1cbd245849dd2d8ec7fad90f64aa..dd847195201a8a4f1e8f75efd1ff9d1474a9ea52 100644
--- a/src/sampling/meshToMesh/calcMethod/correctedCellVolumeWeight/correctedCellVolumeWeightMethod.C
+++ b/src/sampling/meshToMesh/calcMethod/correctedCellVolumeWeight/correctedCellVolumeWeightMethod.C
@@ -245,7 +245,7 @@ void Foam::correctedCellVolumeWeightMethod::calculate
// list to keep track of whether src cell can be mapped
boolList mapFlag(src_.nCells(), false);
- UIndirectList<bool>(mapFlag, srcCellIDs) = true;
+ boolUIndList(mapFlag, srcCellIDs) = true;
// find initial point in tgt mesh
label srcSeedI = -1;
diff --git a/src/sampling/meshToMesh/calcMethod/direct/directMethod.C b/src/sampling/meshToMesh/calcMethod/direct/directMethod.C
index 6195d531fd54d97dd3dca9122bbefeb0c566e853..785be4ebe83e00dead971cc61cdff0f64c5c4467 100644
--- a/src/sampling/meshToMesh/calcMethod/direct/directMethod.C
+++ b/src/sampling/meshToMesh/calcMethod/direct/directMethod.C
@@ -266,7 +266,7 @@ void Foam::directMethod::calculate
// list to keep track of whether src cell can be mapped
boolList mapFlag(src_.nCells(), false);
- UIndirectList<bool>(mapFlag, srcCellIDs) = true;
+ boolUIndList(mapFlag, srcCellIDs) = true;
// find initial point in tgt mesh
label srcSeedI = -1;
diff --git a/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.C b/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.C
index 267a424952d1dbe3652c0ce1153f585d9fa57fca..6580b4305f9c95fe289a395d466736462a7f4b41 100644
--- a/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.C
+++ b/src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.C
@@ -373,7 +373,7 @@ void Foam::mapNearestMethod::calculate
// list to keep track of whether src cell can be mapped
boolList mapFlag(src_.nCells(), false);
- UIndirectList<bool>(mapFlag, srcCellIDs) = true;
+ boolUIndList(mapFlag, srcCellIDs) = true;
// find initial point in tgt mesh
label srcSeedI = -1;
diff --git a/src/sampling/sampledSet/patchSeed/patchSeedSet.C b/src/sampling/sampledSet/patchSeed/patchSeedSet.C
index 9060f8aeb7b923cbbe8fb02cac862b6f83ffa5ba..b8c0de4551e3d32d47a7bb13b3c2e26ee33585da 100644
--- a/src/sampling/sampledSet/patchSeed/patchSeedSet.C
+++ b/src/sampling/sampledSet/patchSeed/patchSeedSet.C
@@ -235,7 +235,7 @@ void Foam::patchSeedSet::calcSamples
subset.setSize(myMaxPoints);
// Subset patchFaces
- patchFaces = UIndirectList<label>(patchFaces, subset)();
+ patchFaces = labelUIndList(patchFaces, subset)();
if (debug)
{
diff --git a/src/sampling/sampledSurface/sampledPatch/sampledPatch.C b/src/sampling/sampledSurface/sampledPatch/sampledPatch.C
index 0ffa2903c6b0a0b1c320ab99f81e318f30db6817..58a84f9e116831ae70782e13c22cbad8c05237b0 100644
--- a/src/sampling/sampledSurface/sampledPatch/sampledPatch.C
+++ b/src/sampling/sampledSurface/sampledPatch/sampledPatch.C
@@ -204,11 +204,11 @@ void Foam::sampledPatch::remapFaces(const labelUList& faceMap)
MeshStorage::remapFaces(faceMap);
patchFaceLabels_ = labelList
(
- UIndirectList<label>(patchFaceLabels_, faceMap)
+ labelUIndList(patchFaceLabels_, faceMap)
);
patchIndex_ = labelList
(
- UIndirectList<label>(patchIndex_, faceMap)
+ labelUIndList(patchIndex_, faceMap)
);
// Redo patchStart.
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
index 3359515ade439da56fd168ddf4c73d3057815e20..f2542e4cc11a5555b75049fcaed0dfa832e5f988 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C
@@ -437,7 +437,7 @@ bool Foam::sampledTriSurfaceMesh::update(const meshSearch& meshSearcher)
}
// Subset cellOrFaceLabels (for compact faces)
- cellOrFaceLabels = UIndirectList<label>(cellOrFaceLabels, faceMap)();
+ cellOrFaceLabels = labelUIndList(cellOrFaceLabels, faceMap)();
// Store any face per point (without using pointFaces())
labelList pointToFace(pointMap.size());
diff --git a/src/sampling/surface/triSurfaceMesh/discreteSurface.C b/src/sampling/surface/triSurfaceMesh/discreteSurface.C
index ef95c86318e6f5de75991c72ef2726c2a876d356..9ea692374851c39d925c51e3c87660f90617953f 100644
--- a/src/sampling/surface/triSurfaceMesh/discreteSurface.C
+++ b/src/sampling/surface/triSurfaceMesh/discreteSurface.C
@@ -431,7 +431,7 @@ bool Foam::discreteSurface::update(const meshSearch& meshSearcher)
}
// Subset cellOrFaceLabels (for compact faces)
- cellOrFaceLabels = UIndirectList<label>(cellOrFaceLabels, faceMap)();
+ cellOrFaceLabels = labelUIndList(cellOrFaceLabels, faceMap)();
// Store any face per point (without using pointFaces())
labelList pointToFace(pointMap.size());
diff --git a/src/surfMesh/triSurface/triSurfaceAddressing.C b/src/surfMesh/triSurface/triSurfaceAddressing.C
index 9aa9dae918ab3c53205878548422f73e45f4ca01..ad10578404bc7f68e7cd1e680a5d371b4136b952 100644
--- a/src/surfMesh/triSurface/triSurfaceAddressing.C
+++ b/src/surfMesh/triSurface/triSurfaceAddressing.C
@@ -105,7 +105,7 @@ void Foam::triSurface::calcEdgeOwner() const
<< "Edge " << edgeI << " vertices:" << e
<< " is used by faces " << myFaces
<< " vertices:"
- << UIndirectList<labelledTri>(localFaces(), myFaces)()
+ << UIndirectList<labelledTri>(localFaces(), myFaces)
<< " none of which use the edge vertices in the same order"
<< nl << "I give up" << abort(FatalError);
}