STYLE: indentation for FatalIOErrorInFunction calls

applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C

@@ -94,10 +94,8 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
      || mag(accommodationCoeff_) > 2.0
     )
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "unphysical accommodationCoeff specified"
-            dict
-        )   << "unphysical accommodationCoeff specified"
             << "(0 < accommodationCoeff <= 1)" << endl
             << exit(FatalIOError);
     }

applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C

@@ -96,10 +96,8 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField
      || mag(accommodationCoeff_) > 2.0
     )
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "unphysical accommodationCoeff_ specified"
-            dict
-        )   << "unphysical accommodationCoeff_ specified"
             << "(0 < accommodationCoeff_ <= 1)" << endl
             << exit(FatalIOError);
     }

applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C

@@ -211,10 +211,8 @@ void readPoints
         {
             hasWarned = true;
 
-            IOWarningInFunction
+            IOWarningInFunction(is)
-            (
+                << "Points not in order starting at point " << pointi
-                is
-            )   << "Points not in order starting at point " << pointi
                 << endl;
         }
 

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C

@@ -465,10 +465,8 @@ Foam::conformationSurfaces::conformationSurfaces
 
     if (unmatchedKeys.size() > 0)
     {
-        IOWarningInFunction
+        IOWarningInFunction(surfacesDict)
-        (
+            << "Not all entries in conformationSurfaces dictionary were used."
-            surfacesDict
-        )   << "Not all entries in conformationSurfaces dictionary were used."
             << " The following entries were not used : "
             << unmatchedKeys.sortedToc()
             << endl;

applications/utilities/surface/surfaceFeatureExtract/extractionMethod/surfaceFeaturesExtraction.C

@@ -74,10 +74,8 @@ Foam::surfaceFeaturesExtraction::method::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "Unknown extractionMethod " << methodName << nl << nl
-            dict
-        )   << "Unknown extractionMethod " << methodName << nl << nl
             << "Valid extraction methods:" << nl
             << flatOutput(dictionaryConstructorTablePtr_->sortedToc())
             << exit(FatalIOError);

src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C

@@ -80,10 +80,8 @@ void Foam::HashPtrTable<T, Key, Hash>::readIstream
             }
             else
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(is)
-                (
+                    << "incorrect first token, '(', found " << firstToken.info()
-                    is
-                )   << "incorrect first token, '(', found " << firstToken.info()
                     << exit(FatalIOError);
             }
         }
@@ -95,10 +93,8 @@ void Foam::HashPtrTable<T, Key, Hash>::readIstream
     {
         if (firstToken.pToken() != token::BEGIN_LIST)
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(is)
-            (
+                << "incorrect first token, '(', found " << firstToken.info()
-                is
-            )   << "incorrect first token, '(', found " << firstToken.info()
                 << exit(FatalIOError);
         }
 
@@ -127,10 +123,8 @@ void Foam::HashPtrTable<T, Key, Hash>::readIstream
     }
     else
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(is)
-        (
+            << "incorrect first token, expected <int> or '(', found "
-            is
-        )   << "incorrect first token, expected <int> or '(', found "
             << firstToken.info()
             << exit(FatalIOError);
     }

src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C

@@ -189,10 +189,8 @@ Foam::Istream& Foam::operator>>
             }
             else
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(is)
-                (
+                    << "incorrect first token, '(', found " << firstToken.info()
-                    is
-                )   << "incorrect first token, '(', found " << firstToken.info()
                     << exit(FatalIOError);
             }
         }
@@ -204,10 +202,8 @@ Foam::Istream& Foam::operator>>
     {
         if (firstToken.pToken() != token::BEGIN_LIST)
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(is)
-            (
+                << "incorrect first token, '(', found " << firstToken.info()
-                is
-            )   << "incorrect first token, '(', found " << firstToken.info()
                 << exit(FatalIOError);
         }
 
@@ -237,10 +233,8 @@ Foam::Istream& Foam::operator>>
     }
     else
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(is)
-        (
+            << "incorrect first token, expected <int> or '(', found "
-            is
-        )   << "incorrect first token, expected <int> or '(', found "
             << firstToken.info()
             << exit(FatalIOError);
     }

src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C

@@ -91,10 +91,8 @@ void Foam::ILList<LListBase, T>::readIstream(Istream& is, const INew& inew)
     {
         if (firstToken.pToken() != token::BEGIN_LIST)
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(is)
-            (
+                << "incorrect first token, '(', found " << firstToken.info()
-                is
-            )   << "incorrect first token, '(', found " << firstToken.info()
                 << exit(FatalIOError);
         }
 

src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LListIO.C

@@ -87,10 +87,8 @@ Foam::Istream& Foam::operator>>(Istream& is, LList<LListBase, T>& lst)
     {
         if (firstToken.pToken() != token::BEGIN_LIST)
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(is)
-            (
+                << "incorrect first token, '(', found " << firstToken.info()
-                is
-            )   << "incorrect first token, '(', found " << firstToken.info()
                 << exit(FatalIOError);
         }
 

src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C

@@ -92,10 +92,8 @@ void Foam::LPtrList<LListBase, T>::readIstream(Istream& is, const INew& inew)
     {
         if (firstToken.pToken() != token::BEGIN_LIST)
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(is)
-            (
+                << "incorrect first token, '(', found " << firstToken.info()
-                is
-            )   << "incorrect first token, '(', found " << firstToken.info()
                 << exit(FatalIOError);
         }
 
@@ -119,10 +117,8 @@ void Foam::LPtrList<LListBase, T>::readIstream(Istream& is, const INew& inew)
     }
     else
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(is)
-        (
+            << "incorrect first token, expected <int> or '(', found "
-            is
-        )   << "incorrect first token, expected <int> or '(', found "
             << firstToken.info()
             << exit(FatalIOError);
     }

src/OpenFOAM/containers/PtrLists/PtrList/PtrListIO.C

@@ -107,10 +107,8 @@ void Foam::PtrList<T>::readIstream(Istream& is, const INew& inew)
     {
         if (firstToken.pToken() != token::BEGIN_LIST)
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(is)
-            (
+                << "incorrect first token, '(', found " << firstToken.info()
-                is
-            )   << "incorrect first token, '(', found " << firstToken.info()
                 << exit(FatalIOError);
         }
 
@@ -129,10 +127,8 @@ void Foam::PtrList<T>::readIstream(Istream& is, const INew& inew)
 
             if (is.eof())
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(is)
-                (
+                    << "Premature EOF after reading " << lastToken.info()
-                    is
-                )   << "Premature EOF after reading " << lastToken.info()
                     << exit(FatalIOError);
             }
 
@@ -152,10 +148,8 @@ void Foam::PtrList<T>::readIstream(Istream& is, const INew& inew)
         return;
     }
 
-    FatalIOErrorInFunction
+    FatalIOErrorInFunction(is)
-    (
+        << "incorrect first token, expected <int> or '(', found "
-        is
-    )   << "incorrect first token, expected <int> or '(', found "
         << firstToken.info()
         << exit(FatalIOError);
 }

src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C

@@ -47,10 +47,8 @@ void Foam::CompactIOField<T, BaseType>::readFromStream(const bool valid)
         }
         else
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(is)
-            (
+                << "unexpected class name " << headerClassName()
-                is
-            )   << "unexpected class name " << headerClassName()
                 << " expected " << typeName << " or " << IOField<T>::typeName
                 << endl
                 << "    while reading object " << name()

src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C

@@ -203,10 +203,8 @@ Foam::functionEntries::codeStream::getFunction
 
                 if (!dynCode.copyOrCreateFiles(true))
                 {
-                    FatalIOErrorInFunction
+                    FatalIOErrorInFunction(parentDict)
-                    (
+                        << "Failed writing files for" << nl
-                        parentDict
-                    )   << "Failed writing files for" << nl
                         << dynCode.libRelPath() << nl
                         << exit(FatalIOError);
                 }
@@ -214,10 +212,8 @@ Foam::functionEntries::codeStream::getFunction
 
             if (!dynCode.wmakeLibso())
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(parentDict)
-                (
+                    << "Failed wmake " << dynCode.libRelPath() << nl
-                    parentDict
-                )   << "Failed wmake " << dynCode.libRelPath() << nl
                     << exit(FatalIOError);
             }
         }
