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

Merge branch 'feature-error' into 'develop'

Browse Source 
ENH: Foam abort - reading from env(FOAM_ABORT) instead of caching value on construction

As discussed - no longer caching value of FOAM_ABORT on construction of error class; instead, always read from FOAM_ABORT.  Should be no perceived performance impact since this is only triggered on exit/abort.

See merge request !15
This commit is contained in:
Mattijs Janssens
2015-11-26 12:53:49 +00:00
parent 67feb101c2 7cb56873ee
commit 11204d2a23
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/OpenFOAM/db/error/IOerror.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -174,7 +174,7 @@ void Foam::IOerror::exit(const int)
jobInfo.exit();
}
if (abort_)
if (env("FOAM_ABORT"))
{
abort();
}
@ -215,7 +215,7 @@ void Foam::IOerror::abort()
jobInfo.abort();
}
if (abort_)
if (env("FOAM_ABORT"))
{
Perr<< endl << *this << endl
<< "\nFOAM aborting (FOAM_ABORT set)\n" << endl;

9
src/OpenFOAM/db/error/error.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -40,7 +40,6 @@ Foam::error::error(const string& title)
functionName_("unknown"),
sourceFileName_("unknown"),
sourceFileLineNumber_(0),
abort_(env("FOAM_ABORT")),
throwExceptions_(false),
messageStreamPtr_(new OStringStream())
{
@ -61,7 +60,6 @@ Foam::error::error(const dictionary& errDict)
functionName_(errDict.lookup("functionName")),
sourceFileName_(errDict.lookup("sourceFileName")),
sourceFileLineNumber_(readLabel(errDict.lookup("sourceFileLineNumber"))),
abort_(env("FOAM_ABORT")),
throwExceptions_(false),
messageStreamPtr_(new OStringStream())
{
@ -83,7 +81,6 @@ Foam::error::error(const error& err)
functionName_(err.functionName_),
sourceFileName_(err.sourceFileName_),
sourceFileLineNumber_(err.sourceFileLineNumber_),
abort_(err.abort_),
throwExceptions_(err.throwExceptions_),
messageStreamPtr_(new OStringStream(*err.messageStreamPtr_))
{
@ -173,7 +170,7 @@ void Foam::error::exit(const int errNo)
jobInfo.exit();
}
if (abort_)
if (env("FOAM_ABORT"))
{
abort();
}
@ -214,7 +211,7 @@ void Foam::error::abort()
jobInfo.abort();
}
if (abort_)
if (env("FOAM_ABORT"))
{
Perr<< endl << *this << endl
<< "\nFOAM aborting (FOAM_ABORT set)\n" << endl;

5
src/OpenFOAM/db/error/error.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -78,11 +78,10 @@ protected:
string sourceFileName_;
label sourceFileLineNumber_;
bool abort_;
bool throwExceptions_;
OStringStream* messageStreamPtr_;
public:
// Constructors