Renamed meshCellZones -> cellZones, meshFaceZones -> faceZones and meshPointZones -> pointZones
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:
@ -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)
|
||||
|
||||
@ -238,7 +238,7 @@ void simpleMarkFeatures
|
||||
}
|
||||
|
||||
// B. face zones.
|
||||
const meshFaceZones& faceZones = mesh.faceZones();
|
||||
const faceZones& faceZones = mesh.faceZones();
|
||||
|
||||
if (doNotPreserveFaceZones)
|
||||
{
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@ -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
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user