@@ -266,10 +262,8 @@ Foam::functionEntries::codeStream::getFunction
 
                 if (mySize < masterSize)
                 {
-                    FatalIOErrorInFunction
+                    FatalIOErrorInFunction(parentDict)
-                    (
+                        << "Cannot read (NFS mounted) library " << nl
-                        parentDict
-                    )   << "Cannot read (NFS mounted) library " << nl
                         << libPath << nl
                         << "on processor " << Pstream::myProcNo()
                         << " detected size " << mySize
@@ -304,10 +298,8 @@ Foam::functionEntries::codeStream::getFunction
 
             if (!dlLibs.open(libPath, false))
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(parentDict)
-                (
+                    << "Failed loading library " << libPath << nl
-                    parentDict
-                )   << "Failed loading library " << libPath << nl
                     << "Did you add all libraries to the 'libs' entry"
                     << " in system/controlDict?"
                     << exit(FatalIOError);
@@ -334,10 +326,8 @@ Foam::functionEntries::codeStream::getFunction
 
     if (!haveLib)
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(parentDict)
-        (
+            << "Failed loading library " << libPath
-            parentDict
-        )   << "Failed loading library " << libPath
             << " on some processors."
             << exit(FatalIOError);
     }
@@ -353,10 +343,8 @@ Foam::functionEntries::codeStream::getFunction
 
     if (!function)
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(parentDict)
-        (
+            << "Failed looking up symbol " << dynCode.codeName()
-            parentDict
-        )   << "Failed looking up symbol " << dynCode.codeName()
             << " in library " << lib << exit(FatalIOError);
     }
 

src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C

@@ -159,10 +159,8 @@ bool Foam::functionEntries::includeEntry::execute
         return true;
     }
 
-    FatalIOErrorInFunction
+    FatalIOErrorInFunction(is)
-    (
+        << "Cannot open include file "
-        is
-    )   << "Cannot open include file "
         << (ifs.name().size() ? ifs.name() : rawName)
         << " while reading dictionary " << parentDict.name()
         << exit(FatalIOError);
@@ -206,10 +204,8 @@ bool Foam::functionEntries::includeEntry::execute
         return true;
     }
 
-    FatalIOErrorInFunction
+    FatalIOErrorInFunction(is)
-    (
+        << "Cannot open include file "
-        is
-    )   << "Cannot open include file "
         << (ifs.name().size() ? ifs.name() : rawName)
         << " while reading dictionary " << parentDict.name()
         << exit(FatalIOError);

src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C

@@ -108,10 +108,8 @@ bool Foam::functionEntries::includeEtcEntry::execute
         return true;
     }
 
-    FatalIOErrorInFunction
+    FatalIOErrorInFunction(is)
-    (
+        << "Cannot open etc file "
-        is
-    )   << "Cannot open etc file "
         << (ifs.name().size() ? ifs.name() : rawName)
         << " while reading dictionary " << parentDict.name()
         << exit(FatalIOError);
@@ -143,10 +141,8 @@ bool Foam::functionEntries::includeEtcEntry::execute
         return true;
     }
 
-    FatalIOErrorInFunction
+    FatalIOErrorInFunction(is)
-    (
+        << "Cannot open etc file "
-        is
-    )   << "Cannot open etc file "
         << (ifs.name().size() ? ifs.name() : rawName)
         << " while reading dictionary " << parentDict.name()
         << exit(FatalIOError);

src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C

@@ -87,10 +87,8 @@ bool Foam::primitiveEntry::expandVariable
 
         if (str.empty())
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(dict)
-            (
+                << "Illegal dictionary entry or environment variable name "
-                dict
-            )   << "Illegal dictionary entry or environment variable name "
                 << varName << endl << "Valid dictionary entries are "
                 << dict.toc() << exit(FatalIOError);
 

src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C

@@ -117,28 +117,22 @@ void* Foam::codedBase::loadLibrary
                     }
                     else
                     {
-                        FatalIOErrorInFunction
+                        FatalIOErrorInFunction(contextDict)
-                        (
+                            << "Failed looking up symbol " << globalFuncName
-                            contextDict
-                        )   << "Failed looking up symbol " << globalFuncName
                             << nl << "from " << libPath << exit(FatalIOError);
                     }
                 }
                 else
                 {
-                    FatalIOErrorInFunction
+                    FatalIOErrorInFunction(contextDict)
-                    (
+                        << "Failed looking up symbol " << globalFuncName << nl
-                        contextDict
-                    )   << "Failed looking up symbol " << globalFuncName << nl
                         << "from " << libPath << exit(FatalIOError);
 
                     lib = 0;
                     if (!libs().close(libPath, false))
                     {
-                        FatalIOErrorInFunction
+                        FatalIOErrorInFunction(contextDict)
-                        (
+                            << "Failed unloading library "
-                            contextDict
-                        )   << "Failed unloading library "
                             << libPath
                             << exit(FatalIOError);
                     }
@@ -187,20 +181,16 @@ void Foam::codedBase::unloadLibrary
         }
         else
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(contextDict)
-            (
+                << "Failed looking up symbol " << globalFuncName << nl
-                contextDict
-            )   << "Failed looking up symbol " << globalFuncName << nl
                 << "from " << libPath << exit(FatalIOError);
         }
     }
 
     if (!libs().close(libPath, false))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(contextDict)
-        (
+            << "Failed unloading library " << libPath
-            contextDict
-        )   << "Failed unloading library " << libPath
             << exit(FatalIOError);
     }
 }
@@ -228,10 +218,8 @@ void Foam::codedBase::createLibrary
 
             if (!dynCode.copyOrCreateFiles(true))
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(context.dict())
-                (
+                    << "Failed writing files for" << nl
-                    context.dict()
-                )   << "Failed writing files for" << nl
                     << dynCode.libRelPath() << nl
                     << exit(FatalIOError);
             }
@@ -239,10 +227,8 @@ void Foam::codedBase::createLibrary
 
         if (!dynCode.wmakeLibso())
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(context.dict())
-            (
+                << "Failed wmake " << dynCode.libRelPath() << nl
-                context.dict()
-            )   << "Failed wmake " << dynCode.libRelPath() << nl
                 << exit(FatalIOError);
         }
     }
@@ -289,10 +275,8 @@ void Foam::codedBase::createLibrary
 
             if (mySize < masterSize)
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(context.dict())
-                (
+                    << "Cannot read (NFS mounted) library " << nl
-                    context.dict()
-                )   << "Cannot read (NFS mounted) library " << nl
                     << libPath << nl
                     << "on processor " << Pstream::myProcNo()
                     << " detected size " << mySize

src/OpenFOAM/dimensionSet/dimensionSetIO.C

@@ -294,10 +294,8 @@ Foam::dimensionedScalar Foam::dimensionSet::parse
                 token t = tis.nextToken();
                 if (!t.isPunctuation()  || t.pToken() !=  token::END_LIST)
                 {
-                    FatalIOErrorInFunction
+                    FatalIOErrorInFunction(tis.stream())
-                    (
+                        << "Illegal token " << t << exit(FatalIOError);
-                        tis.stream()
-                    )   << "Illegal token " << t << exit(FatalIOError);
                 }
 
                 ds.dimensions() *= sub.dimensions();
@@ -363,18 +361,14 @@ Foam::dimensionedScalar Foam::dimensionSet::parse
             }
             else
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(tis.stream())
-                (
+                    << "Illegal token " << nextToken << exit(FatalIOError);
-                    tis.stream()
-                )   << "Illegal token " << nextToken << exit(FatalIOError);
             }
         }
         else
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(tis.stream())
-            (
+                << "Illegal token " << nextToken << exit(FatalIOError);
-                tis.stream()
-            )   << "Illegal token " << nextToken << exit(FatalIOError);
         }
 
 
@@ -415,10 +409,8 @@ Foam::Istream& Foam::dimensionSet::read
 
     if (startToken != token::BEGIN_SQR)
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(is)
-        (
+            << "Expected a " << token::BEGIN_SQR << " in dimensionSet"
-            is
-        )   << "expected a " << token::BEGIN_SQR << " in dimensionSet"
             << endl << "in stream " << is.info()
             << exit(FatalIOError);
     }
@@ -471,10 +463,8 @@ Foam::Istream& Foam::dimensionSet::read
         // Check end of dimensionSet
         if (nextToken != token::END_SQR)
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(is)
-            (
+                << "Expected a " << token::END_SQR << " in dimensionSet "
-                is
-            )   << "expected a " << token::END_SQR << " in dimensionSet "
                 << endl << "in stream " << is.info()
                 << exit(FatalIOError);
         }
@@ -509,10 +499,8 @@ Foam::Istream& Foam::dimensionSet::read
 
     if (startToken != token::BEGIN_SQR)
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(is)
-        (
+            << "Expected a " << token::BEGIN_SQR << " in dimensionSet"
-            is
-        )   << "expected a " << token::BEGIN_SQR << " in dimensionSet"
             << endl << "in stream " << is.info()
             << exit(FatalIOError);
     }
@@ -609,10 +597,8 @@ Foam::Istream& Foam::dimensionSet::read
         // Check end of dimensionSet
         if (nextToken != token::END_SQR)
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(is)
-            (
+                << "Expected a " << token::END_SQR << " in dimensionSet "
-                is
-            )   << "expected a " << token::END_SQR << " in dimensionSet "
                 << endl << "in stream " << is.info()
                 << exit(FatalIOError);
         }

