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

@ -575,8 +575,7 @@ labelList regionRenumber
Info<< " region " << regioni << " starts at " << celli << endl;
// Make sure no parallel comms
const bool oldParRun = UPstream::parRun();
UPstream::parRun() = false;
const bool oldParRun = UPstream::parRun(false);
// Per region do a reordering.
fvMeshSubset subsetter(mesh, regioni, cellToRegion);
@ -589,8 +588,8 @@ labelList regionRenumber
subMesh.cellCentres()
);
// Restore state
UPstream::parRun() = oldParRun;
UPstream::parRun(oldParRun); // Restore parallel state
const labelList& cellMap = subsetter.cellMap();
@ -914,8 +913,7 @@ int main(int argc, char *argv[])
dictionary decomposeDict(renumberDictPtr().subDict("blockCoeffs"));
decomposeDict.set("numberOfSubdomains", nBlocks);
bool oldParRun = UPstream::parRun();
UPstream::parRun() = false;
const bool oldParRun = UPstream::parRun(false);
autoPtr<decompositionMethod> decomposePtr = decompositionMethod::New
(
@ -931,8 +929,8 @@ int main(int argc, char *argv[])
)
);
// Restore state
UPstream::parRun() = oldParRun;
UPstream::parRun(oldParRun); // Restore parallel state
// For debugging: write out region
createScalarField