STYLE: add nBoundaryFaces() method to primitiveMesh

- nBoundaryFaces() is often used and is identical to
  (nFaces() - nInternalFaces()).

- forward the mesh nInternalFaces() and nBoundaryFaces() to
  polyBoundaryMesh as nFaces() and start() respectively,
  for use when operating on a polyBoundaryMesh.

STYLE:

- use identity() function with starting offset when creating boundary maps.

     labelList map
     (
         identity(mesh.nBoundaryFaces(), mesh.nInternalFaces())
     );

  vs.

     labelList map(mesh.nBoundaryFaces());
     forAll(map, i)
     {
         map[i] = mesh.nInternalFaces() + i;
     }
This commit is contained in:
Mark Olesen
2018-09-27 10:17:30 +02:00
parent 3a641275d3
commit 64c3e484bb
83 changed files with 279 additions and 303 deletions

View File

@ -413,7 +413,7 @@ int main(int argc, char *argv[])
const SubList<face> outsideFaces
(
mesh.faces(),
mesh.nFaces() - mesh.nInternalFaces(),
mesh.nBoundaryFaces(),
mesh.nInternalFaces()
);

View File

@ -1386,7 +1386,7 @@ int main(int argc, char *argv[])
DynamicList<polyPatch*> newPatches(nPatches);
// For every boundary face the old patch.
labelList facePatchID(pShapeMesh.nFaces()-pShapeMesh.nInternalFaces(), -1);
labelList facePatchID(pShapeMesh.nBoundaryFaces(), -1);
label cMeshFace = pShapeMesh.nInternalFaces();
label nBoundaries = 0;

View File

@ -468,7 +468,7 @@ void Foam::backgroundMeshDecomposition::printMeshData
// // Print stats
// globalIndex globalBoundaryFaces(mesh.nFaces()-mesh.nInternalFaces());
// globalIndex globalBoundaryFaces(mesh.nBoundaryFaces());
for (label proci = 0; proci < Pstream::nProcs(); proci++)
{
@ -671,7 +671,7 @@ void Foam::backgroundMeshDecomposition::buildPatchAndTree()
SubList<face>
(
mesh_.faces(),
mesh_.nFaces() - mesh_.nInternalFaces(),
mesh_.nBoundaryFaces(),
mesh_.nInternalFaces()
),
mesh_.points()

View File

@ -39,7 +39,7 @@ void Foam::conformalVoronoiMesh::calcNeighbourCellCentres
pointField& neiCc
) const
{
label nBoundaryFaces = mesh.nFaces() - mesh.nInternalFaces();
const label nBoundaryFaces = mesh.nBoundaryFaces();
if (neiCc.size() != nBoundaryFaces)
{
@ -319,7 +319,7 @@ void Foam::conformalVoronoiMesh::calcFaceZones
const labelList& faceOwner = mesh.faceOwner();
const labelList& faceNeighbour = mesh.faceNeighbour();
labelList neiFaceOwner(mesh.nFaces() - mesh.nInternalFaces(), label(-1));
labelList neiFaceOwner(mesh.nBoundaryFaces(), label(-1));
const polyBoundaryMesh& patches = mesh.boundaryMesh();
@ -421,7 +421,7 @@ void Foam::conformalVoronoiMesh::calcFaceZones
)
);
pointField neiCc(mesh.nFaces() - mesh.nInternalFaces());
pointField neiCc(mesh.nBoundaryFaces());
calcNeighbourCellCentres
(
mesh,
@ -498,7 +498,7 @@ void Foam::conformalVoronoiMesh::calcFaceZones
}
// labelList neiCellSurface(mesh.nFaces()-mesh.nInternalFaces());
// labelList neiCellSurface(mesh.nBoundaryFaces());
//
// forAll(patches, patchi)
// {

View File

@ -119,7 +119,7 @@ void printMeshData(const polyMesh& mesh)
// Print stats
globalIndex globalBoundaryFaces(mesh.nFaces()-mesh.nInternalFaces());
globalIndex globalBoundaryFaces(mesh.nBoundaryFaces());
label maxProcCells = 0;
label totProcFaces = 0;

