Commit 4b297733 authored by Andrew Heather's avatar Andrew Heather
Browse files

STYLE: Updated messages to use pretty macros

parent 0359333e
......@@ -80,16 +80,8 @@ Foam::oversetFvPatchField<Type>::oversetFvPatchField
{
if (!isA<oversetFvPatch>(p))
{
FatalIOErrorIn
(
"oversetFvPatchField<Type>::oversetFvPatchField"
"("
"const fvPatch&, "
"const DimensionedField<Type, volMesh>&, "
"const dictionary&"
")",
dict
) << " patch type '" << p.type()
FatalIOErrorInFunction(dict)
<< " patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
......
......@@ -108,19 +108,8 @@ void Foam::setRefCells
if (refCells.size() != regionNeedReference.size())
{
FatalIOErrorIn
(
"setRefCell\n"
"(\n"
" const volScalarField&,\n"
" const volScalarField&,\n"
" const dictionary&,\n"
" labelList&,\n"
" scalarField&,\n"
" const bool\n"
")\n",
dict
) << "Number of refCells " << refCells.size()
FatalIOErrorInFunction(dict)
<< "Number of refCells " << refCells.size()
<< " does not correspond to number of regions "
<< regionNeedReference.size()
<< exit(FatalIOError);
......@@ -146,19 +135,8 @@ void Foam::setRefCells
&& regionRefCells[regionI] == -1
)
{
FatalIOErrorIn
(
"setRefCell\n"
"(\n"
" const volScalarField&,\n"
" const volScalarField&,\n"
" const dictionary&,\n"
" labelList&,\n"
" scalarField&,\n"
" const bool\n"
")\n",
dict
) << "Have no reference cell for region " << regionI
FatalIOErrorInFunction(dict)
<< "Have no reference cell for region " << regionI
<< nl
<< "Overall per-region reference cells "
<< regionRefCells
......@@ -173,19 +151,8 @@ void Foam::setRefCells
if (refPoints.size() != regionNeedReference.size())
{
FatalIOErrorIn
(
"setRefCell\n"
"(\n"
" const volScalarField&,\n"
" const volScalarField&,\n"
" const dictionary&,\n"
" labelList&,\n"
" scalarField&,\n"
" const bool\n"
")\n",
dict
) << "Number of refPoints " << refPoints.size()
FatalIOErrorInFunction(dict)
<< "Number of refPoints " << refPoints.size()
<< " does not correspond to number of regions "
<< regionNeedReference.size()
<< exit(FatalIOError);
......@@ -226,19 +193,8 @@ void Foam::setRefCells
{
if (hasRef[regionI] != 1)
{
FatalIOErrorIn
(
"setRefCell\n"
"(\n"
" const volScalarField&,\n"
" const volScalarField&,\n"
" const dictionary&,\n"
" labelList&,\n"
" scalarField&,\n"
" const bool\n"
")\n",
dict
) << "Unable to set reference cell for field " << field.name()
FatalIOErrorInFunction(dict)
<< "Unable to set reference cell for field " << field.name()
<< nl
<< " Reference points " << refPointName
<< " " << refPoints
......@@ -251,19 +207,8 @@ void Foam::setRefCells
}
else
{
FatalIOErrorIn
(
"setRefCell\n"
"(\n"
" const volScalarField&,\n"
" const volScalarField&,\n"
" const dictionary&,\n"
" labelList&,\n"
" scalarField&,\n"
" const bool\n"
")\n",
dict
) << "Unable to set reference cell for field " << field.name()
FatalIOErrorInFunction(dict)
<< "Unable to set reference cell for field " << field.name()
<< nl
<< " Please supply either " << refCellName
<< " or " << refPointName << nl << exit(FatalIOError);
......
......@@ -42,10 +42,8 @@ Foam::autoPtr<Foam::windowModel> Foam::windowModel::New
if (!cstrIter.found())
{
FatalErrorIn
(
"windowModel::New(const dictionary&, const label)"
) << "Unknown windowModel type "
FatalErrorInFunction
<< "Unknown windowModel type "
<< modelType << nl << nl
<< "Valid windowModel types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
......
......@@ -159,11 +159,7 @@ void Foam::fileFormats::FLMAsurfaceFormat<Face>::write
{
if (!os.good())
{
FatalErrorIn
(
"fileFormats::FLMAsurfaceFormat::write"
"(OSstream&, const MeshedSurfaceProxy<Face>&)"
)
FatalErrorInFunction
<< "bad output state "
<< exit(FatalError);
}
......@@ -352,11 +348,7 @@ void Foam::fileFormats::FLMAsurfaceFormat<Face>::write
}
else
{
FatalErrorIn
(
"fileFormats::FLMAsurfaceFormat::write"
"(const fileName&, const MeshedSurfaceProxy<Face>&)"
)
FatalErrorInFunction
<< "Cannot open file for writing " << filename
<< exit(FatalError);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment