From 339e20c0f8fdec4ccc89d78f9967bcfa0f96fe41 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Tue, 26 Mar 2024 13:30:21 +0000 Subject: [PATCH] zones: Renamed meshZones() -> zones() --- .../meshes/polyMesh/zones/Zone/Zone.C | 2 +- .../meshes/polyMesh/zones/Zone/Zone.H | 2 +- .../meshes/polyMesh/zones/faceZone/faceZone.C | 20 +++++++++---------- .../polyMesh/zones/pointZone/pointZone.C | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/OpenFOAM/meshes/polyMesh/zones/Zone/Zone.C b/src/OpenFOAM/meshes/polyMesh/zones/Zone/Zone.C index a1ad80c7dc..5f4395d647 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/Zone/Zone.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/Zone/Zone.C @@ -154,7 +154,7 @@ Foam::Zone::~Zone() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -const ZonesType& Foam::Zone::meshZones() const +const ZonesType& Foam::Zone::zones() const { return zones_; } diff --git a/src/OpenFOAM/meshes/polyMesh/zones/Zone/Zone.H b/src/OpenFOAM/meshes/polyMesh/zones/Zone/Zone.H index a52e8a1317..919a8ac4e8 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/Zone/Zone.H +++ b/src/OpenFOAM/meshes/polyMesh/zones/Zone/Zone.H @@ -154,7 +154,7 @@ public: } //- Return ZonesType reference - const ZonesType& meshZones() const; + const ZonesType& zones() const; //- Map storing the local index for every global index. Used to find // the index of the item in the zone from the known global index. If diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C index 94bcf10943..255cc6267d 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C @@ -62,12 +62,12 @@ void Foam::faceZone::calcFaceZonePatch() const new primitiveFacePatch ( faceList(size()), - meshZones().mesh().points() + zones().mesh().points() ); primitiveFacePatch& patch = *patchPtr_; - const faceList& f = meshZones().mesh().faces(); + const faceList& f = zones().mesh().faces(); const labelList& addr = *this; const boolList& flip = flipMap(); @@ -111,8 +111,8 @@ void Foam::faceZone::calcCellLayers() const // Go through all the faces in the master zone. Choose the // master or slave cell based on the face flip - const labelList& own = meshZones().mesh().faceOwner(); - const labelList& nei = meshZones().mesh().faceNeighbour(); + const labelList& own = zones().mesh().faceOwner(); + const labelList& nei = zones().mesh().faceNeighbour(); const labelList& mf = *this; @@ -129,7 +129,7 @@ void Foam::faceZone::calcCellLayers() const label ownCelli = own[mf[facei]]; label neiCelli = ( - meshZones().mesh().isInternalFace(mf[facei]) + zones().mesh().isInternalFace(mf[facei]) ? nei[mf[facei]] : -1 ); @@ -163,7 +163,7 @@ void Foam::faceZone::checkAddressing() const const labelList& mf = *this; // Note: nFaces, nCells might not be set yet on mesh so use owner size - const label nFaces = meshZones().mesh().faceOwner().size(); + const label nFaces = zones().mesh().faceOwner().size(); bool hasWarned = false; forAll(mf, i) @@ -349,8 +349,8 @@ const Foam::labelList& Foam::faceZone::meshEdges() const ( operator()().meshEdges ( - meshZones().mesh().edges(), - meshZones().mesh().pointEdges() + zones().mesh().edges(), + zones().mesh().pointEdges() ) ); } @@ -388,7 +388,7 @@ bool Foam::faceZone::checkDefinition(const bool report) const { return Zone::checkDefinition ( - meshZones().mesh().faces().size(), + zones().mesh().faces().size(), report ); } @@ -396,7 +396,7 @@ bool Foam::faceZone::checkDefinition(const bool report) const bool Foam::faceZone::checkParallelSync(const bool report) const { - const polyMesh& mesh = meshZones().mesh(); + const polyMesh& mesh = zones().mesh(); const polyBoundaryMesh& bm = mesh.boundaryMesh(); bool hasError = false; diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C index a1157b209c..14f2d2c1ea 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C @@ -124,7 +124,7 @@ bool Foam::pointZone::checkDefinition(const bool report) const bool Foam::pointZone::checkParallelSync(const bool report) const { - const polyMesh& mesh = meshZones().mesh(); + const polyMesh& mesh = zones().mesh(); const label index = zones_.findIndex(name());