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

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

6
applications/utilities/parallelProcessing/decomposePar/decomposePar.C
View File

@ -283,7 +283,7 @@ int main(int argc, char *argv[])
// Sanity check on previously decomposed case
if (nProcs != nDomains)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Specified -fields, but the case was decomposed with "
<< nProcs << " domains"
<< nl
@ -329,7 +329,7 @@ int main(int argc, char *argv[])
if (procDirsProblem)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Case is already decomposed with " << nProcs
<< " domains, use the -force option or manually" << nl
<< "remove processor directories before decomposing. e.g.,"
@ -640,7 +640,7 @@ int main(int argc, char *argv[])
// Check
if (celli < 0 || celli >= mesh.nCells())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Illegal cell number " << celli
<< " for particle with index " << iter().index()
<< " at position " << iter().position() << nl

21
applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.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
@ -30,7 +30,6 @@ Description
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components
Foam::lagrangianFieldDecomposer::lagrangianFieldDecomposer
(
const polyMesh& mesh,
@ -77,22 +76,8 @@ Foam::lagrangianFieldDecomposer::lagrangianFieldDecomposer
// if (mappedTetFace == -1)
// {
// FatalErrorIn
// (
// "Foam::lagrangianFieldDecomposer"
// "::lagrangianFieldDecomposer"
// "("
// "const polyMesh& mesh, "
// "const polyMesh& procMesh, "
// "const labelList& faceProcAddressing, "
// "const labelList& cellProcAddressing, "
// "const word& cloudName, "
// "const Cloud<indexedParticle>& "
// "lagrangianPositions, "
// "const List<SLList<indexedParticle*>*>& "
// "cellParticles"
// ")"
// ) << "Face lookup failure." << nl
// FatalErrorInFunction
// << "Face lookup failure." << nl
// << abort(FatalError);
// }

8
applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.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
@ -67,10 +67,8 @@ Foam::pointFieldDecomposer::patchFieldDecomposer::patchFieldDecomposer
{
hasUnmapped_ = true;
FatalErrorIn
(
"pointFieldDecomposer::patchFieldDecomposer()"
) << "Incomplete patch point addressing"
FatalErrorInFunction
<< "Incomplete patch point addressing"
<< abort(FatalError);
}
}

2
applications/utilities/parallelProcessing/reconstructPar/checkFaceAddressingComp.H
View File

@ -23,7 +23,7 @@
if (minFaceIndex < 1)
{
WarningIn(args.executable())
WarningInFunction
<< "parallel decomposition addressing." << endl
<< "It looks like you are trying to reconstruct the case "
<< "decomposed with an earlier version of FOAM, which could\n"

8
applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
View File

@ -145,7 +145,7 @@ int main(int argc, char *argv[])
{
if (noLagrangian)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot specify noLagrangian and lagrangianFields "
<< "options together."
<< exit(FatalError);
@ -168,7 +168,7 @@ int main(int argc, char *argv[])
if (!nProcs)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "No processor* directories found"
<< exit(FatalError);
}
@ -207,7 +207,7 @@ int main(int argc, char *argv[])
if (timeDirs.empty())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "No times selected"
<< exit(FatalError);
}
@ -347,7 +347,7 @@ int main(int argc, char *argv[])
}
else if (meshStat != procStat)
{
WarningIn(args.executable())
WarningInFunction
<< "readUpdate for the reconstructed mesh:"
<< meshStat << nl
<< "readUpdate for the processor meshes :"

8
applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
View File

@ -268,7 +268,7 @@ autoPtr<mapPolyMesh> mergeSharedPoints
}
else
{
FatalErrorIn("fvMeshDistribute::mergeSharedPoints()")
FatalErrorInFunction
<< "Problem. oldPointI:" << oldPointI
<< " newPointI:" << newPointI << abort(FatalError);
}
@ -301,7 +301,7 @@ boundBox procBounds
if (pointsInstance != databases[procI].timeName())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Your time was specified as " << databases[procI].timeName()
<< " but there is no polyMesh/points in that time." << endl
<< "(there is a points file in " << pointsInstance
@ -497,7 +497,7 @@ int main(int argc, char *argv[])
if (runTime.writeFormat() == IOstream::ASCII && mergeTol < writeTol)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Your current settings specify ASCII writing with "
<< IOstream::defaultPrecision() << " digits precision." << endl
<< "Your merging tolerance (" << mergeTol << ") is finer than this."
@ -726,7 +726,7 @@ int main(int argc, char *argv[])
if (!masterMesh.write())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Failed writing polyMesh."
<< exit(FatalError);
}

