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

applications: 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 17:53:31 +00:00
parent 735ce9cce7
commit e2ef006b91
271 changed files with 851 additions and 1559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -85,7 +85,7 @@ Foam::tmp<Foam::volScalarField> Foam::orderedPhasePair::E() const
{
if (!aspectRatio_.valid())
{
FatalErrorIn("Foam::orderedPhasePair::E() const")
FatalErrorInFunction
<< "Aspect ratio model not specified for " << *this << "."
<< exit(FatalError);
}

6
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.C
View File

@ -82,7 +82,7 @@ Foam::phasePair::~phasePair()
const Foam::phaseModel& Foam::phasePair::dispersed() const
{
FatalErrorIn("Foam::phasePair::dispersed() const")
FatalErrorInFunction
<< "Requested dispersed phase from an unordered pair."
<< exit(FatalError);
@ -92,7 +92,7 @@ const Foam::phaseModel& Foam::phasePair::dispersed() const
const Foam::phaseModel& Foam::phasePair::continuous() const
{
FatalErrorIn("Foam::phasePair::dispersed() const")
FatalErrorInFunction
<< "Requested continuous phase from an unordered pair."
<< exit(FatalError);
@ -185,7 +185,7 @@ Foam::tmp<Foam::volScalarField> Foam::phasePair::Ta() const
Foam::tmp<Foam::volScalarField> Foam::phasePair::E() const
{
FatalErrorIn("Foam::phasePair::E() const")
FatalErrorInFunction
<< "Requested aspect ratio of the dispersed phase in an unordered pair"
<< exit(FatalError);

12
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePairKey/phasePairKey.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -125,14 +125,8 @@ Foam::Istream& Foam::operator>>(Istream& is, phasePairKey& key)
}
else
{
FatalErrorIn
(
"friend Istream& operator>>"
"("
"Istream& is, "
"phasePairKey& key"
")"
) << "Phase pair type is not recognised. "
FatalErrorInFunction
<< "Phase pair type is not recognised. "
<< temp
<< "Use (phaseDispersed in phaseContinuous) for an ordered"
<< "pair, or (phase1 and pase2) for an unordered pair."