zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: add UPstream::parRun(const bool)

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

5
applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C
View File

@ -157,8 +157,7 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
if (!haveMesh)
{
const bool oldParRun = Pstream::parRun();
Pstream::parRun() = false;
const bool oldParRun = Pstream::parRun(false);
// Create dummy mesh. Only used on procs that don't have mesh.
@ -241,7 +240,7 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
// << endl;
dummyMesh.write();
Pstream::parRun() = oldParRun;
Pstream::parRun(oldParRun); // Restore parallel state
}

15
applications/utilities/parallelProcessing/redistributePar/redistributePar.C
View File

@ -2425,10 +2425,9 @@ int main(int argc, char *argv[])
instantList timeDirs;
if (Pstream::master())
{
const bool oldParRun = Pstream::parRun();
Pstream::parRun() = false;
const bool oldParRun = Pstream::parRun(false);
timeDirs = Time::findTimes(args.path(), "constant");
Pstream::parRun() = oldParRun;
Pstream::parRun(oldParRun); // Restore parallel state
}
Pstream::scatter(timeDirs);
for (const instant& t : timeDirs)
@ -2464,10 +2463,9 @@ int main(int argc, char *argv[])
if (Pstream::master())
{
const bool oldParRun = Pstream::parRun();
Pstream::parRun() = false;
const bool oldParRun = Pstream::parRun(false);
timeDirs = Time::findTimes(basePath, "constant");
Pstream::parRun() = oldParRun;
Pstream::parRun(oldParRun); // Restore parallel state
}
Pstream::scatter(timeDirs);
for (const instant& t : timeDirs)
@ -3038,11 +3036,10 @@ int main(int argc, char *argv[])
if (!Pstream::master() && !haveMesh[Pstream::myProcNo()])
{
// Remove dummy mesh created by loadOrCreateMesh
const bool oldParRun = Pstream::parRun();
Pstream::parRun() = false;
const bool oldParRun = Pstream::parRun(false);
mesh.removeFiles();
rmDir(mesh.objectRegistry::objectPath());
Pstream::parRun() = oldParRun;
Pstream::parRun(oldParRun); // Restore parallel state
}
continue;
}