14
applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.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
@ -236,10 +236,8 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
if (patchI >= patches.size())
{
FatalErrorIn
(
"createMesh(const Time&, const fileName&, const bool)"
) << "Non-processor patches not synchronised."
FatalErrorInFunction
<< "Non-processor patches not synchronised."
<< endl
<< "Processor " << Pstream::myProcNo()
<< " has only " << patches.size()
@ -254,10 +252,8 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
|| name != patches[patchI].name()
)
{
FatalErrorIn
(
"createMesh(const Time&, const fileName&, const bool)"
) << "Non-processor patches not synchronised."
FatalErrorInFunction
<< "Non-processor patches not synchronised."
<< endl
<< "Master patch " << patchI
<< " name:" << type

25
applications/utilities/parallelProcessing/redistributePar/redistributePar.C
View File

@ -82,7 +82,7 @@ scalar getMergeDistance
if (runTime.writeFormat() == IOstream::ASCII && mergeTol < writeTol)
{
FatalErrorIn("getMergeDistance")
FatalErrorInFunction
<< "Your current settings specify ASCII writing with "
<< IOstream::defaultPrecision() << " digits precision." << endl
<< "Your merging tolerance (" << mergeTol << ") is finer than this."
@ -272,7 +272,7 @@ void readFields
if (haveMesh[Pstream::myProcNo()] && objectNames != masterNames)
{
FatalErrorIn("readFields()")
FatalErrorInFunction
<< "differing fields of type " << GeoField::typeName
<< " on processors." << endl
<< "Master has:" << masterNames << endl
@ -373,11 +373,8 @@ void compareFields
{
if (mag(b[cellI] - a[cellI]) > tolDim)
{
FatalErrorIn
(
"compareFields"
"(const scalar, const volVectorField&, const volVectorField&)"
) << "Did not map volVectorField correctly:" << nl
FatalErrorInFunction
<< "Did not map volVectorField correctly:" << nl
<< "cell:" << cellI
<< " transfer b:" << b[cellI]
<< " real cc:" << a[cellI]
@ -401,12 +398,8 @@ void compareFields
{
if (mag(aBoundary[i] - bBoundary[i]) > tolDim)
{
WarningIn
(
"compareFields"
"(const scalar, const volVectorField&"
", const volVectorField&)"
) << "Did not map volVectorField correctly:"
WarningInFunction
<< "Did not map volVectorField correctly:"
<< endl
<< "patch:" << patchI << " patchFace:" << i
<< " cc:" << endl
@ -441,7 +434,7 @@ int main(int argc, char *argv[])
if (env("FOAM_SIGFPE"))
{
WarningIn(args.executable())
WarningInFunction
<< "Detected floating point exception trapping (FOAM_SIGFPE)."
<< " This might give" << nl
<< " problems when mapping fields. Switch it off in case"
@ -550,7 +543,7 @@ int main(int argc, char *argv[])
if (!decomposer().parallelAware())
{
WarningIn(args.executable())
WarningInFunction
<< "You have selected decomposition method "
<< decomposer().typeName
<< " which does" << endl
@ -596,7 +589,7 @@ int main(int argc, char *argv[])
if (nonProcI == -1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot find non-processor patch on processor "
<< Pstream::myProcNo() << endl
<< " Current patches:" << patches.names() << abort(FatalError);