diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L index 61b89c279c..e1202c7004 100644 --- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L +++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L @@ -642,7 +642,7 @@ int main(int argc, char *argv[]) ( patchNames[patchi], bFaceLabels, - boolList(bFaceLabels.size(), false), + false, // none are flipped fz.size(), pShapeMesh.faceZones() ) diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L index 8898cded2c..7f06475c50 100644 --- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L +++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L @@ -1156,7 +1156,6 @@ int main(int argc, char *argv[]) new cellZone ( name, - labelList(0), cellZonei, mesh.cellZones() ) @@ -1186,8 +1185,6 @@ int main(int argc, char *argv[]) new faceZone ( name, - labelList(0), - boolList(0), faceZonei, mesh.faceZones() ) diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L index 527d7e368c..e00bbcf907 100644 --- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L +++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L @@ -1077,7 +1077,6 @@ int main(int argc, char *argv[]) // Create new faces forAll(faces, facei) { - if (faces[facei].size() != 2) { FatalErrorInFunction @@ -1660,7 +1659,7 @@ int main(int argc, char *argv[]) ( name, zoneFaces, - boolList(zoneFaces.size(), false), + false, // none are flipped cnt, pShapeMesh.faceZones() ); diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C index 398563d9cb..c107f03e38 100644 --- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C +++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C @@ -1102,7 +1102,7 @@ int main(int argc, char *argv[]) ( zoneName, zoneFaces[zoneI], - boolList(zoneFaces[zoneI].size(), true), + true, // all are flipped nValidFaceZones, mesh.faceZones() ); diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C index ea44a998a6..ccb2e5e42f 100644 --- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C +++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C @@ -1282,7 +1282,7 @@ int main(int argc, char *argv[]) ( faceZones.toc()[cnt], indizes, - boolList(indizes.size(),false), + false, // none are flipped cnt, mesh.faceZones() ); diff --git a/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.H b/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.H index fa25d815ea..c4e472363c 100644 --- a/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.H +++ b/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.H @@ -16,10 +16,10 @@ + name(pairI) ); + // An empty zone for cut points pz[pairI] = new pointZone ( mergeName + "CutPointZone", - labelList(0), 0, mesh.pointZones() ); @@ -40,7 +40,7 @@ ( mergeName + "MasterZone", isf, - boolList(masterPatch.size(), false), + false, // none are flipped 0, mesh.faceZones() ); @@ -61,17 +61,15 @@ ( mergeName + "SlaveZone", osf, - boolList(slavePatch.size(), false), + false, // none are flipped 1, mesh.faceZones() ); - // Add empty zone for cut faces + // An empty zone for cut faces fz[3*pairI + 2] = new faceZone ( mergeName + "CutFaceZone", - labelList(0), - boolList(0, false), 2, mesh.faceZones() ); diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C index a08f245e14..731e38f67b 100644 --- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C +++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C @@ -1026,7 +1026,7 @@ int main(int argc, char *argv[]) ( cutZoneName, frontPatchFaces, - boolList(frontPatchFaces.size(), false), + false, // none are flipped 0, mesh.faceZones() ) diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C index 72f0a675d5..7a114c3e22 100644 --- a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C +++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C @@ -502,70 +502,58 @@ void Foam::mergePolyMesh::merge() // Add the zones if necessary if (pointZoneNames_.size() > pointZones().size()) { - Info<< "Adding new pointZones. " << endl; - label nZones = pointZones().size(); + Info<< "Adding new pointZones." << endl; - pointZones().setSize(pointZoneNames_.size()); + label zonei = pointZones().size(); // continue from here - for (label zoneI = nZones; zoneI < pointZoneNames_.size(); zoneI++) + const label nZones = pointZoneNames_.size(); + + pointZones().setSize(nZones); + + for (/*nil*/; zonei < nZones; ++zonei) { pointZones().set ( - zoneI, - new pointZone - ( - pointZoneNames_[zoneI], - labelList(), - zoneI, - pointZones() - ) + zonei, + new pointZone(pointZoneNames_[zonei], zonei, pointZones()) ); } } if (cellZoneNames_.size() > cellZones().size()) { - Info<< "Adding new cellZones. " << endl; + Info<< "Adding new cellZones." << endl; - label nZones = cellZones().size(); + label zonei = cellZones().size(); // continue from here + + const label nZones = cellZoneNames_.size(); cellZones().setSize(cellZoneNames_.size()); - for (label zoneI = nZones; zoneI < cellZoneNames_.size(); zoneI++) + for (/*nil*/; zonei < nZones; ++zonei) { cellZones().set ( - zoneI, - new cellZone - ( - cellZoneNames_[zoneI], - labelList(), - zoneI, - cellZones() - ) + zonei, + new cellZone(cellZoneNames_[zonei], zonei, cellZones()) ); } } if (faceZoneNames_.size() > faceZones().size()) { - Info<< "Adding new faceZones. " << endl; + Info<< "Adding new faceZones." << endl; - label nZones = faceZones().size(); + label zonei = faceZones().size(); // continue from here - faceZones().setSize(faceZoneNames_.size()); + const label nZones = faceZoneNames_.size(); - for (label zoneI = nZones; zoneI < faceZoneNames_.size(); zoneI++) + faceZones().setSize(nZones); + + for (/*nil*/; zonei < nZones; ++zonei) { faceZones().set ( - zoneI, - new faceZone - ( - faceZoneNames_[zoneI], - labelList(), - boolList(), - zoneI, - faceZones() - ) + zonei, + new faceZone(faceZoneNames_[zonei], zonei, faceZones()) ); } } diff --git a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C index 2b30a5d7fa..f6b2dccc50 100644 --- a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C +++ b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C @@ -113,36 +113,28 @@ int main(int argc, char *argv[]) pointSet set(*iter()); SortableList