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: paraFoam: catch read errors. Fixes #798.

Browse Source
This commit is contained in:
mattijs
2018-04-12 15:12:04 +01:00
parent cb14a2020b
commit d2b1b1cdc0
4 changed files with 271 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,34 +260,43 @@ void Foam::IOerror::abort()
}
Foam::Ostream& Foam::operator<<(Ostream& os, const IOerror& err)
void Foam::IOerror::write(Ostream& os, const bool includeTitle) const
{
if (!os.bad())
{
os << nl
<< err.title().c_str() << nl
<< err.message().c_str() << nl << endl;
os << "file: " << err.ioFileName().c_str();
if (err.ioStartLineNumber() >= 0 && err.ioEndLineNumber() >= 0)
os << nl;
if (includeTitle)
{
os << " from line " << err.ioStartLineNumber()
<< " to line " << err.ioEndLineNumber() << '.';
os << title().c_str() << nl;
}
else if (err.ioStartLineNumber() >= 0)
os << message().c_str() << nl << endl;
os << "file: " << ioFileName().c_str();
if (ioStartLineNumber() >= 0 && ioEndLineNumber() >= 0)
{
os << " at line " << err.ioStartLineNumber() << '.';
os << " from line " << ioStartLineNumber()
<< " to line " << ioEndLineNumber() << '.';
}
else if (ioStartLineNumber() >= 0)
{
os << " at line " << ioStartLineNumber() << '.';
}
if (IOerror::level >= 2 && err.sourceFileLineNumber())
if (IOerror::level >= 2 && sourceFileLineNumber())
{
os << nl << nl
<< " From function " << err.functionName().c_str() << endl
<< " in file " << err.sourceFileName().c_str()
<< " at line " << err.sourceFileLineNumber() << '.';
<< " From function " << functionName().c_str() << endl
<< " in file " << sourceFileName().c_str()
<< " at line " << sourceFileLineNumber() << '.';
}
}
}
Foam::Ostream& Foam::operator<<(Ostream& os, const IOerror& err)
{
err.write(os);
return os;
}