src/OpenFOAM/fields/Fields/Field/Field.C

@@ -226,7 +226,7 @@ Foam::Field<Type>::Field
             else
             {
                 FatalIOErrorInFunction(dict)
-                    << "expected keyword 'uniform' or 'nonuniform', found "
+                    << "Expected keyword 'uniform' or 'nonuniform', found "
                     << firstToken.wordToken()
                     << exit(FatalIOError);
             }
@@ -234,7 +234,7 @@ Foam::Field<Type>::Field
         else if (is.version() == IOstream::versionNumber(2,0))
         {
             IOWarningInFunction(dict)
-                << "expected keyword 'uniform' or 'nonuniform', "
+                << "Expected keyword 'uniform' or 'nonuniform', "
                 "assuming deprecated Field format from "
                 "Foam version 2.0." << endl;
 
@@ -246,7 +246,7 @@ Foam::Field<Type>::Field
         else
         {
             FatalIOErrorInFunction(dict)
-                << "expected keyword 'uniform' or 'nonuniform', found "
+                << "Expected keyword 'uniform' or 'nonuniform', found "
                 << firstToken.info() << exit(FatalIOError);
         }
     }

src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C

@@ -158,10 +158,8 @@ readField
         {
             if (bmesh_[patchi].type() == cyclicPolyPatch::typeName)
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(dict)
-                (
+                    << "Cannot find patchField entry for cyclic "
-                    dict
-                )   << "Cannot find patchField entry for cyclic "
                     << bmesh_[patchi].name() << endl
                     << "Is your field uptodate with split cyclics?" << endl
                     << "Run foamUpgradeCyclics to convert mesh and fields"
@@ -169,10 +167,8 @@ readField
             }
             else
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(dict)
-                (
+                    << "Cannot find patchField entry for "
-                    dict
-                )   << "Cannot find patchField entry for "
                     << bmesh_[patchi].name() << exit(FatalIOError);
             }
         }

src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C

@@ -81,10 +81,8 @@ Foam::valuePointPatchField<Type>::valuePointPatchField
     }
     else
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "Essential entry 'value' missing"
-            dict
-        )   << "Essential entry 'value' missing"
             << exit(FatalIOError);
     }
 }

src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C

@@ -55,10 +55,8 @@ Foam::cyclicPointPatchField<Type>::cyclicPointPatchField
 {
     if (!isType<cyclicPointPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "patch " << this->patch().index() << " not cyclic type. "
-            dict
-        )   << "patch " << this->patch().index() << " not cyclic type. "
             << "Patch type = " << p.type()
             << exit(FatalIOError);
     }

src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C

@@ -50,10 +50,8 @@ Foam::emptyPointPatchField<Type>::emptyPointPatchField
 {
     if (!isType<emptyPointPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "patch " << this->patch().index() << " not empty type. "
-            dict
-        )   << "patch " << this->patch().index() << " not empty type. "
             << "Patch type = " << p.type()
             << exit(FatalIOError);
     }

src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C

@@ -50,10 +50,8 @@ Foam::symmetryPointPatchField<Type>::symmetryPointPatchField
 {
     if (!isType<symmetryPointPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "patch " << this->patch().index() << " not symmetry type. "
-            dict
-        )   << "patch " << this->patch().index() << " not symmetry type. "
             << "Patch type = " << p.type()
             << exit(FatalIOError);
     }

src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C

@@ -52,10 +52,8 @@ Foam::symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
 {
     if (!isType<symmetryPlanePointPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "patch " << this->patch().index() << " not symmetry type. "
-            dict
-        )   << "patch " << this->patch().index() << " not symmetry type. "
             << "Patch type = " << p.type()
             << exit(FatalIOError);
     }

src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C

@@ -52,10 +52,8 @@ Foam::wedgePointPatchField<Type>::wedgePointPatchField
 {
     if (!isType<wedgePointPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "patch " << this->patch().index() << " not wedge type. "
-            dict
-        )   << "patch " << this->patch().index() << " not wedge type. "
             << "Patch type = " << p.type()
             << exit(FatalIOError);
     }

src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C

@@ -127,10 +127,8 @@ Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
 
         if (!cstrIter.found())
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(dict)
-            (
+                << "Unknown patchField type " << patchFieldType
-                dict
-            )   << "Unknown patchField type " << patchFieldType
                 << " for patch type " << p.type() << nl << nl
                 << "Valid patchField types :" << endl
                 << dictionaryConstructorTablePtr_->sortedToc()
@@ -160,10 +158,8 @@ Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
 
             if (!patchTypeCstrIter.found())
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(dict)
-                (
+                    << "inconsistent patch and patchField types for \n"
-                    dict
-                )   << "inconsistent patch and patchField types for \n"
                     << "    patch type " << p.type()
                     << " and patchField type " << patchFieldType
                     << exit(FatalIOError);

src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C

@@ -47,10 +47,8 @@ Foam::LduMatrix<Type, DType, LUType>::preconditioner::New
 
         if (!cstrIter.found())
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(preconditionerDict)
-            (
+                << "Unknown symmetric matrix preconditioner "
-                preconditionerDict
-            )   << "Unknown symmetric matrix preconditioner "
                 << preconditionerName << endl << endl
                 << "Valid symmetric matrix preconditioners are :" << endl
                 << symMatrixConstructorTablePtr_->sortedToc()
@@ -73,10 +71,8 @@ Foam::LduMatrix<Type, DType, LUType>::preconditioner::New
 
         if (!cstrIter.found())
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(preconditionerDict)
-            (
+                << "Unknown asymmetric matrix preconditioner "
-                preconditionerDict
-            )   << "Unknown asymmetric matrix preconditioner "
                 << preconditionerName << endl << endl
                 << "Valid asymmetric matrix preconditioners are :" << endl
                 << asymMatrixConstructorTablePtr_->sortedToc()
@@ -93,10 +89,8 @@ Foam::LduMatrix<Type, DType, LUType>::preconditioner::New
         );
     }
 
-    FatalIOErrorInFunction
+    FatalIOErrorInFunction(preconditionerDict)
-    (
+        << "Cannot precondition incomplete matrix, "
-        preconditionerDict
-    )   << "cannot preconditione incomplete matrix, "
            "no diagonal or off-diagonal coefficient"
         << exit(FatalIOError);
 

src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C

@@ -91,10 +91,8 @@ Foam::lduMatrix::preconditioner::New
 
         if (!cstrIter.found())
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(controls)
-            (
+                << "Unknown symmetric matrix preconditioner "
-                controls
-            )   << "Unknown symmetric matrix preconditioner "
                 << name << nl << nl
                 << "Valid symmetric matrix preconditioners :" << endl
                 << symMatrixConstructorTablePtr_->sortedToc()
@@ -116,10 +114,8 @@ Foam::lduMatrix::preconditioner::New
 
         if (!cstrIter.found())
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(controls)
-            (
+                << "Unknown asymmetric matrix preconditioner "
-                controls
-            )   << "Unknown asymmetric matrix preconditioner "
                 << name << nl << nl
                 << "Valid asymmetric matrix preconditioners :" << endl
                 << asymMatrixConstructorTablePtr_->sortedToc()
@@ -136,10 +132,8 @@ Foam::lduMatrix::preconditioner::New
         );
     }
 
-    FatalIOErrorInFunction
+    FatalIOErrorInFunction(controls)
-    (
+        << "cannot solve incomplete matrix, "
-        controls
-    )   << "cannot solve incomplete matrix, "
            "no diagonal or off-diagonal coefficient"
         << exit(FatalIOError);
 

src/OpenFOAM/matrices/solution/solution.C

@@ -279,10 +279,8 @@ Foam::scalar Foam::solution::fieldRelaxationFactor(const word& name) const
     }
     else
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(fieldRelaxDict_)
-        (
+            << "Cannot find variable relaxation factor for '" << name
-            fieldRelaxDict_
-        )   << "Cannot find variable relaxation factor for '" << name
             << "' or a suitable default value."
             << exit(FatalIOError);
 
@@ -308,10 +306,8 @@ Foam::scalar Foam::solution::equationRelaxationFactor(const word& name) const
     }
     else
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(eqnRelaxDict_)
-        (
+            << "Cannot find equation relaxation factor for '" << name
-            eqnRelaxDict_
-        )   << "Cannot find equation relaxation factor for '" << name
             << "' or a suitable default value."
             << exit(FatalIOError);
 

src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C

@@ -660,10 +660,8 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
 {
     if (neighbPatchName_ == word::null && !coupleGroup_.valid())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "No \"neighbourPatch\" provided." << endl
-            dict
-        )   << "No \"neighbourPatch\" provided." << endl
             << "Is your mesh uptodate with split cyclics?" << endl
             << "Run foamUpgradeCyclics to convert mesh and fields"
             << " to split cyclics." << exit(FatalIOError);

