zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

src/finiteVolume: Update ...ErrorIn -> ...ErrorInFunction

Browse Source 
Avoids the clutter and maintenance effort associated with providing the
function signature string.
This commit is contained in:
Henry Weller
2015-11-10 16:55:03 +00:00
parent 78d7482e5b
commit 735ce9cce7
128 changed files with 492 additions and 1307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/finiteVolume/cfdTools/general/MRF/MRFZone.C
View File

@ -289,16 +289,7 @@ Foam::MRFZone::MRFZone
if (!cellZoneFound)
{
FatalErrorIn
(
"MRFZone"
"("
"const word&, "
"const fvMesh&, "
"const dictionary&, "
"const word&"
")"
)
FatalErrorInFunction
<< "cannot find MRF cellZone " << cellZoneName_
<< exit(FatalError);
}

8
src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C
View File

@ -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
@ -57,10 +57,8 @@ Foam::autoPtr<Foam::SRF::SRFModel> Foam::SRF::SRFModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
FatalErrorIn
(
"SRFModel::New(const fvMesh&)"
) << "Unknown SRFModel type "
FatalErrorInFunction
<< "Unknown SRFModel type "
<< modelType << nl << nl
<< "Valid SRFModel types are :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()

11
src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
View File

@ -103,15 +103,8 @@ bool Foam::adjustPhi
}
else if (mag(fixedMassOut - massIn)/totalFlux > 1e-8)
{
FatalErrorIn
(
"adjustPhi"
"("
"surfaceScalarField&, "
"const volVectorField&,"
"volScalarField&"
")"
) << "Continuity error cannot be removed by adjusting the"
FatalErrorInFunction
<< "Continuity error cannot be removed by adjusting the"
" outflow.\nPlease check the velocity boundary conditions"
" and/or run potentialFoam to initialise the outflow." << nl
<< "Total flux : " << totalFlux << nl

30
src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
View File

@ -52,16 +52,8 @@ void Foam::setRefCell
if (refCelli < 0 || refCelli >= field.mesh().nCells())
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"void Foam::setRefCell\n"
" (\n"
" const volScalarField&,\n"
" const volScalarField&,\n"
" const dictionary&,\n"
" label& scalar&,\n"
" bool\n"
")",
dict
) << "Illegal master cellID " << refCelli
<< ". Should be 0.." << field.mesh().nCells()
@ -95,16 +87,8 @@ void Foam::setRefCell
if (sumHasRef != 1)
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"void Foam::setRefCell\n"
" (\n"
" const volScalarField&,\n"
" const volScalarField&,\n"
" const dictionary&,\n"
" label& scalar&,\n"
" bool\n"
" )",
dict
) << "Unable to set reference cell for field " << field.name()
<< nl << " Reference point " << refPointName
@ -115,16 +99,8 @@ void Foam::setRefCell
}
else
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"void Foam::setRefCell\n"
" (\n"
" const volScalarField&,\n"
" const volScalarField&,\n"
" const dictionary&,\n"
" label& scalar&,\n"
" bool\n"
" )",
dict
) << "Unable to set reference cell for field " << field.name()
<< nl

4
src/finiteVolume/cfdTools/general/include/checkPatchFieldTypes.H
View File

