diff --git a/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/cloudFilmTransfer/CloudFilmTransfer/CloudFilmTransfer.C b/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/cloudFilmTransfer/CloudFilmTransfer/CloudFilmTransfer.C index 19e3a49b7a..48d0a72661 100644 --- a/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/cloudFilmTransfer/CloudFilmTransfer/CloudFilmTransfer.C +++ b/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/cloudFilmTransfer/CloudFilmTransfer/CloudFilmTransfer.C @@ -406,7 +406,7 @@ void Foam::CloudFilmTransfer::splashInteraction // Create a new parcel by copying source parcel parcelType* pPtr = new parcelType(p); - pPtr->origId() = pPtr->getNewParticleID(); + pPtr->origId() = pPtr->getNewParticleIndex(); pPtr->origProc() = Pstream::myProcNo(); diff --git a/applications/utilities/mesh/conversion/star3ToFoam/coupledFacePair.C b/applications/utilities/mesh/conversion/star3ToFoam/coupledFacePair.C index 5ce44db233..b712fbe7af 100644 --- a/applications/utilities/mesh/conversion/star3ToFoam/coupledFacePair.C +++ b/applications/utilities/mesh/conversion/star3ToFoam/coupledFacePair.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,11 +40,11 @@ Foam::coupledFacePair::coupledFacePair const label integral ) : - coupleID_(coupleNo), - masterCellID_(mC), - masterFaceID_(mF), - slaveCellID_(sC), - slaveFaceID_(sF), + coupleIndex_(coupleNo), + masterCellIndex_(mC), + masterFaceIndex_(mF), + slaveCellIndex_(sC), + slaveFaceIndex_(sF), integralMatch_(integral == 1) {} @@ -53,10 +53,10 @@ Foam::coupledFacePair::coupledFacePair Foam::Ostream& Foam::operator<<(Ostream& os, const coupledFacePair& c) { - os << "Master cell: " << c.masterCellID_ - << " face: " << c.masterFaceID_ << endl - << "Slave cell: " << c.slaveCellID_ - << " face: " << c.slaveFaceID_ << endl + os << "Master cell: " << c.masterCellIndex_ + << " face: " << c.masterFaceIndex_ << endl + << "Slave cell: " << c.slaveCellIndex_ + << " face: " << c.slaveFaceIndex_ << endl << "Integral: " << c.integralMatch_ << endl; return os; diff --git a/applications/utilities/mesh/conversion/star3ToFoam/coupledFacePair.H b/applications/utilities/mesh/conversion/star3ToFoam/coupledFacePair.H index ab5495af51..b78fcdea13 100644 --- a/applications/utilities/mesh/conversion/star3ToFoam/coupledFacePair.H +++ b/applications/utilities/mesh/conversion/star3ToFoam/coupledFacePair.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -58,19 +58,19 @@ class coupledFacePair // Private Data //- STAR couple ID - label coupleID_; + label coupleIndex_; //- Master cell (lower cell label) - label masterCellID_; + label masterCellIndex_; //- Master face (lower cell label) - label masterFaceID_; + label masterFaceIndex_; //- Slave cell (higher cell label) - label slaveCellID_; + label slaveCellIndex_; //- Slave face (higher cell label) - label slaveFaceID_; + label slaveFaceIndex_; //- Integral or arbitrary flag bool integralMatch_; @@ -94,33 +94,33 @@ public: // Member Functions //- Return STAR couple ID - label coupleID() const + label coupleIndex() const { - return coupleID_; + return coupleIndex_; } //- Return master cell label masterCell() const { - return masterCellID_; + return masterCellIndex_; } //- Return master face label masterFace() const { - return masterFaceID_; + return masterFaceIndex_; } //- Return slave cell label slaveCell() const { - return slaveCellID_; + return slaveCellIndex_; } //- Return slave face label slaveFace() const { - return slaveFaceID_; + return slaveFaceIndex_; } //- Is this an integral match? diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C b/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C index 60be242a5f..4ae46597eb 100644 --- a/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C +++ b/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C @@ -156,9 +156,13 @@ void Foam::starMesh::markBoundaryFaces() forAll(curFace, spI) { - if (curFace[spI] > -1 && curFace[spI] < starPointID_.size()) + if + ( + curFace[spI] > -1 + && curFace[spI] < starPointIndex_.size() + ) { - Info<< "," << starPointID_[curFace[spI]]; + Info<< "," << starPointIndex_[curFace[spI]]; } else { diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C index 17c9069a24..6424b86521 100644 --- a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C +++ b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -67,7 +67,7 @@ void Foam::starMesh::createCoupleMatches() if (coupleI % infoJump == 0) { Info<< "Doing couple " << coupleI << ". STAR couple ID: " - << couples_[coupleI].coupleID() << endl; + << couples_[coupleI].coupleIndex() << endl; } // Initialise cell edges for master and slave cells @@ -96,16 +96,16 @@ void Foam::starMesh::createCoupleMatches() { Info<< "Couple direction mismatch in the couple match " << coupleI << ". STAR couple ID: " - << couples_[coupleI].coupleID() << endl + << couples_[coupleI].coupleIndex() << endl << "The angle between face normals is " << radToDeg(Foam::acos(faceAreaAngle)) << " deg." << endl << "master cell: " << fp.masterCell() - << " STAR number: " << starCellID_[fp.masterCell()] + << " STAR number: " << starCellIndex_[fp.masterCell()] << " type: " << cellShapes_[fp.masterCell()].model().name() << " face: " << fp.masterFace() << endl << "slave cell : " << fp.slaveCell() - << " STAR number: " << starCellID_[fp.slaveCell()] + << " STAR number: " << starCellIndex_[fp.slaveCell()] << " type: " << cellShapes_[fp.slaveCell()].model().name() << " face: " << fp.slaveFace() << endl; } @@ -1103,7 +1103,7 @@ void Foam::starMesh::createCoupleMatches() << endl << "error in face intersection: " << "no edges to consider for closing the loop" << coupleI << ". STAR couple ID: " - << couples_[coupleI].coupleID() << endl + << couples_[coupleI].coupleIndex() << endl << "Cut Master Face: " << newMasterFace << endl << "points: " << newMasterFace.points(points_) << endl @@ -1225,7 +1225,7 @@ void Foam::starMesh::createCoupleMatches() << endl << "error in intersected face: " << "lost thread for intersection of couple " << coupleI << ". STAR couple ID: " - << couples_[coupleI].coupleID() << endl + << couples_[coupleI].coupleIndex() << endl << "Cut Master Face: " << newMasterFace << endl << "points: " << newMasterFace.points(points_) << endl @@ -1277,7 +1277,7 @@ void Foam::starMesh::createCoupleMatches() << "duplicate point in intersected face " << "for couple no " << coupleI << ". STAR couple ID: " - << couples_[coupleI].coupleID() << endl + << couples_[coupleI].coupleIndex() << endl << "Duplicate point label: " << intersectedFace[checkI] << endl << "Cut Master Face: " << newMasterFace << endl @@ -1299,7 +1299,7 @@ void Foam::starMesh::createCoupleMatches() << "void starMesh::createCoupleMatches() : " << endl << "could not find start edge for intersection of couple " << coupleI << ". STAR couple ID: " - << couples_[coupleI].coupleID() << endl + << couples_[coupleI].coupleIndex() << endl << "Cut Master Face: " << newMasterFace << endl << "points: " << newMasterFace.points(points_) << endl << "Cut Slave Face: " << newSlaveFace << endl diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C b/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C index 2c20c7aa9f..22dbeb365c 100644 --- a/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C +++ b/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -106,11 +106,11 @@ void Foam::starMesh::createPolyBoundary() ( curCellFaces[cellFacei][spI] > -1 && curCellFaces[cellFacei][spI] - < starPointID_.size() + < starPointIndex_.size() ) { Info<< "," - << starPointID_ + << starPointIndex_ [curCellFaces[cellFacei][spI]]; } else @@ -140,11 +140,11 @@ void Foam::starMesh::createPolyBoundary() ( curCellFaces[cellFacei][spI] > -1 && curCellFaces[cellFacei][spI] - < starPointID_.size() + < starPointIndex_.size() ) { Info<< "," - << starPointID_ + << starPointIndex_ [curCellFaces[cellFacei][spI]]; } else @@ -189,7 +189,7 @@ void Foam::starMesh::createPolyBoundary() InfoInFunction << "Missing face found in cell " << celli << ".\nType: " << cellShapes_[celli].model().name() - << ". STAR cell number: " << starCellID_[celli] + << ". STAR cell number: " << starCellIndex_[celli] << ". Face: " << missingFace << endl; nMissingFaceFound++; @@ -201,10 +201,10 @@ void Foam::starMesh::createPolyBoundary() if ( missingFace[spI] > -1 - && missingFace[spI] < starPointID_.size() + && missingFace[spI] < starPointIndex_.size() ) { - Info<< "," << starPointID_[missingFace[spI]]; + Info<< "," << starPointIndex_[missingFace[spI]]; } else { @@ -265,10 +265,10 @@ void Foam::starMesh::createPolyBoundary() if ( problemFace[spI] > -1 - && problemFace[spI] < starPointID_.size() + && problemFace[spI] < starPointIndex_.size() ) { - Info<< "," << starPointID_[problemFace[spI]]; + Info<< "," << starPointIndex_[problemFace[spI]]; } else { diff --git a/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C b/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C index 32211c52d2..a211753bcb 100644 --- a/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C +++ b/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -308,10 +308,10 @@ void Foam::starMesh::mergeCoupleFacePoints() { FatalErrorInFunction << "Error in point merging for cell " - << celli << ". STAR index: " << starCellID_[celli] + << celli << ". STAR index: " << starCellIndex_[celli] << ". " << endl << "Point index: " << curLabels[pointi] << " STAR index " - << starPointID_[curLabels[pointi]] << endl + << starPointIndex_[curLabels[pointi]] << endl << "Please check the geometry for the cell." << endl; } } @@ -387,10 +387,10 @@ void Foam::starMesh::mergeCoupleFacePoints() { FatalErrorInFunction << "Error in point renumbering for cell " - << celli << ". STAR index: " << starCellID_[celli] + << celli << ". STAR index: " << starCellIndex_[celli] << ". " << endl << "Point index: " << curLabels[pointi] << " STAR index " - << starPointID_[curLabels[pointi]] << " returns invalid " + << starPointIndex_[curLabels[pointi]] << " returns invalid " << "renumbering index: " << renumberPoints[curLabels[pointi]] << "." << endl << "Old cellShape: " << oldLabels << endl @@ -403,15 +403,15 @@ void Foam::starMesh::mergeCoupleFacePoints() Info<< "Renumbering STAR point lookup" << endl; - labelList oldStarPointID = starPointID_; + labelList oldStarPointID = starPointIndex_; - starPointID_ = -1; + starPointIndex_ = -1; - forAll(starPointID_, pointi) + forAll(starPointIndex_, pointi) { if (renumberPoints[pointi] > -1) { - starPointID_[renumberPoints[pointi]] = oldStarPointID[pointi]; + starPointIndex_[renumberPoints[pointi]] = oldStarPointID[pointi]; } } diff --git a/applications/utilities/mesh/conversion/star3ToFoam/readCells.C b/applications/utilities/mesh/conversion/star3ToFoam/readCells.C index d793572acc..740228fa10 100644 --- a/applications/utilities/mesh/conversion/star3ToFoam/readCells.C +++ b/applications/utilities/mesh/conversion/star3ToFoam/readCells.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -251,7 +251,7 @@ void Foam::starMesh::readCells() Info<< "Number of cells = " << nCells << endl << endl; cellShapes_.setSize(nCells); - starCellID_.setSize(nCells); + starCellIndex_.setSize(nCells); starCellPermutation_.setSize(nCells); // reset permutation to invalid value @@ -346,7 +346,7 @@ void Foam::starMesh::readCells() } while (addOnToCell >= 0); // Record STAR cell number (used for debugging) - starCellID_[celli] = lineLabel; + starCellIndex_[celli] = lineLabel; // insert STAR lookup addressing starCellLabelLookup_[lineLabel] = celli; diff --git a/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C b/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C index 98786381dc..8381b10081 100644 --- a/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C +++ b/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -118,10 +118,10 @@ void Foam::starMesh::readPoints(const scalar scaleFactor) points_.setSize(nPoints); #ifdef starMesh_H - starPointID_.setSize(nPoints); + starPointIndex_.setSize(nPoints); // Reset STAR point ID, just in case - starPointID_ = -1; + starPointIndex_ = -1; #endif starPointLabelLookup_.setSize(maxLabel+1); @@ -147,7 +147,7 @@ void Foam::starMesh::readPoints(const scalar scaleFactor) readToNl(pointsFile); #ifdef starMesh_H - starPointID_[p] = pointLabel; + starPointIndex_[p] = pointLabel; #endif starPointLabelLookup_[pointLabel] = p; diff --git a/applications/utilities/mesh/conversion/star3ToFoam/readSeparatedPoints.C b/applications/utilities/mesh/conversion/star3ToFoam/readSeparatedPoints.C index 6549384652..eb8e2e7c86 100644 --- a/applications/utilities/mesh/conversion/star3ToFoam/readSeparatedPoints.C +++ b/applications/utilities/mesh/conversion/star3ToFoam/readSeparatedPoints.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -67,10 +67,10 @@ void Foam::starMesh::readPoints(const scalar scaleFactor) Info<< "Number of points = " << nPoints << endl << endl; points_.setSize(nPoints); - starPointID_.setSize(nPoints); + starPointIndex_.setSize(nPoints); // Reset STAR point ID, just in case - starPointID_ = -1; + starPointIndex_ = -1; starPointLabelLookup_.setSize(maxLabel+1); @@ -93,7 +93,7 @@ void Foam::starMesh::readPoints(const scalar scaleFactor) >> points_[p].y() >> points_[p].z(); - starPointID_[p] = pointLabel; + starPointIndex_[p] = pointLabel; starPointLabelLookup_[pointLabel] = p; } diff --git a/applications/utilities/mesh/conversion/star3ToFoam/starMesh.C b/applications/utilities/mesh/conversion/star3ToFoam/starMesh.C index 63f72d5afb..098d619ed9 100644 --- a/applications/utilities/mesh/conversion/star3ToFoam/starMesh.C +++ b/applications/utilities/mesh/conversion/star3ToFoam/starMesh.C @@ -211,8 +211,8 @@ void Foam::starMesh::clearExtraStorage() Info<< "Clearing extra storage" << endl; starPointLabelLookup_.setSize(0); - starPointID_.setSize(0); - starCellID_.setSize(0); + starPointIndex_.setSize(0); + starCellIndex_.setSize(0); starCellLabelLookup_.setSize(0); starCellPermutation_.setSize(0); cellFaces_.setSize(0); @@ -244,8 +244,8 @@ Foam::starMesh::starMesh patchNames_(0), patchPhysicalTypes_(0), starPointLabelLookup_(0), - starPointID_(0), - starCellID_(0), + starPointIndex_(0), + starCellIndex_(0), starCellLabelLookup_(0), starCellPermutation_(0), cellFaces_(0), diff --git a/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H b/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H index f72a41d2b7..6d75f9b8d2 100644 --- a/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H +++ b/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H @@ -103,10 +103,10 @@ class starMesh labelList starPointLabelLookup_; //- STAR point number for a given vertex - labelList starPointID_; + labelList starPointIndex_; //- STAR Cell number for a given cell - labelList starCellID_; + labelList starCellIndex_; //- Cell labels (STAR cell numbering is not necessarily contiguous) labelList starCellLabelLookup_; diff --git a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C index 26f4f278e1..f11f7b3104 100644 --- a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C +++ b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C @@ -41,7 +41,9 @@ Foam::label Foam::fvFieldDecomposer::completePatchID } else if (isA(procPatch)) { - return refCast(procPatch).referPatchID(); + return + refCast(procPatch) + .referPatchIndex(); } else { diff --git a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerTemplates.C b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerTemplates.C index 417bb0ff78..f4a6024461 100644 --- a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerTemplates.C +++ b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerTemplates.C @@ -250,7 +250,7 @@ Foam::fvFieldDecomposer::decomposeVolField const label nbrCompletePatchi = refCast(procPatch) - .referPatch().nbrPatchID(); + .referPatch().nbrPatchIndex(); // Use `fvPatchField::New` rather than // `new processorCyclicFvPatchField` so that derivations diff --git a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.C b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.C index 13c5f78bc6..b10b08a8d7 100644 --- a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.C +++ b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.C @@ -42,7 +42,9 @@ Foam::label Foam::fvFieldReconstructor::completePatchID } else if (isA(procPatch)) { - return refCast(procPatch).referPatchID(); + return + refCast(procPatch) + .referPatchIndex(); } else { diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/fluentUnitNumbers.txt b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/fluentUnitNumbers.txt index 1c680ef2de..89d8645baf 100644 --- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/fluentUnitNumbers.txt +++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/fluentUnitNumbers.txt @@ -59,7 +59,7 @@ enum { XF_RF_DATA_MASS_FLUX_M1=47, XF_RF_DATA_MASS_FLUX_M2=48, - XF_RF_DATA_GRID_FLUX=49, + XF_RF_DATA_GRIndex_FLUX=49, XF_RF_DATA_DO_I=50, XF_RF_DATA_DO_RECON_I=51, @@ -182,7 +182,7 @@ enum { /* dynamic mesh */ XF_RF_DATA_VOLUME_M2 = 180 , - XF_RF_DATA_WALL_GRID_VELOCITY = 181 , + XF_RF_DATA_WALL_GRIndex_VELOCITY = 181 , XF_RF_DATA_SV_T_AUX = 190 , /* auxiliary temperature diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C index 90ff99608a..fb07bb2ab7 100644 --- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C +++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C @@ -39,7 +39,6 @@ Description #include "viscosityModel.H" #include "incompressibleMomentumTransportModels.H" #include "wallDist.H" -#include "bound.H" #include "fvcFlux.H" using namespace Foam; @@ -191,9 +190,6 @@ int main(int argc, char *argv[]) { volScalarField omega(omegaHeader, mesh); - const incompressible::RASModel& rasModel = - refCast(turbulence()); - omega = (1 - mask)*omega + mask*ce0*sqrt(k)/(Cmu*min(y, ybl)); // Do not correct BC - G set by the wall-functions is not available diff --git a/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.C b/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.C index 23dc48c2de..ccfd2d2d2c 100644 --- a/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.C +++ b/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -64,7 +64,7 @@ void Foam::ParSortableList::copyInto tagVal.value() = values[elemI]; tagVal.index() = indices[elemI]; - tagVal.procID() = fromProcNo; + tagVal.procIndex() = fromProcNo; destI++; } @@ -338,7 +338,7 @@ void Foam::ParSortableList::sort() { this->operator[](elemI) = combinedValues[elemI].value(); indices_[elemI] = combinedValues[elemI].index(); - procs_[elemI] = combinedValues[elemI].procID(); + procs_[elemI] = combinedValues[elemI].procIndex(); } } diff --git a/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.H b/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.H index dcd6ce77a4..9387dc390f 100644 --- a/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.H +++ b/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -95,7 +95,7 @@ class ParSortableList label index_; //- Proc - label procID_; + label procIndex_; public: @@ -127,14 +127,14 @@ class ParSortableList return index_; } - label procID() const + label procIndex() const { - return procID_; + return procIndex_; } - label& procID() + label& procIndex() { - return procID_; + return procIndex_; } }; diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C index 6474c26346..e9229b1b98 100644 --- a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C +++ b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.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 @@ -245,7 +245,7 @@ void Foam::LUscalarMatrix::convert const cyclicLduInterface& cycInterface = refCast(interface); - label nbrInt = cycInterface.nbrPatchID(); + label nbrInt = cycInterface.nbrPatchIndex(); const label* __restrict__ uPtr = interfaces[nbrInt].interface().faceCells().begin(); diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.H index 70daba0e6a..a0c968b867 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.H +++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -67,7 +67,7 @@ public: // Access //- Return neighbour - virtual label nbrPatchID() const = 0; + virtual label nbrPatchIndex() const = 0; virtual bool owner() const = 0; diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C index abce503d93..9498044fa1 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.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 @@ -94,9 +94,9 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface ) : GAMGInterface(index, coarseInterfaces), - nbrPatchID_ + nbrPatchIndex_ ( - refCast(fineInterface).nbrPatchID() + refCast(fineInterface).nbrPatchIndex() ), owner_(refCast(fineInterface).owner()), transform_(refCast(fineInterface).transform()) @@ -171,7 +171,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface ) : GAMGInterface(index, coarseInterfaces, is), - nbrPatchID_(readLabel(is)), + nbrPatchIndex_(readLabel(is)), owner_(readBool(is)), transform_(is) {} @@ -209,7 +209,7 @@ Foam::tmp Foam::cyclicGAMGInterface::internalFieldTransfer void Foam::cyclicGAMGInterface::write(Ostream& os) const { GAMGInterface::write(os); - os << token::SPACE << nbrPatchID_ + os << token::SPACE << nbrPatchIndex_ << token::SPACE << owner_ << token::SPACE << transform_; } diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H index 222d47edd0..3db5383daa 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -55,7 +55,7 @@ class cyclicGAMGInterface // Private Data //- Neighbour patch number - label nbrPatchID_; + label nbrPatchIndex_; //- Am I owner? bool owner_; @@ -116,9 +116,9 @@ public: //- Cyclic interface functions //- Return neighbour processor number - virtual label nbrPatchID() const + virtual label nbrPatchIndex() const { - return nbrPatchID_; + return nbrPatchIndex_; } virtual bool owner() const @@ -130,7 +130,7 @@ public: { return dynamic_cast ( - coarseInterfaces_[nbrPatchID()] + coarseInterfaces_[nbrPatchIndex()] ); } diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H index 44f25265ea..c3bab82498 100644 --- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H +++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H @@ -115,7 +115,7 @@ public: //- Return neighbour point patch const cyclicPointPatch& nbrPatch() const { - label patchi = cyclicPolyPatch_.nbrPatchID(); + label patchi = cyclicPolyPatch_.nbrPatchIndex(); const pointPatch& pp = this->boundaryMesh()[patchi]; return refCast(pp); } diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C index 83c5d33ffd..39dd167c1e 100644 --- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C +++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.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 @@ -706,7 +706,7 @@ void Foam::globalPoints::receivePatchPoints { const labelPairList infoB = addSendTransform ( - cycPatch.nbrPatchID(), + cycPatch.nbrPatchIndex(), procPoints_[procPointB()] ); diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C index df1fd7ad95..b57d218b46 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C @@ -127,9 +127,9 @@ void Foam::cyclicPolyPatch::rename(const wordList& newNames) void Foam::cyclicPolyPatch::reorder(const labelUList& newToOldIndex) { polyPatch::reorder(newToOldIndex); - if (nbrPatchID_ != -1) + if (nbrPatchIndex_ != -1) { - nbrPatchID_ = findIndex(newToOldIndex, nbrPatchID_); + nbrPatchIndex_ = findIndex(newToOldIndex, nbrPatchIndex_); } } @@ -149,7 +149,7 @@ Foam::cyclicPolyPatch::cyclicPolyPatch coupledPolyPatch(name, size, start, index, bm, patchType), cyclicTransform(false), nbrPatchName_(word::null), - nbrPatchID_(-1), + nbrPatchIndex_(-1), coupledPointsPtr_(nullptr), coupledEdgesPtr_(nullptr), ownToNbrOrderDataPtr_(nullptr), @@ -173,7 +173,7 @@ Foam::cyclicPolyPatch::cyclicPolyPatch coupledPolyPatch(name, size, start, index, bm, patchType), cyclicTransform(transform), nbrPatchName_(nbrPatchName), - nbrPatchID_(-1), + nbrPatchIndex_(-1), coupledPointsPtr_(nullptr), coupledEdgesPtr_(nullptr), ownToNbrOrderDataPtr_(nullptr), @@ -196,7 +196,7 @@ Foam::cyclicPolyPatch::cyclicPolyPatch cyclicTransform(dict, cyclicTransformDefaultIsNone), nbrPatchName_(dict.lookupOrDefault("neighbourPatch", word::null)), coupleGroup_(dict), - nbrPatchID_(-1), + nbrPatchIndex_(-1), coupledPointsPtr_(nullptr), coupledEdgesPtr_(nullptr), ownToNbrOrderDataPtr_(nullptr), @@ -235,7 +235,7 @@ Foam::cyclicPolyPatch::cyclicPolyPatch cyclicTransform(pp), nbrPatchName_(pp.nbrPatchName_), coupleGroup_(pp.coupleGroup_), - nbrPatchID_(-1), + nbrPatchIndex_(-1), coupledPointsPtr_(nullptr), coupledEdgesPtr_(nullptr), ownToNbrOrderDataPtr_(nullptr), @@ -261,7 +261,7 @@ Foam::cyclicPolyPatch::cyclicPolyPatch cyclicTransform(pp), nbrPatchName_(neiName), coupleGroup_(pp.coupleGroup_), - nbrPatchID_(-1), + nbrPatchIndex_(-1), coupledPointsPtr_(nullptr), coupledEdgesPtr_(nullptr), ownToNbrOrderDataPtr_(nullptr), @@ -305,13 +305,13 @@ const Foam::word& Foam::cyclicPolyPatch::nbrPatchName() const } -Foam::label Foam::cyclicPolyPatch::nbrPatchID() const +Foam::label Foam::cyclicPolyPatch::nbrPatchIndex() const { - if (nbrPatchID_ == -1) + if (nbrPatchIndex_ == -1) { - nbrPatchID_ = this->boundaryMesh().findIndex(nbrPatchName()); + nbrPatchIndex_ = this->boundaryMesh().findIndex(nbrPatchName()); - if (nbrPatchID_ == -1) + if (nbrPatchIndex_ == -1) { FatalErrorInFunction << "Illegal neighbourPatch name " << nbrPatchName() @@ -323,7 +323,7 @@ Foam::label Foam::cyclicPolyPatch::nbrPatchID() const // Check that it is a cyclic const cyclicPolyPatch& nbrPatch = refCast ( - this->boundaryMesh()[nbrPatchID_] + this->boundaryMesh()[nbrPatchIndex_] ); if (nbrPatch.nbrPatchName() != name()) @@ -336,7 +336,7 @@ Foam::label Foam::cyclicPolyPatch::nbrPatchID() const << endl; } } - return nbrPatchID_; + return nbrPatchIndex_; } diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H index 1d29871423..d46e711a1e 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H @@ -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 @@ -86,7 +86,7 @@ class cyclicPolyPatch const coupleGroupIdentifier coupleGroup_; //- Index of cyclic neighbour patch - mutable label nbrPatchID_; + mutable label nbrPatchIndex_; //- List of edges formed from connected points. e[0] is the point on // this patch, e[1] the corresponding point on the cyclic neighbour. @@ -247,11 +247,11 @@ public: const word& nbrPatchName() const; //- Neighbour patchID - virtual label nbrPatchID() const; + virtual label nbrPatchIndex() const; virtual bool owner() const { - return index() < nbrPatchID(); + return index() < nbrPatchIndex(); } virtual bool neighbour() const @@ -261,7 +261,7 @@ public: const cyclicPolyPatch& nbrPatch() const { - const polyPatch& pp = this->boundaryMesh()[nbrPatchID()]; + const polyPatch& pp = this->boundaryMesh()[nbrPatchIndex()]; return refCast(pp); } diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C index 9b8caa6a5b..dd68057558 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.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 @@ -65,7 +65,7 @@ Foam::processorCyclicPolyPatch::processorCyclicPolyPatch ), referPatchName_(referPatchName), tag_(-1), - referPatchID_(-1) + referPatchIndex_(-1) {} @@ -94,7 +94,7 @@ Foam::processorCyclicPolyPatch::processorCyclicPolyPatch ), referPatchName_(referPatchName), tag_(-1), - referPatchID_(-1) + referPatchIndex_(-1) {} @@ -110,7 +110,7 @@ Foam::processorCyclicPolyPatch::processorCyclicPolyPatch processorPolyPatch(name, dict, index, bm, patchType), referPatchName_(dict.lookup("referPatch")), tag_(dict.lookupOrDefault("tag", -1)), - referPatchID_(-1) + referPatchIndex_(-1) {} @@ -123,7 +123,7 @@ Foam::processorCyclicPolyPatch::processorCyclicPolyPatch processorPolyPatch(pp, bm), referPatchName_(pp.referPatchName()), tag_(pp.tag()), - referPatchID_(-1) + referPatchIndex_(-1) {} @@ -139,7 +139,7 @@ Foam::processorCyclicPolyPatch::processorCyclicPolyPatch processorPolyPatch(pp, bm, index, newSize, newStart), referPatchName_(pp.referPatchName_), tag_(pp.tag()), - referPatchID_(-1) + referPatchIndex_(-1) {} @@ -260,7 +260,7 @@ void Foam::processorCyclicPolyPatch::initTopoChange(PstreamBuffers& pBufs) void Foam::processorCyclicPolyPatch::topoChange(PstreamBuffers& pBufs) { - referPatchID_ = -1; + referPatchIndex_ = -1; processorPolyPatch::topoChange(pBufs); } diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H index a2c48d3c0b..e1e3092195 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H @@ -62,7 +62,7 @@ class processorCyclicPolyPatch mutable int tag_; //- Index of originating patch - mutable label referPatchID_; + mutable label referPatchIndex_; protected: @@ -230,15 +230,15 @@ public: ); //- Return the referring patchID - label referPatchID() const + label referPatchIndex() const { - if (referPatchID_ == -1) + if (referPatchIndex_ == -1) { - referPatchID_ = this->boundaryMesh().findIndex + referPatchIndex_ = this->boundaryMesh().findIndex ( referPatchName_ ); - if (referPatchID_ == -1) + if (referPatchIndex_ == -1) { FatalErrorInFunction << "Illegal referPatch name " << referPatchName_ @@ -247,13 +247,13 @@ public: << exit(FatalError); } } - return referPatchID_; + return referPatchIndex_; } //- Return a reference to the referring patch const cyclicPolyPatch& referPatch() const { - const polyPatch& pp = this->boundaryMesh()[referPatchID()]; + const polyPatch& pp = this->boundaryMesh()[referPatchIndex()]; return refCast(pp); } diff --git a/src/OpenFOAM/meshes/polyMesh/polyTopoChangeMap/mapSubsetMesh/mapSubsetMesh.H b/src/OpenFOAM/meshes/polyMesh/polyTopoChangeMap/mapSubsetMesh/mapSubsetMesh.H index 808ff34724..7af0dd6666 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyTopoChangeMap/mapSubsetMesh/mapSubsetMesh.H +++ b/src/OpenFOAM/meshes/polyMesh/polyTopoChangeMap/mapSubsetMesh/mapSubsetMesh.H @@ -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 @@ -68,7 +68,7 @@ class mapSubsetMesh const labelList cellMap_; //- Patch for exposed faces - const label exposedPatchID_; + const label exposedPatchIndex_; //- List of the old patch sizes labelList oldPatchSizes_; @@ -142,9 +142,9 @@ public: } //- Patch that exposed faces were put into - label exposedPatchID() const + label exposedPatchIndex() const { - return exposedPatchID_; + return exposedPatchIndex_; } //- Old point map. diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C index c510eaeb29..05b41011a6 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C @@ -144,7 +144,7 @@ Foam::cyclicFvPatchField::nbrPatchField() const return refCast> ( - fld.boundaryField()[this->cyclicPatch().nbrPatchID()] + fld.boundaryField()[this->cyclicPatch().nbrPatchIndex()] ); } diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C index d7cc44c0dd..abfc456828 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C @@ -116,7 +116,7 @@ Foam::cyclicFvsPatchField::patchNeighbourField tmp> tresult ( - new Field(gf.boundaryField()[cp.nbrPatchID()]) + new Field(gf.boundaryField()[cp.nbrPatchIndex()]) ); cp.transform().transform(tresult.ref(), tresult.ref()); diff --git a/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/fvMeshStitcher.C b/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/fvMeshStitcher.C index b80375cc7f..c7f652d6f1 100644 --- a/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/fvMeshStitcher.C +++ b/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/fvMeshStitcher.C @@ -103,11 +103,11 @@ void Foam::fvMeshStitcher::intersectNonConformalCyclic const nonConformalProcessorCyclicFvPatch& ncpcFvp = refCast(fvp); - if (ncpcFvp.referPatchID() == nccFvp.index()) + if (ncpcFvp.referPatchIndex() == nccFvp.index()) { patchis[ncpcFvp.neighbProcNo()] = patchj; } - if (ncpcFvp.referPatchID() == nbrNccFvp.index()) + if (ncpcFvp.referPatchIndex() == nbrNccFvp.index()) { nbrPatchis[ncpcFvp.neighbProcNo()] = patchj; } @@ -1011,7 +1011,7 @@ void Foam::fvMeshStitcher::intersectNonConformalCyclics tOrigFacesNbrBf, tOrigSfNbrBf, tOrigCfNbrBf, - patchEdgeParts[nccFvp.origPatchID()] + patchEdgeParts[nccFvp.origPatchIndex()] ); } @@ -1550,7 +1550,7 @@ bool Foam::fvMeshStitcher::connect .index() : isA(fvp) ? refCast(fvp) - .referPatchID() + .referPatchIndex() : -1; if (nccPatchi != -1) diff --git a/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/fvMeshStitcherTools.C b/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/fvMeshStitcherTools.C index 25c97dff89..c04c13fa7a 100644 --- a/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/fvMeshStitcherTools.C +++ b/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/fvMeshStitcherTools.C @@ -61,7 +61,7 @@ Foam::fvMeshStitcherTools::origNcMagSfb(const fvMesh& mesh) const nonConformalFvPatch& ncFvp = refCast(fvp); - const label origPatchi = ncFvp.origPatchID(); + const label origPatchi = ncFvp.origPatchIndex(); const fvPatch& origFvp = ncFvp.origPatch(); result[origPatchi] += diff --git a/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/fvMeshStitcherToolsTemplates.C b/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/fvMeshStitcherToolsTemplates.C index 56c79fd1c9..c17b456d7a 100644 --- a/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/fvMeshStitcherToolsTemplates.C +++ b/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/fvMeshStitcherToolsTemplates.C @@ -139,7 +139,7 @@ Foam::fvMeshStitcherTools::conformedNcBoundaryField const nonConformalFvPatch& ncFvp = refCast(fvbm[ncPatchi]); - const label origPatchi = ncFvp.origPatchID(); + const label origPatchi = ncFvp.origPatchIndex(); const fvPatch& origFvp = ncFvp.origPatch(); const scalarField& ncNcMagSf = ncFvp.patch().magSf(); @@ -278,7 +278,7 @@ Foam::fvMeshStitcherTools::unconformedBoundaryField const nonConformalFvPatch& ncFvp = refCast(fvp); - const label origPatchi = ncFvp.origPatchID(); + const label origPatchi = ncFvp.origPatchIndex(); const fvPatch& origFvp = ncFvp.origPatch(); fieldb[ncPatchi] = @@ -325,7 +325,7 @@ Foam::fvMeshStitcherTools::unconformedBoundaryField const nonConformalFvPatch& ncFvp = refCast(fvp); - const label origPatchi = ncFvp.origPatchID(); + const label origPatchi = ncFvp.origPatchIndex(); const fvPatch& origFvp = ncFvp.origPatch(); const scalarField ncTotalMagSf @@ -352,7 +352,7 @@ Foam::fvMeshStitcherTools::unconformedBoundaryField const nonConformalErrorFvPatch& errorFvp = refCast(fvp); - const label origPatchi = errorFvp.origPatchID(); + const label origPatchi = errorFvp.origPatchIndex(); const fvPatch& origFvp = errorFvp.origPatch(); if (isFluxField) diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H index 1d3d2b33e6..c12b2b391b 100644 --- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H +++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -94,9 +94,9 @@ public: } //- Return neighbour - virtual label nbrPatchID() const + virtual label nbrPatchIndex() const { - return cyclicPolyPatch_.nbrPatchID(); + return cyclicPolyPatch_.nbrPatchIndex(); } virtual bool owner() const @@ -109,7 +109,7 @@ public: { return refCast ( - this->boundaryMesh()[cyclicPolyPatch_.nbrPatchID()] + this->boundaryMesh()[cyclicPolyPatch_.nbrPatchIndex()] ); } @@ -123,7 +123,7 @@ public: { return refCast ( - this->boundaryMesh()[cyclicPolyPatch_.nbrPatchID()] + this->boundaryMesh()[cyclicPolyPatch_.nbrPatchIndex()] ); } diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformal/nonConformalFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformal/nonConformalFvPatch.C index 464b015c8a..7a6138c2b9 100644 --- a/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformal/nonConformalFvPatch.C +++ b/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformal/nonConformalFvPatch.C @@ -74,15 +74,15 @@ const Foam::word& Foam::nonConformalFvPatch::origPatchName() const } -Foam::label Foam::nonConformalFvPatch::origPatchID() const +Foam::label Foam::nonConformalFvPatch::origPatchIndex() const { - return nonConformalPolyPatch_.origPatchID(); + return nonConformalPolyPatch_.origPatchIndex(); } const Foam::fvPatch& Foam::nonConformalFvPatch::origPatch() const { - return patch_.boundaryMesh()[origPatchID()]; + return patch_.boundaryMesh()[origPatchIndex()]; } diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformal/nonConformalFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformal/nonConformalFvPatch.H index 3588380574..9fc5335cdd 100644 --- a/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformal/nonConformalFvPatch.H +++ b/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformal/nonConformalFvPatch.H @@ -98,7 +98,7 @@ public: const word& origPatchName() const; //- Original patch ID - label origPatchID() const; + label origPatchIndex() const; //- Original patch const fvPatch& origPatch() const; diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalCoupled/nonConformalCoupledFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalCoupled/nonConformalCoupledFvPatch.C index f26c4bd538..315e096c03 100644 --- a/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalCoupled/nonConformalCoupledFvPatch.C +++ b/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalCoupled/nonConformalCoupledFvPatch.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -134,9 +134,9 @@ const Foam::word& Foam::nonConformalCoupledFvPatch::errorPatchName() const } -Foam::label Foam::nonConformalCoupledFvPatch::errorPatchID() const +Foam::label Foam::nonConformalCoupledFvPatch::errorPatchIndex() const { - return nonConformalCoupledPolyPatch_.errorPatchID(); + return nonConformalCoupledPolyPatch_.errorPatchIndex(); } @@ -146,7 +146,7 @@ Foam::nonConformalCoupledFvPatch::errorPatch() const return refCast ( - patch_.boundaryMesh()[errorPatchID()] + patch_.boundaryMesh()[errorPatchIndex()] ); } diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalCoupled/nonConformalCoupledFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalCoupled/nonConformalCoupledFvPatch.H index bf2ff71377..08bf3aeb98 100644 --- a/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalCoupled/nonConformalCoupledFvPatch.H +++ b/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalCoupled/nonConformalCoupledFvPatch.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -118,7 +118,7 @@ public: const word& errorPatchName() const; //- Error patch ID - label errorPatchID() const; + label errorPatchIndex() const; //- Error patch const nonConformalErrorFvPatch& errorPatch() const; diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/processorCyclic/processorCyclicFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/processorCyclic/processorCyclicFvPatch.H index 4a2c8e079b..a862cc585d 100644 --- a/src/finiteVolume/fvMesh/fvPatches/constraint/processorCyclic/processorCyclicFvPatch.H +++ b/src/finiteVolume/fvMesh/fvPatches/constraint/processorCyclic/processorCyclicFvPatch.H @@ -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 @@ -82,15 +82,15 @@ public: } //- Return the referring patch ID - label referPatchID() const + label referPatchIndex() const { - return procPolyPatch_.referPatchID(); + return procPolyPatch_.referPatchIndex(); } //- Return a reference to the referring patch const cyclicFvPatch& referPatch() const { - const fvPatch& fvp = this->boundaryMesh()[referPatchID()]; + const fvPatch& fvp = this->boundaryMesh()[referPatchIndex()]; return refCast(fvp); } diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C index e65db87287..17a7b89e67 100644 --- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C +++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C @@ -203,7 +203,8 @@ void Foam::functionObjects::fieldValues::surfaceFieldValue::setPatchFaces() if ( isA(fvp) - && refCast(fvp).referPatchID() == patchId + && refCast(fvp).referPatchIndex() + == patchId ) { faceId_.append(identityMap(fvp.size())); diff --git a/src/fvMeshMovers/engine/enginePiston/enginePiston.C b/src/fvMeshMovers/engine/enginePiston/enginePiston.C index f8450ec6c5..64236ee7dc 100644 --- a/src/fvMeshMovers/engine/enginePiston/enginePiston.C +++ b/src/fvMeshMovers/engine/enginePiston/enginePiston.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 @@ -37,7 +37,7 @@ Foam::enginePiston::enginePiston ) : meshMover_(refCast(meshMover)), - patchID_(pistonPatchName, meshMover_.mesh().boundaryMesh()), + patchIndex_(pistonPatchName, meshMover_.mesh().boundaryMesh()), csPtr_(pistonCS), minLayer_(minLayer), maxLayer_(maxLayer) @@ -51,7 +51,7 @@ Foam::enginePiston::enginePiston ) : meshMover_(refCast(meshMover)), - patchID_(dict.lookup("patch"), meshMover_.mesh().boundaryMesh()), + patchIndex_(dict.lookup("patch"), meshMover_.mesh().boundaryMesh()), csPtr_ ( coordinateSystem::New @@ -70,7 +70,7 @@ Foam::enginePiston::enginePiston void Foam::enginePiston::writeDict(Ostream& os) const { os << nl << token::BEGIN_BLOCK - << "patch " << patchID_.name() << token::END_STATEMENT << nl + << "patch " << patchIndex_.name() << token::END_STATEMENT << nl << "minLayer " << minLayer_ << token::END_STATEMENT << nl << "maxLayer " << maxLayer_ << token::END_STATEMENT << nl << token::END_BLOCK << endl; diff --git a/src/fvMeshMovers/engine/enginePiston/enginePiston.H b/src/fvMeshMovers/engine/enginePiston/enginePiston.H index 95d5bc04c2..0186173128 100644 --- a/src/fvMeshMovers/engine/enginePiston/enginePiston.H +++ b/src/fvMeshMovers/engine/enginePiston/enginePiston.H @@ -56,7 +56,7 @@ class enginePiston const fvMeshMovers::engine& meshMover_; //- Piston patch - polyPatchDynamicID patchID_; + polyPatchDynamicID patchIndex_; //- Coordinate system autoPtr csPtr_; @@ -106,9 +106,9 @@ public: } //- Return ID of piston patch - const polyPatchDynamicID& patchID() const + const polyPatchDynamicID& patchIndex() const { - return patchID_; + return patchIndex_; } // Piston layering thickness diff --git a/src/fvMeshMovers/engine/engineValve/engineValve.H b/src/fvMeshMovers/engine/engineValve/engineValve.H index 831028c474..ce419a57f1 100644 --- a/src/fvMeshMovers/engine/engineValve/engineValve.H +++ b/src/fvMeshMovers/engine/engineValve/engineValve.H @@ -200,44 +200,44 @@ public: // Valve patches //- Return ID of bottom patch - const polyPatchDynamicID& bottomPatchID() const + const polyPatchDynamicID& bottomPatchIndex() const { return bottomPatch_; } //- Return ID of poppet patch - const polyPatchDynamicID& poppetPatchID() const + const polyPatchDynamicID& poppetPatchIndex() const { return poppetPatch_; } //- Return ID of stem patch - const polyPatchDynamicID& stemPatchID() const + const polyPatchDynamicID& stemPatchIndex() const { return stemPatch_; } //- Return ID of curtain in cylinder patch - const polyPatchDynamicID& curtainInCylinderPatchID() const + const polyPatchDynamicID& curtainInCylinderPatchIndex() const { return curtainInCylinderPatch_; } //- Return ID of curtain in port patch - const polyPatchDynamicID& curtainInPortPatchID() const + const polyPatchDynamicID& curtainInPortPatchIndex() const { return curtainInPortPatch_; } //- Return ID of detach in cylinder patch - const polyPatchDynamicID& detachInCylinderPatchID() const + const polyPatchDynamicID& detachInCylinderPatchIndex() const { return detachInCylinderPatch_; } //- Return ID of detach in port patch - const polyPatchDynamicID& detachInPortPatchID() const + const polyPatchDynamicID& detachInPortPatchIndex() const { return detachInPortPatch_; } diff --git a/src/fvMeshStitchers/moving/fvMeshStitchersMoving.C b/src/fvMeshStitchers/moving/fvMeshStitchersMoving.C index aef5ac1c94..be7377bd50 100644 --- a/src/fvMeshStitchers/moving/fvMeshStitchersMoving.C +++ b/src/fvMeshStitchers/moving/fvMeshStitchersMoving.C @@ -145,7 +145,7 @@ void Foam::fvMeshStitchers::moving::conformCorrectMeshPhi const nonConformalFvPatch& ncFvp = refCast(phiBf[nccPatchi].patch()); - const label origPatchi = ncFvp.origPatchID(); + const label origPatchi = ncFvp.origPatchIndex(); const fvPatch& origFvp = ncFvp.origPatch(); for (label i = 0; i <= phi.nOldTimes(false); ++ i) @@ -800,7 +800,7 @@ void Foam::fvMeshStitchers::moving::unconformInternalFaceCorrectMeshPhi if (!nccFvp.owner()) continue; - const label origPatchi = nccFvp.origPatchID(); + const label origPatchi = nccFvp.origPatchIndex(); const fvPatch& origFvp = nccFvp.origPatch(); forAll(nccFvp, nccPatchFacei) @@ -830,7 +830,7 @@ void Foam::fvMeshStitchers::moving::unconformInternalFaceCorrectMeshPhi if (!nccFvp.owner()) continue; - const label origPatchi = nccFvp.origPatchID(); + const label origPatchi = nccFvp.origPatchIndex(); const fvPatch& origFvp = nccFvp.origPatch(); forAll(nccFvp, nccPatchFacei) @@ -895,10 +895,10 @@ void Foam::fvMeshStitchers::moving::unconformErrorFaceCorrectMeshPhi const nonConformalCoupledFvPatch& nccFvp = refCast(fvp); - const label origPatchi = nccFvp.origPatchID(); + const label origPatchi = nccFvp.origPatchIndex(); const polyPatch& origPp = mesh().boundaryMesh()[origPatchi]; - const label errorPatchi = nccFvp.errorPatchID(); + const label errorPatchi = nccFvp.errorPatchIndex(); forAll(nccFvp, nccPatchFacei) { diff --git a/src/fvModels/derived/effectivenessHeatExchanger/effectivenessHeatExchanger.C b/src/fvModels/derived/effectivenessHeatExchanger/effectivenessHeatExchanger.C index 1537cbd4de..3006434e2f 100644 --- a/src/fvModels/derived/effectivenessHeatExchanger/effectivenessHeatExchanger.C +++ b/src/fvModels/derived/effectivenessHeatExchanger/effectivenessHeatExchanger.C @@ -69,8 +69,8 @@ void Foam::fv::effectivenessHeatExchanger::readCoeffs() void Foam::fv::effectivenessHeatExchanger::setZone() { - zoneID_ = mesh().faceZones().findIndex(faceZoneName_); - if (zoneID_ < 0) + zoneIndex_ = mesh().faceZones().findIndex(faceZoneName_); + if (zoneIndex_ < 0) { FatalErrorInFunction << type() << " " << this->name() << ": " @@ -79,7 +79,7 @@ void Foam::fv::effectivenessHeatExchanger::setZone() << nl << exit(FatalError); } - const faceZone& fZone = mesh().faceZones()[zoneID_]; + const faceZone& fZone = mesh().faceZones()[zoneIndex_]; faceId_.setSize(fZone.size()); facePatchId_.setSize(fZone.size()); @@ -188,7 +188,7 @@ Foam::fv::effectivenessHeatExchanger::effectivenessHeatExchanger TName_(word::null), phiName_(word::null), faceZoneName_(word::null), - zoneID_(-1), + zoneIndex_(-1), faceId_(), facePatchId_(), faceSign_(), diff --git a/src/fvModels/derived/effectivenessHeatExchanger/effectivenessHeatExchanger.H b/src/fvModels/derived/effectivenessHeatExchanger/effectivenessHeatExchanger.H index 8afe543217..b564ec9af9 100644 --- a/src/fvModels/derived/effectivenessHeatExchanger/effectivenessHeatExchanger.H +++ b/src/fvModels/derived/effectivenessHeatExchanger/effectivenessHeatExchanger.H @@ -143,7 +143,7 @@ class effectivenessHeatExchanger word faceZoneName_; //- Id for the face zone - label zoneID_; + label zoneIndex_; //- Local list of face IDs labelList faceId_; diff --git a/src/fvModels/derived/rotorDisk/bladeModel/bladeModel.C b/src/fvModels/derived/rotorDisk/bladeModel/bladeModel.C index 9b0141db01..29fdcbac47 100644 --- a/src/fvModels/derived/rotorDisk/bladeModel/bladeModel.C +++ b/src/fvModels/derived/rotorDisk/bladeModel/bladeModel.C @@ -89,7 +89,7 @@ void Foam::bladeModel::interpolateWeights Foam::bladeModel::bladeModel(const dictionary& dict) : profileName_(), - profileID_(), + profileIndex_(), radius_(), twist_(), chord_(), @@ -109,7 +109,7 @@ Foam::bladeModel::bladeModel(const dictionary& dict) if (data.size() > 0) { profileName_.setSize(data.size()); - profileID_.setSize(data.size()); + profileIndex_.setSize(data.size()); radius_.setSize(data.size()); twist_.setSize(data.size()); chord_.setSize(data.size()); @@ -117,7 +117,7 @@ Foam::bladeModel::bladeModel(const dictionary& dict) forAll(data, i) { profileName_[i] = data[i].first(); - profileID_[i] = -1; + profileIndex_[i] = -1; radius_[i] = data[i].second()[0]; twist_[i] = degToRad(data[i].second()[1]); chord_[i] = data[i].second()[2]; @@ -144,9 +144,9 @@ const Foam::List& Foam::bladeModel::profileName() const } -const Foam::List& Foam::bladeModel::profileID() const +const Foam::List& Foam::bladeModel::profileIndex() const { - return profileID_; + return profileIndex_; } @@ -168,9 +168,9 @@ const Foam::List& Foam::bladeModel::chord() const } -Foam::List& Foam::bladeModel::profileID() +Foam::List& Foam::bladeModel::profileIndex() { - return profileID_; + return profileIndex_; } diff --git a/src/fvModels/derived/rotorDisk/bladeModel/bladeModel.H b/src/fvModels/derived/rotorDisk/bladeModel/bladeModel.H index cc67c52015..5e421bc5cc 100644 --- a/src/fvModels/derived/rotorDisk/bladeModel/bladeModel.H +++ b/src/fvModels/derived/rotorDisk/bladeModel/bladeModel.H @@ -73,7 +73,7 @@ protected: List profileName_; //- Corresponding profile ID per section - List