From e9054ec636a79974508dcc9cfc88bb7cbde87110 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 30 Nov 2021 14:03:31 +0100
Subject: [PATCH] COMP: consistent FatalError/FatalIOError exit types
STYLE: hostName() is short name, don't need parameter
---
.../composedFunctionImplicitFunction.C | 2 +-
src/OpenFOAM/expressions/exprResult/exprResult.C | 6 +++---
.../GeometricFields/GeometricField/GeometricField.C | 2 +-
src/OpenFOAM/global/profiling/profilingSysInfo.C | 6 +++---
src/OpenFOAM/include/OSspecific.H | 4 ++--
src/OpenFOAM/primitives/strings/stringOps/stringOps.C | 2 +-
.../constraint/cyclic/cyclicFaPatchField.C | 2 +-
.../faPatchFields/constraint/empty/emptyFaPatchField.C | 2 +-
.../constraint/processor/processorFaPatchField.C | 2 +-
.../constraint/symmetry/symmetryFaPatchField.C | 2 +-
.../constraint/cyclic/cyclicFvPatchField.C | 2 +-
.../constraint/cyclicACMI/cyclicACMIFvPatchField.C | 2 +-
.../constraint/cyclicAMI/cyclicAMIFvPatchField.C | 2 +-
.../fvPatchFields/constraint/empty/emptyFvPatchField.C | 2 +-
.../constraint/processor/processorFvPatchField.C | 2 +-
.../processorCyclic/processorCyclicFvPatchField.C | 2 +-
.../constraint/symmetry/symmetryFvPatchField.C | 2 +-
.../symmetryPlane/symmetryPlaneFvPatchField.C | 2 +-
.../fvPatchFields/constraint/wedge/wedgeFvPatchField.C | 2 +-
src/functionObjects/field/streamLine/streamLineBase.C | 10 +++++-----
.../actuationDiskSource/actuationDiskSourceTemplates.C | 4 ++--
.../radialActuationDiskSourceTemplates.C | 2 +-
.../cylinderAnnulusToCell/cylinderAnnulusToCell.C | 4 ++--
.../sets/cellSources/cylinderToCell/cylinderToCell.C | 4 ++--
.../cylinderAnnulusToFace/cylinderAnnulusToFace.C | 4 ++--
.../sets/faceSources/cylinderToFace/cylinderToFace.C | 4 ++--
.../decompositionMethods/geomDecomp/geomDecomp.C | 6 +++---
src/surfMesh/writers/surfaceWriter.C | 2 +-
.../thirdBodyEfficiencies/thirdBodyEfficienciesI.H | 2 +-
29 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/applications/utilities/preProcessing/setAlphaField/alphaFieldFunctions/implicitFunctions/composedFunction/composedFunctionImplicitFunction.C b/applications/utilities/preProcessing/setAlphaField/alphaFieldFunctions/implicitFunctions/composedFunction/composedFunctionImplicitFunction.C
index 900188e5e2c..e4eba2a1620 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 58263f5505e..c8ad8378bdc 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 4f45d6905a7..4afcb9659c1 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 5e7bce931da..70bacecab8e 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 6c2a96f3993..df9907034b6 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 c544b1ad998..272285c0d51 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 9e034b59959..30039b895f2 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 95833b687bd..d2ee6e7e14b 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 1f8ed1ee8f0..5c24cc8a1fc 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 2f577b159d5..2ad47be980b 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 43b9af13bc0..242828f5de7 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 b3412479950..9eb8e6169f2 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 502e7101370..a7b0a8041d1 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 688ab66e9c7..a1fc6d3641f 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 f13d8a4aeca..c20c39879e3 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 03e6518cc87..a97da4c856b 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 1ca887f11dd..bb689016081 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 5d008aef3c4..b1e2cf2fd9b 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 c1077eeb0f0..2393afd5e30 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 184173bdca6..e763f5bd72d 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 f51001a7b49..8c70582dcd3 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 037c4ef820f..8bf97af9e78 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 54b4bf1903c..84ce2c762ba 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 1856b4184dc..adf5da3426b 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 844b8928c1a..5bc6885350b 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 5a50c0cf11c..b8211e5a612 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 11aacf91097..8839802b548 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 4fbdb2db4af..ac56c750715 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 fc3882a6e35..1d493cde326 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);
--
GitLab