polyTopoChangeMap: Updated the "reuse" constructor to use std::move

This commit is contained in:
Henry Weller
2024-03-15 14:41:03 +00:00
parent b41e0857ef
commit bb77e8e66f
8 changed files with 137 additions and 242 deletions

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-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2024 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -89,13 +89,13 @@ public:
}
//- Mirrored to original cell
const labelList& cellMap() const
labelList& cellMap()
{
return cellMapPtr_();
}
//- Mirrored to original point
const labelList& pointMap() const
labelList& pointMap()
{
return pointMapPtr_();
}

View File

@ -100,23 +100,24 @@ int main(int argc, char *argv[])
polyTopoChangeMap map
(
mesh,
mesh.nPoints(), // nOldPoints,
mesh.nFaces(), // nOldFaces,
mesh.nCells(), // nOldCells,
mesh.pointMap(), // pointMap,
List<objectMap>(0), // pointsFromPoints,
labelList(0), // faceMap,
List<objectMap>(0), // facesFromFaces,
mesh.cellMap(), // cellMap,
List<objectMap>(0), // cellsFromCells,
labelList(0), // reversePointMap,
labelList(0), // reverseFaceMap,
labelList(0), // reverseCellMap,
labelHashSet(0), // flipFaceFlux,
labelListList(0), // patchPointMap,
labelList(0), // oldPatchStarts,
labelList(0), // oldPatchNMeshPoints,
autoPtr<scalarField>() // oldCellVolumesPtr
mesh.nPoints(), // nOldPoints,
mesh.nFaces(), // nOldFaces,
mesh.nCells(), // nOldCells,
move(mesh.pointMap()), // pointMap,
move(List<objectMap>(0)), // pointsFromPoints,
move(labelList(0)), // faceMap,
move(List<objectMap>(0)), // facesFromFaces,
move(mesh.cellMap()), // cellMap,
move(List<objectMap>(0)), // cellsFromCells,
move(labelList(0)), // reversePointMap,
move(labelList(0)), // reverseFaceMap,
move(labelList(0)), // reverseCellMap,
move(labelHashSet(0)), // flipFaceFlux,
move(labelListList(0)), // patchPointMap,
move(labelList(0)), // oldPatchSizes,
move(labelList(0)), // oldPatchStarts,
move(labelList(0)), // oldPatchNMeshPoints,
move(autoPtr<scalarField>()) // oldCellVolumesPtr
);
refData.topoChange(map);
refData.write();

View File

@ -391,8 +391,8 @@ labelList getRegionFaceOrder
autoPtr<polyTopoChangeMap> reorderMesh
(
polyMesh& mesh,
const labelList& cellOrder,
const labelList& faceOrder
labelList& cellOrder,
labelList& faceOrder
)
{
labelList reverseCellOrder(invert(cellOrder.size(), cellOrder));
@ -506,24 +506,25 @@ autoPtr<polyTopoChangeMap> reorderMesh
(
new polyTopoChangeMap
(
mesh, // const polyMesh& mesh,
mesh.nPoints(), // nOldPoints,
mesh.nFaces(), // nOldFaces,
mesh.nCells(), // nOldCells,
identityMap(mesh.nPoints()), // pointMap,
List<objectMap>(0), // pointsFromPoints,
faceOrder, // faceMap,
List<objectMap>(0), // facesFromFaces,
cellOrder, // cellMap,
List<objectMap>(0), // cellsFromCells,
identityMap(mesh.nPoints()), // reversePointMap,
reverseFaceOrder, // reverseFaceMap,
reverseCellOrder, // reverseCellMap,
flipFaceFlux, // flipFaceFlux,
patchPointMap, // patchPointMap,
patchStarts, // oldPatchStarts,
oldPatchNMeshPoints, // oldPatchNMeshPoints
autoPtr<scalarField>() // oldCellVolumes
mesh, // const polyMesh& mesh,
mesh.nPoints(), // nOldPoints,
mesh.nFaces(), // nOldFaces,
mesh.nCells(), // nOldCells,
identityMap(mesh.nPoints()), // pointMap,
List<objectMap>(0), // pointsFromPoints,
move(faceOrder), // faceMap,
List<objectMap>(0), // facesFromFaces,
move(cellOrder), // cellMap,
List<objectMap>(0), // cellsFromCells,
identityMap(mesh.nPoints()), // reversePointMap,
move(reverseFaceOrder), // reverseFaceMap,
move(reverseCellOrder), // reverseCellMap,
move(flipFaceFlux), // flipFaceFlux,
move(patchPointMap), // patchPointMap,
move(patchSizes), // oldPatchSizes
move(patchStarts), // oldPatchStarts,
move(oldPatchNMeshPoints), // oldPatchNMeshPoints
move(autoPtr<scalarField>()) // oldCellVolumes
)
);
}