diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
index 94884519b798e0f58c57f27cfe8b46a2715875be..4f4aa8c2af874d9e70349ebf0de8eead4ddefcae 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -159,7 +159,7 @@ Foam::radiation::cloudAbsorptionEmission::EDisp(const label bandI) const
tE() += tc.Ep();
}
- return tE;
+ return 4*tE;
}
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/boundaryRadiationProperties/boundaryRadiationPropertiesFvPatchField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/boundaryRadiationProperties/boundaryRadiationPropertiesFvPatchField.C
index 2363f4ea43a9485f006afd13ca9d2f458f6a4ed3..aa3e086e20ef374b0b48ae479bc49fdc8c2ae211 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/boundaryRadiationProperties/boundaryRadiationPropertiesFvPatchField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/boundaryRadiationProperties/boundaryRadiationPropertiesFvPatchField.C
@@ -115,19 +115,11 @@ boundaryRadiationPropertiesFvPatchField
{
if (!isA<mappedPatchBase>(p.patch()))
{
- FatalIOErrorIn
- (
- "boundaryRadiationPropertiesFvPatchField:"
- ":boundaryRadiationPropertiesFvPatchField\n"
- "(\n"
- " const fvPatch& p,\n"
- " const dictionary& dict\n"
- ")\n",
- dict
- ) << "\n patch type '" << p.type()
+ FatalErrorInFunction
+ << "\n patch type '" << p.type()
<< "' not type '" << mappedPatchBase::typeName << "'"
<< "\n for patch " << p.name()
- << exit(FatalIOError);
+ << abort(FatalIOError);
}
}
break;
@@ -301,13 +293,8 @@ emissivity(const label bandI) const
default:
{
- FatalErrorIn
- (
- "boundaryRadiationPropertiesFvPatchField::"
- "emissivity(const scalarField&)"
- ) << "Unimplemented method " << method_ << endl
- << "Please set 'mode' to one of "
- << methodTypeNames_.toc()
+ FatalErrorInFunction
+ << "Please set 'mode' to one of " << methodTypeNames_.toc()
<< exit(FatalError);
}
break;
@@ -380,11 +367,8 @@ boundaryRadiationPropertiesFvPatchField::absorptivity
default:
{
- FatalErrorIn
- (
- "boundaryRadiationPropertiesFvPatchField::"
- "absorptivity(const scalarField&)"
- ) << "Unimplemented method " << method_ << endl
+ FatalErrorInFunction
+ << "Unimplemented method " << method_ << endl
<< "Please set 'mode' to one of "
<< methodTypeNames_.toc()
<< exit(FatalError);
@@ -459,11 +443,8 @@ transmissivity(const label bandI) const
default:
{
- FatalErrorIn
- (
- "boundaryRadiationPropertiesFvPatchField::"
- "transmissivity(const scalarField&)"
- ) << "Unimplemented method " << method_ << endl
+ FatalErrorInFunction
+ << "Unimplemented method " << method_ << endl
<< "Please set 'mode' to one of "
<< methodTypeNames_.toc()
<< exit(FatalError);
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
index c7f01ae723689a859550f158721db760c718585b..6138abf45fd579de77eba8eee8a08c0799a38118 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C
@@ -158,11 +158,8 @@ updateCoeffs()
if (dom.nLambda() != 1)
{
- FatalErrorIn
- (
- "Foam::radiation::"
- "greyDiffusiveRadiationMixedFvPatchScalarField::updateCoeffs"
- ) << " a grey boundary condition is used with a non-grey "
+ FatalErrorInFunction
+ << " a grey boundary condition is used with a non-grey "
<< "absorption model" << nl << exit(FatalError);
}
diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
index bddab8bde0cd0e10abbc9e6cb39b17d80a302e05..8c3e44547cd6ad7913f8953b0512d93f5863ae52 100644
--- a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C
@@ -146,11 +146,8 @@ updateCoeffs()
if (dom.nLambda() == 0)
{
- FatalErrorIn
- (
- "Foam::radiation::"
- "wideBandDiffusiveRadiationMixedFvPatchScalarField::updateCoeffs"
- ) << " a non-grey boundary condition is used with a grey "
+ FatalErrorInFunction
+ << " a non-grey boundary condition is used with a grey "
<< "absorption model" << nl << exit(FatalError);
}
diff --git a/src/thermophysicalModels/radiation/radiationModels/P1/P1.C b/src/thermophysicalModels/radiation/radiationModels/P1/P1.C
index 4f892892089e429a1691b28c18acd8e1f065fe0a..3a8782d0e36005e94c03c0553f13919ed283bfff 100644
--- a/src/thermophysicalModels/radiation/radiationModels/P1/P1.C
+++ b/src/thermophysicalModels/radiation/radiationModels/P1/P1.C
@@ -239,7 +239,7 @@ void Foam::radiation::P1::calculate()
fvm::laplacian(gamma, G_)
- fvm::Sp(a_, G_)
==
- - 4.0*(e_*physicoChemical::sigma*pow4(T_) + E_)
+ - 4.0*(e_*physicoChemical::sigma*pow4(T_) ) - E_
);
// Calculate radiative heat flux on boundaries.
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
index 4828bc072c200017d2d0c3481f14ff15230d3ff1..469710573999922239a333392e9a7c7bf78fade8 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
@@ -226,14 +226,11 @@ void Foam::radiation::fvDOM::initialise()
if (solarLoad_->nBands() > 1)
{
- FatalErrorIn
- (
- "const Foam::radiation::fvDOM::initialise()"
- )
+ FatalErrorInFunction
<< "Requested solar radiation with fvDOM. Using "
<< "more than one band for the solar load is not allowed"
<< abort(FatalError);
- }
+ }
Info<< "Creating Solar Load Model " << nl;
}
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
index 249f25d71620593553b760f9dc97eb3cbee30989..bbafadda84e8dea9f972b25658cf4c2ecb616a3a 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
@@ -196,7 +196,7 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay
IOobject::AUTO_WRITE
);
- // check if field exists and can be read
+ // Check if field exists and can be read
if (IHeader.headerOk())
{
ILambda_.set
@@ -251,7 +251,7 @@ Foam::radiation::radiativeIntensityRay::~radiativeIntensityRay()
Foam::scalar Foam::radiation::radiativeIntensityRay::correct()
{
- // reset boundary heat flux to zero
+ // Reset boundary heat flux to zero
Qr_.boundaryField() = 0.0;
scalar maxResidual = -GREAT;
@@ -293,8 +293,7 @@ Foam::scalar Foam::radiation::radiativeIntensityRay::correct()
(k - absorptionEmission_.aDisp(lambdaI))
*blackBody_.bLambda(lambdaI)
- + absorptionEmission_.ECont(lambdaI)
- + absorptionEmission_.EDisp(lambdaI)
+ + absorptionEmission_.E(lambdaI)/4
)
);
}
diff --git a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C
index 6699cc04cef14e61b8791e37e2cfa3d4031e00bc..5639f864fe53fc3cca2b8c5436d71a93ce09726f 100644
--- a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C
+++ b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C
@@ -270,11 +270,7 @@ Foam::radiation::radiationModel::absorptionEmission() const
{
if (!absorptionEmission_.valid())
{
- FatalErrorIn
- (
- "const Foam::radiation::absorptionEmissionModel&"
- "Foam::radiation::radiationModel::absorptionEmission() const"
- )
+ FatalErrorInFunction
<< "Requested radiation absorptionEmission model, but model is "
<< "not activate" << abort(FatalError);
}
@@ -288,11 +284,7 @@ Foam::radiation::radiationModel::soot() const
{
if (!soot_.valid())
{
- FatalErrorIn
- (
- "const Foam::radiation::sootModel&"
- "Foam::radiation::radiationModel::soot() const"
- )
+ FatalErrorInFunction
<< "Requested radiation sootModel model, but model is "
<< "not activate" << abort(FatalError);
}
@@ -306,12 +298,8 @@ Foam::radiation::radiationModel::transmissivity() const
{
if (!transmissivity_.valid())
{
- FatalErrorIn
- (
- "const Foam::radiation::transmissivityModel&"
- "Foam::radiation::radiationModel::transmissivity() const"
- )
- << "Requested radiation transmissivity model, but model is "
+ FatalErrorInFunction
+ << "Requested radiation sootModel model, but model is "
<< "not activate" << abort(FatalError);
}
diff --git a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C
index 6a7932ab29bcf5b9ec0bac3644444cde81c9c5a5..1622d6093e82e5b4ea2806971cc80119ede6109a 100644
--- a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C
+++ b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModelNew.C
@@ -62,10 +62,8 @@ Foam::radiation::radiationModel::New
if (cstrIter == TConstructorTablePtr_->end())
{
- FatalErrorIn
- (
- "radiationModel::New(const volScalarField&)"
- ) << "Unknown radiationModel type "
+ FatalErrorInFunction
+ << "Unknown radiationModel type "
<< modelType << nl << nl
<< "Valid radiationModel types are:" << nl
<< TConstructorTablePtr_->sortedToc()
@@ -92,10 +90,8 @@ Foam::radiation::radiationModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn
- (
- "radiationModel::New(const dictionary&, const volScalarField&)"
- ) << "Unknown radiationModel type "
+ FatalErrorInFunction
+ << "Unknown radiationModel type "
<< modelType << nl << nl
<< "Valid radiationModel types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
index 46c8e717a042b6bf63b7ca52bbbf12788c00a415..afd85ffcb2218444dbbb3ab88d469706e2b34f05 100644
--- a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
+++ b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
@@ -211,14 +211,11 @@ void Foam::radiation::viewFactor::initialise()
if (solarLoad_->nBands() > 1)
{
- FatalErrorIn
- (
- "const Foam::radiation::viewFactor::initialise()"
- )
+ FatalErrorInFunction
<< "Requested solar radiation with fvDOM. Using "
<< "more thant one band for the solar load is not allowed"
<< abort(FatalError);
- }
+ }
Info<< "Creating Solar Load Model " << nl;
}
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C
index a4ed016aab6b5bcc92cfd02f5bab78c018c0ec58..c509e25d9e718e3a063a790f8354611f9d1042f7 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C
@@ -44,10 +44,8 @@ Foam::radiation::absorptionEmissionModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn
- (
- "absorptionEmissionModel::New(const dictionary&, const fvMesh&)"
- ) << "Unknown absorptionEmissionModel type "
+ FatalErrorInFunction
+ << "Unknown absorptionEmissionModel type "
<< modelType << nl << nl
<< "Valid absorptionEmissionModel types are :" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
index 29cbf3241f6b5d4f616cf8e697830f975b23e13c..9b00735ac9b2669c0e10081cd141e9aa595e6810 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
@@ -66,14 +66,8 @@ Foam::radiation::greyMeanAbsorptionEmission::greyMeanAbsorptionEmission
{
if (!isA<basicSpecieMixture>(thermo_))
{
- FatalErrorIn
- (
- "radiation::greyMeanAbsorptionEmission::greyMeanAbsorptionEmission"
- "("
- "const dictionary&, "
- "const fvMesh&"
- ")"
- ) << "Model requires a multi-component thermo package"
+ FatalErrorInFunction
+ << "Model requires a multi-component thermo package"
<< abort(FatalError);
}
@@ -112,11 +106,8 @@ Foam::radiation::greyMeanAbsorptionEmission::greyMeanAbsorptionEmission
if (!mesh.foundObject<volScalarField>("ft"))
{
- FatalErrorIn
- (
- "Foam::radiation::greyMeanAbsorptionEmission(const"
- "dictionary& dict, const fvMesh& mesh)"
- ) << "specie ft is not present to use with "
+ FatalErrorInFunction
+ << "specie ft is not present to use with "
<< "lookUpTableFileName " << nl
<< exit(FatalError);
}
@@ -154,11 +145,8 @@ Foam::radiation::greyMeanAbsorptionEmission::greyMeanAbsorptionEmission
}
else
{
- FatalErrorIn
- (
- "Foam::radiation::greyMeanAbsorptionEmission(const"
- "dictionary& dict, const fvMesh& mesh)"
- ) << "specie: " << iter.key()
+ FatalErrorInFunction
+ << "specie: " << iter.key()
<< " is neither in look-up table: "
<< lookUpTablePtr_().tableName()
<< " nor is being solved" << nl
@@ -179,15 +167,11 @@ Foam::radiation::greyMeanAbsorptionEmission::greyMeanAbsorptionEmission
}
else
{
- FatalErrorIn
- (
- "Foam::radiation::greyMeanAbsorptionEmission(const"
- "dictionary& dict, const fvMesh& mesh)"
- ) << " there is not lookup table and the specie" << nl
+ FatalErrorInFunction
+ << " there is not lookup table and the specie" << nl
<< iter.key() << nl
<< " is not found " << nl
<< exit(FatalError);
-
}
}
}
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
index f6c424d76241cec767e4cd9cd894d9e4ef22c01d..00acfa12d6c5246c624ac573c307e1380001991a 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
@@ -96,15 +96,8 @@ greyMeanSolidAbsorptionEmission
{
if (!isA<basicSpecieMixture>(thermo_))
{
- FatalErrorIn
- (
- "radiation::greyMeanSolidAbsorptionEmission::"
- "greyMeanSolidAbsorptionEmission"
- "("
- "const dictionary&, "
- "const fvMesh&"
- ")"
- ) << "Model requires a multi-component thermo package"
+ FatalErrorInFunction
+ << "Model requires a multi-component thermo package"
<< abort(FatalError);
}
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
index afca1f9d539d7e54c3e8b35ee18083859821c2fd..f3a957b612c8fb2e9c9849b884210c2c51952e8c 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
@@ -94,11 +94,8 @@ Foam::radiation::wideBandAbsorptionEmission::wideBandAbsorptionEmission
{
if (!speciesNames_.found(key))
{
- FatalErrorIn
- (
- "Foam::radiation::wideBandAbsorptionEmission(const"
- "dictionary& dict, const fvMesh& mesh)"
- ) << "specie: " << key << "is not in all the bands"
+ FatalErrorInFunction
+ << "specie: " << key << "is not in all the bands"
<< nl << exit(FatalError);
}
}
diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C
index 61d101bae84d0c9ad7bd2c6e6078d58dd383739a..3fd5468da7137185b2eae7ce5e2b7b5a7782e184 100644
--- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C
+++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationProperties.C
@@ -118,11 +118,8 @@ emissivity(const label index, const label bandI) const
}
else
{
- FatalErrorIn
- (
- "Foam::radiation::boundaryRadiationProperties::"
- "emissivity(const label, const label)"
- ) << "Field 'boundaryRadiationProperties'"
+ FatalErrorInFunction
+ << "Field 'boundaryRadiationProperties'"
<< "is not found in the constant directory."
<< "Please add it "
<< exit(FatalError);
@@ -144,11 +141,8 @@ absorptivity(const label index, const label bandI) const
}
else
{
- FatalErrorIn
- (
- "Foam::radiation::boundaryRadiationProperties::"
- "absorptivity(const label, const label)"
- ) << "Field 'boundaryRadiationProperties'"
+ FatalErrorInFunction
+ << "Field 'boundaryRadiationProperties'"
<< "is not found in the constant directory."
<< "Please add it "
<< exit(FatalError);
@@ -170,11 +164,8 @@ transmissivity(const label index, const label bandI) const
}
else
{
- FatalErrorIn
- (
- "Foam::radiation::boundaryRadiationProperties::"
- "transmissivity(const label, const label)"
- ) << "Field 'boundaryRadiationProperties'"
+ FatalErrorInFunction
+ << "Field 'boundaryRadiationProperties'"
<< "is not found in the constant directory."
<< "Please add it "
<< exit(FatalError);
@@ -196,11 +187,8 @@ reflectivity(const label index, const label bandI) const
}
else
{
- FatalErrorIn
- (
- "Foam::radiation::boundaryRadiationProperties::"
- "reflectivity(const label, const label)"
- ) << "Field 'boundaryRadiationProperties'"
+ FatalErrorInFunction
+ << "Field 'boundaryRadiationProperties'"
<< "is not found in the constant directory."
<< "Please add it "
<< exit(FatalError);
diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C
index d2f76834f1cbb7f98b4b0170621ef84b9b5bb911..9f6951323c99249843187fecddd8313b1f7183b6 100644
--- a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C
+++ b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C
@@ -43,10 +43,8 @@ Foam::autoPtr<Foam::radiation::scatterModel> Foam::radiation::scatterModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn
- (
- "scatterModel::New(const dictionary&, const fvMesh&)"
- ) << "Unknown scatterModel type "
+ FatalErrorInFunction
+ << "Unknown scatterModel type "
<< modelType << nl << nl
<< "Valid scatterModel types are :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
index fbd5fcc9fb392e83e161e441d2fe091653debd65..08abcf2853a29b8b077694c9e9834f00d55ab1a0 100644
--- a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
+++ b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
@@ -169,10 +169,8 @@ void Foam::solarCalculator::init()
{
if (word(mesh_.ddtScheme("default")) == "steadyState")
{
- FatalErrorIn
- (
- "Foam::solarCalculator::init()"
- ) << " Sun direction model can not be sunDirtracking if the "
+ FatalErrorInFunction
+ << " Sun direction model can not be sunDirtracking if the "
<< " case is steady " << nl << exit(FatalError);
}
diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
index 9df8ce99d146616910e4177bc4568adc3fce3b70..444fd6c6495b1eea9aa1499dcc390417912b4138 100644
--- a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
+++ b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
@@ -45,15 +45,7 @@ Foam::radiation::mixtureFractionSoot<ThermoType>::checkThermo
}
else
{
- FatalErrorIn
- (
- "template<class ThermoType> "
- "Foam::radiation::mixtureFractionSoot "
- "("
- "const dictionary&, "
- "const fvMesh&"
- ")"
- )
+ FatalErrorInFunction
<< "Inconsistent thermo package for " << thermo.type()
<< "Please select a thermo package based on "
<< "singleStepReactingMixture" << exit(FatalError);
diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/sootModelNew.C b/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/sootModelNew.C
index 5b7601959388b05c99f3d1900ff593402165c4e3..c7807b4241104abdf8340c3522a55235e398eeab 100644
--- a/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/sootModelNew.C
+++ b/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/sootModelNew.C
@@ -49,10 +49,8 @@ Foam::radiation::sootModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn
- (
- "sootModel::New(const dictionary&, const fvMesh&)"
- ) << "Unknown sootModel type "
+ FatalErrorInFunction
+ << "Unknown sootModel type "
<< modelType << nl << nl
<< "Valid sootModel types are :" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
diff --git a/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModelNew.C b/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModelNew.C
index ed66cec6d63bc1a91b9d26e23e5595a9d563fb23..d976fc0652eb0b88851dfae94c9f92dd9eb49b61 100644
--- a/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModelNew.C
+++ b/src/thermophysicalModels/radiation/submodels/transmissivityModel/transmissivityModel/transmissivityModelNew.C
@@ -44,10 +44,8 @@ transmissivityModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn
- (
- "transmissivityModel::New(const dictionary&, const fvMesh&)"
- ) << "Unknown transmissivityModel type "
+ FatalErrorInFunction
+ << "Unknown transmissivityModel type "
<< modelType << nl << nl
<< "Valid transmissivityModel types are :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()