From a7a346b2062485237a06da85164355fa4329e725 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 6 Nov 2018 09:49:22 +0100 Subject: [PATCH] STYLE: indentation for FatalIOErrorInFunction calls --- .../T/smoluchowskiJumpTFvPatchScalarField.C | 6 +- .../BCs/U/maxwellSlipUFvPatchVectorField.C | 6 +- .../ideasUnvToFoam/ideasUnvToFoam.C | 6 +- .../conformationSurfaces.C | 6 +- .../surfaceFeaturesExtraction.C | 6 +- .../HashTables/HashPtrTable/HashPtrTableIO.C | 18 ++---- .../HashTables/HashTable/HashTableIO.C | 18 ++---- .../LinkedLists/accessTypes/ILList/ILListIO.C | 6 +- .../LinkedLists/accessTypes/LList/LListIO.C | 6 +- .../accessTypes/LPtrList/LPtrListIO.C | 12 ++-- .../containers/PtrLists/PtrList/PtrListIO.C | 18 ++---- .../IOobjects/CompactIOField/CompactIOField.C | 6 +- .../functionEntries/codeStream/codeStream.C | 36 ++++-------- .../includeEntry/includeEntry.C | 12 ++-- .../includeEtcEntry/includeEtcEntry.C | 12 ++-- .../primitiveEntry/primitiveEntry.C | 6 +- .../db/dynamicLibrary/codedBase/codedBase.C | 48 +++++---------- src/OpenFOAM/dimensionSet/dimensionSetIO.C | 42 +++++--------- src/OpenFOAM/fields/Fields/Field/Field.C | 6 +- .../GeometricField/GeometricBoundaryField.C | 12 ++-- .../basic/value/valuePointPatchField.C | 6 +- .../constraint/cyclic/cyclicPointPatchField.C | 6 +- .../constraint/empty/emptyPointPatchField.C | 6 +- .../symmetry/symmetryPointPatchField.C | 6 +- .../symmetryPlanePointPatchField.C | 6 +- .../constraint/wedge/wedgePointPatchField.C | 6 +- .../pointPatchField/pointPatchFieldNew.C | 12 ++-- .../LduMatrix/LduMatrixPreconditioner.C | 18 ++---- .../lduMatrix/lduMatrixPreconditioner.C | 18 ++---- src/OpenFOAM/matrices/solution/solution.C | 12 ++-- .../constraint/cyclic/cyclicPolyPatch.C | 6 +- .../constraint/oldCyclic/oldCyclicPolyPatch.C | 6 +- .../polyPatches/polyPatch/polyPatchNew.C | 6 +- .../polyMesh/zones/cellZone/cellZoneNew.C | 6 +- .../polyMesh/zones/faceZone/faceZoneNew.C | 6 +- .../polyMesh/zones/pointZone/pointZoneNew.C | 6 +- .../functions/Function1/TableFile/TableFile.C | 6 +- .../primitives/strings/stringOps/stringOps.C | 12 ++-- .../thermalBaffle1DFvPatchScalarField.C | 10 ++-- .../reactionRateFlameAreaNew.C | 6 +- .../dynamicMultiMotionSolverFvMesh.C | 6 +- .../solidBody/multiSolidBodyMotionSolver.C | 6 +- .../polyMeshModifier/polyMeshModifierNew.C | 6 +- .../vtk/read/vtkUnstructuredReader.C | 51 ++++++---------- .../general/findRefCell/findRefCell.C | 18 ++---- .../constraint/cyclic/cyclicFvPatchField.C | 6 +- .../cyclicACMI/cyclicACMIFvPatchField.C | 11 +--- .../cyclicAMI/cyclicAMIFvPatchField.C | 6 +- .../constraint/empty/emptyFvPatchField.C | 6 +- .../processor/processorFvPatchField.C | 6 +- .../processorCyclicFvPatchField.C | 6 +- .../symmetry/symmetryFvPatchField.C | 6 +- .../symmetryPlane/symmetryPlaneFvPatchField.C | 6 +- .../constraint/wedge/wedgeFvPatchField.C | 6 +- .../derived/advective/advectiveFvPatchField.C | 6 +- .../flowRateInletVelocityFvPatchVectorField.C | 6 +- ...flowRateOutletVelocityFvPatchVectorField.C | 6 +- .../supersonicFreestreamFvPatchVectorField.C | 6 +- .../fvPatchFields/fvPatchField/fvPatchField.C | 6 +- .../fvPatchField/fvPatchFieldNew.C | 12 ++-- .../constraint/cyclic/cyclicFvsPatchField.C | 6 +- .../cyclicACMI/cyclicACMIFvsPatchField.C | 6 +- .../cyclicAMI/cyclicAMIFvsPatchField.C | 6 +- .../constraint/empty/emptyFvsPatchField.C | 6 +- .../processor/processorFvsPatchField.C | 6 +- .../processorCyclicFvsPatchField.C | 6 +- .../symmetry/symmetryFvsPatchField.C | 6 +- .../symmetryPlaneFvsPatchField.C | 6 +- .../constraint/wedge/wedgeFvsPatchField.C | 6 +- .../fvsPatchField/fvsPatchFieldNew.C | 12 ++-- .../convectionScheme/convectionScheme.C | 24 +++----- .../d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C | 12 ++-- .../CrankNicolsonDdtScheme.C | 6 +- .../ddtSchemes/ddtScheme/ddtScheme.C | 12 ++-- .../divSchemes/divScheme/divScheme.C | 12 ++-- .../gradSchemes/gradScheme/gradScheme.C | 12 ++-- .../cellLimitedGrad/cellLimitedGrad.H | 6 +- .../gradientLimiters/cubicGradientLimiter.H | 6 +- .../cellMDLimitedGrad/cellMDLimitedGrad.H | 6 +- .../faceLimitedGrad/faceLimitedGrad.H | 6 +- .../faceMDLimitedGrad/faceMDLimitedGrad.H | 6 +- .../laplacianScheme/laplacianScheme.C | 12 ++-- .../limitedSnGrad/limitedSnGrad.H | 6 +- .../snGradSchemes/snGradScheme/snGradScheme.C | 12 ++-- .../fvMatrices/fvMatrix/fvMatrixSolve.C | 6 +- .../limitedSurfaceInterpolationScheme.C | 24 +++----- .../multivariateSurfaceInterpolationScheme.C | 6 +- .../surfaceInterpolationScheme.C | 24 +++----- ...meVaryingMappedFixedValuePointPatchField.C | 6 +- .../genericFaPatchField/genericFaPatchField.C | 58 +++++++------------ .../genericFvPatchField/genericFvPatchField.C | 58 +++++++------------ .../genericPointPatchField.C | 44 +++++--------- .../ParticleForce/ParticleForce.C | 6 +- .../blockDescriptor/blockDescriptor.C | 6 +- .../refinementFeatures/refinementFeatures.C | 6 +- .../refinementSurfaces/refinementSurfaces.C | 6 +- .../refinementSurfaces/surfaceZonesInfo.C | 12 ++-- .../shellSurfaces/shellSurfaces.C | 6 +- .../layerParameters/layerParameters.C | 14 ++--- .../cyclicACMIPointPatchField.C | 6 +- .../cyclicACMIPolyPatch/cyclicACMIPolyPatch.C | 6 +- .../cyclicAMIPointPatchField.C | 6 +- .../cyclicAMIPolyPatch/cyclicAMIPolyPatch.C | 18 ++---- .../ConstantField/ConstantField.C | 2 +- .../coordinate/systems/coordinateSystems.C | 6 +- .../edgeMeshFormats/edgeMesh/edgeMeshFormat.C | 12 ++-- .../mappedPolyPatch/mappedPatchBase.C | 4 +- .../hierarchGeomDecomp/hierarchGeomDecomp.C | 12 ++-- .../isoSurface/sampledIsoSurface.C | 6 +- .../RaviPetersen/RaviPetersen.C | 14 ++--- .../laminarFlameSpeed/laminarFlameSpeedNew.C | 8 +-- 111 files changed, 415 insertions(+), 813 deletions(-) diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C index 4e12e668e2..ef0cf6b6dd 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C @@ -94,10 +94,8 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField || mag(accommodationCoeff_) > 2.0 ) { - FatalIOErrorInFunction - ( - dict - ) << "unphysical accommodationCoeff specified" + FatalIOErrorInFunction(dict) + << "unphysical accommodationCoeff specified" << "(0 < accommodationCoeff <= 1)" << endl << exit(FatalIOError); } diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C index aa6e13648b..612f76a3ff 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C @@ -96,10 +96,8 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField || mag(accommodationCoeff_) > 2.0 ) { - FatalIOErrorInFunction - ( - dict - ) << "unphysical accommodationCoeff_ specified" + FatalIOErrorInFunction(dict) + << "unphysical accommodationCoeff_ specified" << "(0 < accommodationCoeff_ <= 1)" << endl << exit(FatalIOError); } diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C index 44b607c3f7..6759d39ce4 100644 --- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C +++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C @@ -211,10 +211,8 @@ void readPoints { hasWarned = true; - IOWarningInFunction - ( - is - ) << "Points not in order starting at point " << pointi + IOWarningInFunction(is) + << "Points not in order starting at point " << pointi << endl; } diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C index d63a7f12d4..7334b9eaf2 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C @@ -465,10 +465,8 @@ Foam::conformationSurfaces::conformationSurfaces if (unmatchedKeys.size() > 0) { - IOWarningInFunction - ( - surfacesDict - ) << "Not all entries in conformationSurfaces dictionary were used." + IOWarningInFunction(surfacesDict) + << "Not all entries in conformationSurfaces dictionary were used." << " The following entries were not used : " << unmatchedKeys.sortedToc() << endl; diff --git a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/surfaceFeaturesExtraction.C b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/surfaceFeaturesExtraction.C index 42f9639cef..3518891d9d 100644 --- a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/surfaceFeaturesExtraction.C +++ b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/surfaceFeaturesExtraction.C @@ -74,10 +74,8 @@ Foam::surfaceFeaturesExtraction::method::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - dict - ) << "Unknown extractionMethod " << methodName << nl << nl + FatalIOErrorInFunction(dict) + << "Unknown extractionMethod " << methodName << nl << nl << "Valid extraction methods:" << nl << flatOutput(dictionaryConstructorTablePtr_->sortedToc()) << exit(FatalIOError); diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C index e3459acd00..e44b20e2d5 100644 --- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C +++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C @@ -80,10 +80,8 @@ void Foam::HashPtrTable::readIstream } else { - FatalIOErrorInFunction - ( - is - ) << "incorrect first token, '(', found " << firstToken.info() + FatalIOErrorInFunction(is) + << "incorrect first token, '(', found " << firstToken.info() << exit(FatalIOError); } } @@ -95,10 +93,8 @@ void Foam::HashPtrTable::readIstream { if (firstToken.pToken() != token::BEGIN_LIST) { - FatalIOErrorInFunction - ( - is - ) << "incorrect first token, '(', found " << firstToken.info() + FatalIOErrorInFunction(is) + << "incorrect first token, '(', found " << firstToken.info() << exit(FatalIOError); } @@ -127,10 +123,8 @@ void Foam::HashPtrTable::readIstream } else { - FatalIOErrorInFunction - ( - is - ) << "incorrect first token, expected or '(', found " + FatalIOErrorInFunction(is) + << "incorrect first token, expected or '(', found " << firstToken.info() << exit(FatalIOError); } diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C index 0ee42dff4d..9cd7c7b263 100644 --- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C +++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C @@ -189,10 +189,8 @@ Foam::Istream& Foam::operator>> } else { - FatalIOErrorInFunction - ( - is - ) << "incorrect first token, '(', found " << firstToken.info() + FatalIOErrorInFunction(is) + << "incorrect first token, '(', found " << firstToken.info() << exit(FatalIOError); } } @@ -204,10 +202,8 @@ Foam::Istream& Foam::operator>> { if (firstToken.pToken() != token::BEGIN_LIST) { - FatalIOErrorInFunction - ( - is - ) << "incorrect first token, '(', found " << firstToken.info() + FatalIOErrorInFunction(is) + << "incorrect first token, '(', found " << firstToken.info() << exit(FatalIOError); } @@ -237,10 +233,8 @@ Foam::Istream& Foam::operator>> } else { - FatalIOErrorInFunction - ( - is - ) << "incorrect first token, expected or '(', found " + FatalIOErrorInFunction(is) + << "incorrect first token, expected or '(', found " << firstToken.info() << exit(FatalIOError); } diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C index 4d1a06d5ff..c11a3a354e 100644 --- a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C +++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C @@ -91,10 +91,8 @@ void Foam::ILList::readIstream(Istream& is, const INew& inew) { if (firstToken.pToken() != token::BEGIN_LIST) { - FatalIOErrorInFunction - ( - is - ) << "incorrect first token, '(', found " << firstToken.info() + FatalIOErrorInFunction(is) + << "incorrect first token, '(', found " << firstToken.info() << exit(FatalIOError); } diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LListIO.C b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LListIO.C index 2ff55fb686..93ba63f638 100644 --- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LListIO.C +++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LListIO.C @@ -87,10 +87,8 @@ Foam::Istream& Foam::operator>>(Istream& is, LList& lst) { if (firstToken.pToken() != token::BEGIN_LIST) { - FatalIOErrorInFunction - ( - is - ) << "incorrect first token, '(', found " << firstToken.info() + FatalIOErrorInFunction(is) + << "incorrect first token, '(', found " << firstToken.info() << exit(FatalIOError); } diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C index 7ba2e1234d..e3fb4407a1 100644 --- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C +++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C @@ -92,10 +92,8 @@ void Foam::LPtrList::readIstream(Istream& is, const INew& inew) { if (firstToken.pToken() != token::BEGIN_LIST) { - FatalIOErrorInFunction - ( - is - ) << "incorrect first token, '(', found " << firstToken.info() + FatalIOErrorInFunction(is) + << "incorrect first token, '(', found " << firstToken.info() << exit(FatalIOError); } @@ -119,10 +117,8 @@ void Foam::LPtrList::readIstream(Istream& is, const INew& inew) } else { - FatalIOErrorInFunction - ( - is - ) << "incorrect first token, expected or '(', found " + FatalIOErrorInFunction(is) + << "incorrect first token, expected or '(', found " << firstToken.info() << exit(FatalIOError); } diff --git a/src/OpenFOAM/containers/PtrLists/PtrList/PtrListIO.C b/src/OpenFOAM/containers/PtrLists/PtrList/PtrListIO.C index 7c1dd41dee..68c9547b32 100644 --- a/src/OpenFOAM/containers/PtrLists/PtrList/PtrListIO.C +++ b/src/OpenFOAM/containers/PtrLists/PtrList/PtrListIO.C @@ -107,10 +107,8 @@ void Foam::PtrList::readIstream(Istream& is, const INew& inew) { if (firstToken.pToken() != token::BEGIN_LIST) { - FatalIOErrorInFunction - ( - is - ) << "incorrect first token, '(', found " << firstToken.info() + FatalIOErrorInFunction(is) + << "incorrect first token, '(', found " << firstToken.info() << exit(FatalIOError); } @@ -129,10 +127,8 @@ void Foam::PtrList::readIstream(Istream& is, const INew& inew) if (is.eof()) { - FatalIOErrorInFunction - ( - is - ) << "Premature EOF after reading " << lastToken.info() + FatalIOErrorInFunction(is) + << "Premature EOF after reading " << lastToken.info() << exit(FatalIOError); } @@ -152,10 +148,8 @@ void Foam::PtrList::readIstream(Istream& is, const INew& inew) return; } - FatalIOErrorInFunction - ( - is - ) << "incorrect first token, expected or '(', found " + FatalIOErrorInFunction(is) + << "incorrect first token, expected or '(', found " << firstToken.info() << exit(FatalIOError); } diff --git a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C index 8bbb2f6863..f3354557cc 100644 --- a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C +++ b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C @@ -47,10 +47,8 @@ void Foam::CompactIOField::readFromStream(const bool valid) } else { - FatalIOErrorInFunction - ( - is - ) << "unexpected class name " << headerClassName() + FatalIOErrorInFunction(is) + << "unexpected class name " << headerClassName() << " expected " << typeName << " or " << IOField::typeName << endl << " while reading object " << name() diff --git a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C index b2eed6a22f..e13a0ebd82 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C +++ b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C @@ -203,10 +203,8 @@ Foam::functionEntries::codeStream::getFunction if (!dynCode.copyOrCreateFiles(true)) { - FatalIOErrorInFunction - ( - parentDict - ) << "Failed writing files for" << nl + FatalIOErrorInFunction(parentDict) + << "Failed writing files for" << nl << dynCode.libRelPath() << nl << exit(FatalIOError); } @@ -214,10 +212,8 @@ Foam::functionEntries::codeStream::getFunction if (!dynCode.wmakeLibso()) { - FatalIOErrorInFunction - ( - parentDict - ) << "Failed wmake " << dynCode.libRelPath() << nl + FatalIOErrorInFunction(parentDict) + << "Failed wmake " << dynCode.libRelPath() << nl << exit(FatalIOError); } } @@ -266,10 +262,8 @@ Foam::functionEntries::codeStream::getFunction if (mySize < masterSize) { - FatalIOErrorInFunction - ( - parentDict - ) << "Cannot read (NFS mounted) library " << nl + FatalIOErrorInFunction(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 - ( - parentDict - ) << "Failed loading library " << libPath << nl + FatalIOErrorInFunction(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 - ( - parentDict - ) << "Failed loading library " << libPath + FatalIOErrorInFunction(parentDict) + << "Failed loading library " << libPath << " on some processors." << exit(FatalIOError); } @@ -353,10 +343,8 @@ Foam::functionEntries::codeStream::getFunction if (!function) { - FatalIOErrorInFunction - ( - parentDict - ) << "Failed looking up symbol " << dynCode.codeName() + FatalIOErrorInFunction(parentDict) + << "Failed looking up symbol " << dynCode.codeName() << " in library " << lib << exit(FatalIOError); } diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C index f587ba964a..c8a5af0cf5 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C +++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C @@ -159,10 +159,8 @@ bool Foam::functionEntries::includeEntry::execute return true; } - FatalIOErrorInFunction - ( - is - ) << "Cannot open include file " + FatalIOErrorInFunction(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 - ( - is - ) << "Cannot open include file " + FatalIOErrorInFunction(is) + << "Cannot open include file " << (ifs.name().size() ? ifs.name() : rawName) << " while reading dictionary " << parentDict.name() << exit(FatalIOError); diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C index 8a316b332c..17bd15632a 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C +++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C @@ -108,10 +108,8 @@ bool Foam::functionEntries::includeEtcEntry::execute return true; } - FatalIOErrorInFunction - ( - is - ) << "Cannot open etc file " + FatalIOErrorInFunction(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 - ( - is - ) << "Cannot open etc file " + FatalIOErrorInFunction(is) + << "Cannot open etc file " << (ifs.name().size() ? ifs.name() : rawName) << " while reading dictionary " << parentDict.name() << exit(FatalIOError); diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C index 3c8715a2c0..0b3ceb5674 100644 --- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C +++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C @@ -87,10 +87,8 @@ bool Foam::primitiveEntry::expandVariable if (str.empty()) { - FatalIOErrorInFunction - ( - dict - ) << "Illegal dictionary entry or environment variable name " + FatalIOErrorInFunction(dict) + << "Illegal dictionary entry or environment variable name " << varName << endl << "Valid dictionary entries are " << dict.toc() << exit(FatalIOError); diff --git a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C index 0cbb02b7a2..ee41803bf6 100644 --- a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C +++ b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C @@ -117,28 +117,22 @@ void* Foam::codedBase::loadLibrary } else { - FatalIOErrorInFunction - ( - contextDict - ) << "Failed looking up symbol " << globalFuncName + FatalIOErrorInFunction(contextDict) + << "Failed looking up symbol " << globalFuncName << nl << "from " << libPath << exit(FatalIOError); } } else { - FatalIOErrorInFunction - ( - contextDict - ) << "Failed looking up symbol " << globalFuncName << nl + FatalIOErrorInFunction(contextDict) + << "Failed looking up symbol " << globalFuncName << nl << "from " << libPath << exit(FatalIOError); lib = 0; if (!libs().close(libPath, false)) { - FatalIOErrorInFunction - ( - contextDict - ) << "Failed unloading library " + FatalIOErrorInFunction(contextDict) + << "Failed unloading library " << libPath << exit(FatalIOError); } @@ -187,20 +181,16 @@ void Foam::codedBase::unloadLibrary } else { - FatalIOErrorInFunction - ( - contextDict - ) << "Failed looking up symbol " << globalFuncName << nl + FatalIOErrorInFunction(contextDict) + << "Failed looking up symbol " << globalFuncName << nl << "from " << libPath << exit(FatalIOError); } } if (!libs().close(libPath, false)) { - FatalIOErrorInFunction - ( - contextDict - ) << "Failed unloading library " << libPath + FatalIOErrorInFunction(contextDict) + << "Failed unloading library " << libPath << exit(FatalIOError); } } @@ -228,10 +218,8 @@ void Foam::codedBase::createLibrary if (!dynCode.copyOrCreateFiles(true)) { - FatalIOErrorInFunction - ( - context.dict() - ) << "Failed writing files for" << nl + FatalIOErrorInFunction(context.dict()) + << "Failed writing files for" << nl << dynCode.libRelPath() << nl << exit(FatalIOError); } @@ -239,10 +227,8 @@ void Foam::codedBase::createLibrary if (!dynCode.wmakeLibso()) { - FatalIOErrorInFunction - ( - context.dict() - ) << "Failed wmake " << dynCode.libRelPath() << nl + FatalIOErrorInFunction(context.dict()) + << "Failed wmake " << dynCode.libRelPath() << nl << exit(FatalIOError); } } @@ -289,10 +275,8 @@ void Foam::codedBase::createLibrary if (mySize < masterSize) { - FatalIOErrorInFunction - ( - context.dict() - ) << "Cannot read (NFS mounted) library " << nl + FatalIOErrorInFunction(context.dict()) + << "Cannot read (NFS mounted) library " << nl << libPath << nl << "on processor " << Pstream::myProcNo() << " detected size " << mySize diff --git a/src/OpenFOAM/dimensionSet/dimensionSetIO.C b/src/OpenFOAM/dimensionSet/dimensionSetIO.C index 57c0e80692..fc7117ca8c 100644 --- a/src/OpenFOAM/dimensionSet/dimensionSetIO.C +++ b/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 - ( - tis.stream() - ) << "Illegal token " << t << exit(FatalIOError); + FatalIOErrorInFunction(tis.stream()) + << "Illegal token " << t << exit(FatalIOError); } ds.dimensions() *= sub.dimensions(); @@ -363,18 +361,14 @@ Foam::dimensionedScalar Foam::dimensionSet::parse } else { - FatalIOErrorInFunction - ( - tis.stream() - ) << "Illegal token " << nextToken << exit(FatalIOError); + FatalIOErrorInFunction(tis.stream()) + << "Illegal token " << nextToken << exit(FatalIOError); } } else { - FatalIOErrorInFunction - ( - tis.stream() - ) << "Illegal token " << nextToken << exit(FatalIOError); + FatalIOErrorInFunction(tis.stream()) + << "Illegal token " << nextToken << exit(FatalIOError); } @@ -415,10 +409,8 @@ Foam::Istream& Foam::dimensionSet::read if (startToken != token::BEGIN_SQR) { - FatalIOErrorInFunction - ( - is - ) << "expected a " << token::BEGIN_SQR << " in dimensionSet" + FatalIOErrorInFunction(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 - ( - is - ) << "expected a " << token::END_SQR << " in dimensionSet " + FatalIOErrorInFunction(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 - ( - is - ) << "expected a " << token::BEGIN_SQR << " in dimensionSet" + FatalIOErrorInFunction(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 - ( - is - ) << "expected a " << token::END_SQR << " in dimensionSet " + FatalIOErrorInFunction(is) + << "Expected a " << token::END_SQR << " in dimensionSet " << endl << "in stream " << is.info() << exit(FatalIOError); } diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C index 68b263a36f..61bc7f69be 100644 --- a/src/OpenFOAM/fields/Fields/Field/Field.C +++ b/src/OpenFOAM/fields/Fields/Field/Field.C @@ -226,7 +226,7 @@ Foam::Field::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::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::Field else { FatalIOErrorInFunction(dict) - << "expected keyword 'uniform' or 'nonuniform', found " + << "Expected keyword 'uniform' or 'nonuniform', found " << firstToken.info() << exit(FatalIOError); } } diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C index d82f34fa9f..b2d299af9b 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C @@ -158,10 +158,8 @@ readField { if (bmesh_[patchi].type() == cyclicPolyPatch::typeName) { - FatalIOErrorInFunction - ( - dict - ) << "Cannot find patchField entry for cyclic " + FatalIOErrorInFunction(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 - ( - dict - ) << "Cannot find patchField entry for " + FatalIOErrorInFunction(dict) + << "Cannot find patchField entry for " << bmesh_[patchi].name() << exit(FatalIOError); } } diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C index 09927c0494..84e8c00970 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C @@ -81,10 +81,8 @@ Foam::valuePointPatchField::valuePointPatchField } else { - FatalIOErrorInFunction - ( - dict - ) << "Essential entry 'value' missing" + FatalIOErrorInFunction(dict) + << "Essential entry 'value' missing" << exit(FatalIOError); } } diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C index 2ce727f3f5..bf9491ae2b 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C @@ -55,10 +55,8 @@ Foam::cyclicPointPatchField::cyclicPointPatchField { if (!isType(p)) { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not cyclic type. " + FatalIOErrorInFunction(dict) + << "patch " << this->patch().index() << " not cyclic type. " << "Patch type = " << p.type() << exit(FatalIOError); } diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C index 8fbbaadd07..73f29bc049 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C @@ -50,10 +50,8 @@ Foam::emptyPointPatchField::emptyPointPatchField { if (!isType(p)) { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not empty type. " + FatalIOErrorInFunction(dict) + << "patch " << this->patch().index() << " not empty type. " << "Patch type = " << p.type() << exit(FatalIOError); } diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C index 250b438ff9..c220a7103e 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C @@ -50,10 +50,8 @@ Foam::symmetryPointPatchField::symmetryPointPatchField { if (!isType(p)) { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not symmetry type. " + FatalIOErrorInFunction(dict) + << "patch " << this->patch().index() << " not symmetry type. " << "Patch type = " << p.type() << exit(FatalIOError); } diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C index ace223aaa6..f76620d377 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C @@ -52,10 +52,8 @@ Foam::symmetryPlanePointPatchField::symmetryPlanePointPatchField { if (!isType(p)) { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not symmetry type. " + FatalIOErrorInFunction(dict) + << "patch " << this->patch().index() << " not symmetry type. " << "Patch type = " << p.type() << exit(FatalIOError); } diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C index 0c93ef5905..dce44e7012 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C @@ -52,10 +52,8 @@ Foam::wedgePointPatchField::wedgePointPatchField { if (!isType(p)) { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not wedge type. " + FatalIOErrorInFunction(dict) + << "patch " << this->patch().index() << " not wedge type. " << "Patch type = " << p.type() << exit(FatalIOError); } diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C index 4ab75d2ab0..cdd63c2c60 100644 --- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C +++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C @@ -127,10 +127,8 @@ Foam::autoPtr> Foam::pointPatchField::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - dict - ) << "Unknown patchField type " << patchFieldType + FatalIOErrorInFunction(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::New if (!patchTypeCstrIter.found()) { - FatalIOErrorInFunction - ( - dict - ) << "inconsistent patch and patchField types for \n" + FatalIOErrorInFunction(dict) + << "inconsistent patch and patchField types for \n" << " patch type " << p.type() << " and patchField type " << patchFieldType << exit(FatalIOError); diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C index d35db37028..529fc8242b 100644 --- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C +++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C @@ -47,10 +47,8 @@ Foam::LduMatrix::preconditioner::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - preconditionerDict - ) << "Unknown symmetric matrix preconditioner " + FatalIOErrorInFunction(preconditionerDict) + << "Unknown symmetric matrix preconditioner " << preconditionerName << endl << endl << "Valid symmetric matrix preconditioners are :" << endl << symMatrixConstructorTablePtr_->sortedToc() @@ -73,10 +71,8 @@ Foam::LduMatrix::preconditioner::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - preconditionerDict - ) << "Unknown asymmetric matrix preconditioner " + FatalIOErrorInFunction(preconditionerDict) + << "Unknown asymmetric matrix preconditioner " << preconditionerName << endl << endl << "Valid asymmetric matrix preconditioners are :" << endl << asymMatrixConstructorTablePtr_->sortedToc() @@ -93,10 +89,8 @@ Foam::LduMatrix::preconditioner::New ); } - FatalIOErrorInFunction - ( - preconditionerDict - ) << "cannot preconditione incomplete matrix, " + FatalIOErrorInFunction(preconditionerDict) + << "Cannot precondition incomplete matrix, " "no diagonal or off-diagonal coefficient" << exit(FatalIOError); diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C index 88a1f86380..8e71c2e0a0 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C +++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C @@ -91,10 +91,8 @@ Foam::lduMatrix::preconditioner::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - controls - ) << "Unknown symmetric matrix preconditioner " + FatalIOErrorInFunction(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 - ( - controls - ) << "Unknown asymmetric matrix preconditioner " + FatalIOErrorInFunction(controls) + << "Unknown asymmetric matrix preconditioner " << name << nl << nl << "Valid asymmetric matrix preconditioners :" << endl << asymMatrixConstructorTablePtr_->sortedToc() @@ -136,10 +132,8 @@ Foam::lduMatrix::preconditioner::New ); } - FatalIOErrorInFunction - ( - controls - ) << "cannot solve incomplete matrix, " + FatalIOErrorInFunction(controls) + << "cannot solve incomplete matrix, " "no diagonal or off-diagonal coefficient" << exit(FatalIOError); diff --git a/src/OpenFOAM/matrices/solution/solution.C b/src/OpenFOAM/matrices/solution/solution.C index b2a3a07800..c951b0ee03 100644 --- a/src/OpenFOAM/matrices/solution/solution.C +++ b/src/OpenFOAM/matrices/solution/solution.C @@ -279,10 +279,8 @@ Foam::scalar Foam::solution::fieldRelaxationFactor(const word& name) const } else { - FatalIOErrorInFunction - ( - fieldRelaxDict_ - ) << "Cannot find variable relaxation factor for '" << name + FatalIOErrorInFunction(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 - ( - eqnRelaxDict_ - ) << "Cannot find equation relaxation factor for '" << name + FatalIOErrorInFunction(eqnRelaxDict_) + << "Cannot find equation relaxation factor for '" << name << "' or a suitable default value." << exit(FatalIOError); diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C index de5ae612ed..b55121fe0e 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C @@ -660,10 +660,8 @@ Foam::cyclicPolyPatch::cyclicPolyPatch { if (neighbPatchName_ == word::null && !coupleGroup_.valid()) { - FatalIOErrorInFunction - ( - dict - ) << "No \"neighbourPatch\" provided." << endl + FatalIOErrorInFunction(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); diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C index 05d4f41a3c..4b4fab5fd1 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C @@ -599,10 +599,8 @@ Foam::oldCyclicPolyPatch::oldCyclicPolyPatch { if (dict.found("neighbourPatch")) { - FatalIOErrorInFunction - ( - dict - ) << "Found \"neighbourPatch\" entry when reading cyclic patch " + FatalIOErrorInFunction(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" diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C index a02b5fdd95..1780af0604 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C @@ -115,10 +115,8 @@ Foam::autoPtr Foam::polyPatch::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - dict - ) << "Unknown polyPatch type " + FatalIOErrorInFunction(dict) + << "Unknown polyPatch type " << patchType << " for patch " << name << nl << nl << "Valid polyPatch types :" << endl << dictionaryConstructorTablePtr_->sortedToc() diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C index 2557cae94f..12234b0076 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C @@ -47,10 +47,8 @@ Foam::autoPtr Foam::cellZone::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - dict - ) << "Unknown cellZone type " + FatalIOErrorInFunction(dict) + << "Unknown cellZone type " << zoneType << nl << nl << "Valid cellZone types :" << nl << dictionaryConstructorTablePtr_->sortedToc() diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C index 1d546ead91..8dab5f4d68 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C @@ -47,10 +47,8 @@ Foam::autoPtr Foam::faceZone::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - dict - ) << "Unknown faceZone type " + FatalIOErrorInFunction(dict) + << "Unknown faceZone type " << zoneType << nl << nl << "Valid faceZone types :" << nl << dictionaryConstructorTablePtr_->sortedToc() diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C index 544ea5de3b..3f2feaf1b4 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C @@ -47,10 +47,8 @@ Foam::autoPtr Foam::pointZone::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - dict - ) << "Unknown pointZone type " + FatalIOErrorInFunction(dict) + << "Unknown pointZone type " << zoneType << nl << nl << "Valid pointZone types :" << nl << dictionaryConstructorTablePtr_->sortedToc() diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C index 29535f5909..f58f7d4c15 100644 --- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C +++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C @@ -46,10 +46,8 @@ Foam::Function1Types::TableFile::TableFile if (!is.good()) { - FatalIOErrorInFunction - ( - is - ) << "Cannot open file." << exit(FatalIOError); + FatalIOErrorInFunction(is) + << "Cannot open file." << exit(FatalIOError); } is >> this->table_; diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C index 325e64051d..5ed3841e3f 100644 --- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C +++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C @@ -487,18 +487,14 @@ Foam::string Foam::stringOps::getVariable { if (allowEnvVars) { - FatalIOErrorInFunction - ( - dict - ) << "Cannot find dictionary or environment variable " + FatalIOErrorInFunction(dict) + << "Cannot find dictionary or environment variable " << name << exit(FatalIOError); } else { - FatalIOErrorInFunction - ( - dict - ) << "Cannot find dictionary variable " + FatalIOErrorInFunction(dict) + << "Cannot find dictionary variable " << name << exit(FatalIOError); } } diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C index e03353d158..4040dc4fbe 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C @@ -233,12 +233,10 @@ baffleThickness() const { if (thickness_.size() != patch().size()) { - FatalIOErrorInFunction - ( - solidDict_ - )<< " Field thickness has not been specified " - << " for patch " << this->patch().name() - << exit(FatalIOError); + FatalIOErrorInFunction(solidDict_) + << "Field thickness has not been specified" + " for patch " << this->patch().name() + << exit(FatalIOError); } return thickness_; diff --git a/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameAreaNew.C b/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameAreaNew.C index 83222a222b..b4c1186335 100644 --- a/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameAreaNew.C +++ b/src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameAreaNew.C @@ -46,10 +46,8 @@ Foam::autoPtr Foam::reactionRateFlameArea::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - dict - ) << "Unknown reactionRateFlameArea type " + FatalIOErrorInFunction(dict) + << "Unknown reactionRateFlameArea type " << modelType << nl << nl << "Valid reaction rate flame area types :" << endl << dictionaryConstructorTablePtr_->sortedToc() diff --git a/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C b/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C index bd7afc1ce2..591a8fef72 100644 --- a/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C +++ b/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C @@ -83,10 +83,8 @@ Foam::dynamicMultiMotionSolverFvMesh::dynamicMultiMotionSolverFvMesh if (zoneIDs_[zoneI] == -1) { - FatalIOErrorInFunction - ( - dynamicMeshCoeffs - ) << "Cannot find cellZone named " << zoneName + FatalIOErrorInFunction(dynamicMeshCoeffs) + << "Cannot find cellZone named " << zoneName << ". Valid zones are " << cellZones().names() << exit(FatalIOError); } diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver.C index daab9660b6..6a4b9a64d6 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver.C +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver.C @@ -70,10 +70,8 @@ Foam::multiSolidBodyMotionSolver::multiSolidBodyMotionSolver if (zoneIDs_[zonei] == -1) { - FatalIOErrorInFunction - ( - coeffDict() - ) << "Cannot find cellZone named " << zoneName + FatalIOErrorInFunction(coeffDict()) + << "Cannot find cellZone named " << zoneName << ". Valid zones are " << flatOutput(mesh.cellZones().names()) << exit(FatalIOError); diff --git a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C index 28ef8f9029..97cc75b72f 100644 --- a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C +++ b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C @@ -47,10 +47,8 @@ Foam::autoPtr Foam::polyMeshModifier::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - dict - ) << "Unknown polyMeshModifier type " + FatalIOErrorInFunction(dict) + << "Unknown polyMeshModifier type " << modifierType << nl << nl << "Valid polyMeshModifier types :" << endl << dictionaryConstructorTablePtr_->sortedToc() diff --git a/src/fileFormats/vtk/read/vtkUnstructuredReader.C b/src/fileFormats/vtk/read/vtkUnstructuredReader.C index ed0b466617..c541b2c3bd 100644 --- a/src/fileFormats/vtk/read/vtkUnstructuredReader.C +++ b/src/fileFormats/vtk/read/vtkUnstructuredReader.C @@ -143,10 +143,8 @@ void Foam::vtkUnstructuredReader::extractCells label nRead = cellVertData[dataIndex++]; if (nRead != 1) { - FatalIOErrorInFunction - ( - inFile - ) << "Expected size 1 for VTK_VERTEX but found " + FatalIOErrorInFunction(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 - ( - inFile - ) << "Expected size 2 for VTK_LINE but found " + FatalIOErrorInFunction(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 - ( - inFile - ) << "Expected size 3 for VTK_TRIANGLE but found " + FatalIOErrorInFunction(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 - ( - inFile - ) << "Expected size 4 for VTK_QUAD but found " + FatalIOErrorInFunction(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 - ( - inFile - ) << "Expected size 4 for VTK_TETRA but found " + FatalIOErrorInFunction(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 - ( - inFile - ) << "Expected size 5 for VTK_PYRAMID but found " + FatalIOErrorInFunction(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 - ( - inFile - ) << "Expected size 6 for VTK_WEDGE but found " + FatalIOErrorInFunction(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 - ( - inFile - ) << "Expected size 8 for VTK_HEXAHEDRON but found " + FatalIOErrorInFunction(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; diff --git a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C index e5e6ea9a7e..799d9f20cf 100644 --- a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C +++ b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C @@ -51,10 +51,8 @@ bool Foam::setRefCell if (refCelli < 0 || refCelli >= field.mesh().nCells()) { - FatalIOErrorInFunction - ( - dict - ) << "Illegal master cellID " << refCelli + FatalIOErrorInFunction(dict) + << "Illegal master cellID " << refCelli << ". Should be 0.." << field.mesh().nCells() << exit(FatalIOError); } @@ -86,10 +84,8 @@ bool Foam::setRefCell if (sumHasRef != 1) { - FatalIOErrorInFunction - ( - dict - ) << "Unable to set reference cell for field " << field.name() + FatalIOErrorInFunction(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 - ( - dict - ) << "Unable to set reference cell for field " << field.name() + FatalIOErrorInFunction(dict) + << "Unable to set reference cell for field " << field.name() << nl << " Please supply either " << refCellName << " or " << refPointName << nl << exit(FatalIOError); diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C index 718fc5ca40..cf442108f4 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C @@ -53,10 +53,8 @@ Foam::cyclicFvPatchField::cyclicFvPatchField { if (!isA(p)) { - FatalIOErrorInFunction - ( - dict - ) << " patch type '" << p.type() + FatalIOErrorInFunction(dict) + << " patch type '" << p.type() << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() << " of field " << this->internalField().name() diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C index a779c9425d..97139bb565 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C @@ -55,10 +55,8 @@ Foam::cyclicACMIFvPatchField::cyclicACMIFvPatchField { if (!isA(p)) { - FatalIOErrorInFunction - ( - dict - ) << " patch type '" << p.type() + FatalIOErrorInFunction(dict) + << " patch type '" << p.type() << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() << " of field " << this->internalField().name() @@ -78,10 +76,7 @@ Foam::cyclicACMIFvPatchField::cyclicACMIFvPatchField ); if (!fld.boundaryField().set(cyclicACMIPatch_.nonOverlapPatchID())) { - FatalIOErrorInFunction - ( - dict - ) + FatalIOErrorInFunction(dict) << " patch " << p.name() << " of field " << this->internalField().name() << " refers to non-overlap patch " diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C index 2888814b16..119d183005 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C @@ -52,10 +52,8 @@ Foam::cyclicAMIFvPatchField::cyclicAMIFvPatchField { if (!isA(p)) { - FatalIOErrorInFunction - ( - dict - ) << " patch type '" << p.type() + FatalIOErrorInFunction(dict) + << " patch type '" << p.type() << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() << " of field " << this->internalField().name() diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C index 7dbb969448..991e6c23c2 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C @@ -74,10 +74,8 @@ Foam::emptyFvPatchField::emptyFvPatchField { if (!isType(p)) { - FatalIOErrorInFunction - ( - dict - ) << "\n patch type '" << p.type() + FatalIOErrorInFunction(dict) + << "\n patch type '" << p.type() << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() << " of field " << this->internalField().name() diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C index a9573c596f..d82ade6420 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C @@ -86,10 +86,8 @@ Foam::processorFvPatchField::processorFvPatchField { if (!isA(p)) { - FatalIOErrorInFunction - ( - dict - ) << "\n patch type '" << p.type() + FatalIOErrorInFunction(dict) + << "\n patch type '" << p.type() << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() << " of field " << this->internalField().name() diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C index be958aaacf..48eda932ed 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C @@ -55,10 +55,8 @@ Foam::processorCyclicFvPatchField::processorCyclicFvPatchField { if (!isType(p)) { - FatalIOErrorInFunction - ( - dict - ) << "\n patch type '" << p.type() + FatalIOErrorInFunction(dict) + << "\n patch type '" << p.type() << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() << " of field " << this->internalField().name() diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C index de0de6fdfa..d217b2fbc2 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C @@ -50,10 +50,8 @@ Foam::symmetryFvPatchField::symmetryFvPatchField { if (!isType(p)) { - FatalIOErrorInFunction - ( - dict - ) << "\n patch type '" << p.type() + FatalIOErrorInFunction(dict) + << "\n patch type '" << p.type() << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() << " of field " << this->internalField().name() diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C index f8a8d0e71c..9f1ec0ba32 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C @@ -77,10 +77,8 @@ Foam::symmetryPlaneFvPatchField::symmetryPlaneFvPatchField { if (!isType(p)) { - FatalIOErrorInFunction - ( - dict - ) << "\n patch type '" << p.type() + FatalIOErrorInFunction(dict) + << "\n patch type '" << p.type() << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() << " of field " << this->internalField().name() diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C index 9a9700ff55..d5daddf903 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C @@ -78,10 +78,8 @@ Foam::wedgeFvPatchField::wedgeFvPatchField { if (!isType(p)) { - FatalIOErrorInFunction - ( - dict - ) << "\n patch type '" << p.type() + FatalIOErrorInFunction(dict) + << "\n patch type '" << p.type() << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() << " of field " << this->internalField().name() diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C index 2e352f8baf..b8134c1bb8 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C @@ -107,10 +107,8 @@ Foam::advectiveFvPatchField::advectiveFvPatchField if (lInf_ < 0.0) { - FatalIOErrorInFunction - ( - dict - ) << "unphysical lInf specified (lInf < 0)" << nl + FatalIOErrorInFunction(dict) + << "unphysical lInf specified (lInf < 0)" << nl << " on patch " << this->patch().name() << " of field " << this->internalField().name() << " in file " << this->internalField().objectPath() diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C index a2f202f93b..bfd7389486 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C @@ -75,10 +75,8 @@ flowRateInletVelocityFvPatchVectorField } else { - FatalIOErrorInFunction - ( - dict - ) << "Please supply either 'volumetricFlowRate' or" + FatalIOErrorInFunction(dict) + << "Please supply either 'volumetricFlowRate' or" << " 'massFlowRate' and 'rho'" << exit(FatalIOError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C index 73429df1b1..31a9aca2aa 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C @@ -70,10 +70,8 @@ flowRateOutletVelocityFvPatchVectorField } else { - FatalIOErrorInFunction - ( - dict - ) << "Please supply either 'volumetricFlowRate' or" + FatalIOErrorInFunction(dict) + << "Please supply either 'volumetricFlowRate' or" << " 'massFlowRate' and 'rho'" << exit(FatalIOError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C index 283fc587dd..5b334a13b9 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C @@ -89,10 +89,8 @@ supersonicFreestreamFvPatchVectorField if (pInf_ < SMALL) { - FatalIOErrorInFunction - ( - dict - ) << " unphysical pInf specified (pInf <= 0.0)" + FatalIOErrorInFunction(dict) + << " unphysical pInf specified (pInf <= 0.0)" << "\n on patch " << this->patch().name() << " of field " << this->internalField().name() << " in file " << this->internalField().objectPath() diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C index 764a266517..de92236540 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C @@ -125,10 +125,8 @@ Foam::fvPatchField::fvPatchField } else { - FatalIOErrorInFunction - ( - dict - ) << "Essential entry 'value' missing" + FatalIOErrorInFunction(dict) + << "Essential entry 'value' missing" << exit(FatalIOError); } } diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C index 2c94a44ea9..79a5c2a851 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C @@ -125,10 +125,8 @@ Foam::tmp> Foam::fvPatchField::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - dict - ) << "Unknown patchField type " << patchFieldType + FatalIOErrorInFunction(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::New if (patchTypeCstrIter.found() && patchTypeCstrIter() != cstrIter()) { - FatalIOErrorInFunction - ( - dict - ) << "inconsistent patch and patchField types for \n" + FatalIOErrorInFunction(dict) + << "inconsistent patch and patchField types for \n" " patch type " << p.type() << " and patchField type " << patchFieldType << exit(FatalIOError); diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C index dab94137f1..6003761d24 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C @@ -52,10 +52,8 @@ Foam::cyclicFvsPatchField::cyclicFvsPatchField { if (!isA(p)) { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not cyclic type. " + FatalIOErrorInFunction(dict) + << "patch " << this->patch().index() << " not cyclic type. " << "Patch type = " << p.type() << exit(FatalIOError); } diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.C index 86cfbabbf1..7460d58e1a 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.C @@ -76,10 +76,8 @@ Foam::cyclicACMIFvsPatchField::cyclicACMIFvsPatchField { if (!isA(p)) { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not cyclicACMI type. " + FatalIOErrorInFunction(dict) + << "patch " << this->patch().index() << " not cyclicACMI type. " << "Patch type = " << p.type() << exit(FatalIOError); } diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.C index 1862467aac..44a9859d52 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.C @@ -76,10 +76,8 @@ Foam::cyclicAMIFvsPatchField::cyclicAMIFvsPatchField { if (!isA(p)) { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not cyclicAMI type. " + FatalIOErrorInFunction(dict) + << "patch " << this->patch().index() << " not cyclicAMI type. " << "Patch type = " << p.type() << exit(FatalIOError); } diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C index f4c6a7172a..e7626ceff2 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C @@ -52,10 +52,8 @@ Foam::emptyFvsPatchField::emptyFvsPatchField { if (!isType(p)) { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not empty type. " + FatalIOErrorInFunction(dict) + << "patch " << this->patch().index() << " not empty type. " << "Patch type = " << p.type() << exit(FatalIOError); } diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C index a9f6bd3ca0..87d56fafc4 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C @@ -65,10 +65,8 @@ Foam::processorFvsPatchField::processorFvsPatchField { if (!isType(p)) { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not processor type. " + FatalIOErrorInFunction(dict) + << "patch " << this->patch().index() << " not processor type. " << "Patch type = " << p.type() << exit(FatalIOError); } diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C index 6f5d10d4ce..0656da50a7 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C @@ -65,10 +65,8 @@ Foam::processorCyclicFvsPatchField::processorCyclicFvsPatchField { if (!isType(p)) { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not processor type. " + FatalIOErrorInFunction(dict) + << "patch " << this->patch().index() << " not processor type. " << "Patch type = " << p.type() << exit(FatalIOError); } diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C index fef8848e67..6f0fb8bd4c 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C @@ -50,10 +50,8 @@ Foam::symmetryFvsPatchField::symmetryFvsPatchField { if (!isType(p)) { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not symmetry type. " + FatalIOErrorInFunction(dict) + << "patch " << this->patch().index() << " not symmetry type. " << "Patch type = " << p.type() << exit(FatalIOError); } diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C index c1d2d3d3c5..7cd068d881 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C @@ -50,10 +50,8 @@ Foam::symmetryPlaneFvsPatchField::symmetryPlaneFvsPatchField { if (!isType(p)) { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not symmetryPlane type. " + FatalIOErrorInFunction(dict) + << "patch " << this->patch().index() << " not symmetryPlane type. " << "Patch type = " << p.type() << exit(FatalIOError); } diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C index 5c5ada449e..2e31abe9d9 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C @@ -50,10 +50,8 @@ Foam::wedgeFvsPatchField::wedgeFvsPatchField { if (!isType(p)) { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not wedge type. " + FatalIOErrorInFunction(dict) + << "patch " << this->patch().index() << " not wedge type. " << "Patch type = " << p.type() << exit(FatalIOError); } diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C index 4ef1047a94..43051c9e71 100644 --- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C +++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C @@ -113,10 +113,8 @@ Foam::tmp> Foam::fvsPatchField::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - dict - ) << "Unknown patchField type " << patchFieldType + FatalIOErrorInFunction(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::New if (patchTypeCstrIter.found() && patchTypeCstrIter() != cstrIter()) { - FatalIOErrorInFunction - ( - dict - ) << "inconsistent patch and patchField types for \n" + FatalIOErrorInFunction(dict) + << "inconsistent patch and patchField types for \n" " patch type " << p.type() << " and patchField type " << patchFieldType << exit(FatalIOError); diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C index c238481597..508acdee07 100644 --- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C +++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C @@ -68,10 +68,8 @@ tmp> convectionScheme::New if (schemeData.eof()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Convection scheme not specified" << endl << endl + FatalIOErrorInFunction(schemeData) + << "Convection scheme not specified" << endl << endl << "Valid convection schemes are :" << endl << IstreamConstructorTablePtr_->sortedToc() << exit(FatalIOError); @@ -83,10 +81,8 @@ tmp> convectionScheme::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Unknown convection scheme " + FatalIOErrorInFunction(schemeData) + << "Unknown convection scheme " << schemeName << nl << nl << "Valid convection schemes are :" << endl << IstreamConstructorTablePtr_->sortedToc() @@ -114,10 +110,8 @@ tmp> convectionScheme::New if (schemeData.eof()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Convection scheme not specified" << endl << endl + FatalIOErrorInFunction(schemeData) + << "Convection scheme not specified" << endl << endl << "Valid convection schemes are :" << endl << MultivariateConstructorTablePtr_->sortedToc() << exit(FatalIOError); @@ -129,10 +123,8 @@ tmp> convectionScheme::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Unknown convection scheme " + FatalIOErrorInFunction(schemeData) + << "Unknown convection scheme " << schemeName << nl << nl << "Valid convection schemes are :" << endl << MultivariateConstructorTablePtr_->sortedToc() diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C index 70208e9790..bb5b0e36ab 100644 --- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C +++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C @@ -52,10 +52,8 @@ tmp> d2dt2Scheme::New if (schemeData.eof()) { - FatalIOErrorInFunction - ( - schemeData - ) << "D2dt2 scheme not specified" << endl << endl + FatalIOErrorInFunction(schemeData) + << "D2dt2 scheme not specified" << endl << endl << "Valid d2dt2 schemes are :" << endl << IstreamConstructorTablePtr_->sortedToc() << exit(FatalIOError); @@ -67,10 +65,8 @@ tmp> d2dt2Scheme::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Unknown d2dt2 scheme " + FatalIOErrorInFunction(schemeData) + << "Unknown d2dt2 scheme " << schemeName << nl << nl << "Valid d2dt2 schemes are :" << endl << IstreamConstructorTablePtr_->sortedToc() diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C index 8331fad013..f85a9a033e 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C @@ -308,10 +308,8 @@ CrankNicolsonDdtScheme::CrankNicolsonDdtScheme const scalar ocCoeff = firstToken.number(); if (ocCoeff < 0 || ocCoeff > 1) { - FatalIOErrorInFunction - ( - is - ) << "Off-centreing coefficient = " << ocCoeff + FatalIOErrorInFunction(is) + << "Off-centreing coefficient = " << ocCoeff << " should be >= 0 and <= 1" << exit(FatalIOError); } diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C index 013ff96908..31eabea476 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C @@ -56,10 +56,8 @@ tmp> ddtScheme::New if (schemeData.eof()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Ddt scheme not specified" << endl << endl + FatalIOErrorInFunction(schemeData) + << "Ddt scheme not specified" << endl << endl << "Valid ddt schemes are :" << endl << IstreamConstructorTablePtr_->sortedToc() << exit(FatalIOError); @@ -71,10 +69,8 @@ tmp> ddtScheme::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Unknown ddt scheme " + FatalIOErrorInFunction(schemeData) + << "Unknown ddt scheme " << schemeName << nl << nl << "Valid ddt schemes are :" << endl << IstreamConstructorTablePtr_->sortedToc() diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C index 66b7f83df2..7bec9a4f2b 100644 --- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C +++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C @@ -56,10 +56,8 @@ tmp> divScheme::New if (schemeData.eof()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Div scheme not specified" << endl << endl + FatalIOErrorInFunction(schemeData) + << "Div scheme not specified" << endl << endl << "Valid div schemes are :" << endl << IstreamConstructorTablePtr_->sortedToc() << exit(FatalIOError); @@ -71,10 +69,8 @@ tmp> divScheme::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - schemeData - ) << "unknown div scheme " + FatalIOErrorInFunction(schemeData) + << "unknown div scheme " << schemeName << nl << nl << "Valid div schemes are :" << endl << IstreamConstructorTablePtr_->sortedToc() diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C index cb7207785c..987691c787 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C +++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C @@ -43,10 +43,8 @@ Foam::tmp> Foam::fv::gradScheme::New if (schemeData.eof()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Grad scheme not specified" << endl << endl + FatalIOErrorInFunction(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::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Unknown grad scheme " + FatalIOErrorInFunction(schemeData) + << "Unknown grad scheme " << schemeName << nl << nl << "Valid grad schemes are :" << endl << IstreamConstructorTablePtr_->sortedToc() diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H index 6278594e4b..f908fc7704 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H +++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H @@ -111,10 +111,8 @@ public: { if (k_ < 0 || k_ > 1) { - FatalIOErrorInFunction - ( - schemeData - ) << "coefficient = " << k_ + FatalIOErrorInFunction(schemeData) + << "coefficient = " << k_ << " should be >= 0 and <= 1" << exit(FatalIOError); } diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/gradientLimiters/cubicGradientLimiter.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/gradientLimiters/cubicGradientLimiter.H index 9270d1b6d0..ba0cfb98bb 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/gradientLimiters/cubicGradientLimiter.H +++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/gradientLimiters/cubicGradientLimiter.H @@ -105,10 +105,8 @@ public: { if (rt_ < 1) { - FatalIOErrorInFunction - ( - schemeData - ) << "coefficient = " << rt_ + FatalIOErrorInFunction(schemeData) + << "coefficient = " << rt_ << " should be > 1" << exit(FatalIOError); } diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H index e469ed3246..ac777714cb 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H +++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H @@ -98,10 +98,8 @@ public: { if (k_ < 0 || k_ > 1) { - FatalIOErrorInFunction - ( - schemeData - ) << "coefficient = " << k_ + FatalIOErrorInFunction(schemeData) + << "coefficient = " << k_ << " should be >= 0 and <= 1" << exit(FatalIOError); } diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H index 25daa2bd0f..8907982a83 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H +++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H @@ -107,10 +107,8 @@ public: { if (k_ < 0 || k_ > 1) { - FatalIOErrorInFunction - ( - schemeData - ) << "coefficient = " << k_ + FatalIOErrorInFunction(schemeData) + << "coefficient = " << k_ << " should be >= 0 and <= 1" << exit(FatalIOError); } diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H index 7ab32b22fb..c676c85658 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H +++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H @@ -107,10 +107,8 @@ public: { if (k_ < 0 || k_ > 1) { - FatalIOErrorInFunction - ( - schemeData - ) << "coefficient = " << k_ + FatalIOErrorInFunction(schemeData) + << "coefficient = " << k_ << " should be >= 0 and <= 1" << exit(FatalIOError); } diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C index fefd505876..1aa3f51b22 100644 --- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C +++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C @@ -54,10 +54,8 @@ tmp> laplacianScheme::New if (schemeData.eof()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Laplacian scheme not specified" << endl << endl + FatalIOErrorInFunction(schemeData) + << "Laplacian scheme not specified" << endl << endl << "Valid laplacian schemes are :" << endl << IstreamConstructorTablePtr_->sortedToc() << exit(FatalIOError); @@ -69,10 +67,8 @@ tmp> laplacianScheme::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Unknown laplacian scheme " + FatalIOErrorInFunction(schemeData) + << "Unknown laplacian scheme " << schemeName << nl << nl << "Valid laplacian schemes are :" << endl << IstreamConstructorTablePtr_->sortedToc() diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H index eb4e5fc94f..2f02ab2fba 100644 --- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H +++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H @@ -138,10 +138,8 @@ public: { if (limitCoeff_ < 0 || limitCoeff_ > 1) { - FatalIOErrorInFunction - ( - schemeData - ) << "limitCoeff is specified as " << limitCoeff_ + FatalIOErrorInFunction(schemeData) + << "limitCoeff is specified as " << limitCoeff_ << " but should be >= 0 && <= 1" << exit(FatalIOError); } diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C index 245a014065..517c1ea369 100644 --- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C +++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C @@ -55,10 +55,8 @@ tmp> snGradScheme::New if (schemeData.eof()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Discretisation scheme not specified" + FatalIOErrorInFunction(schemeData) + << "Discretisation scheme not specified" << endl << endl << "Valid schemes are :" << endl << MeshConstructorTablePtr_->sortedToc() @@ -71,10 +69,8 @@ tmp> snGradScheme::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Unknown discretisation scheme " + FatalIOErrorInFunction(schemeData) + << "Unknown discretisation scheme " << schemeName << nl << nl << "Valid schemes are :" << endl << MeshConstructorTablePtr_->sortedToc() diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C index ea6286a483..2c6fc59433 100644 --- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C +++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C @@ -96,10 +96,8 @@ Foam::SolverPerformance Foam::fvMatrix::solveSegregatedOrCoupled } else { - FatalIOErrorInFunction - ( - solverControls - ) << "Unknown type " << type + FatalIOErrorInFunction(solverControls) + << "Unknown type " << type << "; currently supported solver types are segregated and coupled" << exit(FatalIOError); diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C index 5e891eb16f..b9cd1d4255 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C @@ -46,10 +46,8 @@ Foam::limitedSurfaceInterpolationScheme::New if (schemeData.eof()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Discretisation scheme not specified" + FatalIOErrorInFunction(schemeData) + << "Discretisation scheme not specified" << endl << endl << "Valid schemes are :" << endl << MeshConstructorTablePtr_->sortedToc() @@ -62,10 +60,8 @@ Foam::limitedSurfaceInterpolationScheme::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Unknown discretisation scheme " + FatalIOErrorInFunction(schemeData) + << "Unknown discretisation scheme " << schemeName << nl << nl << "Valid schemes are :" << endl << MeshConstructorTablePtr_->sortedToc() @@ -94,10 +90,8 @@ Foam::limitedSurfaceInterpolationScheme::New if (schemeData.eof()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Discretisation scheme not specified" + FatalIOErrorInFunction(schemeData) + << "Discretisation scheme not specified" << endl << endl << "Valid schemes are :" << endl << MeshConstructorTablePtr_->sortedToc() @@ -110,10 +104,8 @@ Foam::limitedSurfaceInterpolationScheme::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Unknown discretisation scheme " + FatalIOErrorInFunction(schemeData) + << "Unknown discretisation scheme " << schemeName << nl << nl << "Valid schemes are :" << endl << MeshFluxConstructorTablePtr_->sortedToc() diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C index 5a4a26285f..f6329d747f 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C @@ -69,10 +69,8 @@ Foam::multivariateSurfaceInterpolationScheme::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Unknown discretisation scheme " << schemeName << nl << nl + FatalIOErrorInFunction(schemeData) + << "Unknown discretisation scheme " << schemeName << nl << nl << "Valid schemes are :" << endl << IstreamConstructorTablePtr_->sortedToc() << exit(FatalIOError); diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C index 8e14179101..838aa51f79 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C @@ -41,10 +41,8 @@ Foam::surfaceInterpolationScheme::New { if (schemeData.eof()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Discretisation scheme not specified" + FatalIOErrorInFunction(schemeData) + << "Discretisation scheme not specified" << endl << endl << "Valid schemes are :" << endl << MeshConstructorTablePtr_->sortedToc() @@ -62,10 +60,8 @@ Foam::surfaceInterpolationScheme::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Unknown discretisation scheme " + FatalIOErrorInFunction(schemeData) + << "Unknown discretisation scheme " << schemeName << nl << nl << "Valid schemes are :" << endl << MeshConstructorTablePtr_->sortedToc() @@ -87,10 +83,8 @@ Foam::surfaceInterpolationScheme::New { if (schemeData.eof()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Discretisation scheme not specified" + FatalIOErrorInFunction(schemeData) + << "Discretisation scheme not specified" << endl << endl << "Valid schemes are :" << endl << MeshConstructorTablePtr_->sortedToc() @@ -109,10 +103,8 @@ Foam::surfaceInterpolationScheme::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - schemeData - ) << "Unknown discretisation scheme " + FatalIOErrorInFunction(schemeData) + << "Unknown discretisation scheme " << schemeName << nl << nl << "Valid schemes are :" << endl << MeshFluxConstructorTablePtr_->sortedToc() diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C index 93025bfbd1..34f269cfff 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C @@ -96,10 +96,8 @@ timeVaryingMappedFixedValuePointPatchField && mapMethod_ != "nearest" ) { - FatalIOErrorInFunction - ( - dict - ) << "mapMethod should be one of 'planarInterpolation'" + FatalIOErrorInFunction(dict) + << "mapMethod should be one of 'planarInterpolation'" << ", 'nearest'" << exit(FatalIOError); } diff --git a/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C b/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C index c8e743312d..b8305fe363 100644 --- a/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C +++ b/src/genericPatchFields/genericFaPatchField/genericFaPatchField.C @@ -59,10 +59,8 @@ Foam::genericFaPatchField::genericFaPatchField { if (!dict.found("value")) { - FatalIOErrorInFunction - ( - dict - ) << "\n Cannot find 'value' entry" + FatalIOErrorInFunction(dict) + << "\n Cannot find 'value' entry" << " on patch " << this->patch().name() << " of field " << this->internalField().name() << " in file " << this->internalField().objectPath() @@ -116,17 +114,15 @@ Foam::genericFaPatchField::genericFaPatchField } else { - FatalIOErrorInFunction - ( - dict - ) << "\n token following 'nonuniform' " - "is not a compound" + FatalIOErrorInFunction(dict) + << "\n token following 'nonuniform' " + "is not a compound" << "\n on patch " << this->patch().name() << " of field " << this->internalField().name() << " in file " << this->internalField().objectPath() - << exit(FatalIOError); + << exit(FatalIOError); } } else if @@ -147,10 +143,8 @@ Foam::genericFaPatchField::genericFaPatchField if (fPtr->size() != this->size()) { - FatalIOErrorInFunction - ( - dict - ) << "\n size of field " << key + FatalIOErrorInFunction(dict) + << "\n size of field " << key << " (" << fPtr->size() << ')' << " is not the same size as the patch (" << this->size() << ')' @@ -182,10 +176,8 @@ Foam::genericFaPatchField::genericFaPatchField if (fPtr->size() != this->size()) { - FatalIOErrorInFunction - ( - dict - ) << "\n size of field " << key + FatalIOErrorInFunction(dict) + << "\n size of field " << key << " (" << fPtr->size() << ')' << " is not the same size as the patch (" << this->size() << ')' @@ -220,10 +212,8 @@ Foam::genericFaPatchField::genericFaPatchField if (fPtr->size() != this->size()) { - FatalIOErrorInFunction - ( - dict - ) << "\n size of field " << key + FatalIOErrorInFunction(dict) + << "\n size of field " << key << " (" << fPtr->size() << ')' << " is not the same size as the patch (" << this->size() << ')' @@ -258,10 +248,8 @@ Foam::genericFaPatchField::genericFaPatchField if (fPtr->size() != this->size()) { - FatalIOErrorInFunction - ( - dict - ) << "\n size of field " << key + FatalIOErrorInFunction(dict) + << "\n size of field " << key << " (" << fPtr->size() << ')' << " is not the same size as the patch (" << this->size() << ')' @@ -293,10 +281,8 @@ Foam::genericFaPatchField::genericFaPatchField if (fPtr->size() != this->size()) { - FatalIOErrorInFunction - ( - dict - ) << "\n size of field " << key + FatalIOErrorInFunction(dict) + << "\n size of field " << key << " (" << fPtr->size() << ')' << " is not the same size as the patch (" << this->size() << ')' @@ -312,10 +298,8 @@ Foam::genericFaPatchField::genericFaPatchField } else { - FatalIOErrorInFunction - ( - dict - ) << "\n compound " << fieldToken.compoundToken() + FatalIOErrorInFunction(dict) + << "\n compound " << fieldToken.compoundToken() << " not supported" << "\n on patch " << this->patch().name() << " of field " @@ -415,10 +399,8 @@ Foam::genericFaPatchField::genericFaPatchField } else { - FatalIOErrorInFunction - ( - dict - ) << "\n unrecognised native type " << l + FatalIOErrorInFunction(dict) + << "\n unrecognised native type " << l << "\n on patch " << this->patch().name() << " of field " << this->internalField().name() diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C index 61b2669313..2257a3a9df 100644 --- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C +++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C @@ -59,10 +59,8 @@ Foam::genericFvPatchField::genericFvPatchField { if (!dict.found("value")) { - FatalIOErrorInFunction - ( - dict - ) << "\n Cannot find 'value' entry" + FatalIOErrorInFunction(dict) + << "\n Cannot find 'value' entry" << " on patch " << this->patch().name() << " of field " << this->internalField().name() << " in file " << this->internalField().objectPath() @@ -116,17 +114,15 @@ Foam::genericFvPatchField::genericFvPatchField } else { - FatalIOErrorInFunction - ( - dict - ) << "\n token following 'nonuniform' " - "is not a compound" + FatalIOErrorInFunction(dict) + << "\n token following 'nonuniform' " + "is not a compound" << "\n on patch " << this->patch().name() << " of field " << this->internalField().name() << " in file " << this->internalField().objectPath() - << exit(FatalIOError); + << exit(FatalIOError); } } else if @@ -147,10 +143,8 @@ Foam::genericFvPatchField::genericFvPatchField if (fPtr->size() != this->size()) { - FatalIOErrorInFunction - ( - dict - ) << "\n size of field " << key + FatalIOErrorInFunction(dict) + << "\n size of field " << key << " (" << fPtr->size() << ')' << " is not the same size as the patch (" << this->size() << ')' @@ -182,10 +176,8 @@ Foam::genericFvPatchField::genericFvPatchField if (fPtr->size() != this->size()) { - FatalIOErrorInFunction - ( - dict - ) << "\n size of field " << key + FatalIOErrorInFunction(dict) + << "\n size of field " << key << " (" << fPtr->size() << ')' << " is not the same size as the patch (" << this->size() << ')' @@ -220,10 +212,8 @@ Foam::genericFvPatchField::genericFvPatchField if (fPtr->size() != this->size()) { - FatalIOErrorInFunction - ( - dict - ) << "\n size of field " << key + FatalIOErrorInFunction(dict) + << "\n size of field " << key << " (" << fPtr->size() << ')' << " is not the same size as the patch (" << this->size() << ')' @@ -258,10 +248,8 @@ Foam::genericFvPatchField::genericFvPatchField if (fPtr->size() != this->size()) { - FatalIOErrorInFunction - ( - dict - ) << "\n size of field " << key + FatalIOErrorInFunction(dict) + << "\n size of field " << key << " (" << fPtr->size() << ')' << " is not the same size as the patch (" << this->size() << ')' @@ -293,10 +281,8 @@ Foam::genericFvPatchField::genericFvPatchField if (fPtr->size() != this->size()) { - FatalIOErrorInFunction - ( - dict - ) << "\n size of field " << key + FatalIOErrorInFunction(dict) + << "\n size of field " << key << " (" << fPtr->size() << ')' << " is not the same size as the patch (" << this->size() << ')' @@ -312,10 +298,8 @@ Foam::genericFvPatchField::genericFvPatchField } else { - FatalIOErrorInFunction - ( - dict - ) << "\n compound " << fieldToken.compoundToken() + FatalIOErrorInFunction(dict) + << "\n compound " << fieldToken.compoundToken() << " not supported" << "\n on patch " << this->patch().name() << " of field " @@ -415,10 +399,8 @@ Foam::genericFvPatchField::genericFvPatchField } else { - FatalIOErrorInFunction - ( - dict - ) << "\n unrecognised native type " << l + FatalIOErrorInFunction(dict) + << "\n unrecognised native type " << l << "\n on patch " << this->patch().name() << " of field " << this->internalField().name() diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C index 44a6dc3dd0..6f4d85cf1f 100644 --- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C +++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C @@ -94,11 +94,9 @@ Foam::genericPointPatchField::genericPointPatchField } else { - FatalIOErrorInFunction - ( - dict - ) << "\n token following 'nonuniform' " - "is not a compound" + FatalIOErrorInFunction(dict) + << "\n token following 'nonuniform' " + "is not a compound" << "\n on patch " << this->patch().name() << " of field " << this->internalField().name() @@ -125,10 +123,8 @@ Foam::genericPointPatchField::genericPointPatchField if (fPtr->size() != this->size()) { - FatalIOErrorInFunction - ( - dict - ) << "\n size of field " << key + FatalIOErrorInFunction(dict) + << "\n size of field " << key << " (" << fPtr->size() << ')' << " is not the same size as the patch (" << this->size() << ')' @@ -160,10 +156,8 @@ Foam::genericPointPatchField::genericPointPatchField if (fPtr->size() != this->size()) { - FatalIOErrorInFunction - ( - dict - ) << "\n size of field " << key + FatalIOErrorInFunction(dict) + << "\n size of field " << key << " (" << fPtr->size() << ')' << " is not the same size as the patch (" << this->size() << ')' @@ -198,10 +192,8 @@ Foam::genericPointPatchField::genericPointPatchField if (fPtr->size() != this->size()) { - FatalIOErrorInFunction - ( - dict - ) << "\n size of field " << key + FatalIOErrorInFunction(dict) + << "\n size of field " << key << " (" << fPtr->size() << ')' << " is not the same size as the patch (" << this->size() << ')' @@ -236,10 +228,8 @@ Foam::genericPointPatchField::genericPointPatchField if (fPtr->size() != this->size()) { - FatalIOErrorInFunction - ( - dict - ) << "\n size of field " << key + FatalIOErrorInFunction(dict) + << "\n size of field " << key << " (" << fPtr->size() << ')' << " is not the same size as the patch (" << this->size() << ')' @@ -271,10 +261,8 @@ Foam::genericPointPatchField::genericPointPatchField if (fPtr->size() != this->size()) { - FatalIOErrorInFunction - ( - dict - ) << "\n size of field " << key + FatalIOErrorInFunction(dict) + << "\n size of field " << key << " (" << fPtr->size() << ')' << " is not the same size as the patch (" << this->size() << ')' @@ -290,10 +278,8 @@ Foam::genericPointPatchField::genericPointPatchField } else { - FatalIOErrorInFunction - ( - dict - ) << "\n compound " << fieldToken.compoundToken() + FatalIOErrorInFunction(dict) + << "\n compound " << fieldToken.compoundToken() << " not supported" << "\n on patch " << this->patch().name() << " of field " diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C index e0b8d6fb3e..f56ef07861 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C @@ -43,10 +43,8 @@ Foam::ParticleForce::ParticleForce { if (readCoeffs && (coeffs_.dictName() != forceType)) { - FatalIOErrorInFunction - ( - dict - ) << "Force " << forceType << " must be specified as a dictionary" + FatalIOErrorInFunction(dict) + << "Force " << forceType << " must be specified as a dictionary" << exit(FatalIOError); } } diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C index f1f6f81ccc..aa2a7f4761 100644 --- a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C +++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C @@ -217,10 +217,8 @@ Foam::blockDescriptor::blockDescriptor } else { - FatalIOErrorInFunction - ( - is - ) << "incorrect token while reading n, expected '(', found " + FatalIOErrorInFunction(is) + << "incorrect token while reading n, expected '(', found " << t.info() << exit(FatalIOError); } diff --git a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C index f0c1ea312f..86d322c192 100644 --- a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C +++ b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C @@ -92,10 +92,8 @@ void Foam::refinementFeatures::read if (fName.empty()) { - FatalIOErrorInFunction - ( - dict - ) << "Could not open " << featObj.objectPath() + FatalIOErrorInFunction(dict) + << "Could not open " << featObj.objectPath() << exit(FatalIOError); } diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C index 9d68962bf5..c6bd20e068 100644 --- a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C +++ b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C @@ -373,10 +373,8 @@ Foam::refinementSurfaces::refinementSurfaces if (unmatchedKeys.size() > 0) { - IOWarningInFunction - ( - surfacesDict - ) << "Not all entries in refinementSurfaces dictionary were used." + IOWarningInFunction(surfacesDict) + << "Not all entries in refinementSurfaces dictionary were used." << " The following entries were not used : " << unmatchedKeys.sortedToc() << endl; diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C index ccf8cf9155..3f5f1df9c3 100644 --- a/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C +++ b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.C @@ -110,10 +110,8 @@ Foam::surfaceZonesInfo::surfaceZonesInfo && !surface.hasVolumeType() ) { - IOWarningInFunction - ( - surfacesDict - ) << "Illegal entry zoneInside " + IOWarningInFunction(surfacesDict) + << "Illegal entry zoneInside " << areaSelectionAlgoNames[zoneInside_] << " for faceZone " << faceZoneName_ @@ -122,10 +120,8 @@ Foam::surfaceZonesInfo::surfaceZonesInfo } else if (hasSide) { - IOWarningInFunction - ( - surfacesDict - ) << "Unused entry zoneInside for faceZone " + IOWarningInFunction(surfacesDict) + << "Unused entry zoneInside for faceZone " << faceZoneName_ << " since no cellZone specified." << endl; diff --git a/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C b/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C index 82a81a2bf7..02e207f5e6 100644 --- a/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C +++ b/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C @@ -751,10 +751,8 @@ Foam::shellSurfaces::shellSurfaces if (unmatchedKeys.size() > 0) { - IOWarningInFunction - ( - shellsDict - ) << "Not all entries in refinementRegions dictionary were used." + IOWarningInFunction(shellsDict) + << "Not all entries in refinementRegions dictionary were used." << " The following entries were not used : " << unmatchedKeys.sortedToc() << endl; diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.C index 1b36db923b..4e5f08bfb5 100644 --- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.C +++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.C @@ -226,10 +226,8 @@ Foam::layerParameters::layerParameters if (layerSpec_ == ILLEGAL || nSpec != 2) { - FatalIOErrorInFunction - ( - dict - ) << "Over- or underspecified layer thickness." + FatalIOErrorInFunction(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 - ( - dict - ) << "problem." << exit(FatalIOError); + FatalIOErrorInFunction(dict) + << "problem." << exit(FatalIOError); break; } diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.C b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.C index 434489fed1..527d9bf175 100644 --- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.C +++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.C @@ -59,10 +59,8 @@ Foam::cyclicACMIPointPatchField::cyclicACMIPointPatchField { if (!isType(p)) { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not cyclicACMI type. " + FatalIOErrorInFunction(dict) + << "patch " << this->patch().index() << " not cyclicACMI type. " << "Patch type = " << p.type() << exit(FatalIOError); } diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C index 98b7a2ca2d..95fb2acfa9 100644 --- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C +++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C @@ -375,10 +375,8 @@ Foam::cyclicACMIPolyPatch::cyclicACMIPolyPatch if (nonOverlapPatchName_ == name) { - FatalIOErrorInFunction - ( - dict - ) << "Non-overlapping patch name " << nonOverlapPatchName_ + FatalIOErrorInFunction(dict) + << "Non-overlapping patch name " << nonOverlapPatchName_ << " cannot be the same as this patch " << name << exit(FatalIOError); } diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.C index 64650ab876..06e448ad8e 100644 --- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.C +++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.C @@ -59,10 +59,8 @@ Foam::cyclicAMIPointPatchField::cyclicAMIPointPatchField { if (!isType(p)) { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not cyclicAMI type. " + FatalIOErrorInFunction(dict) + << "patch " << this->patch().index() << " not cyclicAMI type. " << "Patch type = " << p.type() << exit(FatalIOError); } diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C index e8a6556361..6807318c3a 100644 --- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C +++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C @@ -546,19 +546,15 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch { if (nbrPatchName_ == word::null && !coupleGroup_.valid()) { - FatalIOErrorInFunction - ( - dict - ) << "No \"neighbourPatch\" or \"coupleGroup\" provided." + FatalIOErrorInFunction(dict) + << "No \"neighbourPatch\" or \"coupleGroup\" provided." << exit(FatalIOError); } if (nbrPatchName_ == name) { - FatalIOErrorInFunction - ( - dict - ) << "Neighbour patch name " << nbrPatchName_ + FatalIOErrorInFunction(dict) + << "Neighbour patch name " << nbrPatchName_ << " cannot be the same as this patch " << name << exit(FatalIOError); } @@ -584,10 +580,8 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch scalar magRot = mag(rotationAxis_); if (magRot < SMALL) { - FatalIOErrorInFunction - ( - dict - ) << "Illegal rotationAxis " << rotationAxis_ << endl + FatalIOErrorInFunction(dict) + << "Illegal rotationAxis " << rotationAxis_ << endl << "Please supply a non-zero vector." << exit(FatalIOError); } diff --git a/src/meshTools/PatchFunction1/ConstantField/ConstantField.C b/src/meshTools/PatchFunction1/ConstantField/ConstantField.C index 2755e472c3..1b9378ccc4 100644 --- a/src/meshTools/PatchFunction1/ConstantField/ConstantField.C +++ b/src/meshTools/PatchFunction1/ConstantField/ConstantField.C @@ -106,7 +106,7 @@ Foam::Field Foam::PatchFunction1Types::ConstantField::getValue else { FatalIOErrorInFunction(dict) - << "expected keyword 'uniform', 'nonuniform' or 'constant'" + << "Expected keyword 'uniform', 'nonuniform' or 'constant'" << ", found " << firstToken.wordToken() << exit(FatalIOError); } diff --git a/src/meshTools/coordinate/systems/coordinateSystems.C b/src/meshTools/coordinate/systems/coordinateSystems.C index 0da9cb0c8b..68cd8f12ec 100644 --- a/src/meshTools/coordinate/systems/coordinateSystems.C +++ b/src/meshTools/coordinate/systems/coordinateSystems.C @@ -158,10 +158,8 @@ void Foam::coordinateSystems::readFromStream(const bool valid) } else { - FatalIOErrorInFunction - ( - is - ) << "unexpected class name " << headerClassName() + FatalIOErrorInFunction(is) + << "unexpected class name " << headerClassName() << " expected " << typeName << " or " << headerTypeCompat << nl << " while reading object " << name() diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C index d8b14d5a9c..758c70898f 100644 --- a/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C +++ b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C @@ -181,10 +181,8 @@ void Foam::fileFormats::edgeMeshFormat::write if (!osPtr().good()) { - FatalIOErrorInFunction - ( - osPtr() - ) << "Cannot open file for writing " << filename + FatalIOErrorInFunction(osPtr()) + << "Cannot open file for writing " << filename << exit(FatalIOError); } @@ -193,10 +191,8 @@ void Foam::fileFormats::edgeMeshFormat::write if (!ok) { - FatalIOErrorInFunction - ( - os - ) << "Cannot write header" + FatalIOErrorInFunction(os) + << "Cannot write header" << exit(FatalIOError); } diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C index 405e110606..327e1c02aa 100644 --- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C +++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C @@ -884,7 +884,7 @@ Foam::tmp Foam::mappedPatchBase::readListOrField else { FatalIOErrorInFunction(dict) - << "expected keyword 'uniform' or 'nonuniform', found " + << "Expected keyword 'uniform' or 'nonuniform', found " << firstToken.wordToken() << exit(FatalIOError); } @@ -892,7 +892,7 @@ Foam::tmp Foam::mappedPatchBase::readListOrField else if (is.version() == IOstream::versionNumber(2,0)) { IOWarningInFunction(dict) - << "expected keyword 'uniform' or 'nonuniform', " + << "Expected keyword 'uniform' or 'nonuniform', " "assuming List format for backwards compatibility." "Foam version 2.0." << endl; diff --git a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C index d56e3ae19e..05c66ad764 100644 --- a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C +++ b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C @@ -59,10 +59,8 @@ void Foam::hierarchGeomDecomp::setDecompOrder() { if (order.size() != 3) { - FatalIOErrorInFunction - ( - decompositionDict_ - ) << "number of characters in order (" << order << ") != 3" + FatalIOErrorInFunction(decompositionDict_) + << "number of characters in order (" << order << ") != 3" << exit(FatalIOError); } @@ -77,10 +75,8 @@ void Foam::hierarchGeomDecomp::setDecompOrder() case 'z': decompOrder_[i] = 2; break; default: - FatalIOErrorInFunction - ( - decompositionDict_ - ) << "Illegal decomposition order " << order << nl + FatalIOErrorInFunction(decompositionDict_) + << "Illegal decomposition order " << order << nl << "It should only contain x, y or z" << exit(FatalError); break; diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C index 87a847f247..22e1360cbe 100644 --- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C +++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C @@ -434,10 +434,8 @@ Foam::sampledIsoSurface::sampledIsoSurface { if (!sampledSurface::interpolate()) { - FatalIOErrorInFunction - ( - dict - ) << "Non-interpolated iso surface not supported since triangles" + FatalIOErrorInFunction(dict) + << "Non-interpolated iso surface not supported since triangles" << " span across cells." << exit(FatalIOError); } diff --git a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C index ed707d79ee..7bca4b0459 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C +++ b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C @@ -85,11 +85,9 @@ void Foam::laminarFlameSpeedModels::RaviPetersen::checkPointsMonotonicity { if (x[i] <= x[i-1]) { - FatalIOErrorInFunction - ( - coeffsDict_ - ) << "Data points for the " << name - << " do not increase monotonically" << endl + FatalIOErrorInFunction(coeffsDict_) + << "Data points for the " << name + << " do not increase monotonically" << nl << exit(FatalIOError); } } @@ -118,10 +116,8 @@ void Foam::laminarFlameSpeedModels::RaviPetersen::checkCoefficientArrayShape if (!ok) { - FatalIOErrorInFunction - ( - coeffsDict_ - ) << "Inconsistent size of " << name << " coefficients array" << endl + FatalIOErrorInFunction(coeffsDict_) + << "Inconsistent size of " << name << " coefficients array" << nl << exit(FatalIOError); } } diff --git a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C index 732b7a23a3..8a30611df9 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C +++ b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/laminarFlameSpeedNew.C @@ -54,12 +54,10 @@ Foam::autoPtr Foam::laminarFlameSpeed::New if (!cstrIter.found()) { - FatalIOErrorInFunction - ( - propDict - ) << "Unknown laminarFlameSpeed type " + FatalIOErrorInFunction(propDict) + << "Unknown laminarFlameSpeed type " << modelType << nl << nl - << "Valid laminarFlameSpeed types :" << endl + << "Valid laminarFlameSpeed types :" << nl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalIOError); }