@ -1,6 +1,6 @@
if (!isA<zeroGradientFvPatchScalarField>(k_.boundaryField()[patchi]))
{
FatalErrorIn("wall-function evaluation")
FatalErrorInFunction
<< k_.boundaryField()[patchi].type()
<< " is the wrong k patchField type for wall-functions on patch "
<< curPatch.name() << nl
@ -10,7 +10,7 @@ if (!isA<zeroGradientFvPatchScalarField>(k_.boundaryField()[patchi]))
if (!isA<zeroGradientFvPatchScalarField>(epsilon_.boundaryField()[patchi]))
{
FatalErrorIn("wall-function evaluation")
FatalErrorInFunction
<< epsilon_.boundaryField()[patchi].type()
<< " is the wrong epsilon patchField type for wall-functions on patch "
<< curPatch.name() << nl

24
src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -43,13 +43,8 @@ void Foam::porosityModel::adjustNegativeResistance(dimensionedVector& resist)
if (maxCmpt < 0)
{
FatalErrorIn
(
"void Foam::porosityModel::adjustNegativeResistance"
"("
"dimensionedVector&"
")"
) << "Negative resistances are invalid, resistance = " << resist
FatalErrorInFunction
<< "Negative resistances are invalid, resistance = " << resist
<< exit(FatalError);
}
else
@ -123,17 +118,8 @@ Foam::porosityModel::porosityModel
if (!foundZone && Pstream::master())
{
FatalErrorIn
(
"Foam::porosityModel::porosityModel"
"("
"const word&, "
"const word&, "
"const fvMesh&, "
"const dictionary&"
"const word&, "
")"
) << "cannot find porous cellZone " << zoneName_
FatalErrorInFunction
<< "cannot find porous cellZone " << zoneName_
<< exit(FatalError);
}
}

13
src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -45,16 +45,7 @@ Foam::autoPtr<Foam::porosityModel> Foam::porosityModel::New
if (cstrIter == meshConstructorTablePtr_->end())
{
FatalErrorIn
(
"porosityModel::New"
"("
"const word&, "
"const fvMesh&, "
"const dictionary&, "
"const word&"
")"
)
FatalErrorInFunction
<< "Unknown " << typeName << " type " << modelType << nl << nl
<< "Valid " << typeName << " types are:" << nl
<< meshConstructorTablePtr_->sortedToc()

4
src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
View File

@ -81,7 +81,7 @@ void Foam::solutionControl::read(const bool absTolOnly)
}
else
{
FatalErrorIn("bool Foam::solutionControl::read()")
FatalErrorInFunction
<< "Residual data for " << iter().keyword()
<< " must be specified as a dictionary"
<< exit(FatalError);
@ -107,7 +107,7 @@ void Foam::solutionControl::read(const bool absTolOnly)
}
else
{
FatalErrorIn("bool Foam::solutionControl::read()")
FatalErrorInFunction
<< "Residual data for " << iter().keyword()
<< " must be specified as a dictionary"
<< exit(FatalError);

36
src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -147,12 +147,8 @@ Foam::calculatedFvPatchField<Type>::valueInternalCoeffs
const tmp<scalarField>&
) const
{
FatalErrorIn
(
"calculatedFvPatchField<Type>::"
"valueInternalCoeffs(const tmp<scalarField>&) const"
) << "\n "
"valueInternalCoeffs cannot be called for a calculatedFvPatchField"
FatalErrorInFunction
<< "cannot be called for a calculatedFvPatchField"
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
@ -171,12 +167,8 @@ Foam::calculatedFvPatchField<Type>::valueBoundaryCoeffs
const tmp<scalarField>&
) const
{
FatalErrorIn
(
"calculatedFvPatchField<Type>::"
"valueBoundaryCoeffs(const tmp<scalarField>&) const"
) << "\n "
"valueBoundaryCoeffs cannot be called for a calculatedFvPatchField"
FatalErrorInFunction
<< "cannot be called for a calculatedFvPatchField"
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
@ -192,13 +184,8 @@ template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::calculatedFvPatchField<Type>::gradientInternalCoeffs() const
{
FatalErrorIn
(
"calculatedFvPatchField<Type>::"
"gradientInternalCoeffs() const"
) << "\n "
"gradientInternalCoeffs cannot be called for a "
"calculatedFvPatchField"
FatalErrorInFunction
<< "cannot be called for a calculatedFvPatchField"
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
@ -214,13 +201,8 @@ template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::calculatedFvPatchField<Type>::gradientBoundaryCoeffs() const
{
FatalErrorIn
(
"calculatedFvPatchField<Type>::"
"gradientBoundaryCoeffs() const"
) << "\n "
"gradientBoundaryCoeffs cannot be called for a "
"calculatedFvPatchField"
FatalErrorInFunction
<< "cannot be called for a calculatedFvPatchField"
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()

14
src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -58,16 +58,8 @@ Foam::directionMixedFvPatchField<Type>::directionMixedFvPatchField
{
if (notNull(iF) && mapper.hasUnmapped())
{
WarningIn
(
"directionMixedFvPatchField<Type>::directionMixedFvPatchField\n"
"(\n"
" const directionMixedFvPatchField<Type>&,\n"
" const fvPatch&,\n"
" const DimensionedField<Type, volMesh>&,\n"
" const fvPatchFieldMapper&\n"
")\n"
) << "On field " << iF.name() << " patch " << p.name()
WarningInFunction
<< "On field " << iF.name() << " patch " << p.name()
<< " patchField " << this->type()
<< " : mapper does not map all values." << nl
<< " To avoid this warning fully specify the mapping in derived"

14
src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -59,16 +59,8 @@ fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
{
if (notNull(iF) && mapper.hasUnmapped())
{
WarningIn
(
"fixedGradientFvPatchField<Type>::fixedGradientFvPatchField\n"
"(\n"
" const fixedGradientFvPatchField<Type>&,\n"
" const fvPatch&,\n"
" const DimensionedField<Type, volMesh>&,\n"
" const fvPatchFieldMapper&\n"
")\n"
) << "On field " << iF.name() << " patch " << p.name()
WarningInFunction
<< "On field " << iF.name() << " patch " << p.name()
<< " patchField " << this->type()
<< " : mapper does not map all values." << nl
<< " To avoid this warning fully specify the mapping in derived"

14
src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -68,16 +68,8 @@ fixedValueFvPatchField<Type>::fixedValueFvPatchField
{
if (notNull(iF) && mapper.hasUnmapped())
{
WarningIn
(
"fixedValueFvPatchField<Type>::fixedValueFvPatchField\n"
"(\n"
" const fixedValueFvPatchField<Type>&,\n"
" const fvPatch&,\n"
" const DimensionedField<Type, volMesh>&,\n"
" const fvPatchFieldMapper&\n"
")\n"
) << "On field " << iF.name() << " patch " << p.name()
WarningInFunction
<< "On field " << iF.name() << " patch " << p.name()
<< " patchField " << this->type()
<< " : mapper does not map all values." << nl
<< " To avoid this warning fully specify the mapping in derived"

14
src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -62,16 +62,8 @@ mixedFvPatchField<Type>::mixedFvPatchField
{
if (notNull(iF) && mapper.hasUnmapped())
{
WarningIn
(
"mixedFvPatchField<Type>::mixedFvPatchField\n"
"(\n"
" const mixedFvPatchField<Type>&,\n"
" const fvPatch&,\n"
" const DimensionedField<Type, volMesh>&,\n"
" const fvPatchFieldMapper&\n"
")\n"
) << "On field " << iF.name() << " patch " << p.name()
WarningInFunction
<< "On field " << iF.name() << " patch " << p.name()
<< " patchField " << this->type()
<< " : mapper does not map all values." << nl
<< " To avoid this warning fully specify the mapping in derived"

21
src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -59,16 +59,7 @@ cyclicFvPatchField<Type>::cyclicFvPatchField
{
if (!isA<cyclicFvPatch>(this->patch()))
{
FatalErrorIn
(
"cyclicFvPatchField<Type>::cyclicFvPatchField"
"("
"const cyclicFvPatchField<Type>& ,"
"const fvPatch&, "
"const DimensionedField<Type, volMesh>&, "
"const fvPatchFieldMapper&"
")"
) << " patch type '" << p.type()
FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
@ -91,14 +82,8 @@ cyclicFvPatchField<Type>::cyclicFvPatchField
{
if (!isA<cyclicFvPatch>(p))
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"cyclicFvPatchField<Type>::cyclicFvPatchField"
"("
"const fvPatch&, "
"const Field<Type>&, "
"const dictionary&"
")",
dict
) << " patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"

21
src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -56,16 +56,7 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
{
if (!isA<cyclicACMIFvPatch>(this->patch()))
{
FatalErrorIn
(
"cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField"
"("
"const cyclicACMIFvPatchField<Type>& ,"
"const fvPatch&, "
"const DimensionedField<Type, volMesh>&, "
"const fvPatchFieldMapper&"
")"
) << " patch type '" << p.type()
FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
@ -89,14 +80,8 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
{
if (!isA<cyclicACMIFvPatch>(p))
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField"
"("
"const fvPatch&, "
"const DimensionedField<Type, volMesh>&, "
"const dictionary&"
")",
dict
) << " patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"

21
src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -53,16 +53,7 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
{
if (!isA<cyclicAMIFvPatch>(this->patch()))
{
FatalErrorIn
(
"cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField"
"("
"const cyclicAMIFvPatchField<Type>& ,"
"const fvPatch&, "
"const DimensionedField<Type, volMesh>&, "
"const fvPatchFieldMapper&"
")"
) << " patch type '" << p.type()
FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
@ -86,14 +77,8 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
{
if (!isA<cyclicAMIFvPatch>(p))
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField"
"("
"const fvPatch&, "
"const DimensionedField<Type, volMesh>&, "
"const dictionary&"
")",
dict
) << " patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"

59
src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C
View File

@ -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
@ -26,15 +26,10 @@ License
#include "emptyFvPatchField.H"
#include "fvPatchFieldMapper.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
emptyFvPatchField<Type>::emptyFvPatchField
Foam::emptyFvPatchField<Type>::emptyFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@ -45,7 +40,7 @@ emptyFvPatchField<Type>::emptyFvPatchField
template<class Type>
emptyFvPatchField<Type>::emptyFvPatchField
Foam::emptyFvPatchField<Type>::emptyFvPatchField
(
const emptyFvPatchField<Type>&,
const fvPatch& p,
@ -57,16 +52,7 @@ emptyFvPatchField<Type>::emptyFvPatchField
{
if (!isType<emptyFvPatch>(p))
{
FatalErrorIn
(
"emptyFvPatchField<Type>::emptyFvPatchField\n"
"(\n"
" const emptyFvPatchField<Type>&,\n"
" const fvPatch& p,\n"
" const DimensionedField<Type, volMesh>& iF,\n"
" const fvPatchFieldMapper& mapper\n"
")\n"
) << "\n patch type '" << p.type()
FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
@ -77,7 +63,7 @@ emptyFvPatchField<Type>::emptyFvPatchField
template<class Type>
emptyFvPatchField<Type>::emptyFvPatchField
Foam::emptyFvPatchField<Type>::emptyFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
@ -88,14 +74,8 @@ emptyFvPatchField<Type>::emptyFvPatchField
{
if (!isType<emptyFvPatch>(p))
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"emptyFvPatchField<Type>::emptyFvPatchField\n"
"(\n"
" const fvPatch& p,\n"
" const Field<Type>& field,\n"
" const dictionary& dict\n"
")\n",
dict
) << "\n patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"
@ -108,7 +88,7 @@ emptyFvPatchField<Type>::emptyFvPatchField
template<class Type>
emptyFvPatchField<Type>::emptyFvPatchField
Foam::emptyFvPatchField<Type>::emptyFvPatchField
(
const emptyFvPatchField<Type>& ptf
)
@ -123,7 +103,7 @@ emptyFvPatchField<Type>::emptyFvPatchField
template<class Type>
emptyFvPatchField<Type>::emptyFvPatchField
Foam::emptyFvPatchField<Type>::emptyFvPatchField
(
const emptyFvPatchField<Type>& ptf,
const DimensionedField<Type, volMesh>& iF
@ -136,28 +116,11 @@ emptyFvPatchField<Type>::emptyFvPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
void emptyFvPatchField<Type>::updateCoeffs()
void Foam::emptyFvPatchField<Type>::updateCoeffs()
{
//- Check moved to checkMesh. Test here breaks down if multiple empty
// patches.
//if
//(
// this->patch().patch().size()
// % this->dimensionedInternalField().mesh().nCells()
//)
//{
// FatalErrorIn("emptyFvPatchField<Type>::updateCoeffs()")
// << "This mesh contains patches of type empty but is not"
// << "1D or 2D\n"
// " by virtue of the fact that the number of faces of this\n"
// " empty patch is not divisible by the number of cells."
// << exit(FatalError);
//}
// Check moved to checkMesh.
// Test here fails if multiple empty patches.
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* //

41
src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -88,16 +88,7 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
{
if (!isA<processorFvPatch>(this->patch()))
{
FatalErrorIn
(
"processorFvPatchField<Type>::processorFvPatchField\n"
"(\n"
" const processorFvPatchField<Type>& ptf,\n"
" const fvPatch& p,\n"
" const DimensionedField<Type, volMesh>& iF,\n"
" const fvPatchFieldMapper& mapper\n"
")\n"
) << "\n patch type '" << p.type()
FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
@ -106,7 +97,7 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
}
if (debug && !ptf.ready())
{
FatalErrorIn("processorFvPatchField<Type>::processorFvPatchField(..)")
FatalErrorInFunction
<< "On patch " << procPatch_.name() << " outstanding request."
<< abort(FatalError);
}
@ -132,14 +123,8 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
{
if (!isA<processorFvPatch>(p))
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"processorFvPatchField<Type>::processorFvPatchField\n"
"(\n"
" const fvPatch& p,\n"
" const Field<Type>& field,\n"
" const dictionary& dict\n"
")\n",
dict
) << "\n patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"
@ -169,7 +154,7 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
{
if (debug && !ptf.ready())
{
FatalErrorIn("processorFvPatchField<Type>::processorFvPatchField(..)")
FatalErrorInFunction
<< "On patch " << procPatch_.name() << " outstanding request."
<< abort(FatalError);
}
@ -194,7 +179,7 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
{
if (debug && !ptf.ready())
{
FatalErrorIn("processorFvPatchField<Type>::processorFvPatchField(..)")
FatalErrorInFunction
<< "On patch " << procPatch_.name() << " outstanding request."
<< abort(FatalError);
}
@ -216,7 +201,7 @@ Foam::processorFvPatchField<Type>::patchNeighbourField() const
{
if (debug && !this->ready())
{
FatalErrorIn("processorFvPatchField<Type>::patchNeighbourField()")
FatalErrorInFunction
<< "On patch " << procPatch_.name()
<< " outstanding request."
<< abort(FatalError);
@ -333,10 +318,8 @@ void Foam::processorFvPatchField<Type>::initInterfaceMatrixUpdate
// Fast path.
if (debug && !this->ready())
{
FatalErrorIn
(
"processorFvPatchField<Type>::initInterfaceMatrixUpdate(..)"
) << "On patch " << procPatch_.name()
FatalErrorInFunction
<< "On patch " << procPatch_.name()
<< " outstanding request."
<< abort(FatalError);
}
@ -454,10 +437,8 @@ void Foam::processorFvPatchField<Type>::initInterfaceMatrixUpdate
// Fast path.
if (debug && !this->ready())
{
FatalErrorIn
(
"processorFvPatchField<Type>::initInterfaceMatrixUpdate(..)"
) << "On patch " << procPatch_.name()
FatalErrorInFunction
<< "On patch " << procPatch_.name()
<< " outstanding request."
<< abort(FatalError);
}

8
src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -49,10 +49,8 @@ void processorFvPatchField<scalar>::initInterfaceMatrixUpdate
// Fast path.
if (debug && !this->ready())
{
FatalErrorIn
(
"processorFvPatchField<scalar>::initInterfaceMatrixUpdate(..)"
) << "On patch " << procPatch_.name()
FatalErrorInFunction
<< "On patch " << procPatch_.name()
<< " outstanding request."
<< abort(FatalError);
}

32
src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -72,16 +72,7 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
{
if (!isType<processorCyclicFvPatch>(this->patch()))
{
FatalErrorIn
(
"processorCyclicFvPatchField<Type>::processorCyclicFvPatchField\n"
"(\n"
" const processorCyclicFvPatchField<Type>& ptf,\n"
" const fvPatch& p,\n"
" const DimensionedField<Type, volMesh>& iF,\n"
" const fvPatchFieldMapper& mapper\n"
")\n"
) << "\n patch type '" << p.type()
FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
@ -105,14 +96,8 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
{
if (!isType<processorCyclicFvPatch>(p))
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"processorCyclicFvPatchField<Type>::processorCyclicFvPatchField\n"
"(\n"
" const fvPatch& p,\n"
" const Field<Type>& field,\n"
" const dictionary& dict\n"
")\n",
dict
) << "\n patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"
@ -124,15 +109,8 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
if (Pstream::defaultCommsType == Pstream::scheduled)
{
WarningIn
(
"processorCyclicFvPatchField<Type>::processorCyclicFvPatchField\n"
"(\n"
" const fvPatch& p,\n"
" const DimensionedField<Type, volMesh>& iF,\n"
" const dictionary& dict\n"
")\n"
) << "Scheduled communication with split cyclics not supported."
WarningInFunction
<< "Scheduled communication with split cyclics not supported."
<< endl;
}
}

21
src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C
View File

@ -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
@ -56,16 +56,7 @@ symmetryFvPatchField<Type>::symmetryFvPatchField
{
if (!isType<symmetryFvPatch>(this->patch()))
{
FatalErrorIn
(
"symmetryFvPatchField<Type>::symmetryFvPatchField\n"
"(\n"
" const symmetryFvPatchField<Type>& ptf,\n"
" const fvPatch& p,\n"
" const DimensionedField<Type, volMesh>& iF,\n"
" const fvPatchFieldMapper& mapper\n"
")\n"
) << "\n patch type '" << p.type()
FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
@ -87,14 +78,8 @@ symmetryFvPatchField<Type>::symmetryFvPatchField
{
if (!isType<symmetryFvPatch>(p))
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"symmetryFvPatchField<Type>::symmetryFvPatchField\n"
"(\n"
" const fvPatch& p,\n"
" const Field<Type>& field,\n"
" const dictionary& dict\n"
")\n",
dict
) << "\n patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"

21
src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -54,16 +54,7 @@ Foam::symmetryPlaneFvPatchField<Type>::symmetryPlaneFvPatchField
{
if (!isType<symmetryPlaneFvPatch>(this->patch()))
{
FatalErrorIn
(
"symmetryPlaneFvPatchField<Type>::symmetryPlaneFvPatchField\n"
"(\n"
" const symmetryPlaneFvPatchField<Type>& ptf,\n"
" const fvPatch& p,\n"
" const DimensionedField<Type, volMesh>& iF,\n"
" const fvPatchFieldMapper& mapper\n"
")\n"
) << "\n patch type '" << p.type()
FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
@ -86,14 +77,8 @@ Foam::symmetryPlaneFvPatchField<Type>::symmetryPlaneFvPatchField
{
if (!isType<symmetryPlaneFvPatch>(p))
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"symmetryPlaneFvPatchField<Type>::symmetryPlaneFvPatchField\n"
"(\n"
" const fvPatch& p,\n"
" const Field<Type>& field,\n"
" const dictionary& dict\n"
")\n",
dict
) << "\n patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"

21
src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C
View File

@ -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
@ -56,16 +56,7 @@ Foam::wedgeFvPatchField<Type>::wedgeFvPatchField
{
if (!isType<wedgeFvPatch>(this->patch()))
{
FatalErrorIn
(
"wedgeFvPatchField<Type>::wedgeFvPatchField\n"
"(\n"
" const wedgeFvPatchField<Type>& ptf,\n"
" const fvPatch& p,\n"
" const DimensionedField<Type, volMesh>& iF,\n"
" const fvPatchFieldMapper& mapper\n"
")\n"
) << "\n patch type '" << p.type()
FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
@ -87,14 +78,8 @@ Foam::wedgeFvPatchField<Type>::wedgeFvPatchField
{
if (!isType<wedgeFvPatch>(p))
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"wedgeFvPatchField<Type>::wedgeFvPatchField\n"
"(\n"
" const fvPatch& p,\n"
" const Field<Type>& field,\n"
" dictionary& dict\n"
")\n",
dict
) << "\n patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"

19
src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
View File

@ -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
@ -106,15 +106,8 @@ Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
if (lInf_ < 0.0)
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"advectiveFvPatchField<Type>::"
"advectiveFvPatchField"
"("
"const fvPatch&, "
"const DimensionedField<Type, volMesh>&, "
"const dictionary&"
")",
dict
) << "unphysical lInf specified (lInf < 0)" << nl
<< " on patch " << this->patch().name()
@ -252,8 +245,7 @@ void Foam::advectiveFvPatchField<Type>::updateCoeffs()
}
else
{
FatalErrorIn("advectiveFvPatchField<Type>::updateCoeffs()")
<< " Unsupported temporal differencing scheme : "
FatalErrorInFunction
<< ddtScheme << nl
<< " on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
@ -285,10 +277,7 @@ void Foam::advectiveFvPatchField<Type>::updateCoeffs()
}
else
{
FatalErrorIn
(
"advectiveFvPatchField<Type>::updateCoeffs()"
) << " Unsupported temporal differencing scheme : "
FatalErrorInFunction
<< ddtScheme
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()

35
src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -280,12 +280,7 @@ void Foam::externalCoupledMixedFvPatchField<Type>::wait() const
{
if (totalTime > timeOut_)
{
FatalErrorIn
(
"void "
"Foam::externalCoupledMixedFvPatchField<Type>::wait() "
"const"
)
FatalErrorInFunction
<< "Wait time exceeded time out time of " << timeOut_
<< " s" << abort(FatalError);
}
@ -327,14 +322,7 @@ void Foam::externalCoupledMixedFvPatchField<Type>::initialiseRead
{
if (!is.good())
{
FatalErrorIn
(
"void Foam::externalCoupledMixedFvPatchField<Type>::"
"initialiseRead"
"("
"IFstream&"
") const"
)
FatalErrorInFunction
<< "Unable to open data transfer file " << is.name()
<< " for patch " << this->patch().name()
<< exit(FatalError);
@ -352,14 +340,7 @@ void Foam::externalCoupledMixedFvPatchField<Type>::initialiseRead
}
else
{
FatalErrorIn
(
"void Foam::externalCoupledMixedFvPatchField<Type>::"
"initialiseRead"
"("
"IFstream&"
") const"
)
FatalErrorInFunction
<< "Unable to scan forward to appropriate read position for "
<< "data transfer file " << is.name()
<< " for patch " << this->patch().name()
@ -394,13 +375,7 @@ void Foam::externalCoupledMixedFvPatchField<Type>::readData
}
else
{
FatalErrorIn
(
"void Foam::externalCoupledMixedFvPatchField<Type>::readData"
"("
"const fileName&"
")"
)
FatalErrorInFunction
<< "Insufficient data for patch "
<< this->patch().name()
<< " in file " << is.name()

4
src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -148,7 +148,7 @@ void Foam::fanPressureFvPatchScalarField::updateCoeffs()
}
else
{
FatalErrorIn("fanPressureFvPatchScalarField::updateCoeffs()")
FatalErrorInFunction
<< "dimensions of phi are not correct"
<< "\n on patch " << patch().name()
<< " of field " << dimensionedInternalField().name()

4
src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -148,7 +148,7 @@ void Foam::fixedFluxPressureFvPatchScalarField::updateCoeffs()
if (curTimeIndex_ != this->db().time().timeIndex())
{
FatalErrorIn("fixedFluxPressureFvPatchScalarField::updateCoeffs()")
FatalErrorInFunction
<< "updateCoeffs(const scalarField& snGradp) MUST be called before"
" updateCoeffs() or evaluate() to set the boundary gradient."
<< exit(FatalError);

14
src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -88,12 +88,8 @@ flowRateInletVelocityFvPatchVectorField
}
else
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"flowRateInletVelocityFvPatchVectorField::"
"flowRateInletVelocityFvPatchVectorField"
"(const fvPatch&, const DimensionedField<vector, volMesh>&,"
" const dictionary&)",
dict
) << "Please supply either 'volumetricFlowRate' or"
<< " 'massFlowRate' and 'rho'" << exit(FatalIOError);
@ -179,10 +175,8 @@ void Foam::flowRateInletVelocityFvPatchVectorField::updateCoeffs()
// Use constant density
if (rhoInlet_ < 0)
{
FatalErrorIn
(
"flowRateInletVelocityFvPatchVectorField::updateCoeffs()"
) << "Did not find registered density field " << rhoName_
FatalErrorInFunction
<< "Did not find registered density field " << rhoName_
<< " and no constant density 'rhoInlet' specified"
<< exit(FatalError);
}

7
src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -124,10 +124,7 @@ void Foam::fluxCorrectedVelocityFvPatchVectorField::evaluate
}
else
{
FatalErrorIn
(
"fluxCorrectedVelocityFvPatchVectorField::evaluate()"
)
FatalErrorInFunction
<< "dimensions of phi are incorrect\n"
<< " on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()

2
src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C
View File

@ -141,7 +141,7 @@ void Foam::freestreamPressureFvPatchScalarField::updateCoeffs()
}
else
{
FatalErrorIn("freestreamPressureFvPatchScalarField::updateCoeffs()")
FatalErrorInFunction
<< "dimensions of phi are not correct"
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()

14
src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -243,10 +243,8 @@ tmp<Field<Type> > mappedPatchFieldBase<Type>::mappedField() const
if (nbrPatchID < 0)
{
FatalErrorIn
(
"void mappedPatchFieldBase<Type>::updateCoeffs()"
)<< "Unable to find sample patch " << mapper_.samplePatch()
FatalErrorInFunction
<< "Unable to find sample patch " << mapper_.samplePatch()
<< " in region " << mapper_.sampleRegion()
<< " for patch " << patchField_.patch().name() << nl
<< abort(FatalError);
@ -284,10 +282,8 @@ tmp<Field<Type> > mappedPatchFieldBase<Type>::mappedField() const
}
default:
{
FatalErrorIn
(
"mappedPatchFieldBase<Type>::updateCoeffs()"
)<< "Unknown sampling mode: " << mapper_.mode()
FatalErrorInFunction
<< "Unknown sampling mode: " << mapper_.mode()
<< nl << abort(FatalError);
}
}

10
src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -121,10 +121,8 @@ void Foam::mappedFixedInternalValueFvPatchField<Type>::updateCoeffs()
{
case mappedPatchBase::NEARESTCELL:
{
FatalErrorIn
(
"void mappedFixedValueFvPatchField<Type>::updateCoeffs()"
) << "Cannot apply "
FatalErrorInFunction
<< "Cannot apply "
<< mappedPatchBase::sampleModeNames_
[
mappedPatchBase::NEARESTCELL
@ -171,7 +169,7 @@ void Foam::mappedFixedInternalValueFvPatchField<Type>::updateCoeffs()
}
default:
{
FatalErrorIn("mappedFixedValueFvPatchField<Type>::updateCoeffs()")
FatalErrorInFunction
<< "Unknown sampling mode: " << mpp.mode()
<< abort(FatalError);
}

7
src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -107,10 +107,7 @@ const mappedPatchBase& mappedFixedValueFvPatchField<Type>::mapper
{
if (!isA<mappedPatchBase>(p.patch()))
{
FatalErrorIn
(
"mappedFixedValueFvPatchField<Type>::mapper()"
) << "\n patch type '" << p.patch().type()
FatalErrorInFunction
<< "' not type '" << mappedPatchBase::typeName << "'"
<< "\n for patch " << p.patch().name()
<< " of field " << iF.name()

8
src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C
View File

@ -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
@ -165,10 +165,8 @@ void Foam::mappedFlowRateFvPatchVectorField::updateCoeffs()
}
else
{
FatalErrorIn
(
"mappedFlowRateFvPatchVectorField::updateCoeffs()"
) << "dimensions of " << phiName_ << " are incorrect" << nl
FatalErrorInFunction
<< "dimensions of " << phiName_ << " are incorrect" << nl
<< " on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()

46
src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
View File

@ -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
@ -59,17 +59,8 @@ mappedVelocityFluxFixedValueFvPatchField
{
if (!isA<mappedPatchBase>(this->patch().patch()))
{
FatalErrorIn
(
"mappedVelocityFluxFixedValueFvPatchField::"
"mappedVelocityFluxFixedValueFvPatchField"
"("
"const mappedVelocityFluxFixedValueFvPatchField&, "
"const fvPatch&, "
"const DimensionedField<vector, volMesh>&, "
"const fvPatchFieldMapper&"
")"
) << "Patch type '" << p.type()
FatalErrorInFunction
<< "Patch type '" << p.type()
<< "' not type '" << mappedPatchBase::typeName << "'"
<< " for patch " << p.name()
<< " of field " << dimensionedInternalField().name()
@ -92,16 +83,8 @@ mappedVelocityFluxFixedValueFvPatchField
{
if (!isA<mappedPatchBase>(this->patch().patch()))
{
FatalErrorIn
(
"mappedVelocityFluxFixedValueFvPatchField::"
"mappedVelocityFluxFixedValueFvPatchField"
"("
"const fvPatch&, "
"const DimensionedField<vector, volMesh>&, "
"const dictionary&"
")"
) << "Patch type '" << p.type()
FatalErrorInFunction
<< "Patch type '" << p.type()
<< "' not type '" << mappedPatchBase::typeName << "'"
<< " for patch " << p.name()
<< " of field " << dimensionedInternalField().name()
@ -115,16 +98,8 @@ mappedVelocityFluxFixedValueFvPatchField
);
if (mpp.mode() == mappedPolyPatch::NEARESTCELL)
{
FatalErrorIn
(
"mappedVelocityFluxFixedValueFvPatchField::"
"mappedVelocityFluxFixedValueFvPatchField"
"("
"const fvPatch&, "
"const DimensionedField<vector, volMesh>&, "
"const dictionary&"
")"
) << "Patch " << p.name()
FatalErrorInFunction
<< "Patch " << p.name()
<< " of type '" << p.type()
<< "' can not be used in 'nearestCell' mode"
<< " of field " << dimensionedInternalField().name()
@ -234,11 +209,8 @@ void Foam::mappedVelocityFluxFixedValueFvPatchField::updateCoeffs()
}
default:
{
FatalErrorIn
(
"mappedVelocityFluxFixedValueFvPatchField::"
"updateCoeffs()"
) << "patch can only be used in NEARESTPATCHFACE, "
FatalErrorInFunction
<< "patch can only be used in NEARESTPATCHFACE, "
<< "NEARESTPATCHFACEAMI or NEARESTFACE mode" << nl
<< abort(FatalError);
}

8
src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
View File

@ -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
@ -126,10 +126,8 @@ void Foam::outletMappedUniformInletFvPatchField<Type>::updateCoeffs()
if (outletPatchID < 0)
{
FatalErrorIn
(
"void outletMappedUniformInletFvPatchField<Type>::updateCoeffs()"
) << "Unable to find outlet patch " << outletPatchName_
FatalErrorInFunction
<< "Unable to find outlet patch " << outletPatchName_
<< abort(FatalError);
}

9
src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
View File

@ -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
@ -169,11 +169,8 @@ void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::updateCoeffs()
}
else
{
FatalErrorIn
(
"pressureDirectedInletOutletVelocityFvPatchVectorField::"
"updateCoeffs()"
) << "dimensions of phi are not correct"
FatalErrorInFunction
<< "dimensions of phi are not correct"
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()

8
src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C
View File

@ -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
@ -162,10 +162,8 @@ void Foam::pressureDirectedInletVelocityFvPatchVectorField::updateCoeffs()
}
else
{
FatalErrorIn
(
"pressureDirectedInletVelocityFvPatchVectorField::updateCoeffs()"
) << "dimensions of phi are not correct"
FatalErrorInFunction
<< "dimensions of phi are not correct"
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()

9
src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -143,11 +143,8 @@ void Foam::pressureInletOutletParSlipVelocityFvPatchVectorField::updateCoeffs()
}
else
{
FatalErrorIn
(
"pressureInletOutletParSlipVelocityFvPatchVectorField::"
"updateCoeffs()"
) << "dimensions of phi are not correct" << nl
FatalErrorInFunction
<< "dimensions of phi are not correct" << nl
<< " on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()

4
src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C
View File

@ -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
@ -130,7 +130,7 @@ void Foam::pressureInletVelocityFvPatchVectorField::updateCoeffs()
}
else
{
FatalErrorIn("pressureInletVelocityFvPatchVectorField::updateCoeffs()")
FatalErrorInFunction
<< "dimensions of phi are not correct"
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()

9
src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
View File

@ -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
@ -139,11 +139,8 @@ void Foam::pressureNormalInletOutletVelocityFvPatchVectorField::updateCoeffs()
}
else
{
FatalErrorIn
(
"pressureNormalInletOutletVelocityFvPatchVectorField::"
"updateCoeffs()"
) << "dimensions of phi are not correct"
FatalErrorInFunction
<< "dimensions of phi are not correct"
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()

18
src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -107,11 +107,8 @@ supersonicFreestreamFvPatchVectorField
if (pInf_ < SMALL)
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"supersonicFreestreamFvPatchVectorField::"
"supersonicFreestreamFvPatchVectorField"
"(const fvPatch&, const vectorField&, const dictionary&)",
dict
) << " unphysical pInf specified (pInf <= 0.0)"
<< "\n on patch " << this->patch().name()
@ -183,10 +180,7 @@ void Foam::supersonicFreestreamFvPatchVectorField::updateCoeffs()
if (MachInf < 1.0)
{
FatalErrorIn
(
"supersonicFreestreamFvPatchVectorField::updateCoeffs()"
) << " MachInf < 1.0, free stream must be supersonic"
FatalErrorInFunction
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
@ -283,10 +277,8 @@ void Foam::supersonicFreestreamFvPatchVectorField::updateCoeffs()
}
else // If subsonic
{
FatalErrorIn
(
"supersonicFreestreamFvPatchVectorField::updateCoeffs()"
) << "unphysical subsonic inflow has been generated"
FatalErrorInFunction
<< "unphysical subsonic inflow has been generated"
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file "

8
src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
View File

@ -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
@ -155,10 +155,8 @@ void Foam::swirlFlowRateInletVelocityFvPatchVectorField::updateCoeffs()
}
else
{
FatalErrorIn
(
"swirlFlowRateInletVelocityFvPatchVectorField::updateCoeffs()"
) << "dimensions of " << phiName_ << " are incorrect" << nl
FatalErrorInFunction
<< "dimensions of " << phiName_ << " are incorrect" << nl
<< " on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()

2
src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
View File

@ -213,7 +213,7 @@ void Foam::syringePressureFvPatchScalarField::updateCoeffs()
}
else
{
FatalErrorIn("syringePressureFvPatchScalarField::updateCoeffs()")
FatalErrorInFunction
<< "dimensions of phi are not correct"
<< "\n on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()

31
src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -127,15 +127,8 @@ timeVaryingMappedFixedValueFvPatchField
&& mapMethod_ != "nearest"
)
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"timeVaryingMappedFixedValueFvPatchField<Type>::\n"
"timeVaryingMappedFixedValueFvPatchField\n"
"(\n"
" const fvPatch&\n"
" const DimensionedField<Type, volMesh>&\n"
" const dictionary&\n"
")\n",
dict
) << "mapMethod should be one of 'planarInterpolation'"
<< ", 'nearest'" << exit(FatalIOError);
@ -339,10 +332,8 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
if (!foundTime)
{
FatalErrorIn
(
"timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()"
) << "Cannot find starting sampling values for current time "
FatalErrorInFunction
<< "Cannot find starting sampling values for current time "
<< this->db().time().value() << nl
<< "Have sampling values for times "
<< pointToPointPlanarInterpolation::timeNames(sampleTimes_) << nl
@ -405,11 +396,8 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
if (vals.size() != mapperPtr_().sourceSize())
{
FatalErrorIn
(
"timeVaryingMappedFixedValueFvPatchField<Type>::"
"checkTable()"
) << "Number of values (" << vals.size()
FatalErrorInFunction
<< "Number of values (" << vals.size()
<< ") differs from the number of points ("
<< mapperPtr_().sourceSize()
<< ") in file " << vals.objectPath() << exit(FatalError);
@ -463,11 +451,8 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
if (vals.size() != mapperPtr_().sourceSize())
{
FatalErrorIn
(
"timeVaryingMappedFixedValueFvPatchField<Type>::"
"checkTable()"
) << "Number of values (" << vals.size()
FatalErrorInFunction
<< "Number of values (" << vals.size()
<< ") differs from the number of points ("
<< mapperPtr_().sourceSize()
<< ") in file " << vals.objectPath() << exit(FatalError);

8
src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
View File

@ -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
@ -204,10 +204,8 @@ void Foam::totalPressureFvPatchScalarField::updateCoeffs
}
else
{
FatalErrorIn
(
"totalPressureFvPatchScalarField::updateCoeffs()"
) << " rho or psi set inconsistently, rho = " << rhoName_
FatalErrorInFunction
<< " rho or psi set inconsistently, rho = " << rhoName_
<< ", psi = " << psiName_ << ".\n"
<< " Set either rho or psi or neither depending on the "
"definition of total pressure." << nl

14
src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,16 +77,8 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
if (intensity_ < 0 || intensity_ > 1)
{
FatalErrorIn
(
"turbulentIntensityKineticEnergyInletFvPatchScalarField::"
"turbulentIntensityKineticEnergyInletFvPatchScalarField"
"("
"const fvPatch&, "
"const DimensionedField<scalar, volMesh>&, "
"const dictionary&"
")"
) << "Turbulence intensity should be specified as a fraction 0-1 "
FatalErrorInFunction
<< "Turbulence intensity should be specified as a fraction 0-1 "
"of the mean velocity\n"
" value given is " << intensity_ << nl
<< " on patch " << this->patch().name()

4
src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -199,7 +199,7 @@ void Foam::uniformTotalPressureFvPatchScalarField::updateCoeffs
}
else
{
FatalErrorIn("uniformTotalPressureFvPatchScalarField::updateCoeffs()")
FatalErrorInFunction
<< " rho or psi set inconsitently, rho = " << rhoName_
<< ", psi = " << psiName_ << ".\n"
<< " Set either rho or psi or neither depending on the "

5
src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
View File

@ -208,10 +208,7 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs()
}
default:
{
FatalErrorIn
(
"waveSurfacePressureFvPatchScalarField<Type>::updateCoeffs()"
) << " Unsupported temporal differencing scheme : "
FatalErrorInFunction
<< ddtSchemeName << nl
<< " on patch " << this->patch().name()
<< " of field " << this->dimensionedInternalField().name()

24
src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -135,15 +135,8 @@ Foam::fvPatchField<Type>::fvPatchField
}
else
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"fvPatchField<Type>::fvPatchField"
"("
"const fvPatch& p,"
"const DimensionedField<Type, volMesh>& iF,"
"const dictionary& dict,"
"const bool valueRequired"
")",
dict
) << "Essential entry 'value' missing"
<< exit(FatalIOError);
@ -196,7 +189,7 @@ void Foam::fvPatchField<Type>::check(const fvPatchField<Type>& ptf) const
{
if (&patch_ != &(ptf.patch_))
{
FatalErrorIn("PatchField<Type>::check(const fvPatchField<Type>&)")
FatalErrorInFunction
<< "different patches for fvPatchField<Type>s"
<< abort(FatalError);
}
@ -433,10 +426,8 @@ void Foam::fvPatchField<Type>::operator*=
{
if (&patch_ != &ptf.patch())
{
FatalErrorIn
(
"PatchField<Type>::operator*=(const fvPatchField<scalar>& ptf)"
) << "incompatible patches for patch fields"
FatalErrorInFunction
<< "incompatible patches for patch fields"
<< abort(FatalError);
}
@ -452,10 +443,7 @@ void Foam::fvPatchField<Type>::operator/=
{
if (&patch_ != &ptf.patch())
{
FatalErrorIn
(
"PatchField<Type>::operator/=(const fvPatchField<scalar>& ptf)"
) << " incompatible patches for patch fields"
FatalErrorInFunction
<< abort(FatalError);
}

27
src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -49,11 +49,8 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
if (cstrIter == patchConstructorTablePtr_->end())
{
FatalErrorIn
(
"fvPatchField<Type>::New(const word&, const word&, const fvPatch&,"
"const DimensionedField<Type, volMesh>&)"
) << "Unknown patchField type "
FatalErrorInFunction
<< "Unknown patchField type "
<< patchFieldType << nl << nl
<< "Valid patchField types are :" << endl
<< patchConstructorTablePtr_->sortedToc()
@ -134,11 +131,8 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"fvPatchField<Type>::New(const fvPatch&, "
"const DimensionedField<Type, volMesh>&, "
"const dictionary&)",
dict
) << "Unknown patchField type " << patchFieldType
<< " for patch type " << p.type() << nl << nl
@ -163,11 +157,8 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
&& patchTypeCstrIter() != cstrIter()
)
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"fvPatchField<Type>::New(const fvPatch&, "
"const DimensionedField<Type, volMesh>&, "
"const dictionary&)",
dict
) << "inconsistent patch and patchField types for \n"
" patch type " << p.type()
@ -203,12 +194,8 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
if (cstrIter == patchMapperConstructorTablePtr_->end())
{
FatalErrorIn
(
"fvPatchField<Type>::New(const fvPatchField<Type>&, "
"const fvPatch&, const DimensionedField<Type, volMesh>&, "
"const fvPatchFieldMapper&)"
) << "Unknown patchField type " << ptf.type() << nl << nl
FatalErrorInFunction
<< "Unknown patchField type " << ptf.type() << nl << nl
<< "Valid patchField types are :" << endl
<< patchMapperConstructorTablePtr_->sortedToc()
<< exit(FatalError);

22
src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C
View File

@ -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
@ -58,16 +58,8 @@ cyclicFvsPatchField<Type>::cyclicFvsPatchField
{
if (!isA<cyclicFvPatch>(this->patch()))
{
FatalErrorIn
(
"cyclicFvsPatchField<Type>::cyclicFvsPatchField\n"
"(\n"
" const cyclicFvsPatchField<Type>& ptf,\n"
" const fvPatch& p,\n"
" const DimensionedField<Type, surfaceMesh>& iF,\n"
" const fvPatchFieldMapper& mapper\n"
")\n"
) << "Field type does not correspond to patch type for patch "
FatalErrorInFunction
<< "Field type does not correspond to patch type for patch "
<< this->patch().index() << "." << endl
<< "Field type: " << typeName << endl
<< "Patch type: " << this->patch().type()
@ -89,14 +81,8 @@ cyclicFvsPatchField<Type>::cyclicFvsPatchField
{
if (!isA<cyclicFvPatch>(p))
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"cyclicFvsPatchField<Type>::cyclicFvsPatchField\n"
"(\n"
" const fvPatch& p,\n"
" const DimensionedField<Type, surfaceMesh>& iF,\n"
" const dictionary& dict\n"
")\n",
dict
) << "patch " << this->patch().index() << " not cyclic type. "
<< "Patch type = " << p.type()

22
src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -53,16 +53,8 @@ Foam::cyclicACMIFvsPatchField<Type>::cyclicACMIFvsPatchField
{
if (!isA<cyclicACMIFvPatch>(this->patch()))
{
FatalErrorIn
(
"cyclicACMIFvsPatchField<Type>::cyclicACMIFvsPatchField\n"
"("
"const cyclicACMIFvsPatchField<Type>&, "
"const fvPatch&, "
"const DimensionedField<Type, surfaceMesh>&, "
"const fvPatchFieldMapper&"
")"
) << "Field type does not correspond to patch type for patch "
FatalErrorInFunction
<< "Field type does not correspond to patch type for patch "
<< this->patch().index() << "." << endl
<< "Field type: " << typeName << endl
<< "Patch type: " << this->patch().type()
@ -84,14 +76,8 @@ Foam::cyclicACMIFvsPatchField<Type>::cyclicACMIFvsPatchField
{
if (!isA<cyclicACMIFvPatch>(p))
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"cyclicACMIFvsPatchField<Type>::cyclicACMIFvsPatchField"
"("
"const fvPatch&, "
"const Field<Type>&, "
"const dictionary&"
")",
dict
) << "patch " << this->patch().index() << " not cyclicACMI type. "
<< "Patch type = " << p.type()

22
src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.C
View File

@ -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
@ -53,16 +53,8 @@ Foam::cyclicAMIFvsPatchField<Type>::cyclicAMIFvsPatchField
{
if (!isA<cyclicAMIFvPatch>(this->patch()))
{
FatalErrorIn
(
"cyclicAMIFvsPatchField<Type>::cyclicAMIFvsPatchField\n"
"("
"const cyclicAMIFvsPatchField<Type>&, "
"const fvPatch&, "
"const DimensionedField<Type, surfaceMesh>&, "
"const fvPatchFieldMapper&"
")"
) << "Field type does not correspond to patch type for patch "
FatalErrorInFunction
<< "Field type does not correspond to patch type for patch "
<< this->patch().index() << "." << endl
<< "Field type: " << typeName << endl
<< "Patch type: " << this->patch().type()
@ -84,14 +76,8 @@ Foam::cyclicAMIFvsPatchField<Type>::cyclicAMIFvsPatchField
{
if (!isA<cyclicAMIFvPatch>(p))
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"cyclicAMIFvsPatchField<Type>::cyclicAMIFvsPatchField"
"("
"const fvPatch&, "
"const Field<Type>&, "
"const dictionary&"
")",
dict
) << "patch " << this->patch().index() << " not cyclicAMI type. "
<< "Patch type = " << p.type()

22
src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C
View File

@ -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
@ -58,16 +58,8 @@ emptyFvsPatchField<Type>::emptyFvsPatchField
{
if (!isType<emptyFvPatch>(this->patch()))
{
FatalErrorIn
(
"emptyFvsPatchField<Type>::emptyFvsPatchField\n"
"(\n"
" const emptyFvsPatchField<Type>&,\n"
" const fvPatch& p,\n"
" const DimensionedField<Type, surfaceMesh>& iF,\n"
" const fvPatchFieldMapper& mapper\n"
")\n"
) << "Field type does not correspond to patch type for patch "
FatalErrorInFunction
<< "Field type does not correspond to patch type for patch "
<< this->patch().index() << "." << endl
<< "Field type: " << typeName << endl
<< "Patch type: " << this->patch().type()
@ -88,14 +80,8 @@ emptyFvsPatchField<Type>::emptyFvsPatchField
{
if (!isType<emptyFvPatch>(p))
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"emptyFvsPatchField<Type>::emptyFvsPatchField\n"
"(\n"
" const fvPatch& p,\n"
" const Field<Type>& field,\n"
" const dictionary& dict\n"
")\n",
dict
) << "patch " << this->patch().index() << " not empty type. "
<< "Patch type = " << p.type()

22
src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C
View File

@ -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
@ -72,16 +72,8 @@ processorFvsPatchField<Type>::processorFvsPatchField
{
if (!isType<processorFvPatch>(this->patch()))
{
FatalErrorIn
(
"processorFvsPatchField<Type>::processorFvsPatchField\n"
"(\n"
" const processorFvsPatchField<Type>& ptf,\n"
" const fvPatch& p,\n"
" const DimensionedField<Type, surfaceMesh>& iF,\n"
" const fvPatchFieldMapper& mapper\n"
")\n"
) << "Field type does not correspond to patch type for patch "
FatalErrorInFunction
<< "Field type does not correspond to patch type for patch "
<< this->patch().index() << "." << endl
<< "Field type: " << typeName << endl
<< "Patch type: " << this->patch().type()
@ -103,14 +95,8 @@ processorFvsPatchField<Type>::processorFvsPatchField
{
if (!isType<processorFvPatch>(p))
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"processorFvsPatchField<Type>::processorFvsPatchField\n"
"(\n"
" const fvPatch& p,\n"
" const Field<Type>& field,\n"
" const dictionary& dict\n"
")\n",
dict
) << "patch " << this->patch().index() << " not processor type. "
<< "Patch type = " << p.type()

22
src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C
View File

@ -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
@ -72,16 +72,8 @@ processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
{
if (!isType<processorCyclicFvPatch>(this->patch()))
{
FatalErrorIn
(
"processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField\n"
"(\n"
" const processorCyclicFvsPatchField<Type>& ptf,\n"
" const fvPatch& p,\n"
" const DimensionedField<Type, surfaceMesh>& iF,\n"
" const fvPatchFieldMapper& mapper\n"
")\n"
) << "Field type does not correspond to patch type for patch "
FatalErrorInFunction
<< "Field type does not correspond to patch type for patch "
<< this->patch().index() << "." << endl
<< "Field type: " << typeName << endl
<< "Patch type: " << this->patch().type()
@ -103,14 +95,8 @@ processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
{
if (!isType<processorCyclicFvPatch>(p))
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField\n"
"(\n"
" const fvPatch& p,\n"
" const Field<Type>& field,\n"
" const dictionary& dict\n"
")\n",
dict
) << "patch " << this->patch().index() << " not processor type. "
<< "Patch type = " << p.type()

22
src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C
View File

@ -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
@ -56,16 +56,8 @@ symmetryFvsPatchField<Type>::symmetryFvsPatchField
{
if (!isType<symmetryFvPatch>(this->patch()))
{
FatalErrorIn
(
"symmetryFvsPatchField<Type>::symmetryFvsPatchField\n"
"(\n"
" const symmetryFvsPatchField<Type>& ptf,\n"
" const fvPatch& p,\n"
" const DimensionedField<Type, surfaceMesh>& iF,\n"
" const fvPatchFieldMapper& mapper\n"
")\n"
) << "Field type does not correspond to patch type for patch "
FatalErrorInFunction
<< "Field type does not correspond to patch type for patch "
<< this->patch().index() << "." << endl
<< "Field type: " << typeName << endl
<< "Patch type: " << this->patch().type()
@ -86,14 +78,8 @@ symmetryFvsPatchField<Type>::symmetryFvsPatchField
{
if (!isType<symmetryFvPatch>(p))
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"symmetryFvsPatchField<Type>::symmetryFvsPatchField\n"
"(\n"
" const fvPatch& p,\n"
" const Field<Type>& field,\n"
" const dictionary& dict\n"
")\n",
dict
) << "patch " << this->patch().index() << " not symmetry type. "
<< "Patch type = " << p.type()

22
src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -56,16 +56,8 @@ symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
{
if (!isType<symmetryPlaneFvPatch>(this->patch()))
{
FatalErrorIn
(
"symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField\n"
"(\n"
" const symmetryPlaneFvsPatchField<Type>& ptf,\n"
" const fvPatch& p,\n"
" const DimensionedField<Type, surfaceMesh>& iF,\n"
" const fvPatchFieldMapper& mapper\n"
")\n"
) << "Field type does not correspond to patch type for patch "
FatalErrorInFunction
<< "Field type does not correspond to patch type for patch "
<< this->patch().index() << "." << endl
<< "Field type: " << typeName << endl
<< "Patch type: " << this->patch().type()
@ -86,14 +78,8 @@ symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
{
if (!isType<symmetryPlaneFvPatch>(p))
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField\n"
"(\n"
" const fvPatch& p,\n"
" const Field<Type>& field,\n"
" const dictionary& dict\n"
")\n",
dict
) << "patch " << this->patch().index() << " not symmetryPlane type. "
<< "Patch type = " << p.type()

22
src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C
View File

@ -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
@ -56,16 +56,8 @@ wedgeFvsPatchField<Type>::wedgeFvsPatchField
{
if (!isType<wedgeFvPatch>(this->patch()))
{
FatalErrorIn
(
"wedgeFvsPatchField<Type>::wedgeFvsPatchField\n"
"(\n"
" const wedgeFvsPatchField<Type>& ptf,\n"
" const fvPatch& p,\n"
" const DimensionedField<Type, surfaceMesh>& iF,\n"
" const fvPatchFieldMapper& mapper\n"
")\n"
) << "Field type does not correspond to patch type for patch "
FatalErrorInFunction
<< "Field type does not correspond to patch type for patch "
<< this->patch().index() << "." << endl
<< "Field type: " << typeName << endl
<< "Patch type: " << this->patch().type()
@ -86,14 +78,8 @@ wedgeFvsPatchField<Type>::wedgeFvsPatchField
{
if (!isType<wedgeFvPatch>(p))
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"wedgeFvsPatchField<Type>::wedgeFvsPatchField\n"
"(\n"
" const fvPatch& p,\n"
" const Field<Type>& field,\n"
" dictionary& dict\n"
")\n",
dict
) << "patch " << this->patch().index() << " not wedge type. "
<< "Patch type = " << p.type()

23
src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
View File

@ -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
@ -98,14 +98,8 @@ fvsPatchField<Type>::fvsPatchField
}
else
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"fvsPatchField<Type>::fvsPatchField\n"
"(\n"
" const fvPatch& p,\n"
" const DimensionedField<Type, surfaceMesh>& iF,\n"
" const dictionary& dict\n"
")\n",
dict
) << "essential value entry not provided"
<< exit(FatalIOError);
@ -152,7 +146,7 @@ void fvsPatchField<Type>::check(const fvsPatchField<Type>& ptf) const
{
if (&patch_ != &(ptf.patch_))
{
FatalErrorIn("PatchField<Type>::check(const fvsPatchField<Type>&)")
FatalErrorInFunction
<< "different patches for fvsPatchField<Type>s"
<< abort(FatalError);
}
@ -244,10 +238,8 @@ void fvsPatchField<Type>::operator*=
{
if (&patch_ != &ptf.patch())
{
FatalErrorIn
(
"PatchField<Type>::operator*=(const fvsPatchField<scalar>& ptf)"
) << "incompatible patches for patch fields"
FatalErrorInFunction
<< "incompatible patches for patch fields"
<< abort(FatalError);
}
@ -263,10 +255,7 @@ void fvsPatchField<Type>::operator/=
{
if (&patch_ != &ptf.patch())
{
FatalErrorIn
(
"PatchField<Type>::operator/=(const fvsPatchField<scalar>& ptf)"
) << " incompatible patches for patch fields"
FatalErrorInFunction
<< abort(FatalError);
}

25
src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C
View File

@ -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
@ -52,11 +52,8 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
if (cstrIter == patchConstructorTablePtr_->end())
{
FatalErrorIn
(
"fvsPatchField<Type>::New(const word&, const word&, const fvPatch&"
", const Field<Type>&)"
) << "Unknown patchField type "
FatalErrorInFunction
<< "Unknown patchField type "
<< patchFieldType << nl << nl
<< "Valid patchField types are :" << endl
<< patchConstructorTablePtr_->sortedToc()
@ -130,10 +127,8 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"fvsPatchField<Type>::New(const fvPatch&, const Field<Type>&, "
"const dictionary&)",
dict
) << "Unknown patchField type " << patchFieldType
<< " for patch type " << p.type() << nl << nl
@ -158,10 +153,8 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
&& patchTypeCstrIter() != cstrIter()
)
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"fvsPatchField<Type>const fvPatch&, const Field<Type>&, "
"const dictionary&)",
dict
) << "inconsistent patch and patchField types for \n"
" patch type " << p.type()
@ -199,12 +192,8 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
if (cstrIter == patchMapperConstructorTablePtr_->end())
{
FatalErrorIn
(
"fvsPatchField<Type>::New(const fvsPatchField<Type>&, "
"const fvPatch&, const Field<Type>&, "
"const fvPatchFieldMapper&)"
) << "Unknown patchField type " << ptf.type() << nl << nl
FatalErrorInFunction
<< "Unknown patchField type " << ptf.type() << nl << nl
<< "Valid patchField types are :" << endl
<< patchMapperConstructorTablePtr_->sortedToc()
<< exit(FatalError);

28
src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
View File

@ -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
@ -71,10 +71,8 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
if (schemeData.eof())
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"convectionScheme<Type>::New"
"(const fvMesh&, const surfaceScalarField&, Istream&)",
schemeData
) << "Convection scheme not specified" << endl << endl
<< "Valid convection schemes are :" << endl
@ -89,10 +87,8 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
if (cstrIter == IstreamConstructorTablePtr_->end())
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"convectionScheme<Type>::New"
"(const fvMesh&, const surfaceScalarField&, Istream&)",
schemeData
) << "Unknown convection scheme " << schemeName << nl << nl
<< "Valid convection schemes are :" << endl
@ -126,12 +122,8 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
if (schemeData.eof())
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"convectionScheme<Type>::New"
"(const fvMesh&, "
"const typename multivariateSurfaceInterpolationScheme<Type>"
"::fieldTable&, const surfaceScalarField&, Istream&)",
schemeData
) << "Convection scheme not specified" << endl << endl
<< "Valid convection schemes are :" << endl
@ -146,12 +138,8 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
if (cstrIter == MultivariateConstructorTablePtr_->end())
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"convectionScheme<Type>::New"
"(const fvMesh&, "
"const typename multivariateSurfaceInterpolationScheme<Type>"
"::fieldTable&, const surfaceScalarField&, Istream&)",
schemeData
) << "Unknown convection scheme " << schemeName << nl << nl
<< "Valid convection schemes are :" << endl
@ -177,10 +165,8 @@ void convectionScheme<Type>::operator=(const convectionScheme<Type>& cs)
{
if (this == &cs)
{
FatalErrorIn
(
"convectionScheme<Type>::operator=(const convectionScheme<Type>&)"
) << "attempted assignment to self"
FatalErrorInFunction
<< "attempted assignment to self"
<< abort(FatalError);
}
}

4
src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -120,7 +120,7 @@ public:
{
fileNameList controlDictFiles(findEtcFiles("controlDict"));
IOWarningIn("gaussConvectionScheme", is)
IOWarningInFunction(is)
<< "Unbounded 'Gauss' div scheme used in "
"steady-state solver, use 'bounded Gauss' "
"to ensure boundedness.\n"

8
src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
View File

@ -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
@ -57,9 +57,8 @@ tmp<d2dt2Scheme<Type> > d2dt2Scheme<Type>::New
if (schemeData.eof())
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"d2dt2Scheme<Type>::New(const fvMesh&, Istream&)",
schemeData
) << "D2dt2 scheme not specified" << endl << endl
<< "Valid d2dt2 schemes are :" << endl
@ -74,9 +73,8 @@ tmp<d2dt2Scheme<Type> > d2dt2Scheme<Type>::New
if (cstrIter == IstreamConstructorTablePtr_->end())
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"d2dt2Scheme<Type>::New(const fvMesh&, Istream&)",
schemeData
) << "Unknown d2dt2 scheme " << schemeName << nl << nl
<< "Valid d2dt2 schemes are :" << endl

16
src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -141,7 +141,7 @@ tmp<surfaceScalarField> CoEulerDdtScheme<Type>::CofrDeltaT() const
}
else
{
FatalErrorIn("CoEulerDdtScheme<Type>::CofrDeltaT() const")
FatalErrorInFunction
<< "Incorrect dimensions of phi: " << phi.dimensions()
<< abort(FatalError);
@ -717,10 +717,8 @@ CoEulerDdtScheme<Type>::fvcDdtUfCorr
}
else
{
FatalErrorIn
(
"CoEulerDdtScheme<Type>::fvcDdtPhiCorr"
) << "dimensions of Uf are not correct"
FatalErrorInFunction
<< "dimensions of Uf are not correct"
<< abort(FatalError);
return fluxFieldType::null();
@ -781,10 +779,8 @@ CoEulerDdtScheme<Type>::fvcDdtPhiCorr
}
else
{
FatalErrorIn
(
"CoEulerDdtScheme<Type>::fvcDdtPhiCorr"
) << "dimensions of phi are not correct"
FatalErrorInFunction
<< "dimensions of phi are not correct"
<< abort(FatalError);
return fluxFieldType::null();

14
src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -1323,10 +1323,8 @@ CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
}
else
{
FatalErrorIn
(
"CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr"
) << "dimensions of Uf are not correct"
FatalErrorInFunction
<< "dimensions of Uf are not correct"
<< abort(FatalError);
return fluxFieldType::null();
@ -1420,10 +1418,8 @@ CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
}
else
{
FatalErrorIn
(
"CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr"
) << "dimensions of phi are not correct"
FatalErrorInFunction
<< "dimensions of phi are not correct"
<< abort(FatalError);
return fluxFieldType::null();

3
src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
View File

@ -208,9 +208,8 @@ public:
{
if (ocCoeff_ < 0 || ocCoeff_ > 1)
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"CrankNicolsonDdtScheme(const fvMesh& mesh, Istream& is)",
is
) << "Off-centreing coefficient = " << ocCoeff_
<< " should be >= 0 and <= 1"

14
src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -606,10 +606,8 @@ EulerDdtScheme<Type>::fvcDdtUfCorr
}
else
{
FatalErrorIn
(
"EulerDdtScheme<Type>::fvcDdtPhiCorr"
) << "dimensions of Uf are not correct"
FatalErrorInFunction
<< "dimensions of Uf are not correct"
<< abort(FatalError);
return fluxFieldType::null();
@ -670,10 +668,8 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
}
else
{
FatalErrorIn
(
"EulerDdtScheme<Type>::fvcDdtPhiCorr"
) << "dimensions of phi are not correct"
FatalErrorInFunction
<< "dimensions of phi are not correct"
<< abort(FatalError);
return fluxFieldType::null();

16
src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -139,7 +139,7 @@ tmp<volScalarField> SLTSDdtScheme<Type>::SLrDeltaT() const
}
else
{
FatalErrorIn("SLTSDdtScheme<Type>::CofrDeltaT() const")
FatalErrorInFunction
<< "Incorrect dimensions of phi: " << phi.dimensions()
<< abort(FatalError);
}
@ -719,10 +719,8 @@ SLTSDdtScheme<Type>::fvcDdtUfCorr
}
else
{
FatalErrorIn
(
"SLTSDdtScheme<Type>::fvcDdtPhiCorr"
) << "dimensions of Uf are not correct"
FatalErrorInFunction
<< "dimensions of Uf are not correct"
<< abort(FatalError);
return fluxFieldType::null();
@ -783,10 +781,8 @@ SLTSDdtScheme<Type>::fvcDdtPhiCorr
}
else
{
FatalErrorIn
(
"SLTSDdtScheme<Type>::fvcDdtPhiCorr"
) << "dimensions of phi are not correct"
FatalErrorInFunction
<< "dimensions of phi are not correct"
<< abort(FatalError);
return fluxFieldType::null();

14
src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -828,10 +828,8 @@ backwardDdtScheme<Type>::fvcDdtUfCorr
}
else
{
FatalErrorIn
(
"backwardDdtScheme<Type>::fvcDdtPhiCorr"
) << "dimensions of phi are not correct"
FatalErrorInFunction
<< "dimensions of phi are not correct"
<< abort(FatalError);
return fluxFieldType::null();
@ -906,10 +904,8 @@ backwardDdtScheme<Type>::fvcDdtPhiCorr
}
else
{
FatalErrorIn
(
"backwardDdtScheme<Type>::fvcDdtPhiCorr"
) << "dimensions of phi are not correct"
FatalErrorInFunction
<< "dimensions of phi are not correct"
<< abort(FatalError);
return fluxFieldType::null();

6
src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
View File

@ -57,9 +57,8 @@ tmp<ddtScheme<Type> > ddtScheme<Type>::New
if (schemeData.eof())
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"ddtScheme<Type>::New(const fvMesh&, Istream&)",
schemeData
) << "Ddt scheme not specified" << endl << endl
<< "Valid ddt schemes are :" << endl
@ -74,9 +73,8 @@ tmp<ddtScheme<Type> > ddtScheme<Type>::New
if (cstrIter == IstreamConstructorTablePtr_->end())
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"ddtScheme<Type>::New(const fvMesh&, Istream&)",
schemeData
) << "Unknown ddt scheme " << schemeName << nl << nl
<< "Valid ddt schemes are :" << endl

12
src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
View File

@ -613,10 +613,8 @@ localEulerDdtScheme<Type>::fvcDdtUfCorr
}
else
{
FatalErrorIn
(
"localEulerDdtScheme<Type>::fvcDdtPhiCorr"
) << "dimensions of Uf are not correct"
FatalErrorInFunction
<< "dimensions of Uf are not correct"
<< abort(FatalError);
return fluxFieldType::null();
@ -677,10 +675,8 @@ localEulerDdtScheme<Type>::fvcDdtPhiCorr
}
else
{
FatalErrorIn
(
"localEulerDdtScheme<Type>::fvcDdtPhiCorr"
) << "dimensions of phi are not correct"
FatalErrorInFunction
<< "dimensions of phi are not correct"
<< abort(FatalError);
return fluxFieldType::null();

8
src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
View File

@ -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
@ -58,9 +58,8 @@ tmp<divScheme<Type> > divScheme<Type>::New
if (schemeData.eof())
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"divScheme<Type>::New(const fvMesh&, Istream&)",
schemeData
) << "Div scheme not specified" << endl << endl
<< "Valid div schemes are :" << endl
@ -75,9 +74,8 @@ tmp<divScheme<Type> > divScheme<Type>::New
if (cstrIter == IstreamConstructorTablePtr_->end())
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"divScheme<Type>::New(const fvMesh&, Istream&)",
schemeData
) << "unknown div scheme "
<< schemeName << nl << nl

10
src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -46,10 +46,8 @@ Foam::tmp<Foam::fv::gradScheme<Type> > Foam::fv::gradScheme<Type>::New
if (schemeData.eof())
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"gradScheme<Type>::New"
"(const fvMesh& mesh, Istream& schemeData)",
schemeData
) << "Grad scheme not specified" << endl << endl
<< "Valid grad schemes are :" << endl
@ -64,10 +62,8 @@ Foam::tmp<Foam::fv::gradScheme<Type> > Foam::fv::gradScheme<Type>::New
if (cstrIter == IstreamConstructorTablePtr_->end())
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"gradScheme<Type>::New"
"(const fvMesh& mesh, Istream& schemeData)",
schemeData
) << "Unknown grad scheme " << schemeName << nl << nl
<< "Valid grad schemes are :" << endl

5
src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H
View File

@ -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
@ -95,9 +95,8 @@ public:
{
if (k_ < 0 || k_ > 1)
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"cellLimitedGrad(const fvMesh&, Istream& schemeData)",
schemeData
) << "coefficient = " << k_
<< " should be >= 0 and <= 1"

5
src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H
View File

@ -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
@ -95,9 +95,8 @@ public:
{
if (k_ < 0 || k_ > 1)
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"cellMDLimitedGrad(const fvMesh&, Istream& schemeData)",
schemeData
) << "coefficient = " << k_
<< " should be >= 0 and <= 1"

5
src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H
View File

@ -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
@ -104,9 +104,8 @@ public:
{
if (k_ < 0 || k_ > 1)
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"faceLimitedGrad(const fvMesh&, Istream& schemeData)",
schemeData
) << "coefficient = " << k_
<< " should be >= 0 and <= 1"

5
src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H
View File

@ -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
@ -104,9 +104,8 @@ public:
{
if (k_ < 0 || k_ > 1)
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"faceMDLimitedGrad(const fvMesh&, Istream& schemeData)",
schemeData
) << "coefficient = " << k_
<< " should be >= 0 and <= 1"

8
src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
View File

@ -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
@ -56,9 +56,8 @@ tmp<laplacianScheme<Type, GType> > laplacianScheme<Type, GType>::New
if (schemeData.eof())
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"laplacianScheme<Type, GType>::New(const fvMesh&, Istream&)",
schemeData
) << "Laplacian scheme not specified" << endl << endl
<< "Valid laplacian schemes are :" << endl
@ -73,9 +72,8 @@ tmp<laplacianScheme<Type, GType> > laplacianScheme<Type, GType>::New
if (cstrIter == IstreamConstructorTablePtr_->end())
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"laplacianScheme<Type, GType>::New(const fvMesh&, Istream&)",
schemeData
) << "Unknown laplacian scheme " << schemeName << nl << nl
<< "Valid laplacian schemes are :" << endl

15
src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -156,11 +156,8 @@ void Foam::CentredFitSnGradData<Polynomial>::calcFit
// (not good fit so increase weight in the centre and weight
// for constant and linear terms)
WarningIn
(
"CentredFitSnGradData<Polynomial>::calcFit"
"(const List<point>& C, const label facei"
) << "Cannot fit face " << facei << " iteration " << iIt
WarningInFunction
<< "Cannot fit face " << facei << " iteration " << iIt
<< " with sum of weights " << sum(coeffsi) << nl
<< " Weights " << coeffsi << nl
<< " Linear weights " << wLin << " " << 1 - wLin << nl
@ -198,10 +195,8 @@ void Foam::CentredFitSnGradData<Polynomial>::calcFit
}
else
{
WarningIn
(
"CentredFitSnGradData<Polynomial>::calcFit(..)"
) << "Could not fit face " << facei
WarningInFunction
<< "Could not fit face " << facei
<< " Coefficients = " << coeffsi
<< ", reverting to uncorrected." << endl;

3
src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
View File

@ -135,9 +135,8 @@ public:
{
if (limitCoeff_ < 0 || limitCoeff_ > 1)
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"limitedSnGrad(const fvMesh& mesh, Istream& schemeData) : ",
schemeData
) << "limitCoeff is specified as " << limitCoeff_
<< " but should be >= 0 && <= 1"

8
src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -57,9 +57,8 @@ tmp<snGradScheme<Type> > snGradScheme<Type>::New
if (schemeData.eof())
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"snGradScheme<Type>::New(const fvMesh&, Istream&)",
schemeData
) << "Discretisation scheme not specified"
<< endl << endl
@ -75,9 +74,8 @@ tmp<snGradScheme<Type> > snGradScheme<Type>::New
if (constructorIter == MeshConstructorTablePtr_->end())
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"snGradScheme<Type>::New(const fvMesh&, Istream&)",
schemeData
) << "Unknown discretisation scheme "
<< schemeName << nl << nl

55
src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
View File

@ -43,11 +43,8 @@ void Foam::fvMatrix<Type>::addToInternalField
{
if (addr.size() != pf.size())
{
FatalErrorIn
(
"fvMatrix<Type>::addToInternalField(const labelUList&, "
"const Field&, Field&)"
) << "sizes of addressing and field are different"
FatalErrorInFunction
<< "sizes of addressing and field are different"
<< abort(FatalError);
}
@ -83,11 +80,8 @@ void Foam::fvMatrix<Type>::subtractFromInternalField
{
if (addr.size() != pf.size())
{
FatalErrorIn
(
"fvMatrix<Type>::addToInternalField(const labelUList&, "
"const Field&, Field&)"
) << "sizes of addressing and field are different"
FatalErrorInFunction
<< "sizes of addressing and field are different"
<< abort(FatalError);
}
@ -531,7 +525,7 @@ void Foam::fvMatrix<Type>::relax(const scalar alpha)
if (debug)
{
InfoIn("fvMatrix<Type>::relax(const scalar alpha)")
InfoInFunction
<< "Relaxing " << psi_.name() << " by " << alpha
<< endl;
}
@ -622,7 +616,7 @@ void Foam::fvMatrix<Type>::relax(const scalar alpha)
psi_.mesh().comm()
);
InfoIn("fvMatrix<Type>::relax(const scalar alpha)")
InfoInFunction
<< "Matrix dominance test for " << psi_.name() << nl
<< " number of non-dominant cells : " << nNon << nl
<< " maximum relative non-dominance : " << maxNon << nl
@ -880,7 +874,7 @@ flux() const
{
if (!psi_.mesh().fluxRequired(psi_.name()))
{
FatalErrorIn("fvMatrix<Type>::flux()")
FatalErrorInFunction
<< "flux requested but " << psi_.name()
<< " not specified in the fluxRequired sub-dictionary"
" of fvSchemes."
@ -964,14 +958,14 @@ void Foam::fvMatrix<Type>::operator=(const fvMatrix<Type>& fvmv)
{
if (this == &fvmv)
{
FatalErrorIn("fvMatrix<Type>::operator=(const fvMatrix<Type>&)")
FatalErrorInFunction
<< "attempted assignment to self"
<< abort(FatalError);
}
if (&psi_ != &(fvmv.psi_))
{
FatalErrorIn("fvMatrix<Type>::operator=(const fvMatrix<Type>&)")
FatalErrorInFunction
<< "different fields"
<< abort(FatalError);
}
@ -1209,11 +1203,8 @@ void Foam::fvMatrix<Type>::operator*=
if (faceFluxCorrectionPtr_)
{
FatalErrorIn
(
"fvMatrix<Type>::operator*="
"(const DimensionedField<scalar, volMesh>&)"
) << "cannot scale a matrix containing a faceFluxCorrection"
FatalErrorInFunction
<< "cannot scale a matrix containing a faceFluxCorrection"
<< abort(FatalError);
}
}
@ -1272,10 +1263,8 @@ void Foam::checkMethod
{
if (&fvm1.psi() != &fvm2.psi())
{
FatalErrorIn
(
"checkMethod(const fvMatrix<Type>&, const fvMatrix<Type>&)"
) << "incompatible fields for operation "
FatalErrorInFunction
<< "incompatible fields for operation "
<< endl << " "
<< "[" << fvm1.psi().name() << "] "
<< op
@ -1285,10 +1274,8 @@ void Foam::checkMethod
if (dimensionSet::debug && fvm1.dimensions() != fvm2.dimensions())
{
FatalErrorIn
(
"checkMethod(const fvMatrix<Type>&, const fvMatrix<Type>&)"
) << "incompatible dimensions for operation "
FatalErrorInFunction
<< "incompatible dimensions for operation "
<< endl << " "
<< "[" << fvm1.psi().name() << fvm1.dimensions()/dimVolume << " ] "
<< op
@ -1308,11 +1295,7 @@ void Foam::checkMethod
{
if (dimensionSet::debug && fvm.dimensions()/dimVolume != df.dimensions())
{
FatalErrorIn
(
"checkMethod(const fvMatrix<Type>&, const GeometricField<Type, "
"fvPatchField, volMesh>&)"
) << "incompatible dimensions for operation "
FatalErrorInFunction
<< endl << " "
<< "[" << fvm.psi().name() << fvm.dimensions()/dimVolume << " ] "
<< op
@ -1332,10 +1315,8 @@ void Foam::checkMethod
{
if (dimensionSet::debug && fvm.dimensions()/dimVolume != dt.dimensions())
{
FatalErrorIn
(
"checkMethod(const fvMatrix<Type>&, const dimensioned<Type>&)"
) << "incompatible dimensions for operation "
FatalErrorInFunction
<< "incompatible dimensions for operation "
<< endl << " "
<< "[" << fvm.psi().name() << fvm.dimensions()/dimVolume << " ] "
<< op

3
src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
View File

@ -87,9 +87,8 @@ Foam::SolverPerformance<Type> Foam::fvMatrix<Type>::solve
}
else
{
FatalIOErrorIn
FatalIOErrorInFunction
(
"fvMatrix<Type>::solve(const dictionary& solverControls)",
solverControls
) << "Unknown type " << type
<< "; currently supported solver types are segregated and coupled"

9
src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -43,11 +43,8 @@ Foam::extendedCellToCellStencil::extendedCellToCellStencil(const polyMesh& mesh)
if (!cpp.parallel() || cpp.separated())
{
FatalErrorIn
(
"extendedCellToCellStencil::extendedCellToCellStencil"
"(const polyMesh&)"
) << "Coupled patches with transformations not supported."
FatalErrorInFunction
<< "Coupled patches with transformations not supported."
<< endl
<< "Problematic patch " << cpp.name() << exit(FatalError);
}

4
src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -123,7 +123,7 @@ void Foam::cellToCellStencil::merge
if (resultI != result.size())
{
FatalErrorIn("cellToCellStencil::merge(..)")
FatalErrorInFunction
<< "problem" << abort(FatalError);
}

9
src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -113,11 +113,8 @@ Foam::extendedCellToFaceStencil::extendedCellToFaceStencil(const polyMesh& mesh)
if (!cpp.parallel() || cpp.separated())
{
FatalErrorIn
(
"extendedCellToFaceStencil::extendedCellToFaceStencil"
"(const polyMesh&)"
) << "Coupled patches with transformations not supported."
FatalErrorInFunction
<< "Coupled patches with transformations not supported."
<< endl
<< "Problematic patch " << cpp.name() << exit(FatalError);
}

14
src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.C
View File

@ -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
@ -168,10 +168,8 @@ void Foam::extendedUpwindCellToFaceStencil::transportStencil
}
if (n != transportedStencil.size())
{
FatalErrorIn
(
"extendedUpwindCellToFaceStencil::transportStencil(..)"
) << "problem:" << faceStencilSet
FatalErrorInFunction
<< "problem:" << faceStencilSet
<< abort(FatalError);
}
}
@ -190,10 +188,8 @@ void Foam::extendedUpwindCellToFaceStencil::transportStencil
}
if (n != transportedStencil.size())
{
FatalErrorIn
(
"extendedUpwindCellToFaceStencil::transportStencil(..)"
) << "problem:" << faceStencilSet
FatalErrorInFunction
<< "problem:" << faceStencilSet
<< abort(FatalError);
}
}

28
src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -211,7 +211,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil
{
if (iter.key() == globalOwn || iter.key() == globalNei)
{
FatalErrorIn("FECCellToFaceStencil::calcFaceStencil(..)")
FatalErrorInFunction
<< "problem:" << faceStencilSet
<< abort(FatalError);
}
@ -272,10 +272,8 @@ void Foam::FECCellToFaceStencil::calcFaceStencil
{
if (iter.key() == globalOwn || iter.key() == globalNei)
{
FatalErrorIn
(
"FECCellToFaceStencil::calcFaceStencil(..)"
) << "problem:" << faceStencilSet
FatalErrorInFunction
<< "problem:" << faceStencilSet
<< abort(FatalError);
}
faceStencil[faceI][n++] = iter.key();
@ -283,7 +281,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil
if (n != faceStencil[faceI].size())
{
FatalErrorIn("problem") << "n:" << n
FatalErrorInFunction
<< " size:" << faceStencil[faceI].size()
<< abort(FatalError);
}
@ -338,10 +336,8 @@ void Foam::FECCellToFaceStencil::calcFaceStencil
{
if (iter.key() == globalOwn)
{
FatalErrorIn
(
"FECCellToFaceStencil::calcFaceStencil(..)"
) << "problem:" << faceStencilSet
FatalErrorInFunction
<< "problem:" << faceStencilSet
<< abort(FatalError);
}
faceStencil[faceI][n++] = iter.key();
@ -358,7 +354,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil
label globalOwn = globalNumbering().toGlobal(own[faceI]);
if (faceStencil[faceI][0] != globalOwn)
{
FatalErrorIn("FECCellToFaceStencil::calcFaceStencil(..)")
FatalErrorInFunction
<< "problem:" << faceStencil[faceI]
<< " globalOwn:" << globalOwn
<< abort(FatalError);
@ -366,7 +362,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil
label globalNei = globalNumbering().toGlobal(nei[faceI]);
if (faceStencil[faceI][1] != globalNei)
{
FatalErrorIn("FECCellToFaceStencil::calcFaceStencil(..)")
FatalErrorInFunction
<< "problem:" << faceStencil[faceI]
<< " globalNei:" << globalNei
<< abort(FatalError);
@ -387,7 +383,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil
label globalOwn = globalNumbering().toGlobal(own[faceI]);
if (faceStencil[faceI][0] != globalOwn)
{
FatalErrorIn("FECCellToFaceStencil::calcFaceStencil(..)")
FatalErrorInFunction
<< "problem:" << faceStencil[faceI]
<< " globalOwn:" << globalOwn
<< abort(FatalError);
@ -395,7 +391,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil
label globalNei = neiGlobalCell[faceI-mesh().nInternalFaces()];
if (faceStencil[faceI][1] != globalNei)
{
FatalErrorIn("FECCellToFaceStencil::calcFaceStencil(..)")
FatalErrorInFunction
<< "problem:" << faceStencil[faceI]
<< " globalNei:" << globalNei
<< abort(FatalError);
@ -411,7 +407,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil
label globalOwn = globalNumbering().toGlobal(own[faceI]);
if (faceStencil[faceI][0] != globalOwn)
{
FatalErrorIn("FECCellToFaceStencil::calcFaceStencil(..)")
FatalErrorInFunction
<< "problem:" << faceStencil[faceI]
<< " globalOwn:" << globalOwn
<< abort(FatalError);

4
src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -124,7 +124,7 @@ void Foam::cellToFaceStencil::merge
if (resultI != result.size())
{
FatalErrorIn("cellToFaceStencil::merge(..)")
FatalErrorInFunction
<< "problem" << abort(FatalError);
}

9
src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.C
View File

@ -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
@ -45,11 +45,8 @@ Foam::extendedFaceToCellStencil::extendedFaceToCellStencil(const polyMesh& mesh)
if (!cpp.parallel() || cpp.separated())
{
FatalErrorIn
(
"extendedFaceToCellStencil::extendedFaceToCellStencil"
"(const polyMesh&)"
) << "Coupled patches with transformations not supported."
FatalErrorInFunction
<< "Coupled patches with transformations not supported."
<< endl
<< "Problematic patch " << cpp.name() << exit(FatalError);
}

14
src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C
View File

@ -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
@ -149,10 +149,8 @@ const Foam::fvPatch& Foam::fvBoundaryMesh::operator[]
if (patchI < 0)
{
FatalErrorIn
(
"fvBoundaryMesh::operator[](const word&) const"
) << "Patch named " << patchName << " not found." << nl
FatalErrorInFunction
<< "Patch named " << patchName << " not found." << nl
<< abort(FatalError);
}
@ -169,10 +167,8 @@ Foam::fvPatch& Foam::fvBoundaryMesh::operator[]
if (patchI < 0)
{
FatalErrorIn
(
"fvBoundaryMesh::operator[](const word&)"
) << "Patch named " << patchName << " not found." << nl
FatalErrorInFunction
<< "Patch named " << patchName << " not found." << nl
<< abort(FatalError);
}

14
src/finiteVolume/fvMesh/fvMesh.C
View File

@ -466,10 +466,8 @@ void Foam::fvMesh::addFvPatches
{
if (boundary().size())
{
FatalErrorIn
(
"fvMesh::addFvPatches(const List<polyPatch*>&, const bool)"
) << " boundary already exists"
FatalErrorInFunction
<< " boundary already exists"
<< abort(FatalError);
}
@ -586,7 +584,7 @@ void Foam::fvMesh::mapFields(const mapPolyMesh& meshMap)
|| meshMap.faceMap().size() != nFaces()
)
{
FatalErrorIn("fvMesh::mapFields(const mapPolyMesh&)")
FatalErrorInFunction
<< "mapPolyMesh does not correspond to the old mesh."
<< " nCells:" << nCells()
<< " cellMap:" << meshMap.cellMap().size()
@ -815,7 +813,7 @@ void Foam::fvMesh::updateMesh(const mapPolyMesh& mpm)
// Few checks
if (VPtr_ && (V().size() != mpm.nOldCells()))
{
FatalErrorIn("fvMesh::updateMesh(const mapPolyMesh&)")
FatalErrorInFunction
<< "V:" << V().size()
<< " not equal to the number of old cells "
<< mpm.nOldCells()
@ -823,7 +821,7 @@ void Foam::fvMesh::updateMesh(const mapPolyMesh& mpm)
}
if (V0Ptr_ && (V0Ptr_->size() != mpm.nOldCells()))
{
FatalErrorIn("fvMesh::updateMesh(const mapPolyMesh&)")
FatalErrorInFunction
<< "V0:" << V0Ptr_->size()
<< " not equal to the number of old cells "
<< mpm.nOldCells()
@ -831,7 +829,7 @@ void Foam::fvMesh::updateMesh(const mapPolyMesh& mpm)
}
if (V00Ptr_ && (V00Ptr_->size() != mpm.nOldCells()))
{
FatalErrorIn("fvMesh::updateMesh(const mapPolyMesh&)")
FatalErrorInFunction
<< "V0:" << V00Ptr_->size()
<< " not equal to the number of old cells "
<< mpm.nOldCells()

18
src/finiteVolume/fvMesh/fvMeshGeometry.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -53,7 +53,7 @@ void fvMesh::makeSf() const
// if the pointer is already set
if (SfPtr_)
{
FatalErrorIn("fvMesh::makeSf()")
FatalErrorInFunction
<< "face areas already exist"
<< abort(FatalError);
}
@ -90,7 +90,7 @@ void fvMesh::makeMagSf() const
// if the pointer is already set
if (magSfPtr_)
{
FatalErrorIn("void fvMesh::makeMagSf()")
FatalErrorInFunction
<< "mag face areas already exist"
<< abort(FatalError);
}
@ -128,7 +128,7 @@ void fvMesh::makeC() const
// if the pointer is already set
if (CPtr_)
{
FatalErrorIn("fvMesh::makeC()")
FatalErrorInFunction
<< "cell centres already exist"
<< abort(FatalError);
}
@ -170,7 +170,7 @@ void fvMesh::makeCf() const
// if the pointer is already set
if (CfPtr_)
{
FatalErrorIn("fvMesh::makeCf()")
FatalErrorInFunction
<< "face centres already exist"
<< abort(FatalError);
}
@ -232,7 +232,7 @@ const volScalarField::DimensionedInternalField& fvMesh::V0() const
{
if (!V0Ptr_)
{
FatalErrorIn("fvMesh::V0() const")
FatalErrorInFunction
<< "V0 is not available"
<< abort(FatalError);
}
@ -245,7 +245,7 @@ volScalarField::DimensionedInternalField& fvMesh::setV0()
{
if (!V0Ptr_)
{
FatalErrorIn("fvMesh::setV0()")
FatalErrorInFunction
<< "V0 is not available"
<< abort(FatalError);
}
@ -439,7 +439,7 @@ const surfaceScalarField& fvMesh::phi() const
{
if (!phiPtr_)
{
FatalErrorIn("fvMesh::phi()")
FatalErrorInFunction
<< "mesh flux field does not exist, is the mesh actually moving?"
<< abort(FatalError);
}
@ -459,7 +459,7 @@ surfaceScalarField& fvMesh::setPhi()
{
if (!phiPtr_)
{
FatalErrorIn("fvMesh::setPhi()")
FatalErrorInFunction
<< "mesh flux field does not exist, is the mesh actually moving?"
<< abort(FatalError);
}

38
src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -41,10 +41,8 @@ void Foam::fvPatchMapper::calcAddressing() const
|| weightsPtr_
)
{
FatalErrorIn
(
"void fvPatchMapper::calcAddressing() const)"
) << "Addressing already calculated"
FatalErrorInFunction
<< "Addressing already calculated"
<< abort(FatalError);
}
@ -95,10 +93,8 @@ void Foam::fvPatchMapper::calcAddressing() const
if (min(addr) < 0)
{
//FatalErrorIn
WarningIn
(
"void fvPatchMapper::calcAddressing() const"
) << "Unmapped entry in patch mapping for patch "
WarningInFunction
<< "Unmapped entry in patch mapping for patch "
<< patch_.index() << " named " << patch_.name()
//<< abort(FatalError);
<< endl;
@ -195,10 +191,8 @@ void Foam::fvPatchMapper::calcAddressing() const
{
if (min(addr[i]) < 0)
{
FatalErrorIn
(
"void fvPatchMapper::calcAddressing() const"
) << "Error in patch mapping for patch "
FatalErrorInFunction
<< "Error in patch mapping for patch "
<< patch_.index() << " named " << patch_.name()
<< abort(FatalError);
}
@ -250,10 +244,8 @@ const Foam::labelUList& Foam::fvPatchMapper::directAddressing() const
{
if (!direct())
{
FatalErrorIn
(
"const labelUList& fvPatchMapper::directAddressing() const"
) << "Requested direct addressing for an interpolative mapper."
FatalErrorInFunction
<< "Requested direct addressing for an interpolative mapper."
<< abort(FatalError);
}
@ -270,10 +262,8 @@ const Foam::labelListList& Foam::fvPatchMapper::addressing() const
{
if (direct())
{
FatalErrorIn
(
"const labelListList& fvPatchMapper::addressing() const"
) << "Requested interpolative addressing for a direct mapper."
FatalErrorInFunction
<< "Requested interpolative addressing for a direct mapper."
<< abort(FatalError);
}
@ -290,10 +280,8 @@ const Foam::scalarListList& Foam::fvPatchMapper::weights() const
{
if (direct())
{
FatalErrorIn
(
"const scalarListList& fvPatchMapper::weights() const"
) << "Requested interpolative weights for a direct mapper."
FatalErrorInFunction
<< "Requested interpolative weights for a direct mapper."
<< abort(FatalError);
}

23
src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
View File

@ -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
@ -43,7 +43,7 @@ void Foam::fvSurfaceMapper::calcAddressing() const
|| insertedObjectLabelsPtr_
)
{
FatalErrorIn("void fvSurfaceMapper::calcAddressing() const)")
FatalErrorInFunction
<< "Addressing already calculated"
<< abort(FatalError);
}
@ -174,11 +174,8 @@ const Foam::labelUList& Foam::fvSurfaceMapper::directAddressing() const
{
if (!direct())
{
FatalErrorIn
(
"const labelUList& fvSurfaceMapper::"
"directAddressing() const"
) << "Requested direct addressing for an interpolative mapper."
FatalErrorInFunction
<< "Requested direct addressing for an interpolative mapper."
<< abort(FatalError);
}
@ -195,10 +192,8 @@ const Foam::labelListList& Foam::fvSurfaceMapper::addressing() const
{
if (direct())
{
FatalErrorIn
(
"const labelListList& fvSurfaceMapper::addressing() const"
) << "Requested interpolative addressing for a direct mapper."
FatalErrorInFunction
<< "Requested interpolative addressing for a direct mapper."
<< abort(FatalError);
}
@ -215,10 +210,8 @@ const Foam::scalarListList& Foam::fvSurfaceMapper::weights() const
{
if (direct())
{
FatalErrorIn
(
"const scalarListList& fvSurfaceMapper::weights() const"
) << "Requested interpolative weights for a direct mapper."
FatalErrorInFunction
<< "Requested interpolative weights for a direct mapper."
<< abort(FatalError);
}

33
src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -46,8 +46,7 @@ bool Foam::fvMeshSubset::checkCellSubset() const
{
if (fvMeshSubsetPtr_.empty())
{
FatalErrorIn("bool fvMeshSubset::checkCellSubset() const")
<< "Mesh subset not set. Please set the cell map using "
FatalErrorInFunction
<< "void setCellSubset(const labelHashSet& cellsToSubset)" << endl
<< "before attempting to access subset data"
<< abort(FatalError);
@ -394,11 +393,8 @@ void Foam::fvMeshSubset::setCellSubset
}
else if (wantedPatchID < 0 || wantedPatchID >= oldPatches.size())
{
FatalErrorIn
(
"fvMeshSubset::setCellSubset(const labelHashSet&"
", const label patchID)"
) << "Non-existing patch index " << wantedPatchID << endl
FatalErrorInFunction
<< "Non-existing patch index " << wantedPatchID << endl
<< "Should be between 0 and " << oldPatches.size()-1
<< abort(FatalError);
}
@ -774,11 +770,8 @@ void Foam::fvMeshSubset::setLargeCellSubset
if (region.size() != oldCells.size())
{
FatalErrorIn
(
"fvMeshSubset::setCellSubset(const labelList&"
", const label, const label, const bool)"
) << "Size of region " << region.size()
FatalErrorInFunction
<< "Size of region " << region.size()
<< " is not equal to number of cells in mesh " << oldCells.size()
<< abort(FatalError);
}
@ -794,11 +787,8 @@ void Foam::fvMeshSubset::setLargeCellSubset
}
else if (wantedPatchID < 0 || wantedPatchID >= oldPatches.size())
{
FatalErrorIn
(
"fvMeshSubset::setCellSubset(const labelList&"
", const label, const label, const bool)"
) << "Non-existing patch index " << wantedPatchID << endl
FatalErrorInFunction
<< "Non-existing patch index " << wantedPatchID << endl
<< "Should be between 0 and " << oldPatches.size()-1
<< abort(FatalError);
}
@ -1045,11 +1035,8 @@ void Foam::fvMeshSubset::setLargeCellSubset
if (faceI != nFacesInSet)
{
FatalErrorIn
(
"fvMeshSubset::setCellSubset(const labelList&"
", const label, const label, const bool)"
) << "Problem" << abort(FatalError);
FatalErrorInFunction
<< "Problem" << abort(FatalError);
}

16
src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C
View File

@ -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
@ -21,10 +21,6 @@ License
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Description
coupledFvPatch is an abstract base class for patches that couple regions
of the computational domain e.g. cyclic and processor-processor links.
\*---------------------------------------------------------------------------*/
#include "regionCoupledFvPatch.H"
@ -62,18 +58,10 @@ Foam::tmp<Foam::labelField> Foam::regionCoupledFvPatch::internalFieldTransfer
}
else
{
/*
WarningIn
(
"regionCoupledFvPatch::internalFieldTransfer"
"( const Pstream::commsTypes, const labelUList&)"
" the internal field can not be transfered "
" as the neighbFvPatch are in different meshes "
);
*/
return tmp<labelField>(new labelField(iF.size(), 0));
}
return tmp<labelField>(NULL);
}

4
src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C
View File

@ -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
@ -47,7 +47,7 @@ Foam::autoPtr<Foam::fvPatch> Foam::fvPatch::New
if (cstrIter == polyPatchConstructorTablePtr_->end())
{
FatalErrorIn("fvPatch::New(const polyPatch&, const fvBoundaryMesh&)")
FatalErrorInFunction
<< "Unknown fvPatch type " << patch.type() << nl
<< "Valid fvPatch types are :"
<< polyPatchConstructorTablePtr_->sortedToc()

Some files were not shown because too many files have changed in this diff Show More