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: parRunControl_ destruction order (since does Pstream::exit)

Browse Source
This commit is contained in:
mattijs
2013-06-13 14:13:10 +01:00
parent 846283d0c5
commit 180c59fbe2
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -473,14 +473,14 @@ Foam::argList::argList
bool initialise bool initialise
) )
: :
parRunControl_(args.parRunControl_),
args_(args.args_), args_(args.args_),
options_(options), options_(options),
executable_(args.executable_), executable_(args.executable_),
rootPath_(args.rootPath_), rootPath_(args.rootPath_),
globalCase_(args.globalCase_), globalCase_(args.globalCase_),
case_(args.case_), case_(args.case_),
argListStr_(args.argListStr_), argListStr_(args.argListStr_)
parRunControl_(args.parRunControl_)
{ {
parse(checkArgs, checkOpts, initialise); parse(checkArgs, checkOpts, initialise);
} }

6
src/OpenFOAM/global/argList/argList.H
View File

@ -105,6 +105,10 @@ class argList
// Private data // Private data
static bool bannerEnabled; static bool bannerEnabled;
//- Switch on/off parallel mode. Has to be first to be constructed
// so destructor is done last.
ParRunControl parRunControl_;
stringList args_; stringList args_;
HashTable<string> options_; HashTable<string> options_;
@ -114,8 +118,6 @@ class argList
fileName case_; fileName case_;
string argListStr_; string argListStr_;
ParRunControl parRunControl_;
// Signal handlers // Signal handlers
sigFpe sigFpe_; sigFpe sigFpe_;
sigInt sigInt_; sigInt sigInt_;