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

BUG: argList: use fileHandler to read decomposeParDict. Fixes #1765

Browse Source
This commit is contained in:
mattijs
2020-07-09 15:11:39 +01:00
parent c06c63f49f
commit b64ada3dde
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/OpenFOAM/global/argList/argList.C
View File

@ -29,7 +29,6 @@ License
#include "argList.H" #include "argList.H"
#include "OSspecific.H" #include "OSspecific.H"
#include "clock.H" #include "clock.H"
#include "IFstream.H"
#include "dictionary.H" #include "dictionary.H"
#include "IOobject.H" #include "IOobject.H"
#include "JobInfo.H" #include "JobInfo.H"
@ -1252,17 +1251,29 @@ void Foam::argList::parse
// Use values from decomposeParDict, the location was already // Use values from decomposeParDict, the location was already
// established above. // established above.
IFstream decompDictStream(source); // Disable any parallel comms happening inside the fileHandler
// since we are on master. This can happen e.g. inside
// the masterUncollated/collated handler.
const bool oldParRun = Pstream::parRun();
Pstream::parRun() = false;
if (!decompDictStream.good()) autoPtr<ISstream> decompDictStream
(
fileHandler().NewIFstream(source)
);
if (!decompDictStream.valid() || !decompDictStream->good())
{ {
FatalError FatalError
<< "Cannot read decomposeParDict from " << "Cannot read decomposeParDict from "
<< decompDictStream.name() << source << exit(FatalError);
<< exit(FatalError);
} }
dictionary decompDict(decompDictStream); dictionary decompDict(*decompDictStream);
// Restore parallel behaviour
Pstream::parRun() = oldParRun;
decompDict.readEntry("numberOfSubdomains", dictNProcs); decompDict.readEntry("numberOfSubdomains", dictNProcs);