zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed meshCellZones -> cellZones, meshFaceZones -> faceZones and meshPointZones -> pointZones

Browse Source 
The prefix "mesh" was confusing and obviously relevant or helpful in
understanding the purpose or operation of these zone container classes.
This commit is contained in:
Henry Weller
2024-03-26 14:52:16 +00:00
parent 339e20c0f8
commit df6d3bf9d2
49 changed files with 219 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
View File

@ -198,7 +198,7 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
const pointField& p = m.points();
labelList renumberPoints(p.size());
const meshPointZones& pz = m.pointZones();
const pointZones& pz = m.pointZones();
labelList pointZoneIndices(pz.size());
forAll(pz, zonei)
@ -229,7 +229,7 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
const cellList& c = m.cells();
labelList renumberCells(c.size());
const meshCellZones& cz = m.cellZones();
const cellZones& cz = m.cellZones();
labelList cellZoneIndices(cz.size());
forAll(cz, zonei)
@ -267,7 +267,7 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
const meshFaceZones& fz = m.faceZones();
const faceZones& fz = m.faceZones();
labelList faceZoneIndices(fz.size());
forAll(fz, zonei)

2
applications/utilities/mesh/manipulation/polyDualMesh/polyDualMesh.C
View File

@ -238,7 +238,7 @@ void simpleMarkFeatures
}
// B. face zones.
const meshFaceZones& faceZones = mesh.faceZones();
const faceZones& faceZones = mesh.faceZones();
if (doNotPreserveFaceZones)
{

4
applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
View File

@ -453,7 +453,7 @@ autoPtr<polyTopoChangeMap> reorderMesh
// Re-do the faceZones
{
meshFaceZones& faceZones = mesh.faceZones();
faceZones& faceZones = mesh.faceZones();
forAll(faceZones, zoneI)
{
faceZone& fZone = faceZones[zoneI];
@ -483,7 +483,7 @@ autoPtr<polyTopoChangeMap> reorderMesh
}
// Re-do the cellZones
{
meshCellZones& cellZones = mesh.cellZones();
cellZones& cellZones = mesh.cellZones();
forAll(cellZones, zoneI)
{
cellZones[zoneI] = UIndirectList<label>

6
applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
View File

@ -125,7 +125,7 @@ int main(int argc, char *argv[])
(
set.name(), // name
pointLabels, // addressing
mesh.pointZones() // meshPointZones
mesh.pointZones() // pointZones
)
);
mesh.pointZones().writeOpt() = IOobject::AUTO_WRITE;
@ -256,7 +256,7 @@ int main(int argc, char *argv[])
set.name(), // name
addressing.shrink(), // addressing
flipMap.shrink(), // flipmap
mesh.faceZones() // meshFaceZones
mesh.faceZones() // faceZones
)
);
mesh.faceZones().writeOpt() = IOobject::AUTO_WRITE;
@ -303,7 +303,7 @@ int main(int argc, char *argv[])
(
set.name(), // name
cellLabels, // addressing
mesh.cellZones() // meshCellZones
mesh.cellZones() // cellZones
)
);
mesh.cellZones().writeOpt() = IOobject::AUTO_WRITE;

10
applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
View File

@ -1122,7 +1122,7 @@ label findCorrespondingRegion
void getZoneID
(
const polyMesh& mesh,
const meshCellZones& cellZones,
const cellZones& cellZones,
labelList& zoneID,
labelList& neiZoneID
)
@ -1181,7 +1181,7 @@ void matchRegions
labelList& zoneToRegion
)
{
const meshCellZones& cellZones = mesh.cellZones();
const cellZones& cellZones = mesh.cellZones();
regionToZone.setSize(nCellRegions, -1);
regionNames.setSize(nCellRegions);
@ -1513,7 +1513,7 @@ int main(int argc, char *argv[])
args.optionLookupOrDefault("defaultRegionName", standardRegionName)
);
const meshCellZones& cellZones = mesh.cellZones();
const Foam::cellZones& cellZones = mesh.cellZones();
// Existing zoneID
labelList zoneID(mesh.nCells(), -1);
@ -1572,7 +1572,7 @@ int main(int argc, char *argv[])
<< "This requires all"
<< " cells to be in one and only one cellZone." << nl << endl;
meshCellZones newCellZones
Foam::cellZones newCellZones
(
IOobject
(
@ -1865,7 +1865,7 @@ int main(int argc, char *argv[])
(
zoneName, // name
regionCells, // addressing
cellZones // meshCellZones
cellZones // cellZones
)
);
}

