diff --git a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C index 1f57e6647d..0d29576943 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C +++ b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C @@ -111,7 +111,7 @@ void ReadAndMapFields label bFacei = facei - mesh.nInternalFaces(); if (bFacei >= 0) { - label patchi = mesh.boundaryMesh().patchID()[bFacei]; + label patchi = mesh.boundaryMesh().patchIndices()[bFacei]; label localFacei = mesh.boundaryMesh()[patchi].whichFace ( facei diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfo.C index 73a764db06..7e08feb464 100644 --- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfo.C +++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfo.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -244,7 +244,7 @@ void Foam::vtkPVFoam::updateInfoPatches if (meshPtr_) { const polyBoundaryMesh& patches = meshPtr_->boundaryMesh(); - const HashTable& groups = patches.groupPatchIDs(); + const HashTable& groups = patches.groupPatchIndices(); const wordList allPatchNames = patches.names(); // Add patch groups diff --git a/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C b/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C index e810baed0c..db4cca22eb 100644 --- a/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C +++ b/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,9 +47,9 @@ Foam::label Foam::coupleGroupIdentifier::findOtherPatchID } HashTable::const_iterator fnd = - pbm.groupPatchIDs().find(name()); + pbm.groupPatchIndices().find(name()); - if (fnd == pbm.groupPatchIDs().end()) + if (fnd == pbm.groupPatchIndices().end()) { if (&mesh == &thisPatch.boundaryMesh().mesh()) { diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C index 383c3cb359..0dd68e8b03 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C +++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C @@ -208,9 +208,9 @@ void Foam::polyBoundaryMesh::clearGeom() void Foam::polyBoundaryMesh::clearAddressing() { nbrEdgesPtr_.clear(); - patchIDPtr_.clear(); - patchFaceIDPtr_.clear(); - groupPatchIDsPtr_.clear(); + patchIndicesPtr_.clear(); + patchFaceIndicesPtr_.clear(); + groupPatchIndicesPtr_.clear(); forAll(*this, patchi) { @@ -403,11 +403,11 @@ Foam::polyBoundaryMesh::nbrEdges() const } -const Foam::labelList& Foam::polyBoundaryMesh::patchID() const +const Foam::labelList& Foam::polyBoundaryMesh::patchIndices() const { - if (!patchIDPtr_.valid()) + if (!patchIndicesPtr_.valid()) { - patchIDPtr_.reset + patchIndicesPtr_.reset ( new labelList ( @@ -415,7 +415,7 @@ const Foam::labelList& Foam::polyBoundaryMesh::patchID() const - mesh_.nInternalFaces() ) ); - labelList& patchID = patchIDPtr_(); + labelList& patchIndices = patchIndicesPtr_(); const polyBoundaryMesh& bm = *this; @@ -424,19 +424,19 @@ const Foam::labelList& Foam::polyBoundaryMesh::patchID() const label bFacei = bm[patchi].start() - mesh_.nInternalFaces(); forAll(bm[patchi], i) { - patchID[bFacei++] = patchi; + patchIndices[bFacei++] = patchi; } } } - return patchIDPtr_(); + return patchIndicesPtr_(); } -const Foam::labelList& Foam::polyBoundaryMesh::patchFaceID() const +const Foam::labelList& Foam::polyBoundaryMesh::patchFaceIndices() const { - if (!patchFaceIDPtr_.valid()) + if (!patchFaceIndicesPtr_.valid()) { - patchFaceIDPtr_.reset + patchFaceIndicesPtr_.reset ( new labelList ( @@ -444,7 +444,7 @@ const Foam::labelList& Foam::polyBoundaryMesh::patchFaceID() const - mesh_.nInternalFaces() ) ); - labelList& patchFaceID = patchFaceIDPtr_(); + labelList& patchFaceID = patchFaceIndicesPtr_(); const polyBoundaryMesh& bm = *this; @@ -457,17 +457,17 @@ const Foam::labelList& Foam::polyBoundaryMesh::patchFaceID() const } } } - return patchFaceIDPtr_(); + return patchFaceIndicesPtr_(); } const Foam::HashTable& -Foam::polyBoundaryMesh::groupPatchIDs() const +Foam::polyBoundaryMesh::groupPatchIndices() const { - if (!groupPatchIDsPtr_.valid()) + if (!groupPatchIndicesPtr_.valid()) { - groupPatchIDsPtr_.reset(new HashTable(10)); - HashTable& groupPatchIDs = groupPatchIDsPtr_(); + groupPatchIndicesPtr_.reset(new HashTable(10)); + HashTable& groupPatchIndices = groupPatchIndicesPtr_(); const polyBoundaryMesh& bm = *this; @@ -479,18 +479,21 @@ Foam::polyBoundaryMesh::groupPatchIDs() const { const word& name = groups[i]; - HashTable::iterator iter = groupPatchIDs.find + HashTable::iterator iter ( - name + groupPatchIndices.find + ( + name + ) ); - if (iter != groupPatchIDs.end()) + if (iter != groupPatchIndices.end()) { iter().append(patchi); } else { - groupPatchIDs.insert(name, labelList(1, patchi)); + groupPatchIndices.insert(name, labelList(1, patchi)); } } } @@ -498,7 +501,7 @@ Foam::polyBoundaryMesh::groupPatchIDs() const // Remove patch names from patchGroups forAll(bm, patchi) { - if (groupPatchIDs.erase(bm[patchi].name())) + if (groupPatchIndices.erase(bm[patchi].name())) { WarningInFunction << "Removing patchGroup '" << bm[patchi].name() @@ -509,26 +512,26 @@ Foam::polyBoundaryMesh::groupPatchIDs() const } } - return groupPatchIDsPtr_(); + return groupPatchIndicesPtr_(); } void Foam::polyBoundaryMesh::setGroup ( const word& groupName, - const labelList& patchIDs + const labelList& patchIndices ) { - groupPatchIDsPtr_.clear(); + groupPatchIndicesPtr_.clear(); polyPatchList& patches = *this; boolList donePatch(patches.size(), false); // Add to specified patches - forAll(patchIDs, i) + forAll(patchIndices, i) { - label patchi = patchIDs[i]; + label patchi = patchIndices[i]; polyPatch& pp = patches[patchi]; if (!pp.inGroup(groupName)) @@ -623,21 +626,22 @@ Foam::labelList Foam::polyBoundaryMesh::findIndices { indices = findStrings(key, this->names()); - if (usePatchGroups && groupPatchIDs().size()) + if (usePatchGroups && groupPatchIndices().size()) { labelHashSet indexSet(indices); - const wordList allGroupNames = groupPatchIDs().toc(); - labelList groupIDs = findStrings(key, allGroupNames); - forAll(groupIDs, i) + const wordList allGroupNames = groupPatchIndices().toc(); + labelList groupIndices = findStrings(key, allGroupNames); + forAll(groupIndices, i) { - const word& grpName = allGroupNames[groupIDs[i]]; - const labelList& patchIDs = groupPatchIDs()[grpName]; - forAll(patchIDs, j) + const word& grpName = allGroupNames[groupIndices[i]]; + const labelList& patchIndices = + groupPatchIndices()[grpName]; + forAll(patchIndices, j) { - if (indexSet.insert(patchIDs[j])) + if (indexSet.insert(patchIndices[j])) { - indices.append(patchIDs[j]); + indices.append(patchIndices[j]); } } } @@ -658,21 +662,21 @@ Foam::labelList Foam::polyBoundaryMesh::findIndices } } - if (usePatchGroups && groupPatchIDs().size()) + if (usePatchGroups && groupPatchIndices().size()) { const HashTable::const_iterator iter = - groupPatchIDs().find(key); + groupPatchIndices().find(key); - if (iter != groupPatchIDs().end()) + if (iter != groupPatchIndices().end()) { labelHashSet indexSet(indices); - const labelList& patchIDs = iter(); - forAll(patchIDs, j) + const labelList& patchIndices = iter(); + forAll(patchIndices, j) { - if (indexSet.insert(patchIDs[j])) + if (indexSet.insert(patchIndices[j])) { - indices.append(patchIDs[j]); + indices.append(patchIndices[j]); } } } @@ -771,34 +775,35 @@ Foam::labelHashSet Foam::polyBoundaryMesh::patchSet // Treat the given patch names as wild-cards and search the set // of all patch names for matches - labelList patchIDs = findStrings(patchName, allPatchNames); + labelList patchIndices = findStrings(patchName, allPatchNames); - forAll(patchIDs, j) + forAll(patchIndices, j) { - ids.insert(patchIDs[j]); + ids.insert(patchIndices[j]); } - if (patchIDs.empty()) + if (patchIndices.empty()) { if (usePatchGroups) { - const wordList allGroupNames = groupPatchIDs().toc(); + const wordList allGroupNames = groupPatchIndices().toc(); // Regard as group name - labelList groupIDs = findStrings(patchName, allGroupNames); + labelList groupIndices = findStrings(patchName, allGroupNames); - forAll(groupIDs, i) + forAll(groupIndices, i) { - const word& name = allGroupNames[groupIDs[i]]; - const labelList& extraPatchIDs = groupPatchIDs()[name]; + const word& name = allGroupNames[groupIndices[i]]; + const labelList& extraPatchIndices = + groupPatchIndices()[name]; - forAll(extraPatchIDs, extraI) + forAll(extraPatchIndices, extraI) { - ids.insert(extraPatchIDs[extraI]); + ids.insert(extraPatchIndices[extraI]); } } - if (groupIDs.empty() && warnNotFound) + if (groupIndices.empty() && warnNotFound) { WarningInFunction << "Cannot find any patch or group names matching " @@ -821,7 +826,7 @@ Foam::labelHashSet Foam::polyBoundaryMesh::patchSet void Foam::polyBoundaryMesh::matchGroups ( - const labelUList& patchIDs, + const labelUList& patchIndices, wordList& groups, labelHashSet& nonGroupPatches ) const @@ -830,14 +835,16 @@ void Foam::polyBoundaryMesh::matchGroups DynamicList matchedGroups(1); // Current set of unmatched patches - nonGroupPatches = labelHashSet(patchIDs); + nonGroupPatches = labelHashSet(patchIndices); + + const HashTable& groupPatchIndices = + this->groupPatchIndices(); - const HashTable& groupPatchIDs = this->groupPatchIDs(); for ( HashTable::const_iterator iter = - groupPatchIDs.begin(); - iter != groupPatchIDs.end(); + groupPatchIndices.begin(); + iter != groupPatchIndices.end(); ++iter ) { @@ -1058,9 +1065,9 @@ void Foam::polyBoundaryMesh::movePoints(const pointField& p) void Foam::polyBoundaryMesh::topoChange() { nbrEdgesPtr_.clear(); - patchIDPtr_.clear(); - patchFaceIDPtr_.clear(); - groupPatchIDsPtr_.clear(); + patchIndicesPtr_.clear(); + patchFaceIndicesPtr_.clear(); + groupPatchIndicesPtr_.clear(); PstreamBuffers pBufs(Pstream::defaultCommsType); diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H index 34eb8b8d68..4bfef1c505 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H +++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H @@ -68,11 +68,11 @@ class polyBoundaryMesh //- Reference to mesh const polyMesh& mesh_; - mutable autoPtr patchIDPtr_; + mutable autoPtr patchIndicesPtr_; - mutable autoPtr patchFaceIDPtr_; + mutable autoPtr patchFaceIndicesPtr_; - mutable autoPtr> groupPatchIDsPtr_; + mutable autoPtr> groupPatchIndicesPtr_; //- Edges of neighbouring patches mutable autoPtr> nbrEdgesPtr_; @@ -179,19 +179,19 @@ public: //- Return patch index for a given face label label whichPatch(const label faceIndex) const; - //- Per boundary face label the patch index - const labelList& patchID() const; + //- Boundary face patch indices + const labelList& patchIndices() const; - //- Per boundary face label the patch face index - const labelList& patchFaceID() const; + //- Boundary face patch face indices + const labelList& patchFaceIndices() const; //- Per patch group the patch indices - const HashTable& groupPatchIDs() const; + const HashTable& groupPatchIndices() const; //- Set/add group with patches - void setGroup(const word& groupName, const labelList& patchIDs); + void setGroup(const word& groupName, const labelList& patchIndices); - //- Return the set of patch IDs corresponding to the given names + //- Return the set of patch indices corresponding to the given names // By default warns if given names are not found. Optionally // matches to patchGroups as well as patchNames labelHashSet patchSet @@ -205,7 +205,7 @@ public: // and any remaining unmatched patches. void matchGroups ( - const labelUList& patchIDs, + const labelUList& patchIndices, wordList& groups, labelHashSet& nonGroupPatches ) const; diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C b/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C index e476bcb49b..1884639745 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C +++ b/src/OpenFOAM/meshes/polyMesh/polyMeshTetDecomposition/polyMeshTetDecomposition.C @@ -227,8 +227,8 @@ Foam::labelList Foam::polyMeshTetDecomposition::findFaceBasePts fI++, bFI++ ) { - label patchi = - mesh.boundaryMesh().patchID()[bFI]; + const label patchi = + mesh.boundaryMesh().patchIndices()[bFI]; if (patches[patchi].coupled()) { @@ -300,7 +300,7 @@ Foam::labelList Foam::polyMeshTetDecomposition::findFaceBasePts continue; } - label patchi = mesh.boundaryMesh().patchID()[bFI]; + const label patchi = mesh.boundaryMesh().patchIndices()[bFI]; if (patches[patchi].coupled()) { @@ -436,7 +436,8 @@ bool Foam::polyMeshTetDecomposition::checkFaceTets } else { - label patchi = patches.patchID()[facei - mesh.nInternalFaces()]; + const label patchi = + patches.patchIndices()[facei - mesh.nInternalFaces()]; if (patches[patchi].coupled()) { diff --git a/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/fvMeshStitcher.C b/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/fvMeshStitcher.C index 801509694e..f16fba6996 100644 --- a/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/fvMeshStitcher.C +++ b/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/fvMeshStitcher.C @@ -632,7 +632,7 @@ void Foam::fvMeshStitcher::applyOwnerOrigBoundaryEdgeParts const label patchi = mesh_.isInternalFace(facei) - ? -1 : pbMesh.patchID()[facei - mesh_.nInternalFaces()]; + ? -1 : pbMesh.patchIndices()[facei - mesh_.nInternalFaces()]; if (patchi != -1 && patchIsOwnerOrig[patchi]) { @@ -684,7 +684,8 @@ void Foam::fvMeshStitcher::applyOwnerOrigBoundaryEdgeParts const label patchi = mesh_.isInternalFace(facei) - ? -1 : pbMesh.patchID()[facei - mesh_.nInternalFaces()]; + ? -1 + : pbMesh.patchIndices()[facei - mesh_.nInternalFaces()]; if (patchi != -1 && patchIsOwnerOrig[patchi]) { @@ -737,7 +738,8 @@ void Foam::fvMeshStitcher::applyOwnerOrigBoundaryEdgeParts const label patchi = mesh_.isInternalFace(facei) - ? -1 : pbMesh.patchID()[facei - mesh_.nInternalFaces()]; + ? -1 + : pbMesh.patchIndices()[facei - mesh_.nInternalFaces()]; if (patchi != -1 && patchIsOwnerOrig[patchi]) { diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.C index 3a32b02b5d..200c585161 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.C +++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -62,8 +62,9 @@ Type Foam::interpolationCellPatchConstrained::interpolate { // Use boundary value const polyBoundaryMesh& pbm = this->psi_.mesh().boundaryMesh(); - label patchi = pbm.patchID()[facei-this->psi_.mesh().nInternalFaces()]; - label patchFacei = pbm[patchi].whichFace(facei); + const label patchi = + pbm.patchIndices()[facei-this->psi_.mesh().nInternalFaces()]; + const label patchFacei = pbm[patchi].whichFace(facei); return this->psi_.boundaryField()[patchi][patchFacei]; } diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C index 64fd91349f..90a7c8b788 100644 --- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C +++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C @@ -98,8 +98,9 @@ Foam::volPointInterpolation::volPointInterpolation(const fvMesh& vm) forAll(pFaces, pPointFacei) { // Poly indices - const label patchi = pbm.patchID()[pFaces[pPointFacei]]; - const label patchFacei = pbm.patchFaceID()[pFaces[pPointFacei]]; + const label patchi = pbm.patchIndices()[pFaces[pPointFacei]]; + const label patchFacei = + pbm.patchFaceIndices()[pFaces[pPointFacei]]; // FV indices const labelUList patches = @@ -188,8 +189,9 @@ Foam::volPointInterpolation::volPointInterpolation(const fvMesh& vm) forAll(pFaces, bPointFacei) { // Poly indices - const label patchi = pbm.patchID()[pFaces[bPointFacei]]; - const label patchFacei = pbm.patchFaceID()[pFaces[bPointFacei]]; + const label patchi = pbm.patchIndices()[pFaces[bPointFacei]]; + const label patchFacei = + pbm.patchFaceIndices()[pFaces[bPointFacei]]; // FV indices const labelUList patches = diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.C b/src/lagrangian/basic/InteractionLists/InteractionLists.C index 8f28779162..1c8181f8e2 100644 --- a/src/lagrangian/basic/InteractionLists/InteractionLists.C +++ b/src/lagrangian/basic/InteractionLists/InteractionLists.C @@ -543,7 +543,7 @@ void Foam::InteractionLists::buildInteractionLists() const face& f = mesh_.faces()[wallFaceIndex]; - label patchi = mesh_.boundaryMesh().patchID() + label patchi = mesh_.boundaryMesh().patchIndices() [ wallFaceIndex - mesh_.nInternalFaces() ]; @@ -1016,7 +1016,7 @@ void Foam::InteractionLists::prepareWallDataToRefer() globalTransforms.transformIndex(wfiat) ); - label patchi = mesh_.boundaryMesh().patchID() + label patchi = mesh_.boundaryMesh().patchIndices() [ wallFaceIndex - mesh_.nInternalFaces() ]; diff --git a/src/lagrangian/parcel/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C b/src/lagrangian/parcel/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C index 68661dc4ba..a30289bf4f 100644 --- a/src/lagrangian/parcel/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C +++ b/src/lagrangian/parcel/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C @@ -293,7 +293,7 @@ Foam::FacePostProcessing::FacePostProcessing else { label bFacei = facei - owner.mesh().nInternalFaces(); - label patchi = pbm.patchID()[bFacei]; + label patchi = pbm.patchIndices()[bFacei]; const polyPatch& pp = pbm[patchi]; if diff --git a/src/lagrangian/parcel/submodels/CloudFunctionObjects/Flux/Flux.C b/src/lagrangian/parcel/submodels/CloudFunctionObjects/Flux/Flux.C index c9aea0380a..0c79e722d5 100644 --- a/src/lagrangian/parcel/submodels/CloudFunctionObjects/Flux/Flux.C +++ b/src/lagrangian/parcel/submodels/CloudFunctionObjects/Flux/Flux.C @@ -66,8 +66,8 @@ void Foam::Flux::accumulate const label facei = p.face(); const label bFacei = isInternal ? -1 : facei - mesh.nInternalFaces(); - const label patchi = isInternal ? -1 : bMesh.patchID()[bFacei]; - const label patchFacei = isInternal ? -1 : bMesh.patchFaceID()[bFacei]; + const label patchi = isInternal ? -1 : bMesh.patchIndices()[bFacei]; + const label patchFacei = isInternal ? -1 : bMesh.patchFaceIndices()[bFacei]; const bool own = mesh.faceOwner()[facei] == p.cell(); diff --git a/src/lagrangian/parcel/submodels/Momentum/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/parcel/submodels/Momentum/CollisionModel/PairCollision/PairCollision.C index 71718c9ca4..705b61b1c7 100644 --- a/src/lagrangian/parcel/submodels/Momentum/CollisionModel/PairCollision/PairCollision.C +++ b/src/lagrangian/parcel/submodels/Momentum/CollisionModel/PairCollision/PairCollision.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -181,7 +181,7 @@ void Foam::PairCollision::wallInteraction() const labelListList& directWallFaces = il_.dwfil(); - const labelList& patchID = mesh.boundaryMesh().patchID(); + const labelList& patchID = mesh.boundaryMesh().patchIndices(); const volVectorField& U = mesh.lookupObject(il_.UName()); diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C index ccb8e8b87f..dd4c4f76a0 100644 --- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C +++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -567,7 +567,7 @@ Foam::label Foam::snappyRefineDriver::danglingCellRefine } else { - label patchi = pbm.patchID()[bFacei]; + label patchi = pbm.patchIndices()[bFacei]; if (pbm[patchi].coupled()) { nIntFaces++; diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C index 465dbd58ea..1a438ae8f5 100644 --- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C +++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C @@ -518,7 +518,7 @@ void Foam::snappySnapDriver::calcNearestFacePointProperties // correctly) { const polyBoundaryMesh& pbm = mesh.boundaryMesh(); - labelList patchID(pbm.patchID()); + labelList patchID(pbm.patchIndices()); // Unmark all non-coupled boundary faces forAll(pbm, patchi) diff --git a/src/polyTopoChange/fvMeshSubset/fvMeshSubsetInterpolate.C b/src/polyTopoChange/fvMeshSubset/fvMeshSubsetInterpolate.C index 709a7a131e..69f945ea99 100644 --- a/src/polyTopoChange/fvMeshSubset/fvMeshSubsetInterpolate.C +++ b/src/polyTopoChange/fvMeshSubset/fvMeshSubsetInterpolate.C @@ -319,7 +319,7 @@ Foam::fvMeshSubset::interpolate else { const label basePatchi = - sf.mesh().boundaryMesh().patchID() + sf.mesh().boundaryMesh().patchIndices() [baseFacei - sf.mesh().nInternalFaces()]; const label basePatchFacei = sf.mesh().boundaryMesh()[basePatchi]