src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C

@@ -599,10 +599,8 @@ Foam::oldCyclicPolyPatch::oldCyclicPolyPatch
 {
     if (dict.found("neighbourPatch"))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "Found \"neighbourPatch\" entry when reading cyclic patch "
-            dict
-        )   << "Found \"neighbourPatch\" entry when reading cyclic patch "
             << name << endl
             << "Is this mesh already with split cyclics?" << endl
             << "If so run a newer version that supports it"

src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C

@@ -115,10 +115,8 @@ Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
 
         if (!cstrIter.found())
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(dict)
-            (
+                << "Unknown polyPatch type "
-                dict
-            )   << "Unknown polyPatch type "
                 << patchType << " for patch " << name << nl << nl
                 << "Valid polyPatch types :" << endl
                 << dictionaryConstructorTablePtr_->sortedToc()

src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C

@@ -47,10 +47,8 @@ Foam::autoPtr<Foam::cellZone> Foam::cellZone::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "Unknown cellZone type "
-            dict
-        )   << "Unknown cellZone type "
             << zoneType << nl << nl
             << "Valid cellZone types :" << nl
             << dictionaryConstructorTablePtr_->sortedToc()

src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C

@@ -47,10 +47,8 @@ Foam::autoPtr<Foam::faceZone> Foam::faceZone::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "Unknown faceZone type "
-            dict
-        )   << "Unknown faceZone type "
             << zoneType << nl << nl
             << "Valid faceZone types :" << nl
             << dictionaryConstructorTablePtr_->sortedToc()

src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C

@@ -47,10 +47,8 @@ Foam::autoPtr<Foam::pointZone> Foam::pointZone::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "Unknown pointZone type "
-            dict
-        )   << "Unknown pointZone type "
             << zoneType << nl << nl
             << "Valid pointZone types :" << nl
             << dictionaryConstructorTablePtr_->sortedToc()

src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C

@@ -46,10 +46,8 @@ Foam::Function1Types::TableFile<Type>::TableFile
 
     if (!is.good())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(is)
-        (
+            << "Cannot open file." << exit(FatalIOError);
-            is
-        )   << "Cannot open file." << exit(FatalIOError);
     }
 
     is  >> this->table_;

src/OpenFOAM/primitives/strings/stringOps/stringOps.C

@@ -487,18 +487,14 @@ Foam::string Foam::stringOps::getVariable
     {
         if (allowEnvVars)
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(dict)
-            (
+                << "Cannot find dictionary or environment variable "
-                dict
-            )   << "Cannot find dictionary or environment variable "
                 << name << exit(FatalIOError);
         }
         else
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(dict)
-            (
+                << "Cannot find dictionary variable "
-                dict
-            )   << "Cannot find dictionary variable "
                 << name << exit(FatalIOError);
         }
     }

src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C

@@ -233,11 +233,9 @@ baffleThickness() const
     {
         if (thickness_.size() != patch().size())
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(solidDict_)
-            (
+                << "Field thickness has not been specified"
-                solidDict_
+                   " for patch " << this->patch().name()
-            )<< " Field thickness has not been specified "
-            << " for patch " << this->patch().name()
                 << exit(FatalIOError);
         }
 

src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameAreaNew.C

@@ -46,10 +46,8 @@ Foam::autoPtr<Foam::reactionRateFlameArea> Foam::reactionRateFlameArea::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "Unknown reactionRateFlameArea type "
-            dict
-        )   << "Unknown reactionRateFlameArea type "
             << modelType << nl << nl
             << "Valid reaction rate flame area types :" << endl
             << dictionaryConstructorTablePtr_->sortedToc()

src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C

@@ -83,10 +83,8 @@ Foam::dynamicMultiMotionSolverFvMesh::dynamicMultiMotionSolverFvMesh
 
             if (zoneIDs_[zoneI] == -1)
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(dynamicMeshCoeffs)
-                (
+                    << "Cannot find cellZone named " << zoneName
-                    dynamicMeshCoeffs
-                )   << "Cannot find cellZone named " << zoneName
                     << ". Valid zones are " << cellZones().names()
                     << exit(FatalIOError);
             }

src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver.C

@@ -70,10 +70,8 @@ Foam::multiSolidBodyMotionSolver::multiSolidBodyMotionSolver
 
             if (zoneIDs_[zonei] == -1)
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(coeffDict())
-                (
+                    << "Cannot find cellZone named " << zoneName
-                    coeffDict()
-                )   << "Cannot find cellZone named " << zoneName
                     << ". Valid zones are "
                     << flatOutput(mesh.cellZones().names())
                     << exit(FatalIOError);

src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C

@@ -47,10 +47,8 @@ Foam::autoPtr<Foam::polyMeshModifier> Foam::polyMeshModifier::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "Unknown polyMeshModifier type "
-            dict
-        )   << "Unknown polyMeshModifier type "
             << modifierType << nl << nl
             << "Valid polyMeshModifier types :" << endl
             << dictionaryConstructorTablePtr_->sortedToc()

src/fileFormats/vtk/read/vtkUnstructuredReader.C

@@ -143,10 +143,8 @@ void Foam::vtkUnstructuredReader::extractCells
                 label nRead = cellVertData[dataIndex++];
                 if (nRead != 1)
                 {
-                    FatalIOErrorInFunction
+                    FatalIOErrorInFunction(inFile)
-                    (
+                        << "Expected size 1 for VTK_VERTEX but found "
-                        inFile
-                    )   << "Expected size 1 for VTK_VERTEX but found "
                         << nRead << exit(FatalIOError);
                 }
                 dataIndex += nRead;
@@ -167,10 +165,8 @@ void Foam::vtkUnstructuredReader::extractCells
                 label nRead = cellVertData[dataIndex++];
                 if (nRead != 2)
                 {
-                    FatalIOErrorInFunction
+                    FatalIOErrorInFunction(inFile)
-                    (
+                        << "Expected size 2 for VTK_LINE but found "
-                        inFile
-                    )   << "Expected size 2 for VTK_LINE but found "
                         << nRead << exit(FatalIOError);
                 }
                 lineMap_[lineI] = i;
@@ -203,10 +199,8 @@ void Foam::vtkUnstructuredReader::extractCells
                 label nRead = cellVertData[dataIndex++];
                 if (nRead != 3)
                 {
-                    FatalIOErrorInFunction
+                    FatalIOErrorInFunction(inFile)
-                    (
+                        << "Expected size 3 for VTK_TRIANGLE but found "
-                        inFile
-                    )   << "Expected size 3 for VTK_TRIANGLE but found "
                         << nRead << exit(FatalIOError);
                 }
                 f[0] = cellVertData[dataIndex++];
@@ -223,10 +217,8 @@ void Foam::vtkUnstructuredReader::extractCells
                 label nRead = cellVertData[dataIndex++];
                 if (nRead != 4)
                 {
-                    FatalIOErrorInFunction
+                    FatalIOErrorInFunction(inFile)
-                    (
+                        << "Expected size 4 for VTK_QUAD but found "
-                        inFile
-                    )   << "Expected size 4 for VTK_QUAD but found "
                         << nRead << exit(FatalIOError);
                 }
                 f[0] = cellVertData[dataIndex++];
@@ -254,10 +246,8 @@ void Foam::vtkUnstructuredReader::extractCells
                 label nRead = cellVertData[dataIndex++];
                 if (nRead != 4)
                 {
-                    FatalIOErrorInFunction
+                    FatalIOErrorInFunction(inFile)
-                    (
+                        << "Expected size 4 for VTK_TETRA but found "
-                        inFile
-                    )   << "Expected size 4 for VTK_TETRA but found "
                         << nRead << exit(FatalIOError);
                 }
                 tetPoints[0] = cellVertData[dataIndex++];
@@ -274,10 +264,8 @@ void Foam::vtkUnstructuredReader::extractCells
                 label nRead = cellVertData[dataIndex++];
                 if (nRead != 5)
                 {
-                    FatalIOErrorInFunction
+                    FatalIOErrorInFunction(inFile)
-                    (
+                        << "Expected size 5 for VTK_PYRAMID but found "
-                        inFile
-                    )   << "Expected size 5 for VTK_PYRAMID but found "
                         << nRead << exit(FatalIOError);
                 }
                 pyrPoints[0] = cellVertData[dataIndex++];
@@ -295,10 +283,8 @@ void Foam::vtkUnstructuredReader::extractCells
                 label nRead = cellVertData[dataIndex++];
                 if (nRead != 6)
                 {
-                    FatalIOErrorInFunction
+                    FatalIOErrorInFunction(inFile)
-                    (
+                        << "Expected size 6 for VTK_WEDGE but found "
-                        inFile
-                    )   << "Expected size 6 for VTK_WEDGE but found "
                         << nRead << exit(FatalIOError);
                 }
                 //- From mesh description in vtk documentation
