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

polyTopoChange: Removed most unnecessary setAction clutter

Browse Source
This commit is contained in:
Henry Weller
2023-12-13 15:33:45 +00:00
parent f1a70fab7e
commit 826fa2db61
27 changed files with 801 additions and 1677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,9 +26,6 @@ License
#include "mergePolyMesh.H"
#include "Time.H"
#include "polyTopoChangeMap.H"
#include "polyAddPoint.H"
#include "polyAddCell.H"
#include "polyAddFace.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -217,17 +214,13 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
zoneID = pointZoneIndices[zoneID];
}
renumberPoints[pointi] =
meshMod_.setAction
(
polyAddPoint
(
p[pointi], // Point to add
-1, // Master point (straight addition)
zoneID, // Zone for point
pointi < m.nPoints() // Is in cell?
)
);
renumberPoints[pointi] = meshMod_.addPoint
(
p[pointi], // Point to add
-1, // Master point (straight addition)
zoneID, // Zone for point
pointi < m.nPoints() // Is in cell?
);
}
// Add cells
@ -254,18 +247,14 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
zoneID = cellZoneIndices[zoneID];
}
renumberCells[celli] =
meshMod_.setAction
(
polyAddCell
(
-1, // Master point
-1, // Master edge
-1, // Master face
-1, // Master cell
zoneID // Zone for cell
)
);
renumberCells[celli] = meshMod_.addCell
(
-1, // Master point
-1, // Master edge
-1, // Master face
-1, // Master cell
zoneID // Zone for cell
);
}
// Add faces
@ -359,23 +348,19 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
newZone = faceZoneIndices[newZone];
}
renumberFaces[facei] =
meshMod_.setAction
(
polyAddFace
(
newFace,
newOwn,
newNei,
-1,
-1,
-1,
false,
newPatch,
newZone,
newZoneFlip
)
);
renumberFaces[facei] = meshMod_.addFace
(
newFace,
newOwn,
newNei,
-1,
-1,
-1,
false,
newPatch,
newZone,
newZoneFlip
);
}
}