From e18ff114a6219c7bc7e1e7bc05495aaba278bca1 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 28 Sep 2020 11:41:24 +0200 Subject: [PATCH] ENH: add UPstream::allProcs() method - returns a range of `int` values that can be iterated across. For example, for (const int proci : Pstream::allProcs()) { ... } instead of for (label proci = 0; proci < Pstream::nProcs(); ++proci) { ... } --- .../laserDTRM/laserDTRM.C | 2 +- .../Test-parallel-nonBlocking.C | 5 ++- .../DelaunayMesh/DistributedDelaunayMesh.C | 2 +- .../backgroundMeshDecomposition.C | 2 +- .../conformalVoronoiMeshConformToSurface.C | 4 +-- .../foamyHexMeshBackgroundMesh.C | 2 +- .../redistributePar/redistributePar.C | 2 +- .../preProcessing/viewFactorsGen/shootRays.H | 2 +- .../Lists/SortableList/ParSortableList.C | 3 +- .../db/IOstreams/Pstreams/PstreamBuffers.H | 5 ++- src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H | 17 +++++++--- .../masterUncollatedFileOperation.C | 7 +--- .../polyMesh/globalMeshData/globalIndex.C | 4 +-- .../mapDistribute/mapDistributeBase.C | 18 +++++----- .../mapDistributeBaseTemplates.C | 34 +++++++++---------- .../hexRef8/refinementHistory.C | 4 +-- .../turbulentDFSEMInletFvPatchVectorField.C | 4 +-- .../fvMesh/zoneDistribute/zoneDistribute.C | 5 +-- .../fvMesh/zoneDistribute/zoneDistributeI.H | 5 +-- src/functionObjects/field/STDMD/STDMD.C | 4 +-- .../field/externalCoupled/externalCoupled.C | 6 ++-- .../energySpectrum/energySpectrum.C | 4 +-- .../basic/InteractionLists/InteractionLists.C | 6 ++-- .../clouds/Templates/SprayCloud/SprayCloudI.H | 4 +-- .../meshRefinement/meshRefinementRefine.C | 8 ++--- .../advancingFrontAMIParallelOps.C | 6 ++-- .../output/foamVtkInternalMeshWriter.C | 2 +- src/meshTools/output/foamVtkPatchMeshWriter.C | 2 +- src/meshTools/processorLOD/box/box.C | 10 +++--- .../inverseDistanceCellCellStencil.C | 6 ++-- .../trackingInverseDistanceCellCellStencil.C | 6 ++-- .../decompose/ptscotchDecomp/ptscotchDecomp.C | 2 +- .../noiseModels/surfaceNoise/surfaceNoise.C | 2 +- .../meshToMesh/meshToMeshParallelOps.C | 4 +-- .../radiationModels/viewFactor/viewFactor.C | 2 +- 35 files changed, 102 insertions(+), 99 deletions(-) diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C index 41b5a02546..6296b29bf9 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C @@ -707,7 +707,7 @@ void Foam::radiation::laserDTRM::calculate() Pstream::gatherList(p0); Pstream::scatterList(p0); - for (label proci = 0; proci < Pstream::nProcs(); ++proci) + for (const int proci : Pstream::allProcs()) { const pointField& pos = positions[proci]; const pointField& pfinal = p0[proci]; diff --git a/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C b/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C index 1d9eeebcca..7fca05e3c2 100644 --- a/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C +++ b/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C @@ -50,7 +50,6 @@ using namespace Foam; int main(int argc, char *argv[]) { - #include "setRootCase.H" #include "createTime.H" @@ -154,7 +153,7 @@ int main(int argc, char *argv[]) { PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking); - for (label proci = 0; proci < Pstream::nProcs(); proci++) + for (const int proci : Pstream::allProcs()) { UOPstream toProc(proci, pBufs); toProc << Pstream::myProcNo(); @@ -164,7 +163,7 @@ int main(int argc, char *argv[]) pBufs.finishedSends(); // Consume - for (label proci = 0; proci < Pstream::nProcs(); proci++) + for (const int proci : Pstream::allProcs()) { UIPstream fromProc(proci, pBufs); label data; diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C index e02810916d..56b18a898a 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C @@ -489,7 +489,7 @@ Foam::label Foam::DistributedDelaunayMesh::referVertices pointMap.distribute(parallelVertices); - for (label proci = 0; proci < Pstream::nProcs(); proci++) + for (const int proci : Pstream::allProcs()) { const labelList& constructMap = pointMap.constructMap()[proci]; diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C index 1b022e59e4..4b50b014ca 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C @@ -473,7 +473,7 @@ void Foam::backgroundMeshDecomposition::printMeshData // globalIndex globalBoundaryFaces(mesh.nBoundaryFaces()); - for (label proci = 0; proci < Pstream::nProcs(); proci++) + for (const int proci : Pstream::allProcs()) { Info<< "Processor " << proci << " " << "Number of cells = " << globalCells.localSize(proci) diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C index 2ba63abf1a..4affaa5758 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C @@ -703,7 +703,7 @@ Foam::label Foam::conformalVoronoiMesh::synchroniseSurfaceTrees label nStoppedInsertion = 0; // Do the nearness tests here - for (label proci = 0; proci < Pstream::nProcs(); ++proci) + for (const int proci : Pstream::allProcs()) { // Skip own points if (proci >= Pstream::myProcNo()) @@ -795,7 +795,7 @@ Foam::label Foam::conformalVoronoiMesh::synchroniseEdgeTrees label nStoppedInsertion = 0; // Do the nearness tests here - for (label proci = 0; proci < Pstream::nProcs(); ++proci) + for (const int proci : Pstream::allProcs()) { // Skip own points if (proci >= Pstream::myProcNo()) diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C index 51a68564c5..111ef191cc 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C @@ -130,7 +130,7 @@ void printMeshData(const polyMesh& mesh) label totProcPatches = 0; label maxProcFaces = 0; - for (label proci = 0; proci < Pstream::nProcs(); proci++) + for (const int proci : Pstream::allProcs()) { Info<< endl << "Processor " << proci << nl diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C index 96f7bc50df..fd916b8476 100644 --- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C +++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C @@ -185,7 +185,7 @@ void printMeshData(const polyMesh& mesh) label totProcPatches = 0; label maxProcFaces = 0; - for (label procI = 0; procI < Pstream::nProcs(); ++procI) + for (const int procI : Pstream::allProcs()) { Info<< nl << "Processor " << procI << nl diff --git a/applications/utilities/preProcessing/viewFactorsGen/shootRays.H b/applications/utilities/preProcessing/viewFactorsGen/shootRays.H index 9a44e73add..9f751ecd20 100644 --- a/applications/utilities/preProcessing/viewFactorsGen/shootRays.H +++ b/applications/utilities/preProcessing/viewFactorsGen/shootRays.H @@ -7,7 +7,7 @@ const label maxDynListLength viewFactorDict.getOrDefault