@@ -318,10 +304,8 @@ void Foam::vtkUnstructuredReader::extractCells
                 label nRead = cellVertData[dataIndex++];
                 if (nRead != 8)
                 {
-                    FatalIOErrorInFunction
+                    FatalIOErrorInFunction(inFile)
-                    (
+                        << "Expected size 8 for VTK_HEXAHEDRON but found "
-                        inFile
-                    )   << "Expected size 8 for VTK_HEXAHEDRON but found "
                         << nRead << exit(FatalIOError);
                 }
                 hexPoints[0] = cellVertData[dataIndex++];
@@ -543,7 +527,8 @@ void Foam::vtkUnstructuredReader::read(ISstream& inFile)
     if (dataType_ == "BINARY")
     {
         FatalIOErrorInFunction(inFile)
-            << "Binary reading not supported " << exit(FatalIOError);
+            << "Binary reading not supported"
+            << exit(FatalIOError);
     }
 
     parseMode readMode = NOMODE;

src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C

@@ -51,10 +51,8 @@ bool Foam::setRefCell
 
                 if (refCelli < 0 || refCelli >= field.mesh().nCells())
                 {
-                    FatalIOErrorInFunction
+                    FatalIOErrorInFunction(dict)
-                    (
+                        << "Illegal master cellID " << refCelli
-                        dict
-                    )   << "Illegal master cellID " << refCelli
                         << ". Should be 0.." << field.mesh().nCells()
                         << exit(FatalIOError);
                 }
@@ -86,10 +84,8 @@ bool Foam::setRefCell
 
             if (sumHasRef != 1)
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(dict)
-                (
+                    << "Unable to set reference cell for field " << field.name()
-                    dict
-                )   << "Unable to set reference cell for field " << field.name()
                     << nl << "    Reference point " << refPointName
                     << " " << refPointi
                     << " found on " << sumHasRef << " domains (should be one)"
@@ -98,10 +94,8 @@ bool Foam::setRefCell
         }
         else
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(dict)
-            (
+                << "Unable to set reference cell for field " << field.name()
-                dict
-            )   << "Unable to set reference cell for field " << field.name()
                 << nl
                 << "    Please supply either " << refCellName
                 << " or " << refPointName << nl << exit(FatalIOError);

src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C

@@ -53,10 +53,8 @@ Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
 {
     if (!isA<cyclicFvPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "    patch type '" << p.type()
-            dict
-        )   << "    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->internalField().name()

src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C

@@ -55,10 +55,8 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
 {
     if (!isA<cyclicACMIFvPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "    patch type '" << p.type()
-            dict
-        )   << "    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->internalField().name()
@@ -78,10 +76,7 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
             );
         if (!fld.boundaryField().set(cyclicACMIPatch_.nonOverlapPatchID()))
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(dict)
-            (
-                dict
-            )
                 << "    patch " << p.name()
                 << " of field " << this->internalField().name()
                 << " refers to non-overlap patch "

src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C

@@ -52,10 +52,8 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
 {
     if (!isA<cyclicAMIFvPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "    patch type '" << p.type()
-            dict
-        )   << "    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->internalField().name()

src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C

@@ -74,10 +74,8 @@ Foam::emptyFvPatchField<Type>::emptyFvPatchField
 {
     if (!isType<emptyFvPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "\n    patch type '" << p.type()
-            dict
-        )   << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->internalField().name()

src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C

@@ -86,10 +86,8 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
 {
     if (!isA<processorFvPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "\n    patch type '" << p.type()
-            dict
-        )   << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->internalField().name()

src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C

@@ -55,10 +55,8 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
 {
     if (!isType<processorCyclicFvPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "\n    patch type '" << p.type()
-            dict
-        )   << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->internalField().name()

src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C

@@ -50,10 +50,8 @@ Foam::symmetryFvPatchField<Type>::symmetryFvPatchField
 {
     if (!isType<symmetryFvPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "\n    patch type '" << p.type()
-            dict
-        )   << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->internalField().name()

src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C

@@ -77,10 +77,8 @@ Foam::symmetryPlaneFvPatchField<Type>::symmetryPlaneFvPatchField
 {
     if (!isType<symmetryPlaneFvPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "\n    patch type '" << p.type()
-            dict
-        )   << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->internalField().name()

src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C

@@ -78,10 +78,8 @@ Foam::wedgeFvPatchField<Type>::wedgeFvPatchField
 {
     if (!isType<wedgeFvPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "\n    patch type '" << p.type()
-            dict
-        )   << "\n    patch type '" << p.type()
             << "' not constraint type '" << typeName << "'"
             << "\n    for patch " << p.name()
             << " of field " << this->internalField().name()

src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C

@@ -107,10 +107,8 @@ Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
 
         if (lInf_ < 0.0)
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(dict)
-            (
+                << "unphysical lInf specified (lInf < 0)" << nl
-                dict
-            )   << "unphysical lInf specified (lInf < 0)" << nl
                 << "    on patch " << this->patch().name()
                 << " of field " << this->internalField().name()
                 << " in file " << this->internalField().objectPath()

src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C

@@ -75,10 +75,8 @@ flowRateInletVelocityFvPatchVectorField
     }
     else
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "Please supply either 'volumetricFlowRate' or"
-            dict
-        )   << "Please supply either 'volumetricFlowRate' or"
             << " 'massFlowRate' and 'rho'" << exit(FatalIOError);
     }
 

src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C

@@ -70,10 +70,8 @@ flowRateOutletVelocityFvPatchVectorField
     }
     else
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "Please supply either 'volumetricFlowRate' or"
-            dict
-        )   << "Please supply either 'volumetricFlowRate' or"
             << " 'massFlowRate' and 'rho'" << exit(FatalIOError);
     }
 

src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C

@@ -89,10 +89,8 @@ supersonicFreestreamFvPatchVectorField
 
     if (pInf_ < SMALL)
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "    unphysical pInf specified (pInf <= 0.0)"
-            dict
-        )   << "    unphysical pInf specified (pInf <= 0.0)"
             << "\n    on patch " << this->patch().name()
             << " of field " << this->internalField().name()
             << " in file " << this->internalField().objectPath()

src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C

@@ -125,10 +125,8 @@ Foam::fvPatchField<Type>::fvPatchField
         }
         else
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(dict)
-            (
+                << "Essential entry 'value' missing"
-                dict
-            )   << "Essential entry 'value' missing"
                 << exit(FatalIOError);
         }
     }

src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C

@@ -125,10 +125,8 @@ Foam::tmp<Foam::fvPatchField<Type>> Foam::fvPatchField<Type>::New
 
         if (!cstrIter.found())
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(dict)
-            (
+                << "Unknown patchField type " << patchFieldType
-                dict
-            )   << "Unknown patchField type " << patchFieldType
                 << " for patch type " << p.type() << nl << nl
                 << "Valid patchField types :" << endl
                 << dictionaryConstructorTablePtr_->sortedToc()
@@ -147,10 +145,8 @@ Foam::tmp<Foam::fvPatchField<Type>> Foam::fvPatchField<Type>::New
 
         if (patchTypeCstrIter.found() && patchTypeCstrIter() != cstrIter())
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(dict)
-            (
+                << "inconsistent patch and patchField types for \n"
-                dict
-            )   << "inconsistent patch and patchField types for \n"
                    "    patch type " << p.type()
                 << " and patchField type " << patchFieldType
                 << exit(FatalIOError);

src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C

@@ -52,10 +52,8 @@ Foam::cyclicFvsPatchField<Type>::cyclicFvsPatchField
 {
     if (!isA<cyclicFvPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "patch " << this->patch().index() << " not cyclic type. "
-            dict
-        )   << "patch " << this->patch().index() << " not cyclic type. "
             << "Patch type = " << p.type()
             << exit(FatalIOError);
     }

src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.C

@@ -76,10 +76,8 @@ Foam::cyclicACMIFvsPatchField<Type>::cyclicACMIFvsPatchField
 {
     if (!isA<cyclicACMIFvPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "patch " << this->patch().index() << " not cyclicACMI type. "
-            dict
-        )   << "patch " << this->patch().index() << " not cyclicACMI type. "
             << "Patch type = " << p.type()
             << exit(FatalIOError);
     }

src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.C

@@ -76,10 +76,8 @@ Foam::cyclicAMIFvsPatchField<Type>::cyclicAMIFvsPatchField
 {
     if (!isA<cyclicAMIFvPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "patch " << this->patch().index() << " not cyclicAMI type. "
-            dict
-        )   << "patch " << this->patch().index() << " not cyclicAMI type. "
             << "Patch type = " << p.type()
             << exit(FatalIOError);
     }

src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C

