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

src/OpenFOAM: Update ...IOErrorIn -> ...IOErrorInFunction

Browse Source 
Avoids the clutter and maintenance effort associated with providing the
function signature string.
This commit is contained in:
Henry Weller
2015-11-10 21:13:04 +00:00
parent e2ef006b91
commit dc43311e62
84 changed files with 309 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/OpenFOAM/dimensionSet/dimensionSetIO.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -292,11 +292,8 @@ Foam::dimensionedScalar Foam::dimensionSet::parse
token t = tis.nextToken();
if (!t.isPunctuation() || t.pToken() != token::END_LIST)
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"dimensionSet::parse"
"(const label, tokeniser&"
", const HashTable<dimensionedScalar>&)",
tis.stream()
) << "Illegal token " << t << exit(FatalIOError);
}
@ -364,22 +361,16 @@ Foam::dimensionedScalar Foam::dimensionSet::parse
}
else
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"dimensionSet::parse"
"(const label, tokeniser&"
", const HashTable<dimensionedScalar>&)",
tis.stream()
) << "Illegal token " << nextToken << exit(FatalIOError);
}
}
else
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"dimensionSet::parse"
"(const label, tokeniser&"
", const HashTable<dimensionedScalar>&)",
tis.stream()
) << "Illegal token " << nextToken << exit(FatalIOError);
}
@ -422,10 +413,8 @@ Foam::Istream& Foam::dimensionSet::read
if (startToken != token::BEGIN_SQR)
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"dimensionSet::read"
"(Istream&, scalar&, const HashTable<dimensionedScalar>&)",
is
) << "expected a " << token::BEGIN_SQR << " in dimensionSet"
<< endl << "in stream " << is.info()
@ -480,10 +469,8 @@ Foam::Istream& Foam::dimensionSet::read
// Check end of dimensionSet
if (nextToken != token::END_SQR)
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"dimensionSet::read"
"(Istream&, scalar&, const HashTable<dimensionedScalar>&)",
is
) << "expected a " << token::END_SQR << " in dimensionSet "
<< endl << "in stream " << is.info()
@ -521,10 +508,8 @@ Foam::Istream& Foam::dimensionSet::read
if (startToken != token::BEGIN_SQR)
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"dimensionSet::read"
"(Istream&, scalar&, const dictionary&)",
is
) << "expected a " << token::BEGIN_SQR << " in dimensionSet"
<< endl << "in stream " << is.info()
@ -623,10 +608,8 @@ Foam::Istream& Foam::dimensionSet::read
// Check end of dimensionSet
if (nextToken != token::END_SQR)
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"dimensionSet::read"
"(Istream&, scalar&, const dictionary&)",
is
) << "expected a " << token::END_SQR << " in dimensionSet "
<< endl << "in stream " << is.info()
@ -734,7 +717,7 @@ Foam::Istream& Foam::operator>>(Istream& is, dimensionSet& dset)
if (mag(multiplier-1.0) > dimensionSet::smallExponent)
{
FatalIOErrorIn("Foam::operator>>(Istream&, dimensionSet&)", is)
FatalIOErrorInFunction(is)
<< "Cannot use scaled units in dimensionSet"
<< exit(FatalIOError);
}

8
src/OpenFOAM/dimensionSet/dimensionSets.C
View File

@ -102,7 +102,7 @@ const HashTable<dimensionedScalar>& unitSet()
if (!dict.found("unitSet"))
{
FatalIOErrorIn("unitSet()", dict)
FatalIOErrorInFunction(dict)
<< "Cannot find unitSet in dictionary " << dict.name()
<< exit(FatalIOError);
}
@ -111,7 +111,7 @@ const HashTable<dimensionedScalar>& unitSet()
if (!dict.found(unitSetCoeffs))
{
FatalIOErrorIn("unitSet()", dict)
FatalIOErrorInFunction(dict)
<< "Cannot find " << unitSetCoeffs << " in dictionary "
<< dict.name() << exit(FatalIOError);
}
@ -129,7 +129,7 @@ const HashTable<dimensionedScalar>& unitSet()
bool ok = unitSetPtr_->insert(iter().keyword(), dt);
if (!ok)
{
FatalIOErrorIn("unitSet()", dict)
FatalIOErrorInFunction(dict)
<< "Duplicate unit " << iter().keyword()
<< " in DimensionSets dictionary"
<< exit(FatalIOError);
@ -150,7 +150,7 @@ const HashTable<dimensionedScalar>& unitSet()
if (writeUnitNames.size() != 0 && writeUnitNames.size() != 7)
{
FatalIOErrorIn("unitSet()", dict)
FatalIOErrorInFunction(dict)
<< "Cannot find entry \"writeUnits\" in " << unitDict.name()
<< " or it is not a wordList of size 7"
<< exit(FatalIOError);