ENH: add UPstream::parRun(const bool)

- slightly neater code when disabling/restoring parallel state

  New
      const bool oldParRun = Pstream::parRun(false);
      ...
      Pstream::parRun(oldParRun);

  Old
      const bool oldParRun = Pstream::parRun();
      Pstream::parRun() = false;
      ...
      Pstream::parRun() = oldParRun;
This commit is contained in:
Mark Olesen
2020-10-08 18:33:17 +02:00
parent ea0de58bbf
commit 9c7aa9727a
12 changed files with 56 additions and 59 deletions

View File

@ -1691,10 +1691,9 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
calcFaceFaces(s, pointFaces, faceFaces);
// Do the actual decomposition
const bool oldParRun = UPstream::parRun();
UPstream::parRun() = false;
const bool oldParRun = UPstream::parRun(false);
distribution = decomposer_().decompose(faceFaces, triCentres);
UPstream::parRun() = oldParRun;
UPstream::parRun(oldParRun); // Restore parallel state
}
else
{
@ -2023,10 +2022,9 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
UIndirectList<point>(mergedPoints, allToMerged) = allCentres;
// Decompose merged centres
const bool oldParRun = UPstream::parRun();
UPstream::parRun() = false;
const bool oldParRun = UPstream::parRun(false);
labelList mergedDist(decomposer_().decompose(mergedPoints));
UPstream::parRun() = oldParRun;
UPstream::parRun(oldParRun); // Restore parallel state
// Convert to all
allDistribution = UIndirectList<label>