@@ -52,10 +52,8 @@ Foam::emptyFvsPatchField<Type>::emptyFvsPatchField
 {
     if (!isType<emptyFvPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "patch " << this->patch().index() << " not empty type. "
-            dict
-        )   << "patch " << this->patch().index() << " not empty type. "
             << "Patch type = " << p.type()
             << exit(FatalIOError);
     }

src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C

@@ -65,10 +65,8 @@ Foam::processorFvsPatchField<Type>::processorFvsPatchField
 {
     if (!isType<processorFvPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "patch " << this->patch().index() << " not processor type. "
-            dict
-        )   << "patch " << this->patch().index() << " not processor type. "
             << "Patch type = " << p.type()
             << exit(FatalIOError);
     }

src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C

@@ -65,10 +65,8 @@ Foam::processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
 {
     if (!isType<processorCyclicFvPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "patch " << this->patch().index() << " not processor type. "
-            dict
-        )   << "patch " << this->patch().index() << " not processor type. "
             << "Patch type = " << p.type()
             << exit(FatalIOError);
     }

src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C

@@ -50,10 +50,8 @@ Foam::symmetryFvsPatchField<Type>::symmetryFvsPatchField
 {
     if (!isType<symmetryFvPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "patch " << this->patch().index() << " not symmetry type. "
-            dict
-        )   << "patch " << this->patch().index() << " not symmetry type. "
             << "Patch type = " << p.type()
             << exit(FatalIOError);
     }

src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C

@@ -50,10 +50,8 @@ Foam::symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
 {
     if (!isType<symmetryPlaneFvPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "patch " << this->patch().index() << " not symmetryPlane type. "
-            dict
-        )   << "patch " << this->patch().index() << " not symmetryPlane type. "
             << "Patch type = " << p.type()
             << exit(FatalIOError);
     }

src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C

@@ -50,10 +50,8 @@ Foam::wedgeFvsPatchField<Type>::wedgeFvsPatchField
 {
     if (!isType<wedgeFvPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "patch " << this->patch().index() << " not wedge type. "
-            dict
-        )   << "patch " << this->patch().index() << " not wedge type. "
             << "Patch type = " << p.type()
             << exit(FatalIOError);
     }

src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C

@@ -113,10 +113,8 @@ Foam::tmp<Foam::fvsPatchField<Type>> Foam::fvsPatchField<Type>::New
 
         if (!cstrIter.found())
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(dict)
-            (
+                << "Unknown patchField type " << patchFieldType
-                dict
-            )   << "Unknown patchField type " << patchFieldType
                 << " for patch type " << p.type() << nl << nl
                 << "Valid patchField types :" << endl
                 << dictionaryConstructorTablePtr_->sortedToc()
@@ -135,10 +133,8 @@ Foam::tmp<Foam::fvsPatchField<Type>> Foam::fvsPatchField<Type>::New
 
         if (patchTypeCstrIter.found() && patchTypeCstrIter() != cstrIter())
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(dict)
-            (
+                << "inconsistent patch and patchField types for \n"
-                dict
-            )   << "inconsistent patch and patchField types for \n"
                    "    patch type " << p.type()
                 << " and patchField type " << patchFieldType
                 << exit(FatalIOError);

src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C

@@ -68,10 +68,8 @@ tmp<convectionScheme<Type>> convectionScheme<Type>::New
 
     if (schemeData.eof())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Convection scheme not specified" << endl << endl
-            schemeData
-        )   << "Convection scheme not specified" << endl << endl
             << "Valid convection schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
@@ -83,10 +81,8 @@ tmp<convectionScheme<Type>> convectionScheme<Type>::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Unknown convection scheme "
-            schemeData
-        )   << "Unknown convection scheme "
             << schemeName << nl << nl
             << "Valid convection schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
@@ -114,10 +110,8 @@ tmp<convectionScheme<Type>> convectionScheme<Type>::New
 
     if (schemeData.eof())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Convection scheme not specified" << endl << endl
-            schemeData
-        )   << "Convection scheme not specified" << endl << endl
             << "Valid convection schemes are :" << endl
             << MultivariateConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
@@ -129,10 +123,8 @@ tmp<convectionScheme<Type>> convectionScheme<Type>::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Unknown convection scheme "
-            schemeData
-        )   << "Unknown convection scheme "
             << schemeName << nl << nl
             << "Valid convection schemes are :" << endl
             << MultivariateConstructorTablePtr_->sortedToc()

src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C

@@ -52,10 +52,8 @@ tmp<d2dt2Scheme<Type>> d2dt2Scheme<Type>::New
 
     if (schemeData.eof())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "D2dt2 scheme not specified" << endl << endl
-            schemeData
-        )   << "D2dt2 scheme not specified" << endl << endl
             << "Valid d2dt2 schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
@@ -67,10 +65,8 @@ tmp<d2dt2Scheme<Type>> d2dt2Scheme<Type>::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Unknown d2dt2 scheme "
-            schemeData
-        )   << "Unknown d2dt2 scheme "
             << schemeName << nl << nl
             << "Valid d2dt2 schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()

src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C

@@ -308,10 +308,8 @@ CrankNicolsonDdtScheme<Type>::CrankNicolsonDdtScheme
         const scalar ocCoeff = firstToken.number();
         if (ocCoeff < 0 || ocCoeff > 1)
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(is)
-            (
+                << "Off-centreing coefficient = " << ocCoeff
-                is
-            )   << "Off-centreing coefficient = " << ocCoeff
                 << " should be >= 0 and <= 1"
                 << exit(FatalIOError);
         }

src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C

@@ -56,10 +56,8 @@ tmp<ddtScheme<Type>> ddtScheme<Type>::New
 
     if (schemeData.eof())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Ddt scheme not specified" << endl << endl
-            schemeData
-        )   << "Ddt scheme not specified" << endl << endl
             << "Valid ddt schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
@@ -71,10 +69,8 @@ tmp<ddtScheme<Type>> ddtScheme<Type>::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Unknown ddt scheme "
-            schemeData
-        )   << "Unknown ddt scheme "
             << schemeName << nl << nl
             << "Valid ddt schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()

src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C

@@ -56,10 +56,8 @@ tmp<divScheme<Type>> divScheme<Type>::New
 
     if (schemeData.eof())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Div scheme not specified" << endl << endl
-            schemeData
-        )   << "Div scheme not specified" << endl << endl
             << "Valid div schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
@@ -71,10 +69,8 @@ tmp<divScheme<Type>> divScheme<Type>::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "unknown div scheme "
-            schemeData
-        )   << "unknown div scheme "
             << schemeName << nl << nl
             << "Valid div schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()

src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C

@@ -43,10 +43,8 @@ Foam::tmp<Foam::fv::gradScheme<Type>> Foam::fv::gradScheme<Type>::New
 
     if (schemeData.eof())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Grad scheme not specified" << endl << endl
-            schemeData
-        )   << "Grad scheme not specified" << endl << endl
             << "Valid grad schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
@@ -58,10 +56,8 @@ Foam::tmp<Foam::fv::gradScheme<Type>> Foam::fv::gradScheme<Type>::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Unknown grad scheme "
-            schemeData
-        )   << "Unknown grad scheme "
             << schemeName << nl << nl
             << "Valid grad schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()

src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H

@@ -111,10 +111,8 @@ public:
         {
             if (k_ < 0 || k_ > 1)
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(schemeData)
-                (
+                    << "coefficient = " << k_
-                    schemeData
-                )   << "coefficient = " << k_
                     << " should be >= 0 and <= 1"
                     << exit(FatalIOError);
             }

src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/gradientLimiters/cubicGradientLimiter.H

@@ -105,10 +105,8 @@ public:
         {
             if (rt_ < 1)
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(schemeData)
-                (
+                    << "coefficient = " << rt_
-                    schemeData
-                )   << "coefficient = " << rt_
                     << " should be > 1"
                     << exit(FatalIOError);
             }

src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H

@@ -98,10 +98,8 @@ public:
         {
             if (k_ < 0 || k_ > 1)
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(schemeData)
-                (
+                    << "coefficient = " << k_
-                    schemeData
-                )   << "coefficient = " << k_
                     << " should be >= 0 and <= 1"
                     << exit(FatalIOError);
             }

src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H

@@ -107,10 +107,8 @@ public:
         {
             if (k_ < 0 || k_ > 1)
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(schemeData)
-                (
+                    << "coefficient = " << k_
-                    schemeData
-                )   << "coefficient = " << k_
                     << " should be >= 0 and <= 1"
                     << exit(FatalIOError);
             }

src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H

@@ -107,10 +107,8 @@ public:
         {
             if (k_ < 0 || k_ > 1)
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(schemeData)
-                (
+                    << "coefficient = " << k_
-                    schemeData
-                )   << "coefficient = " << k_
                     << " should be >= 0 and <= 1"
                     << exit(FatalIOError);
             }

src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C

