diff --git a/applications/utilities/preProcessing/setAlphaField/alphaFieldFunctions/implicitFunctions/composedFunction/composedFunctionImplicitFunction.C b/applications/utilities/preProcessing/setAlphaField/alphaFieldFunctions/implicitFunctions/composedFunction/composedFunctionImplicitFunction.C
index 900188e5e2c56bcefd4d67e6c7828680a90f7ff8..e4eba2a1620e768ce374981d2af41d512f58301c 100644
--- a/applications/utilities/preProcessing/setAlphaField/alphaFieldFunctions/implicitFunctions/composedFunction/composedFunctionImplicitFunction.C
+++ b/applications/utilities/preProcessing/setAlphaField/alphaFieldFunctions/implicitFunctions/composedFunction/composedFunctionImplicitFunction.C
@@ -137,7 +137,7 @@ composedFunctionImplicitFunction
{
FatalIOErrorInFunction(funcDict)
<< "Entry " << key << " is not a dictionary" << endl
- << exit(FatalError);
+ << exit(FatalIOError);
}
const dictionary& subdict = dEntry.dict();
diff --git a/src/OpenFOAM/expressions/exprResult/exprResult.C b/src/OpenFOAM/expressions/exprResult/exprResult.C
index 58263f5505e31d55055d0cdd20f1723127cd8c76..c8ad8378bdcbea9a4b48f82201cb9bcca0de179a 100644
--- a/src/OpenFOAM/expressions/exprResult/exprResult.C
+++ b/src/OpenFOAM/expressions/exprResult/exprResult.C
@@ -284,16 +284,16 @@ Foam::expressions::exprResult::exprResult
valType_ = "none";
}
- FatalErrorInFunction
+ FatalIOErrorInFunction(dict)
<< "Do not know how to read data type " << valType_
<< (uniform ? " as a single value." : ".") << nl
- << exit(FatalError);
+ << exit(FatalIOError);
}
}
else if (needsValue)
{
FatalIOErrorInFunction(dict)
- << "No entry 'value' defined in " << dict.name() << nl
+ << "No entry 'value' defined" << nl
<< exit(FatalIOError);
}
}
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index 4f45d6905a72f0f54fd516034f105a47076f4390..4afcb9659c109025e17a4113cc57946cd430ba52 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -432,7 +432,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
if (this->size() != GeoMesh::size(this->mesh()))
{
- FatalErrorInFunction
+ FatalIOErrorInFunction(dict)
<< " number of field elements = " << this->size()
<< " number of mesh elements = " << GeoMesh::size(this->mesh())
<< exit(FatalIOError);
diff --git a/src/OpenFOAM/global/profiling/profilingSysInfo.C b/src/OpenFOAM/global/profiling/profilingSysInfo.C
index 5e7bce931da911a4991c35918bf4157bf4c5b937..70bacecab8eb8d8e07dcd339688d62f7b76acf2c 100644
--- a/src/OpenFOAM/global/profiling/profilingSysInfo.C
+++ b/src/OpenFOAM/global/profiling/profilingSysInfo.C
@@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
- Copyright (C) 2016-2017 OpenCFD Ltd.
+ Copyright (C) 2016-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -37,7 +37,7 @@ namespace
{
// Write environment entry
-inline static void printEnv
+inline void printEnv
(
Foam::Ostream& os,
const Foam::word& key,
@@ -61,7 +61,7 @@ Foam::Ostream& Foam::profilingSysInfo::write
Ostream& os
) const
{
- os.writeEntry("host", Foam::hostName(false)); // short name
+ os.writeEntry("host", Foam::hostName()); // short name
os.writeEntry("date", Foam::clock::dateTime());
// compile-time information
diff --git a/src/OpenFOAM/include/OSspecific.H b/src/OpenFOAM/include/OSspecific.H
index 6c2a96f39938229a74a13e28940640857d6bd3ed..df9907034b64b4c5f9f5353482eeaa49b494616e 100644
--- a/src/OpenFOAM/include/OSspecific.H
+++ b/src/OpenFOAM/include/OSspecific.H
@@ -82,8 +82,8 @@ FOAM_DEPRECATED_FOR(2020-05, "hasEnv() function")
inline bool env(const std::string& envName) { return Foam::hasEnv(envName); }
//- Return the system's host name, as per hostname(1)
-// Optionally with the full name (as per the '-f' option)
-string hostName(const bool full=false);
+// \note the full name (as per the '-f' option) may be unreliable
+string hostName(bool full=false);
//- Return the system's domain name, as per hostname(1) with the '-d' option
string domainName();
diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
index c544b1ad9980e789dcd1633d903acbf313667420..272285c0d51d3d89171d2cfd27981597dc3af3ee 100644
--- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
+++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
@@ -564,7 +564,7 @@ static Foam::string recursiveExpand
{
FatalErrorInFunction
<< "Expansion ${{ is missing a closing '}}'\n"
- << exit(FatalIOError);
+ << exit(FatalError);
}
///Info<< "eval <" << out << ">" << endl;
diff --git a/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.C b/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.C
index 9e034b59959eb98a08c820e1c8a012551bba6bdf..30039b895f2bfb55c0a4e3f93a082a19a1ecb5dd 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.C
@@ -62,7 +62,7 @@ Foam::cyclicFaPatchField<Type>::cyclicFaPatchField
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
- << exit(FatalIOError);
+ << exit(FatalError);
}
}
diff --git a/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.C b/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.C
index 95833b687bd269e6eb2bba46ae0e8a23cdf4f01a..d2ee6e7e14bd886861d764b3e17dea5b1f270a56 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.C
@@ -61,7 +61,7 @@ Foam::emptyFaPatchField<Type>::emptyFaPatchField
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
- << exit(FatalIOError);
+ << exit(FatalError);
}
}
diff --git a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
index 1f8ed1ee8f02dc3746ab10cc035ff38d6d111390..5c24cc8a1fc56c472eb4f0b7851295bc18ee3645 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.C
@@ -79,7 +79,7 @@ Foam::processorFaPatchField<Type>::processorFaPatchField
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
- << exit(FatalIOError);
+ << exit(FatalError);
}
}
diff --git a/src/finiteArea/fields/faPatchFields/constraint/symmetry/symmetryFaPatchField.C b/src/finiteArea/fields/faPatchFields/constraint/symmetry/symmetryFaPatchField.C
index 2f577b159d5e55022d49c7ecb103fba71c0677b1..2ad47be980ba9b16f4c8a580540d2c80eedfd49d 100644
--- a/src/finiteArea/fields/faPatchFields/constraint/symmetry/symmetryFaPatchField.C
+++ b/src/finiteArea/fields/faPatchFields/constraint/symmetry/symmetryFaPatchField.C
@@ -59,7 +59,7 @@ Foam::symmetryFaPatchField<Type>::symmetryFaPatchField
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
- << exit(FatalIOError);
+ << exit(FatalError);
}
}
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
index 43b9af13bc0d3430ca5fe5a0da8b3d1d7f7b0678..242828f5de76088bb862595f0b6f5c0862b3d8b0 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
@@ -94,7 +94,7 @@ Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
- << exit(FatalIOError);
+ << exit(FatalError);
}
}
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
index b34124799508f8d754da15855d23802c0ecba278..9eb8e6169f2940d74d5c76c3d024c7a359104ac1 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
@@ -116,7 +116,7 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
- << exit(FatalIOError);
+ << exit(FatalError);
}
}
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
index 502e7101370d57e5482a4f7011d491536d93d8ac..a7b0a8041d11efdd03e24118e33f4106f3453037 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
@@ -102,7 +102,7 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
- << exit(FatalIOError);
+ << exit(FatalError);
}
}
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C
index 688ab66e9c79c980bafbf7fa55876712a69f0e15..a1fc6d3641f920110e480bcdf3338a92d8332905 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C
@@ -59,7 +59,7 @@ Foam::emptyFvPatchField<Type>::emptyFvPatchField
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
- << exit(FatalIOError);
+ << exit(FatalError);
}
}
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index f13d8a4aeca9510914437e2062c8bb8b7426fd85..c20c39879e39afc151d26e87508d6f5813bc96cd 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -131,7 +131,7 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
- << exit(FatalIOError);
+ << exit(FatalError);
}
if (debug && !ptf.ready())
{
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
index 03e6518cc87ead72549e959613d51db5be6feb11..a97da4c856b813f6703d5f92d747b8ecf3880b51 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
@@ -106,7 +106,7 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
- << exit(FatalIOError);
+ << exit(FatalError);
}
}
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C
index 1ca887f11dd3786e62a8fc48676106c9e11f142a..bb6890160817f833dbdf97e7854afc8bc3a4874c 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C
@@ -81,7 +81,7 @@ Foam::symmetryFvPatchField<Type>::symmetryFvPatchField
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
- << exit(FatalIOError);
+ << exit(FatalError);
}
}
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C
index 5d008aef3c4f6bdef0e1d57991e938a4e072556f..b1e2cf2fd9bfa708efe5fedea01db4c81c8d5774 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C
@@ -61,7 +61,7 @@ Foam::symmetryPlaneFvPatchField<Type>::symmetryPlaneFvPatchField
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
- << exit(FatalIOError);
+ << exit(FatalError);
}
}
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C
index c1077eeb0f0a39dcbb559ba0ed085e6d316a981c..2393afd5e30f3884aaab35bc93f4c6438de81867 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C
@@ -63,7 +63,7 @@ Foam::wedgeFvPatchField<Type>::wedgeFvPatchField
<< "\n for patch " << p.name()
<< " of field " << this->internalField().name()
<< " in file " << this->internalField().objectPath()
- << exit(FatalIOError);
+ << exit(FatalError);
}
}
diff --git a/src/functionObjects/field/streamLine/streamLineBase.C b/src/functionObjects/field/streamLine/streamLineBase.C
index 184173bdca68ad35e9f34260e7336c00765f8236..e763f5bd72da75278bad86991d9d7fea6b6aca9e 100644
--- a/src/functionObjects/field/streamLine/streamLineBase.C
+++ b/src/functionObjects/field/streamLine/streamLineBase.C
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2015 OpenFOAM Foundation
- Copyright (C) 2015-2020 OpenCFD Ltd.
+ Copyright (C) 2015-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -911,8 +911,8 @@ bool Foam::functionObjects::streamLineBase::read(const dictionary& dict)
if (dict.found("direction"))
{
- FatalIOErrorInFunction(dict) << "Cannot specify both "
- << "\"trackForward\" and \"direction\""
+ FatalIOErrorInFunction(dict)
+ << "Cannot specify both 'trackForward' and 'direction'" << nl
<< exit(FatalIOError);
}
}
@@ -923,9 +923,9 @@ bool Foam::functionObjects::streamLineBase::read(const dictionary& dict)
dict.readEntry("lifeTime", lifeTime_);
if (lifeTime_ < 1)
{
- FatalErrorInFunction
+ FatalIOErrorInFunction(dict)
<< "Illegal value " << lifeTime_ << " for lifeTime"
- << exit(FatalError);
+ << exit(FatalIOError);
}
diff --git a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSourceTemplates.C b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSourceTemplates.C
index f51001a7b4985539a220ad61ca96ff6da9a11533..8c70582dcd39ce7cd9a414825d6d7e8fca25fe53 100644
--- a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSourceTemplates.C
+++ b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSourceTemplates.C
@@ -106,7 +106,7 @@ void Foam::fv::actuationDiskSource::calcFroudeMethod
FatalErrorInFunction
<< "Cp and Ct must be greater than zero." << nl
<< "Cp = " << Cp << ", Ct = " << Ct
- << exit(FatalIOError);
+ << exit(FatalError);
}
// (BJSB:Eq. 3.9)
@@ -213,7 +213,7 @@ void Foam::fv::actuationDiskSource::calcVariableScalingMethod
FatalErrorInFunction
<< "Cp and Ct must be greater than zero." << nl
<< "Cp = " << Cp << ", Ct = " << Ct
- << exit(FatalIOError);
+ << exit(FatalError);
}
// Calibrated thrust/power coeffs from power/thrust curves (LSRMTK:Eq. 6)
diff --git a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
index 037c4ef820f60a27f8cb542d3459cec9cef71558..8bf97af9e78e951b1dae536d97231842fabecf8a 100644
--- a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
+++ b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
@@ -68,7 +68,7 @@ addRadialActuationDiskAxialInertialResistance
FatalErrorInFunction
<< "Radial distribution coefficients lead to zero polynomial." << nl
<< "radialCoeffs = " << radialCoeffs_
- << exit(FatalIOError);
+ << exit(FatalError);
}
// Compute upstream U and rho, spatial-averaged over monitor-region
diff --git a/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.C b/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.C
index 54b4bf1903ce73aeffafa226fcf9825ffd066cbb..84ce2c762ba5f841e4fb8b746d272a5045109bc9 100644
--- a/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.C
+++ b/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.C
@@ -125,9 +125,9 @@ Foam::cylinderAnnulusToCell::cylinderAnnulusToCell
if (innerRadius_ > radius_)
{
FatalErrorInFunction
- << "inner radius = " << innerRadius_ << "cannot be larger than "
+ << "inner radius = " << innerRadius_ << " cannot be larger than "
<< "outer radius = " << radius_
- << exit(FatalIOError);
+ << exit(FatalError);
}
}
diff --git a/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.C b/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.C
index 1856b4184dce0b79823949e5a7ea6b121d6609a9..adf5da3426b66c93c3da074300de4d2fcb86f15b 100644
--- a/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.C
+++ b/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.C
@@ -114,9 +114,9 @@ Foam::cylinderToCell::cylinderToCell
if (innerRadius_ > radius_)
{
FatalErrorInFunction
- << "inner radius = " << innerRadius_ << "cannot be larger than "
+ << "inner radius = " << innerRadius_ << " cannot be larger than "
<< "outer radius = " << radius_
- << exit(FatalIOError);
+ << exit(FatalError);
}
}
diff --git a/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.C b/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.C
index 844b8928c1a5aaa30cb26f8505e20bd281fc7a6f..5bc6885350bf6ecd64305724fd203fa2d28b11c4 100644
--- a/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.C
+++ b/src/meshTools/sets/faceSources/cylinderAnnulusToFace/cylinderAnnulusToFace.C
@@ -125,9 +125,9 @@ Foam::cylinderAnnulusToFace::cylinderAnnulusToFace
if (innerRadius_ > radius_)
{
FatalErrorInFunction
- << "inner radius = " << innerRadius_ << "cannot be larger than "
+ << "inner radius = " << innerRadius_ << " cannot be larger than "
<< "outer radius = " << radius_
- << exit(FatalIOError);
+ << exit(FatalError);
}
}
diff --git a/src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.C b/src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.C
index 5a50c0cf11ceb31e422f69bcae77880f7a811049..b8211e5a6120adb4d74e419b1836b5af8b9c8ecd 100644
--- a/src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.C
+++ b/src/meshTools/sets/faceSources/cylinderToFace/cylinderToFace.C
@@ -114,9 +114,9 @@ Foam::cylinderToFace::cylinderToFace
if (innerRadius_ > radius_)
{
FatalErrorInFunction
- << "inner radius = " << innerRadius_ << "cannot be larger than "
+ << "inner radius = " << innerRadius_ << " cannot be larger than "
<< "outer radius = " << radius_
- << exit(FatalIOError);
+ << exit(FatalError);
}
}
diff --git a/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.C b/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.C
index 11aacf91097bf3bf184f34af9f7805433d50a906..8839802b548458e8c47dd6123e0c637311bcb13f 100644
--- a/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.C
@@ -60,7 +60,7 @@ void Foam::geomDecomp::setOrder()
FatalIOErrorInFunction(decompDict_)
<< "Illegal decomposition order " << order << nl
<< "It should only contain x, y or z"
- << exit(FatalError);
+ << exit(FatalIOError);
break;
}
}
@@ -76,11 +76,11 @@ void Foam::geomDecomp::readCoeffs()
if (nDomains_ != n_.x()*n_.y()*n_.z())
{
// Verify that the input makes sense
- FatalErrorInFunction
+ FatalIOErrorInFunction(coeffsDict_)
<< "Wrong number of domain divisions in geomDecomp:" << nl
<< "Number of domains : " << nDomains_ << nl
<< "Wanted decomposition : " << n_
- << exit(FatalError);
+ << exit(FatalIOError);
}
setOrder();
diff --git a/src/surfMesh/writers/surfaceWriter.C b/src/surfMesh/writers/surfaceWriter.C
index 4fbdb2db4af14d98df7147d95dcacfe560b18bf7..ac56c75071553608feb1321003562292e4005873 100644
--- a/src/surfMesh/writers/surfaceWriter.C
+++ b/src/surfMesh/writers/surfaceWriter.C
@@ -436,7 +436,7 @@ bool Foam::surfaceWriter::checkOpen() const
{
FatalErrorInFunction
<< type() << " : Attempted to write without a path" << nl
- << exit(FatalIOError);
+ << exit(FatalError);
}
return !outputPath_.empty();
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
index fc3882a6e357adceb974d7d6291e318b75369b09..1d493cde32664a66da05bd50520ec6c076ef0e5a 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
@@ -62,7 +62,7 @@ inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
{
if (coeffs.size() != species_.size())
{
- FatalErrorInFunction
+ FatalIOErrorInFunction(dict)
<< "number of efficiencies = " << coeffs.size()
<< " is not equat to the number of species " << species_.size()
<< exit(FatalIOError);