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 a Pstream::shutdown() method (#1660)

Browse Source 
- previously used a Pstream::exit() invoked from the argList
  destructor to handle all MPI shutdown, but this has the unfortunate
  side-effect of using a fixed return value for the program exit.

  Instead use the Pstream::shutdown() method in the destructor and allow
  the normal program exit codes as usual. This means that the
  following code now works as expected.

  ```
  argList args(...);

  if (...)
  {
      InfoErr<< "some error\n";
      return 1;
  }
  ```
This commit is contained in:
Mark Olesen
2020-04-01 12:24:59 +02:00
parent b2a3e9487f
commit 01f6505442
5 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
applications/test/error/Test-error.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2015 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -27,17 +28,27 @@ Description
\*---------------------------------------------------------------------------*/
#include "error.H"
#include "IOstreams.H"
#include "argList.H"
#include "dictionary.H"
using namespace Foam;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Main program:
int main(int argc, char *argv[])
{
#if 0
argList::noBanner();
argList args(argc, argv);
if (true)
{
InfoErr<< "Called with " << (args.size()-1) << " args\n";
InfoErr<< "... some error\n";
return 2;
}
#endif
FatalError.throwExceptions();
try
@ -57,9 +68,9 @@ int main(int argc, char *argv[])
<< "Error 2"
<< exit(FatalError);
}
catch (const Foam::error& fErr)
catch (const Foam::error& err)
{
Serr<< "Caught Foam error " << fErr << nl << endl;
Serr<< "Caught Foam error " << err << nl << endl;
}
try
@ -68,9 +79,9 @@ int main(int argc, char *argv[])
<< "Error# 3"
<< exit(FatalError);
}
catch (const Foam::error& fErr)
catch (const Foam::error& err)
{
Serr<< "Caught Foam error " << fErr << nl << endl;
Serr<< "Caught Foam error " << err << nl << endl;
}
return 0;