@@ -54,10 +54,8 @@ tmp<laplacianScheme<Type, GType>> laplacianScheme<Type, GType>::New
 
     if (schemeData.eof())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Laplacian scheme not specified" << endl << endl
-            schemeData
-        )   << "Laplacian scheme not specified" << endl << endl
             << "Valid laplacian schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
@@ -69,10 +67,8 @@ tmp<laplacianScheme<Type, GType>> laplacianScheme<Type, GType>::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Unknown laplacian scheme "
-            schemeData
-        )   << "Unknown laplacian scheme "
             << schemeName << nl << nl
             << "Valid laplacian schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()

src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H

@@ -138,10 +138,8 @@ public:
         {
             if (limitCoeff_ < 0 || limitCoeff_ > 1)
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(schemeData)
-                (
+                    << "limitCoeff is specified as " << limitCoeff_
-                    schemeData
-                )   << "limitCoeff is specified as " << limitCoeff_
                     << " but should be >= 0 && <= 1"
                     << exit(FatalIOError);
             }

src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C

@@ -55,10 +55,8 @@ tmp<snGradScheme<Type>> snGradScheme<Type>::New
 
     if (schemeData.eof())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Discretisation scheme not specified"
-            schemeData
-        )   << "Discretisation scheme not specified"
             << endl << endl
             << "Valid schemes are :" << endl
             << MeshConstructorTablePtr_->sortedToc()
@@ -71,10 +69,8 @@ tmp<snGradScheme<Type>> snGradScheme<Type>::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Unknown discretisation scheme "
-            schemeData
-        )   << "Unknown discretisation scheme "
             << schemeName << nl << nl
             << "Valid schemes are :" << endl
             << MeshConstructorTablePtr_->sortedToc()

src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C

@@ -96,10 +96,8 @@ Foam::SolverPerformance<Type> Foam::fvMatrix<Type>::solveSegregatedOrCoupled
     }
     else
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(solverControls)
-        (
+            << "Unknown type " << type
-            solverControls
-        )   << "Unknown type " << type
             << "; currently supported solver types are segregated and coupled"
             << exit(FatalIOError);
 

src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C

@@ -46,10 +46,8 @@ Foam::limitedSurfaceInterpolationScheme<Type>::New
 
     if (schemeData.eof())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Discretisation scheme not specified"
-            schemeData
-        )   << "Discretisation scheme not specified"
             << endl << endl
             << "Valid schemes are :" << endl
             << MeshConstructorTablePtr_->sortedToc()
@@ -62,10 +60,8 @@ Foam::limitedSurfaceInterpolationScheme<Type>::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Unknown discretisation scheme "
-            schemeData
-        )   << "Unknown discretisation scheme "
             << schemeName << nl << nl
             << "Valid schemes are :" << endl
             << MeshConstructorTablePtr_->sortedToc()
@@ -94,10 +90,8 @@ Foam::limitedSurfaceInterpolationScheme<Type>::New
 
     if (schemeData.eof())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Discretisation scheme not specified"
-            schemeData
-        )   << "Discretisation scheme not specified"
             << endl << endl
             << "Valid schemes are :" << endl
             << MeshConstructorTablePtr_->sortedToc()
@@ -110,10 +104,8 @@ Foam::limitedSurfaceInterpolationScheme<Type>::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Unknown discretisation scheme "
-            schemeData
-        )   << "Unknown discretisation scheme "
             << schemeName << nl << nl
             << "Valid schemes are :" << endl
             << MeshFluxConstructorTablePtr_->sortedToc()

src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C

@@ -69,10 +69,8 @@ Foam::multivariateSurfaceInterpolationScheme<Type>::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Unknown discretisation scheme " << schemeName << nl << nl
-            schemeData
-        )   << "Unknown discretisation scheme " << schemeName << nl << nl
             << "Valid schemes are :" << endl
             << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);

src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C

@@ -41,10 +41,8 @@ Foam::surfaceInterpolationScheme<Type>::New
 {
     if (schemeData.eof())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Discretisation scheme not specified"
-            schemeData
-        )   << "Discretisation scheme not specified"
             << endl << endl
             << "Valid schemes are :" << endl
             << MeshConstructorTablePtr_->sortedToc()
@@ -62,10 +60,8 @@ Foam::surfaceInterpolationScheme<Type>::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Unknown discretisation scheme "
-            schemeData
-        )   << "Unknown discretisation scheme "
             << schemeName << nl << nl
             << "Valid schemes are :" << endl
             << MeshConstructorTablePtr_->sortedToc()
@@ -87,10 +83,8 @@ Foam::surfaceInterpolationScheme<Type>::New
 {
     if (schemeData.eof())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Discretisation scheme not specified"
-            schemeData
-        )   << "Discretisation scheme not specified"
             << endl << endl
             << "Valid schemes are :" << endl
             << MeshConstructorTablePtr_->sortedToc()
@@ -109,10 +103,8 @@ Foam::surfaceInterpolationScheme<Type>::New
 
     if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(schemeData)
-        (
+            << "Unknown discretisation scheme "
-            schemeData
-        )   << "Unknown discretisation scheme "
             << schemeName << nl << nl
             << "Valid schemes are :" << endl
             << MeshFluxConstructorTablePtr_->sortedToc()

src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C

@@ -96,10 +96,8 @@ timeVaryingMappedFixedValuePointPatchField
      && mapMethod_ != "nearest"
     )
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "mapMethod should be one of 'planarInterpolation'"
-            dict
-        )   << "mapMethod should be one of 'planarInterpolation'"
             << ", 'nearest'" << exit(FatalIOError);
     }
 

src/genericPatchFields/genericFaPatchField/genericFaPatchField.C

@@ -59,10 +59,8 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
 {
     if (!dict.found("value"))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "\n    Cannot find 'value' entry"
-            dict
-        )   << "\n    Cannot find 'value' entry"
             << " on patch " << this->patch().name()
             << " of field " << this->internalField().name()
             << " in file " << this->internalField().objectPath()
@@ -116,10 +114,8 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
                         }
                         else
                         {
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "\n    token following 'nonuniform' "
-                                dict
-                            )   << "\n    token following 'nonuniform' "
                                    "is not a compound"
                                 << "\n    on patch " << this->patch().name()
                                 << " of field "
@@ -147,10 +143,8 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "\n    size of field " << key
-                                dict
-                            )   << "\n    size of field " << key
                                 << " (" << fPtr->size() << ')'
                                 << " is not the same size as the patch ("
                                 << this->size() << ')'
@@ -182,10 +176,8 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "\n    size of field " << key
-                                dict
-                            )   << "\n    size of field " << key
                                 << " (" << fPtr->size() << ')'
                                 << " is not the same size as the patch ("
                                 << this->size() << ')'
@@ -220,10 +212,8 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "\n    size of field " << key
-                                dict
-                            )   << "\n    size of field " << key
                                 << " (" << fPtr->size() << ')'
                                 << " is not the same size as the patch ("
                                 << this->size() << ')'
@@ -258,10 +248,8 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "\n    size of field " << key
-                                dict
-                            )   << "\n    size of field " << key
                                 << " (" << fPtr->size() << ')'
                                 << " is not the same size as the patch ("
                                 << this->size() << ')'
@@ -293,10 +281,8 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "\n    size of field " << key
-                                dict
-                            )   << "\n    size of field " << key
                                 << " (" << fPtr->size() << ')'
                                 << " is not the same size as the patch ("
                                 << this->size() << ')'
@@ -312,10 +298,8 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
                     }
                     else
                     {
-                        FatalIOErrorInFunction
+                        FatalIOErrorInFunction(dict)
-                        (
+                            << "\n    compound " << fieldToken.compoundToken()
-                            dict
-                        )   << "\n    compound " << fieldToken.compoundToken()
                             << " not supported"
                             << "\n    on patch " << this->patch().name()
                             << " of field "
@@ -415,10 +399,8 @@ Foam::genericFaPatchField<Type>::genericFaPatchField
                         }
                         else
                         {
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "\n    unrecognised native type " << l
-                                dict
-                            )   << "\n    unrecognised native type " << l
                                 << "\n    on patch " << this->patch().name()
                                 << " of field "
                                 << this->internalField().name()

src/genericPatchFields/genericFvPatchField/genericFvPatchField.C

@@ -59,10 +59,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
 {
     if (!dict.found("value"))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "\n    Cannot find 'value' entry"
-            dict
-        )   << "\n    Cannot find 'value' entry"
             << " on patch " << this->patch().name()
             << " of field " << this->internalField().name()
             << " in file " << this->internalField().objectPath()
@@ -116,10 +114,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
                         }
                         else
                         {
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "\n    token following 'nonuniform' "
-                                dict
-                            )   << "\n    token following 'nonuniform' "
                                    "is not a compound"
                                 << "\n    on patch " << this->patch().name()
                                 << " of field "
