From 7c1d8cb146566568961ec9bca063ffbda1dc0aeb Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Sun, 19 Nov 2017 09:27:47 +0100
Subject: [PATCH] STYLE: more consistent use of labelUList and labelUIndList
typedefs
---
.../extrude/extrudeMesh/extrudeMesh.C | 1 -
.../extrudeToRegionMesh/extrudeToRegionMesh.C | 16 +++++-----
.../conformalVoronoiMeshIO.C | 2 +-
.../manipulation/polyDualMesh/meshDualiser.C | 12 ++++----
.../manipulation/renumberMesh/renumberMesh.C | 14 ++++-----
.../mesh/manipulation/splitMesh/regionSide.C | 2 +-
.../mesh/manipulation/subsetMesh/subsetMesh.C | 2 +-
.../reconstructParMesh/reconstructParMesh.C | 2 +-
.../surfaceBooleanFeatures.C | 2 +-
.../surfaceMeshTriangulate.C | 10 +++----
.../surfaceSplitNonManifolds.C | 4 +--
.../Lists/IndirectList/IndirectList.H | 9 ------
.../Lists/PackedList/PackedBoolList.C | 6 ++--
.../Lists/PackedList/PackedBoolList.H | 30 +++++++------------
.../Lists/PackedList/PackedBoolListI.H | 14 ++++-----
.../containers/Lists/PackedList/PackedList.C | 2 +-
.../containers/Lists/PackedList/PackedList.H | 4 +--
.../containers/Lists/PackedList/PackedListI.H | 2 +-
.../Lists/UIndirectList/UIndirectList.H | 4 +++
src/OpenFOAM/containers/Lists/UList/UList.H | 1 +
.../procFacesGAMGProcAgglomeration.C | 2 +-
.../meshes/lduMesh/lduPrimitiveMesh.C | 2 +-
.../mapDistribute/mapDistributeBase.H | 2 +-
.../mapDistributeBaseTemplates.C | 2 +-
.../constraint/cyclic/cyclicPolyPatch.C | 2 +-
.../constraint/oldCyclic/oldCyclicPolyPatch.C | 2 +-
.../constraint/processor/processorPolyPatch.C | 4 +--
.../PatchTools/PatchToolsEdgeOwner.C | 2 +-
.../PatchTools/PatchToolsSortEdges.C | 2 +-
.../primitives/bools/lists/boolList.H | 12 ++++++--
.../primitives/ints/lists/labelIndList.H | 2 +-
.../primitives/ints/lists/labelList.H | 9 ++++--
.../vtk/output/foamVtkOutputFields.H | 4 +--
.../vtk/output/foamVtkOutputFieldsTemplates.C | 4 +--
src/conversion/vtk/part/foamVtkMeshMaps.C | 4 +--
src/conversion/vtk/part/foamVtkMeshMaps.H | 4 +--
src/conversion/vtk/part/foamVtuCells.C | 4 +--
src/conversion/vtk/part/foamVtuCells.H | 4 +--
src/conversion/vtk/part/foamVtuSizing.C | 22 +++++++-------
src/conversion/vtk/part/foamVtuSizing.H | 22 +++++++-------
.../kahipDecomp/dummyKahipDecomp.C | 4 +--
.../metisDecomp/dummyMetisDecomp.C | 4 +--
.../ptscotchDecomp/dummyPtscotchDecomp.C | 4 +--
.../scotchDecomp/dummyScotchDecomp.C | 4 +--
.../fvMeshDistribute/fvMeshDistribute.C | 4 +--
src/dynamicMesh/fvMeshSubset/fvMeshSubset.C | 8 ++---
src/dynamicMesh/fvMeshSubset/fvMeshSubset.H | 2 +-
.../meshCut/cellLooper/hexCellLooper.C | 2 +-
.../motionSmoother/motionSmootherAlgo.C | 8 ++---
.../motionSmoother/motionSmootherAlgo.H | 2 +-
.../polyMeshAdder/faceCoupleInfo.C | 16 +++++-----
src/dynamicMesh/polyMeshAdder/polyMeshAdder.C | 4 +--
.../polyTopoChange/addPatchCellLayer.C | 8 ++---
.../polyTopoChange/addPatchCellLayer.H | 2 +-
.../polyTopoChange/hexRef8/hexRef8.C | 22 +++++++-------
.../polyTopoChange/hexRef8/hexRef8Data.C | 8 ++---
.../enrichedPatch/enrichedPatchCutFaces.C | 2 +-
src/fileFormats/ensight/part/ensightCells.C | 2 +-
src/fileFormats/vtk/output/foamVtkOutput.H | 2 +-
.../vtk/output/foamVtkOutputTemplates.C | 2 +-
.../field/fluxSummary/fluxSummary.C | 2 +-
.../regionSizeDistribution.H | 3 +-
.../regionSizeDistributionTemplates.C | 2 +-
.../derived/rotorDiskSource/rotorDiskSource.C | 2 +-
.../meshRefinement/meshRefinement.H | 2 +-
.../meshRefinement/meshRefinementBaffles.C | 5 ++--
.../meshRefinement/meshRefinementGapRefine.C | 10 +++----
.../meshRefinement/meshRefinementMerge.C | 2 +-
.../meshRefinement/meshRefinementRefine.C | 2 +-
.../refinementSurfaces/refinementSurfaces.C | 12 ++++----
.../snappyHexMeshDriver/snappyLayerDriver.C | 2 +-
.../snappySnapDriverFeature.C | 2 +-
.../extendedEdgeMesh/extendedEdgeMesh.C | 14 ++++-----
.../mappedPolyPatch/mappedPatchBase.C | 16 +++-------
src/meshTools/meshTools/meshTools.C | 2 +-
src/meshTools/sets/topoSets/cellSet.C | 2 +-
src/meshTools/sets/topoSets/cellSet.H | 2 +-
src/meshTools/sets/topoSets/faceSet.C | 2 +-
src/meshTools/sets/topoSets/faceSet.H | 2 +-
src/meshTools/sets/topoSets/faceZoneSet.C | 4 +--
src/meshTools/sets/topoSets/pointSet.C | 2 +-
src/meshTools/sets/topoSets/pointSet.H | 2 +-
src/meshTools/sets/topoSets/topoSet.C | 2 +-
src/meshTools/sets/topoSets/topoSet.H | 3 +-
.../faceTriangulation/faceTriangulation.C | 8 ++---
.../cellVolumeWeightCellCellStencil.C | 14 ++++-----
.../inverseDistanceCellCellStencil.C | 2 +-
.../metisLikeDecomp/metisLikeDecomp.C | 4 +--
.../metisLikeDecomp/metisLikeDecomp.H | 8 ++---
.../multiLevelDecomp/multiLevelDecomp.C | 2 +-
.../decompose/kahipDecomp/kahipDecomp.C | 4 +--
.../decompose/kahipDecomp/kahipDecomp.H | 4 +--
.../decompose/metisDecomp/metisDecomp.C | 12 ++++----
.../decompose/metisDecomp/metisDecomp.H | 4 +--
.../decompose/ptscotchDecomp/ptscotchDecomp.C | 8 ++---
.../decompose/ptscotchDecomp/ptscotchDecomp.H | 4 +--
.../decompose/scotchDecomp/scotchDecomp.C | 4 +--
.../decompose/scotchDecomp/scotchDecomp.H | 4 +--
.../cellVolumeWeight/cellVolumeWeightMethod.C | 2 +-
.../correctedCellVolumeWeightMethod.C | 2 +-
.../calcMethod/direct/directMethod.C | 2 +-
.../calcMethod/mapNearest/mapNearestMethod.C | 2 +-
.../sampledSet/patchSeed/patchSeedSet.C | 2 +-
.../sampledPatch/sampledPatch.C | 4 +--
.../sampledTriSurfaceMesh.C | 2 +-
.../surface/triSurfaceMesh/discreteSurface.C | 2 +-
.../triSurface/triSurfaceAddressing.C | 2 +-
107 files changed, 273 insertions(+), 288 deletions(-)
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 731e38f67bd..194e185ac55 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 c36844e47dd..3ac79b9be5a 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 c589f071d85..cbfa624275d 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 52198fb3053..61d22ce8702 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 42752388157..21796ed9d69 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 23456aaa0b7..fb7c8305733 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 2846045f688..fd373c8140c 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 47695496468..9051ab86a5f 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 6588632eb9e..b09313259e4 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 8637ebd9f54..ae957a2b3b6 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 d844e0bb631..befa5a67fd4 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 aa6c222ec26..84a35f81469 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 543c5b85584..db6036d7151 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 a667e8aecf1..05836769ba9 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 4c713dc005d..db40fab00b2 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 b862792b127..b8069fe3e01 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 842a1a100a7..1d41bd14245 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 4f9c58644ad..00d1d54b6e7 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 eac9eaf4151..2fb26f4a36a 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 e0893960df8..76e5362d3a5 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 a03966c1ee6..bc3699370d1 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 3475700bc92..78c97acedf4 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 f469a6876b2..83d99861f7f 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 7e58126c4d4..6622bfd41d1 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 6544881f4a2..20c7f599d14 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 5001f6e238f..80714b0bb47 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 9c27fada851..0c5b7284659 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 95f49cea126..2fbcd25f875 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 0877a50b5fa..4f70b4ca851 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 82c5ae27ab3..83135d7a4a5 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 3a20c2469cc..1f5dd2dd0ef 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 30536a59a91..a25fc5767a9 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 116aadbfeb1..22f9a8d60f3 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 b462922416f..b3852dad2b3 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 badc422df50..121d0099fe7 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 737f02a2edf..00eb195676a 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 962fa9b0ee8..ca134c23c73 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 6c4c71c5242..3c79ce8a33b 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 7ef84a08d50..6d12f7447c6 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 a14209807a9..d09d486f045 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 d3844087e44..96e0bdc16b9 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 aabfa95fee9..3743cc1bae6 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 d924b711b64..decacb6c10c 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 e5102774b5e..582c7702537 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 0e546f1b3ef..ef9bde3c1d1 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 3af15d40af5..dfb166aeb97 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 3f057d2d574..8e49da9f1f9 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 2e39889ab27..86159aa38f1 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 e7d6f558d19..0b5945d31df 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 d1b53c32677..05175adb3d4 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 79bc1bf6887..e1c8a08e64d 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 edd8818ff6f..c3ce66f3a24 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 5135d80e982..fafbba3b038 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 485ee56ee2a..9e6e2235cca 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 43bb0449672..1f87a21ef11 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 b8631f8edbb..7b3f9e75262 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 4c1fd310968..4484c7f8524 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 13781f0e863..039f62c1cc1 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 c3632a11913..0ad5f384887 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 f28d458378e..3cc030a3bc3 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 652f2e414ff..3b365baa855 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 6a1a6525f65..30c327b8ca9 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 6dd27d8613e..261116779e7 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 c36123833a3..73ad3e2c899 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 f807ad2dcfe..1e641cb2e9e 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 b18fcdc66d2..0503b996b23 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 dc87b9376fa..a98e8822a4c 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 ba70983f591..3027ac71f12 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 a9cdcb1f16d..e7f9994f869 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 59d772a5691..e30ab66c215 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 8516c3db43c..749428302e0 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 fb9190add35..4179310609a 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 8758a9662ae..be1a3b4bbee 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 bf2a0801932..b3bd43d4b38 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 dca4246471c..cb90a991c99 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 32a9506f392..d98ab34dfea 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 da1dc407d26..adb7f8edb1d 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/faceSet.C b/src/meshTools/sets/topoSets/faceSet.C
index 4d9c25640be..afeebccbf49 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 7653db16208..02d9f423319 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 7b5ff154750..1f7d2d10391 100644
--- a/src/meshTools/sets/topoSets/faceZoneSet.C
+++ b/src/meshTools/sets/topoSets/faceZoneSet.C
@@ -49,8 +49,8 @@ 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());
diff --git a/src/meshTools/sets/topoSets/pointSet.C b/src/meshTools/sets/topoSets/pointSet.C
index 32d1d90f9b8..01ffabfca27 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 4f4025adc8b..d9909ed34dc 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/topoSet.C b/src/meshTools/sets/topoSets/topoSet.C
index b7e574ddcdd..fc4ddd2e192 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 7a8ecbae92c..adde26e085a 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 c34dbb1ac5b..c083f601467 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 d22979477cf..85c20494d70 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 8e7c96247e5..eb0d1291594 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 232a351f596..02d283c5482 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 8c8a6c9e87f..27b81bf3e68 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 e90406009c9..1bdc02aea9d 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 55cba9cfc38..2bf6d884057 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 37cd4b574c6..c399a68e010 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 3822a0a31e2..efd0d64b1fa 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 a851b0496b5..d037fab95fe 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 0f6d6a05560..610de99d68a 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 039dd511d01..a9146ae9e6f 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 faea40b8668..88f14fac7ca 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 7a44f095f27..ca182253d7c 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/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C b/src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
index 9a49a99fd5e..cbb3c2c1e2e 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 384198ca850..dd847195201 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 6195d531fd5..785be4ebe83 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 267a424952d..6580b4305f9 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 9060f8aeb7b..b8c0de4551e 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 0ffa2903c6b..58a84f9e116 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 3359515ade4..f2542e4cc11 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 ef95c86318e..9ea69237485 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 9aa9dae918a..ad10578404b 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);
}
--
GitLab