6
applications/utilities/mesh/manipulation/topoSet/topoSet.C
View File

@ -126,7 +126,7 @@ void removeSet
{
removeZone
(
const_cast<meshCellZones&>(mesh.cellZones()),
const_cast<cellZones&>(mesh.cellZones()),
setName
);
}
@ -134,7 +134,7 @@ void removeSet
{
removeZone
(
const_cast<meshFaceZones&>(mesh.faceZones()),
const_cast<faceZones&>(mesh.faceZones()),
setName
);
}
@ -142,7 +142,7 @@ void removeSet
{
removeZone
(
const_cast<meshPointZones&>(mesh.pointZones()),
const_cast<pointZones&>(mesh.pointZones()),
setName
);
}

8
applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
View File

@ -1062,18 +1062,18 @@ int main(int argc, char *argv[])
//
//---------------------------------------------------------------------
const meshFaceZones& zones = mesh.faceZones();
const faceZones& zones = mesh.faceZones();
if (doFaceZones && zones.size() > 0)
{
mkDir(fvPath/"meshFaceZones");
mkDir(fvPath/"faceZones");
fileName patchFileName;
if (vMesh.useSubMesh())
{
patchFileName =
fvPath/"meshFaceZones"/cellSetName
fvPath/"faceZones"/cellSetName
+ "_"
+ timeDesc
+ ".plt";
@ -1081,7 +1081,7 @@ int main(int argc, char *argv[])
else
{
patchFileName =
fvPath/"meshFaceZones"/"meshFaceZones"
fvPath/"faceZones"/"faceZones"
+ "_"
+ timeDesc
+ ".plt";

4
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
View File

@ -144,7 +144,7 @@ Usage
#include "sphericalTensorIOField.H"
#include "symmTensorIOField.H"
#include "tensorIOField.H"
#include "meshFaceZones.H"
#include "faceZones.H"
#include "Cloud.H"
#include "passiveParticle.H"
#include "stringListOps.H"
@ -1074,7 +1074,7 @@ int main(int argc, char *argv[])
);
print(" surfVectorFields :", Info, svf);
const meshFaceZones& zones = mesh.faceZones();
const faceZones& zones = mesh.faceZones();
forAll(zones, zoneI)
{

8
applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -264,7 +264,7 @@ void Foam::vtkPVFoam::convertMeshCellZones
printMemory();
}
const meshCellZones& zMesh = mesh.cellZones();
const cellZones& zMesh = mesh.cellZones();
for (int partId = range.start(); partId < range.end(); ++partId)
{
const word zoneName = getPartName(partId);
@ -432,7 +432,7 @@ void Foam::vtkPVFoam::convertMeshFaceZones
printMemory();
}
const meshFaceZones& zMesh = mesh.faceZones();
const faceZones& zMesh = mesh.faceZones();
for (int partId = range.start(); partId < range.end(); ++partId)
{
const word zoneName = getPartName(partId);
@ -550,7 +550,7 @@ void Foam::vtkPVFoam::convertMeshPointZones
if (range.size())
{
const meshPointZones& zMesh = mesh.pointZones();
const pointZones& zMesh = mesh.pointZones();
for (int partId = range.start(); partId < range.end(); ++partId)
{
word zoneName = getPartName(partId);

2
applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamSurfaceField.H
View File

@ -260,7 +260,7 @@ void Foam::vtkPVFoam::convertSurfaceFields
continue;
}
const meshFaceZones& zMesh = mesh.faceZones();
const faceZones& zMesh = mesh.faceZones();
const label zoneId = zMesh.findIndex(zoneName);
if (zoneId < 0)

4
applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamVolFields.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -217,7 +217,7 @@ void Foam::vtkPVFoam::convertVolFields
continue;
}
const meshFaceZones& zMesh = mesh.faceZones();
const faceZones& zMesh = mesh.faceZones();
const label zoneId = zMesh.findIndex(zoneName);
if (zoneId < 0)

2
applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
View File

@ -142,7 +142,7 @@ int main(int argc, char *argv[])
const meshFaceZones& mfz = mesh.faceZones();
const faceZones& mfz = mesh.faceZones();
labelHashSet includeFaceZones(mfz.size());
if (args.optionFound("faceZones"))