@@ -147,10 +143,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "\n    size of field " << key
-                                dict
-                            )   << "\n    size of field " << key
                                 << " (" << fPtr->size() << ')'
                                 << " is not the same size as the patch ("
                                 << this->size() << ')'
@@ -182,10 +176,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "\n    size of field " << key
-                                dict
-                            )   << "\n    size of field " << key
                                 << " (" << fPtr->size() << ')'
                                 << " is not the same size as the patch ("
                                 << this->size() << ')'
@@ -220,10 +212,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "\n    size of field " << key
-                                dict
-                            )   << "\n    size of field " << key
                                 << " (" << fPtr->size() << ')'
                                 << " is not the same size as the patch ("
                                 << this->size() << ')'
@@ -258,10 +248,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "\n    size of field " << key
-                                dict
-                            )   << "\n    size of field " << key
                                 << " (" << fPtr->size() << ')'
                                 << " is not the same size as the patch ("
                                 << this->size() << ')'
@@ -293,10 +281,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "\n    size of field " << key
-                                dict
-                            )   << "\n    size of field " << key
                                 << " (" << fPtr->size() << ')'
                                 << " is not the same size as the patch ("
                                 << this->size() << ')'
@@ -312,10 +298,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
                     }
                     else
                     {
-                        FatalIOErrorInFunction
+                        FatalIOErrorInFunction(dict)
-                        (
+                            << "\n    compound " << fieldToken.compoundToken()
-                            dict
-                        )   << "\n    compound " << fieldToken.compoundToken()
                             << " not supported"
                             << "\n    on patch " << this->patch().name()
                             << " of field "
@@ -415,10 +399,8 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
                         }
                         else
                         {
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "\n    unrecognised native type " << l
-                                dict
-                            )   << "\n    unrecognised native type " << l
                                 << "\n    on patch " << this->patch().name()
                                 << " of field "
                                 << this->internalField().name()

src/genericPatchFields/genericPointPatchField/genericPointPatchField.C

@@ -94,10 +94,8 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
                         }
                         else
                         {
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "\n    token following 'nonuniform' "
-                                dict
-                            )   << "\n    token following 'nonuniform' "
                                    "is not a compound"
                                 << "\n    on patch " << this->patch().name()
                                 << " of field "
@@ -125,10 +123,8 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "\n    size of field " << key
-                                dict
-                            )   << "\n    size of field " << key
                                 << " (" << fPtr->size() << ')'
                                 << " is not the same size as the patch ("
                                 << this->size() << ')'
@@ -160,10 +156,8 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "\n    size of field " << key
-                                dict
-                            )   << "\n    size of field " << key
                                 << " (" << fPtr->size() << ')'
                                 << " is not the same size as the patch ("
                                 << this->size() << ')'
@@ -198,10 +192,8 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "\n    size of field " << key
-                                dict
-                            )   << "\n    size of field " << key
                                 << " (" << fPtr->size() << ')'
                                 << " is not the same size as the patch ("
                                 << this->size() << ')'
@@ -236,10 +228,8 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "\n    size of field " << key
-                                dict
-                            )   << "\n    size of field " << key
                                 << " (" << fPtr->size() << ')'
                                 << " is not the same size as the patch ("
                                 << this->size() << ')'
@@ -271,10 +261,8 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
 
                         if (fPtr->size() != this->size())
                         {
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "\n    size of field " << key
-                                dict
-                            )   << "\n    size of field " << key
                                 << " (" << fPtr->size() << ')'
                                 << " is not the same size as the patch ("
                                 << this->size() << ')'
@@ -290,10 +278,8 @@ Foam::genericPointPatchField<Type>::genericPointPatchField
                     }
                     else
                     {
-                        FatalIOErrorInFunction
+                        FatalIOErrorInFunction(dict)
-                        (
+                            << "\n    compound " << fieldToken.compoundToken()
-                            dict
-                        )   << "\n    compound " << fieldToken.compoundToken()
                             << " not supported"
                             << "\n    on patch " << this->patch().name()
                             << " of field "

src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C

@@ -43,10 +43,8 @@ Foam::ParticleForce<CloudType>::ParticleForce
 {
     if (readCoeffs && (coeffs_.dictName() != forceType))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "Force " << forceType << " must be specified as a dictionary"
-            dict
-        )   << "Force " << forceType << " must be specified as a dictionary"
             << exit(FatalIOError);
     }
 }

src/mesh/blockMesh/blockDescriptor/blockDescriptor.C

@@ -217,10 +217,8 @@ Foam::blockDescriptor::blockDescriptor
         }
         else
         {
-            FatalIOErrorInFunction
+            FatalIOErrorInFunction(is)
-            (
+                << "incorrect token while reading n, expected '(', found "
-                is
-            )   << "incorrect token while reading n, expected '(', found "
                 << t.info()
                 << exit(FatalIOError);
         }

src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C

@@ -92,10 +92,8 @@ void Foam::refinementFeatures::read
 
             if (fName.empty())
             {
-                FatalIOErrorInFunction
+                FatalIOErrorInFunction(dict)
-                (
+                    << "Could not open " << featObj.objectPath()
-                    dict
-                )   << "Could not open " << featObj.objectPath()
                     << exit(FatalIOError);
             }
 

src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C

@@ -373,10 +373,8 @@ Foam::refinementSurfaces::refinementSurfaces
 
     if (unmatchedKeys.size() > 0)
     {
-        IOWarningInFunction
+        IOWarningInFunction(surfacesDict)
-        (
+            << "Not all entries in refinementSurfaces dictionary were used."
-            surfacesDict
-        )   << "Not all entries in refinementSurfaces dictionary were used."
             << " The following entries were not used : "
             << unmatchedKeys.sortedToc()
             << endl;

src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C

@@ -110,10 +110,8 @@ Foam::surfaceZonesInfo::surfaceZonesInfo
             && !surface.hasVolumeType()
             )
             {
-                IOWarningInFunction
+                IOWarningInFunction(surfacesDict)
-                (
+                    << "Illegal entry zoneInside "
-                    surfacesDict
-                )   << "Illegal entry zoneInside "
                     << areaSelectionAlgoNames[zoneInside_]
                     << " for faceZone "
                     << faceZoneName_
@@ -122,10 +120,8 @@ Foam::surfaceZonesInfo::surfaceZonesInfo
         }
         else if (hasSide)
         {
-            IOWarningInFunction
+            IOWarningInFunction(surfacesDict)
-            (
+                << "Unused entry zoneInside for faceZone "
-                surfacesDict
-            )   << "Unused entry zoneInside for faceZone "
                 << faceZoneName_
                 << " since no cellZone specified."
                 << endl;

src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C

@@ -751,10 +751,8 @@ Foam::shellSurfaces::shellSurfaces
 
     if (unmatchedKeys.size() > 0)
     {
-        IOWarningInFunction
+        IOWarningInFunction(shellsDict)
-        (
+            << "Not all entries in refinementRegions dictionary were used."
-            shellsDict
-        )   << "Not all entries in refinementRegions dictionary were used."
             << " The following entries were not used : "
             << unmatchedKeys.sortedToc()
             << endl;

src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.C

@@ -226,10 +226,8 @@ Foam::layerParameters::layerParameters
 
     if (layerSpec_ == ILLEGAL || nSpec != 2)
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "Over- or underspecified layer thickness."
-            dict
-        )   << "Over- or underspecified layer thickness."
             << " Please specify" << nl
             << "    first layer thickness ('firstLayerThickness')"
             << " and overall thickness ('thickness') or" << nl
@@ -250,7 +248,7 @@ Foam::layerParameters::layerParameters
     if (nLayerIter_ < 0 || nRelaxedIter_ < 0)
     {
         FatalIOErrorInFunction(dict)
-            << "Layer iterations should be >= 0." << endl
+            << "Layer iterations should be >= 0." << nl
             << "nLayerIter:" << nLayerIter_
             << " nRelaxedIter:" << nRelaxedIter_
             << exit(FatalIOError);
@@ -353,10 +351,8 @@ Foam::layerParameters::layerParameters
                         break;
 
                         default:
-                            FatalIOErrorInFunction
+                            FatalIOErrorInFunction(dict)
-                            (
+                                << "problem." << exit(FatalIOError);
-                                dict
-                            )   << "problem." << exit(FatalIOError);
                         break;
                     }
 

src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.C

@@ -59,10 +59,8 @@ Foam::cyclicACMIPointPatchField<Type>::cyclicACMIPointPatchField
 {
     if (!isType<cyclicACMIPointPatch>(p))
     {
-        FatalIOErrorInFunction
+        FatalIOErrorInFunction(dict)
-        (
+            << "patch " << this->patch().index() << " not cyclicACMI type. "
-            dict
-        )   << "patch " << this->patch().index() << " not cyclicACMI type. "
             << "Patch type = " << p.type()
             << exit(FatalIOError);
     }