From 11f2f77a8b7f606f995db191ec26f49d34eeac64 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 9 Jan 2018 14:47:00 +0100
Subject: [PATCH] STYLE: use found() instead of contains() methods
- more consistent with other OpenFOAM containers.
With the exception of meshSubset, the other classes already had the
found() and find() methods added previously.
---
.../boundaryLayers/boundaryLayersCreateVertices.C | 4 ++--
.../boundaryLayers/extrudeLayer/extrudeLayerI.H | 4 ++--
.../refineBoundaryLayers/refineBoundaryLayersFaces.C | 8 ++++----
meshLibrary/utilities/containers/FRWGraph/FRWGraph.H | 1 -
meshLibrary/utilities/containers/FRWGraph/FRWGraphI.H | 11 -----------
meshLibrary/utilities/containers/LongList/LongList.H | 1 -
meshLibrary/utilities/containers/LongList/LongListI.H | 7 -------
meshLibrary/utilities/containers/VRWGraph/VRWGraph.H | 1 -
meshLibrary/utilities/containers/VRWGraph/VRWGraphI.H | 10 ----------
.../utilities/containers/graphRow/graphConstRow.H | 1 -
.../utilities/containers/graphRow/graphConstRowI.H | 10 ----------
meshLibrary/utilities/containers/graphRow/graphRow.H | 1 -
meshLibrary/utilities/containers/graphRow/graphRowI.H | 7 -------
meshLibrary/utilities/containers/subGraph/subGraph.H | 1 -
meshLibrary/utilities/containers/subGraph/subGraphI.H | 11 -----------
.../utilities/decomposeCells/decomposeCellsPyramids.C | 2 +-
.../utilities/meshes/polyMeshGen/polyMeshGenCellsI.H | 2 +-
.../utilities/meshes/polyMeshGen/polyMeshGenFacesI.H | 2 +-
.../utilities/meshes/polyMeshGen/polyMeshGenPointsI.H | 2 +-
.../polyMeshGenAddressingParallelAddressing.C | 4 ++--
.../meshes/primitives/meshSubsets/meshSubset.H | 2 +-
.../meshes/primitives/meshSubsets/meshSubsetI.H | 2 +-
meshLibrary/utilities/meshes/triSurf/triSurfFacetsI.H | 2 +-
.../utilities/meshes/triSurf/triSurfFeatureEdgesI.H | 2 +-
meshLibrary/utilities/meshes/triSurf/triSurfPointsI.H | 2 +-
.../meshOctreeAddressingParallelAddressing.C | 2 +-
.../meshOptimizerOptimizePointParallel.C | 2 +-
.../meshSurfaceOptimizerOptimizePointParallel.C | 2 +-
.../checkIrregularSurfaceConnectionsFunctions.C | 4 ++--
.../meshSurfaceEngineParallelAddressing.C | 4 ++--
.../meshSurfaceMapper2DMapVertices.C | 2 +-
.../voronoiMeshExtractorAddressing.C | 2 +-
32 files changed, 28 insertions(+), 90 deletions(-)
diff --git a/meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayersCreateVertices.C b/meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayersCreateVertices.C
index fa43a7c1..5e926c1d 100644
--- a/meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayersCreateVertices.C
+++ b/meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayersCreateVertices.C
@@ -210,7 +210,7 @@ Foam::point Foam::Module::boundaryLayers::createNewVertex
bool found(true);
forAll(otherPatches, opI)
{
- if (!pPatches.contains(bpJ, otherPatches[opI]))
+ if (!pPatches.found(bpJ, otherPatches[opI]))
{
found = false;
break;
@@ -940,7 +940,7 @@ void Foam::Module::boundaryLayers::createNewEdgeVerticesParallel
bool found(true);
forAll(otherPatches, opI)
{
- if (!pPatches.contains(bpJ, otherPatches[opI]))
+ if (!pPatches.found(bpJ, otherPatches[opI]))
{
found = false;
break;
diff --git a/meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayerI.H b/meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayerI.H
index 10f52ca4..a2811bea 100644
--- a/meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayerI.H
+++ b/meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayerI.H
@@ -122,7 +122,7 @@ Foam::Module::extrudeLayer::addressingCalculator::faceSharingEdge
continue;
}
- if (pointExtruded_.contains(nextI, currFaceI))
+ if (pointExtruded_.found(nextI, currFaceI))
{
if (otherFace != -1)
{
@@ -152,7 +152,7 @@ inline void Foam::Module::extrudeLayer::addressingCalculator::facesSharingEdge
{
const label currFaceI = pointExtruded_(start, pfI);
- if (pointExtruded_.contains(end, currFaceI))
+ if (pointExtruded_.found(end, currFaceI))
{
edgeFaces.append(currFaceI);
}
diff --git a/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C b/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C
index ade8fbc5..222c890e 100644
--- a/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C
+++ b/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C
@@ -487,7 +487,7 @@ void Foam::Module::refineBoundaryLayers::sortFacePoints
{
const label nfI = facesFromFace_(faceI, i);
- if ((numSplitsI == 1) && newFaces_.contains(nfI, f.nextLabel(pos)))
+ if ((numSplitsI == 1) && newFaces_.found(nfI, f.nextLabel(pos)))
{
numSplitsI = i + 1;
break;
@@ -584,7 +584,7 @@ void Foam::Module::refineBoundaryLayers::sortFacePoints
{
const label nfI = facesFromFace_(faceI, j);
- if ((numSplitsJ == 1) && newFaces_.contains(nfI, f.prevLabel(pos)))
+ if ((numSplitsJ == 1) && newFaces_.found(nfI, f.prevLabel(pos)))
{
numSplitsJ = j + 1;
break;
@@ -735,7 +735,7 @@ void Foam::Module::refineBoundaryLayers::sortFaceFaces
{
const label nfI = facesFromFace_(faceI, i);
- if ((numSplitsI == 1) && newFaces_.contains(nfI, f.nextLabel(pos)))
+ if ((numSplitsI == 1) && newFaces_.found(nfI, f.nextLabel(pos)))
{
numSplitsI = i + 1;
break;
@@ -789,7 +789,7 @@ void Foam::Module::refineBoundaryLayers::sortFaceFaces
{
const label nfI = facesFromFace_(faceI, j);
- if ((numSplitsJ == 1) && newFaces_.contains(nfI, f.prevLabel(pos)))
+ if ((numSplitsJ == 1) && newFaces_.found(nfI, f.prevLabel(pos)))
{
numSplitsJ = j + 1;
break;
diff --git a/meshLibrary/utilities/containers/FRWGraph/FRWGraph.H b/meshLibrary/utilities/containers/FRWGraph/FRWGraph.H
index 5d9581eb..4b9eb0c0 100644
--- a/meshLibrary/utilities/containers/FRWGraph/FRWGraph.H
+++ b/meshLibrary/utilities/containers/FRWGraph/FRWGraph.H
@@ -140,7 +140,6 @@ public:
inline void setRow(const label rowI, const FixedList<T, width>& l);
//- check if the element is in the given row (takes linear time)
- inline bool contains(const label rowI, const T& e) const;
inline bool found(const label rowI, const T& e) const;
inline label find(const label rowI, const T& e) const;
diff --git a/meshLibrary/utilities/containers/FRWGraph/FRWGraphI.H b/meshLibrary/utilities/containers/FRWGraph/FRWGraphI.H
index 41fe07a4..ffed7be0 100644
--- a/meshLibrary/utilities/containers/FRWGraph/FRWGraphI.H
+++ b/meshLibrary/utilities/containers/FRWGraph/FRWGraphI.H
@@ -155,17 +155,6 @@ inline void Foam::Module::FRWGraph<T, width>::setRow
}
-template<class T, Foam::label width>
-inline bool Foam::Module::FRWGraph<T, width>::contains
-(
- const label rowI,
- const T& e
-) const
-{
- return (this->find(rowI, e) >= 0);
-}
-
-
template<class T, Foam::label width>
inline bool Foam::Module::FRWGraph<T, width>::found
(
diff --git a/meshLibrary/utilities/containers/LongList/LongList.H b/meshLibrary/utilities/containers/LongList/LongList.H
index 1539b471..cf1be65c 100644
--- a/meshLibrary/utilities/containers/LongList/LongList.H
+++ b/meshLibrary/utilities/containers/LongList/LongList.H
@@ -178,7 +178,6 @@ public:
inline void appendIfNotIn(const T& e);
//- check if the element is in the list (takes linear time)
- inline bool contains(const T& e) const;
inline bool found(const T& e) const;
inline label find(const T& e) const;
diff --git a/meshLibrary/utilities/containers/LongList/LongListI.H b/meshLibrary/utilities/containers/LongList/LongListI.H
index 57b5a6fe..1a4667be 100644
--- a/meshLibrary/utilities/containers/LongList/LongListI.H
+++ b/meshLibrary/utilities/containers/LongList/LongListI.H
@@ -296,13 +296,6 @@ inline void Foam::Module::LongList<T, Offset>::appendIfNotIn(const T& e)
}
-template<class T, int Offset>
-inline bool Foam::Module::LongList<T, Offset>::contains(const T& e) const
-{
- return (this->find(e) >= 0);
-}
-
-
template<class T, int Offset>
inline bool Foam::Module::LongList<T, Offset>::found(const T& e) const
{
diff --git a/meshLibrary/utilities/containers/VRWGraph/VRWGraph.H b/meshLibrary/utilities/containers/VRWGraph/VRWGraph.H
index 4b86593a..2e417764 100644
--- a/meshLibrary/utilities/containers/VRWGraph/VRWGraph.H
+++ b/meshLibrary/utilities/containers/VRWGraph/VRWGraph.H
@@ -261,7 +261,6 @@ public:
void optimizeMemoryUsage();
//- check if the element is in the given row (takes linear time)
- inline bool contains(const label rowI, const label e) const;
inline bool found(const label rowI, const label e) const;
inline label find(const label rowI, const label e) const;
diff --git a/meshLibrary/utilities/containers/VRWGraph/VRWGraphI.H b/meshLibrary/utilities/containers/VRWGraph/VRWGraphI.H
index 3e1f39ed..faa1df63 100644
--- a/meshLibrary/utilities/containers/VRWGraph/VRWGraphI.H
+++ b/meshLibrary/utilities/containers/VRWGraph/VRWGraphI.H
@@ -574,16 +574,6 @@ inline void Foam::Module::VRWGraph::reverseAddressing
}
-inline bool Foam::Module::VRWGraph::contains
-(
- const label rowI,
- const label e
-) const
-{
- return (this->find(rowI, e) >= 0);
-}
-
-
inline bool Foam::Module::VRWGraph::found
(
const label rowI,
diff --git a/meshLibrary/utilities/containers/graphRow/graphConstRow.H b/meshLibrary/utilities/containers/graphRow/graphConstRow.H
index 205677c4..7ec66e3d 100644
--- a/meshLibrary/utilities/containers/graphRow/graphConstRow.H
+++ b/meshLibrary/utilities/containers/graphRow/graphConstRow.H
@@ -101,7 +101,6 @@ public:
// Member Operators
//- check if the element is in the given row (takes linear time)
- inline bool contains(const label e) const;
inline bool found(const label e) const;
inline label find(const label e) const;
diff --git a/meshLibrary/utilities/containers/graphRow/graphConstRowI.H b/meshLibrary/utilities/containers/graphRow/graphConstRowI.H
index 7387c38e..02d028e0 100644
--- a/meshLibrary/utilities/containers/graphRow/graphConstRowI.H
+++ b/meshLibrary/utilities/containers/graphRow/graphConstRowI.H
@@ -70,16 +70,6 @@ inline Foam::label Foam::Module::graphConstRow<graphType>::size() const
}
-template<class graphType>
-inline bool Foam::Module::graphConstRow<graphType>::contains
-(
- const label e
-) const
-{
- return data_.contains(rowI_, e);
-}
-
-
template<class graphType>
inline bool Foam::Module::graphConstRow<graphType>::found(const label e) const
{
diff --git a/meshLibrary/utilities/containers/graphRow/graphRow.H b/meshLibrary/utilities/containers/graphRow/graphRow.H
index 0acddac7..717dd016 100644
--- a/meshLibrary/utilities/containers/graphRow/graphRow.H
+++ b/meshLibrary/utilities/containers/graphRow/graphRow.H
@@ -105,7 +105,6 @@ public:
inline void appendIfNotIn(const label);
//- check if the element is in the given row (takes linear time)
- inline bool contains(const label e) const;
inline bool found(const label e) const;
inline label find(const label e) const;
diff --git a/meshLibrary/utilities/containers/graphRow/graphRowI.H b/meshLibrary/utilities/containers/graphRow/graphRowI.H
index bcb43990..bd37bc49 100644
--- a/meshLibrary/utilities/containers/graphRow/graphRowI.H
+++ b/meshLibrary/utilities/containers/graphRow/graphRowI.H
@@ -83,13 +83,6 @@ inline void Foam::Module::graphRow<graphType>::appendIfNotIn(const label el)
}
-template<class graphType>
-inline bool Foam::Module::graphRow<graphType>::contains(const label e) const
-{
- return data_.contains(rowI_, e);
-}
-
-
template<class graphType>
inline bool Foam::Module::graphRow<graphType>::found(const label e) const
{
diff --git a/meshLibrary/utilities/containers/subGraph/subGraph.H b/meshLibrary/utilities/containers/subGraph/subGraph.H
index 5f7fcda3..4e46f61e 100644
--- a/meshLibrary/utilities/containers/subGraph/subGraph.H
+++ b/meshLibrary/utilities/containers/subGraph/subGraph.H
@@ -112,7 +112,6 @@ public:
inline void appendIfNotIn(const label rowI, const label);
//- check if the element is in the given row (takes linear time)
- inline bool contains(const label rowI, const label e) const;
inline bool found(const label rowI, const label e) const;
inline label find(const label rowI, const label e) const;
diff --git a/meshLibrary/utilities/containers/subGraph/subGraphI.H b/meshLibrary/utilities/containers/subGraph/subGraphI.H
index 5969cef4..cd93a74c 100644
--- a/meshLibrary/utilities/containers/subGraph/subGraphI.H
+++ b/meshLibrary/utilities/containers/subGraph/subGraphI.H
@@ -105,17 +105,6 @@ inline void Foam::Module::subGraph<graphType>::appendIfNotIn
}
-template<class graphType>
-inline bool Foam::Module::subGraph<graphType>::contains
-(
- const label rowI,
- const label e
-) const
-{
- return data_.contains(start_ + rowI, e);
-}
-
-
template<class graphType>
inline bool Foam::Module::subGraph<graphType>::found
(
diff --git a/meshLibrary/utilities/decomposeCells/decomposeCellsPyramids.C b/meshLibrary/utilities/decomposeCells/decomposeCellsPyramids.C
index f05b23c5..51500c0c 100644
--- a/meshLibrary/utilities/decomposeCells/decomposeCellsPyramids.C
+++ b/meshLibrary/utilities/decomposeCells/decomposeCellsPyramids.C
@@ -248,7 +248,7 @@ void Foam::Module::decomposeCells::decomposeCellIntoPyramids(const label cellI)
{
const edge e(f[eI], f[(eI + 1)%f.size()]);
- const label pos = cEdges.contains(e);
+ const label pos = cEdges.find(e);
if (pos < 0)
{
diff --git a/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenCellsI.H b/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenCellsI.H
index 48be739c..2810716e 100644
--- a/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenCellsI.H
+++ b/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenCellsI.H
@@ -75,7 +75,7 @@ inline void Foam::Module::polyMeshGenCells::cellInSubsets
forAllConstIters(cellSubsets_, it)
{
- if (it->second.contains(cellI))
+ if (it->second.found(cellI))
{
cellSubsets.append(it->first);
}
diff --git a/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenFacesI.H b/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenFacesI.H
index ded1b5b8..c85c8d6f 100644
--- a/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenFacesI.H
+++ b/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenFacesI.H
@@ -153,7 +153,7 @@ inline void Foam::Module::polyMeshGenFaces::faceInSubsets
forAllConstIters(faceSubsets_, it)
{
- if (it->second.contains(faceI))
+ if (it->second.found(faceI))
{
faceSubsets.append(it->first);
}
diff --git a/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPointsI.H b/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPointsI.H
index daa13117..3a072041 100644
--- a/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPointsI.H
+++ b/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPointsI.H
@@ -93,7 +93,7 @@ inline void Foam::Module::polyMeshGenPoints::pointInSubsets
forAllConstIters(pointSubsets_, it)
{
- if (it->second.contains(pointI))
+ if (it->second.found(pointI))
{
pointSubsets.append(it->first);
}
diff --git a/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C b/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C
index cd235788..58f981cf 100644
--- a/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C
+++ b/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C
@@ -164,7 +164,7 @@ void Foam::Module::polyMeshGenAddressing::calcGlobalPointLabels() const
for (label i = 0; i < nProcs; ++i)
{
const label neiProc = receivedData[counter++];
- if (!pProcs.contains(f[pI], neiProc))
+ if (!pProcs.found(f[pI], neiProc))
{
pProcs.append(f[pI], neiProc);
finished = false;
@@ -618,7 +618,7 @@ void Foam::Module::polyMeshGenAddressing::calcGlobalEdgeLabels() const
for (label i = 0; i < nProcs; ++i)
{
const label neiProc = receivedData[counter++];
- if (!eProcs.contains(edgeI, neiProc))
+ if (!eProcs.found(edgeI, neiProc))
{
eProcs.append(edgeI, neiProc);
finished = false;
diff --git a/meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubset.H b/meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubset.H
index 135f7710..559bf8b1 100644
--- a/meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubset.H
+++ b/meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubset.H
@@ -152,7 +152,7 @@ public:
// Searches
//- find if the element exists in the subset
- inline bool contains(const label) const;
+ inline bool found(const label) const;
// operators
diff --git a/meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubsetI.H b/meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubsetI.H
index 67820303..a02b2457 100644
--- a/meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubsetI.H
+++ b/meshLibrary/utilities/meshes/primitives/meshSubsets/meshSubsetI.H
@@ -162,7 +162,7 @@ inline void Foam::Module::meshSubset::updateSubset(const VRWGraph& newLabels)
}
-inline bool Foam::Module::meshSubset::contains(const label elmt) const
+inline bool Foam::Module::meshSubset::found(const label elmt) const
{
return (data_.find(elmt) != data_.end());
}
diff --git a/meshLibrary/utilities/meshes/triSurf/triSurfFacetsI.H b/meshLibrary/utilities/meshes/triSurf/triSurfFacetsI.H
index d2009c80..0eaa2594 100644
--- a/meshLibrary/utilities/meshes/triSurf/triSurfFacetsI.H
+++ b/meshLibrary/utilities/meshes/triSurf/triSurfFacetsI.H
@@ -100,7 +100,7 @@ inline void Foam::Module::triSurfFacets::facetInSubsets
forAllConstIters(facetSubsets_, it)
{
- if (it().contains(triI))
+ if (it().found(triI))
{
facetSubsets.append(it.key());
}
diff --git a/meshLibrary/utilities/meshes/triSurf/triSurfFeatureEdgesI.H b/meshLibrary/utilities/meshes/triSurf/triSurfFeatureEdgesI.H
index 6d20fdbc..31b1c348 100644
--- a/meshLibrary/utilities/meshes/triSurf/triSurfFeatureEdgesI.H
+++ b/meshLibrary/utilities/meshes/triSurf/triSurfFeatureEdgesI.H
@@ -91,7 +91,7 @@ inline void Foam::Module::triSurfFeatureEdges::edgeInSubsets
forAllConstIters(featureEdgeSubsets_, it)
{
- if (it().contains(eI))
+ if (it().found(eI))
{
edgeSubsets.append(it.key());
}
diff --git a/meshLibrary/utilities/meshes/triSurf/triSurfPointsI.H b/meshLibrary/utilities/meshes/triSurf/triSurfPointsI.H
index caa775fa..3a679467 100644
--- a/meshLibrary/utilities/meshes/triSurf/triSurfPointsI.H
+++ b/meshLibrary/utilities/meshes/triSurf/triSurfPointsI.H
@@ -87,7 +87,7 @@ inline void Foam::Module::triSurfPoints::pointInSubsets
forAllConstIters(pointSubsets_, it)
{
- if (it().contains(pointI))
+ if (it().found(pointI))
{
pointSubsets.append(it.key());
}
diff --git a/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C b/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C
index bee1834e..d5591a3f 100644
--- a/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C
+++ b/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C
@@ -668,7 +668,7 @@ void Foam::Module::meshOctreeAddressing::calcGlobalLeafLabels() const
continue;
}
- if (!leafAtProcs.contains(leafI, it->first))
+ if (!leafAtProcs.found(leafI, it->first))
{
FatalError << "Problem!!" << leafI
<< " does not contain processor " << it->first
diff --git a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePointParallel.C b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePointParallel.C
index a1b45fc5..178874a2 100644
--- a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePointParallel.C
+++ b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePointParallel.C
@@ -83,7 +83,7 @@ void Foam::Module::meshOptimizer::laplaceSmoother::laplacianParallel
forAllRow(pointAtProcs, nei, procI)
{
const label procJ = pointAtProcs(nei, procI);
- if ((procJ < pMin) && pointAtProcs.contains(pointI, procJ))
+ if ((procJ < pMin) && pointAtProcs.found(pointI, procJ))
pMin = procJ;
}
diff --git a/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizePointParallel.C b/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizePointParallel.C
index f7d06c6b..9b103445 100644
--- a/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizePointParallel.C
+++ b/meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizePointParallel.C
@@ -86,7 +86,7 @@ void Foam::Module::meshSurfaceOptimizer::nodeDisplacementLaplacianParallel
forAllRow(bpAtProcs, nei, procI)
{
const label procJ = bpAtProcs(nei, procI);
- if ((procJ < pMin) && bpAtProcs.contains(bpI, procJ))
+ if ((procJ < pMin) && bpAtProcs.found(bpI, procJ))
pMin = procJ;
}
diff --git a/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C b/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C
index 2f41a74c..46c92cef 100644
--- a/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C
+++ b/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C
@@ -110,7 +110,7 @@ checkAndFixCellGroupsAtBndVertices
if (cellGroup.found(neiCell))
continue;
- if (pointCells.contains(pointI, neiCell))
+ if (pointCells.found(pointI, neiCell))
{
cellGroup.insert(neiCell, nGroup);
frontCells.append(neiCell);
@@ -644,7 +644,7 @@ checkFaceGroupsAtBndVertices
if (faceGroup.found(neiFace))
continue;
- if (pointFaces.contains(bpI, neiFace))
+ if (pointFaces.found(bpI, neiFace))
{
front.append(neiFace);
faceGroup.insert(neiFace, nGroup);
diff --git a/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C b/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C
index e781d4ee..4788c62e 100644
--- a/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C
+++ b/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C
@@ -154,7 +154,7 @@ void Foam::Module::meshSurfaceEngine::calcGlobalBoundaryPointLabels() const
for (label i = 0; i < nProcs; ++i)
{
const label neiProc = receivedData[counter++];
- if (!bpAtProcs.contains(bp[f[pI]], neiProc))
+ if (!bpAtProcs.found(bp[f[pI]], neiProc))
{
bpAtProcs.append(bp[f[pI]], neiProc);
finished = false;
@@ -473,7 +473,7 @@ void Foam::Module::meshSurfaceEngine::calcGlobalBoundaryEdgeLabels() const
for (label i = 0; i < nProcs; ++i)
{
const label neiProc = receivedData[counter++];
- if (!beAtProcs.contains(edgeI, neiProc))
+ if (!beAtProcs.found(edgeI, neiProc))
{
facesWithProcBndEdges[patchI].insert
(
diff --git a/meshLibrary/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2DMapVertices.C b/meshLibrary/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2DMapVertices.C
index 87cac691..0b1cd91c 100644
--- a/meshLibrary/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2DMapVertices.C
+++ b/meshLibrary/utilities/surfaceTools/meshSurfaceMapper2D/meshSurfaceMapper2DMapVertices.C
@@ -407,7 +407,7 @@ void Foam::Module::meshSurfaceMapper2D::mapCorners
DynList<label> ePatches;
forAllRow(pPatches, bps, i)
{
- if (pPatches.contains(bpe, pPatches(bps, i)))
+ if (pPatches.found(bpe, pPatches(bps, i)))
ePatches.append(pPatches(bps, i));
}
diff --git a/meshLibrary/voronoiMesh/voronoiMeshExtractor/voronoiMeshExtractorAddressing.C b/meshLibrary/voronoiMesh/voronoiMeshExtractor/voronoiMeshExtractorAddressing.C
index 4fc2eb45..a7d49625 100644
--- a/meshLibrary/voronoiMesh/voronoiMeshExtractor/voronoiMeshExtractorAddressing.C
+++ b/meshLibrary/voronoiMesh/voronoiMeshExtractor/voronoiMeshExtractorAddressing.C
@@ -75,7 +75,7 @@ void Foam::Module::voronoiMeshExtractor::createAddressing() const
{
const label tetJ = pointTets(start, ptI);
- if (!endTets.contains(tetJ))
+ if (!endTets.found(tetJ))
continue;
if (tetJ < tetI)
--
GitLab