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

polyTopoChange: Merged addMesh into constructor

Browse Source 
The addMesh function was not used in any other context.
This commit is contained in:
Henry Weller
2024-03-06 15:52:57 +00:00
parent 1576f3c215
commit dbff8d0f1c
2 changed files with 39 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
src/polyTopoChange/polyTopoChange/polyTopoChange.C
View File

@ -2090,7 +2090,7 @@ Foam::polyTopoChange::polyTopoChange
)
:
strict_(strict),
nPatches_(0),
nPatches_(mesh.boundaryMesh().size()),
points_(0),
pointMap_(0),
reversePointMap_(0),
@ -2116,67 +2116,6 @@ Foam::polyTopoChange::polyTopoChange
cellFromFace_(0),
cellZone_(0)
{
addMesh
(
mesh,
identityMap(mesh.boundaryMesh().size()),
identityMap(mesh.pointZones().size()),
identityMap(mesh.faceZones().size()),
identityMap(mesh.cellZones().size())
);
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::polyTopoChange::clear()
{
points_.clearStorage();
pointMap_.clearStorage();
reversePointMap_.clearStorage();
pointZone_.clearStorage();
retiredPoints_.clearStorage();
oldPoints_.clearStorage();
faces_.clearStorage();
region_.clearStorage();
faceOwner_.clearStorage();
faceNeighbour_.clearStorage();
faceMap_.clearStorage();
reverseFaceMap_.clearStorage();
faceFromPoint_.clearStorage();
faceFromEdge_.clearStorage();
flipFaceFlux_.clearStorage();
faceZone_.clearStorage();
faceZoneFlip_.clearStorage();
nActiveFaces_ = 0;
cellMap_.clearStorage();
reverseCellMap_.clearStorage();
cellZone_.clearStorage();
cellFromPoint_.clearStorage();
cellFromEdge_.clearStorage();
cellFromFace_.clearStorage();
}
void Foam::polyTopoChange::addMesh
(
const polyMesh& mesh,
const labelList& patchMap,
const labelList& pointZoneMap,
const labelList& faceZoneMap,
const labelList& cellZoneMap
)
{
label maxRegion = nPatches_ - 1;
forAll(patchMap, i)
{
maxRegion = max(maxRegion, patchMap[i]);
}
nPatches_ = maxRegion + 1;
// Add points
{
const pointField& points = mesh.points();
@ -2198,7 +2137,7 @@ void Foam::polyTopoChange::addMesh
forAll(pointLabels, j)
{
newZoneID[pointLabels[j]] = pointZoneMap[zoneI];
newZoneID[pointLabels[j]] = zoneI;
}
}
@ -2257,7 +2196,7 @@ void Foam::polyTopoChange::addMesh
}
else
{
newZoneID[celli] = cellZoneMap[zoneI];
newZoneID[celli] = zoneI;
}
}
}
@ -2305,7 +2244,7 @@ void Foam::polyTopoChange::addMesh
forAll(faceLabels, j)
{
newZoneID[faceLabels[j]] = faceZoneMap[zoneI];
newZoneID[faceLabels[j]] = zoneI;
zoneFlip[faceLabels[j]] = flipMap[j];
}
}
@ -2358,7 +2297,7 @@ void Foam::polyTopoChange::addMesh
-1, // masterEdgeID
facei, // masterFaceID
false, // flipFaceFlux
patchMap[patchi], // patchID
patchi, // patchID
newZoneID[facei], // zoneID
zoneFlip[facei] // zoneFlip
);
@ -2368,6 +2307,39 @@ void Foam::polyTopoChange::addMesh
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::polyTopoChange::clear()
{
points_.clearStorage();
pointMap_.clearStorage();
reversePointMap_.clearStorage();
pointZone_.clearStorage();
retiredPoints_.clearStorage();
oldPoints_.clearStorage();
faces_.clearStorage();
region_.clearStorage();
faceOwner_.clearStorage();
faceNeighbour_.clearStorage();
faceMap_.clearStorage();
reverseFaceMap_.clearStorage();
faceFromPoint_.clearStorage();
faceFromEdge_.clearStorage();
flipFaceFlux_.clearStorage();
faceZone_.clearStorage();
faceZoneFlip_.clearStorage();
nActiveFaces_ = 0;
cellMap_.clearStorage();
reverseCellMap_.clearStorage();
cellZone_.clearStorage();
cellFromPoint_.clearStorage();
cellFromEdge_.clearStorage();
cellFromFace_.clearStorage();
}
void Foam::polyTopoChange::setCapacity
(
const label nPoints,

14
src/polyTopoChange/polyTopoChange/polyTopoChange.H
View File

@ -411,13 +411,13 @@ class polyTopoChange
List<Map<label>>& oldMeshFaceZonesPointMaps
);
public:
//- Runtime type information
ClassName("polyTopoChange");
// Constructors
//- Construct without mesh. Either specify nPatches or use
@ -473,17 +473,6 @@ public:
//- Clear all storage
void clear();
//- Add all points/faces/cells of mesh. Additional offset for patch
// or zone ids.
void addMesh
(
const polyMesh&,
const labelList& patchMap,
const labelList& pointZoneMap,
const labelList& faceZoneMap,
const labelList& cellZoneMap
);
//- Explicitly pre-size the dynamic storage for expected mesh
// size for if construct-without-mesh
void setCapacity
@ -633,7 +622,6 @@ public:
const bool orderCells = false,
const bool orderPoints = false
);
};