View File

@ -314,7 +314,7 @@ void Foam::mergeAndWrite
}
boolList bndInSet(mesh.nFaces()-mesh.nInternalFaces());
boolList bndInSet(mesh.nBoundaryFaces());
forAll(pbm, patchi)
{
const polyPatch& pp = pbm[patchi];

View File

@ -249,7 +249,7 @@ labelList findBaffles(const polyMesh& mesh, const labelList& boundaryFaces)
(
mesh,
"duplicateFaces",
(mesh.nFaces() - mesh.nInternalFaces())/256
mesh.nBoundaryFaces()/256
);
forAll(duplicates, bFacei)

View File

@ -295,11 +295,7 @@ int main(int argc, char *argv[])
{
const polyBoundaryMesh& bm = mesh.boundaryMesh();
labelList neiStatus
(
mesh.nFaces()-mesh.nInternalFaces(),
orientedSurface::UNVISITED
);
labelList neiStatus(mesh.nBoundaryFaces(), orientedSurface::UNVISITED);
forAll(faceLabels, i)
{

View File

@ -140,7 +140,7 @@ void simpleMarkFeatures
SubList<face>
(
mesh.faces(),
mesh.nFaces()-mesh.nInternalFaces(),
mesh.nBoundaryFaces(),
mesh.nInternalFaces()
),
mesh.points()
@ -238,7 +238,7 @@ void simpleMarkFeatures
// ~~~~~~~~~~~~~~~~~~~~~~~~~
// Face centres that need inclusion in the dual mesh
labelHashSet featureFaceSet(mesh.nFaces()-mesh.nInternalFaces());
labelHashSet featureFaceSet(mesh.nBoundaryFaces());
// A. boundary faces.
for (label facei = mesh.nInternalFaces(); facei < mesh.nFaces(); facei++)
{

View File

@ -353,7 +353,7 @@ void getInterfaceSizes
// ~~~~~~~~~~~~~~
// Neighbour cellRegion.
labelList coupledRegion(mesh.nFaces()-mesh.nInternalFaces());
labelList coupledRegion(mesh.nBoundaryFaces());
forAll(coupledRegion, i)
{
@ -641,7 +641,7 @@ autoPtr<mapPolyMesh> createRegionMesh
// Neighbour cellRegion.
labelList coupledRegion(mesh.nFaces()-mesh.nInternalFaces());
labelList coupledRegion(mesh.nBoundaryFaces());
forAll(coupledRegion, i)
{
@ -1232,7 +1232,7 @@ void getZoneID
}
// Neighbour zoneID.
neiZoneID.setSize(mesh.nFaces()-mesh.nInternalFaces());
neiZoneID.setSize(mesh.nBoundaryFaces());
forAll(neiZoneID, i)
{
@ -1263,7 +1263,7 @@ void matchRegions
// Get current per cell zoneID
labelList zoneID(mesh.nCells(), -1);
labelList neiZoneID(mesh.nFaces()-mesh.nInternalFaces());
labelList neiZoneID(mesh.nBoundaryFaces());
getZoneID(mesh, cellZones, zoneID, neiZoneID);
// Sizes per cellzone
@ -1552,7 +1552,7 @@ int main(int argc, char *argv[])
// Existing zoneID
labelList zoneID(mesh.nCells(), -1);
// Neighbour zoneID.
labelList neiZoneID(mesh.nFaces()-mesh.nInternalFaces());
labelList neiZoneID(mesh.nBoundaryFaces());
getZoneID(mesh, cellZones, zoneID, neiZoneID);
@ -1622,7 +1622,7 @@ int main(int argc, char *argv[])
);
labelList newZoneID(mesh.nCells(), -1);
labelList newNeiZoneID(mesh.nFaces()-mesh.nInternalFaces());
labelList newNeiZoneID(mesh.nBoundaryFaces());
getZoneID(mesh, newCellZones, newZoneID, newNeiZoneID);
label unzonedCelli = newZoneID.find(-1);