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

9
applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
View File

@ -402,13 +402,8 @@ bool Foam::checkCoupledPoints
if (f.size() != nbrPoints[bFaceI].size())
{
FatalErrorIn
(
"Foam::checkCoupledPoints\n"
"(\n"
" const polyMesh&, const bool, labelHashSet*\n"
")\n"
) << "Local face size : " << f.size()
FatalErrorInFunction
<< "Local face size : " << f.size()
<< " does not equal neighbour face size : "
<< nbrPoints[bFaceI].size()
<< abort(FatalError);

2
applications/utilities/mesh/manipulation/checkMesh/printMeshStats.C
View File

@ -29,7 +29,7 @@ void Foam::printMeshStats(const polyMesh& mesh, const bool allTopology)
if (returnReduce(mesh.nInternalPoints(), minOp<label>()) == -1)
{
WarningIn("Foam::printMeshStats(const polyMesh&, const bool)")
WarningInFunction
<< "Some processors have their points sorted into internal"
<< " and external and some do not." << endl
<< "This can cause problems later on." << endl;

6
applications/utilities/mesh/manipulation/createBaffles/createBaffles.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
@ -313,7 +313,7 @@ void createFaces
{
if (patchWarned.insert(patchI))
{
WarningIn("createFaces(..)")
WarningInFunction
<< "Found boundary face (in patch "
<< pp.name()
<< ") in faceZone " << fZone.name()
@ -770,7 +770,7 @@ int main(int argc, char *argv[])
if (!hasWarned)
{
hasWarned = true;
WarningIn(args.executable())
WarningInFunction
<< "Setting field on boundary faces to zero." << endl
<< "You might have to edit these fields." << endl;
}

9
applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.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
@ -73,11 +73,8 @@ Foam::autoPtr<Foam::faceSelection> Foam::faceSelection::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
FatalErrorIn
(
"faceSelection::New"
"(const word&, const fvMesh&, const dictionary&)"
) << "Unknown faceSelection type "
FatalErrorInFunction
<< "Unknown faceSelection type "
<< sampleType << nl << nl
<< "Valid faceSelection types : " << endl
<< dictionaryConstructorTablePtr_->sortedToc()

14
applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.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
@ -71,10 +71,8 @@ void Foam::faceSelections::faceZoneSelection::select
if (readID == -1)
{
FatalErrorIn
(
"faceSelections::faceZoneSelection::select(labelList&) const"
) << "Cannot find faceZone " << zoneName_ << nl << "Valid zones are "
FatalErrorInFunction
<< "Cannot find faceZone " << zoneName_ << nl << "Valid zones are "
<< mesh_.faceZones().names()
<< exit(FatalError);
}
@ -92,10 +90,8 @@ void Foam::faceSelections::faceZoneSelection::select
}
else if (faceToZoneID[faceI] != zoneID)
{
FatalErrorIn
(
"faceSelections::faceZoneSelection::select(labelList&) const"
) << "Face " << faceI << " already in faceZone "
FatalErrorInFunction
<< "Face " << faceI << " already in faceZone "
<< faceToZoneID[faceI]
<< exit(FatalError);
}

28
applications/utilities/mesh/manipulation/createPatch/createPatch.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
@ -284,10 +284,8 @@ void separateList
}
else
{
FatalErrorIn
(
"separateList(const vectorField&, UList<vector>&)"
) << "Sizes of field and transformation not equal. field:"
FatalErrorInFunction
<< "Sizes of field and transformation not equal. field:"
<< field.size() << " transformation:" << separation.size()
<< abort(FatalError);
}
@ -306,11 +304,8 @@ void syncPoints
{
if (points.size() != mesh.nPoints())
{
FatalErrorIn
(
"syncPoints"
"(const polyMesh&, pointField&, const CombineOp&, const point&)"
) << "Number of values " << points.size()
FatalErrorInFunction
<< "Number of values " << points.size()
<< " is not equal to the number of points in the mesh "
<< mesh.nPoints() << abort(FatalError);
}
@ -470,11 +465,8 @@ void syncPoints
{
if (hasTransformation)
{
WarningIn
(
"syncPoints"
"(const polyMesh&, pointField&, const CombineOp&, const point&)"
) << "There are decomposed cyclics in this mesh with"
WarningInFunction
<< "There are decomposed cyclics in this mesh with"
<< " transformations." << endl
<< "This is not supported. The result will be incorrect"
<< endl;
@ -671,7 +663,7 @@ int main(int argc, char *argv[])
if (destPatchI == -1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "patch " << patchName << " not added. Problem."
<< abort(FatalError);
}
@ -728,7 +720,7 @@ int main(int argc, char *argv[])
if (mesh.isInternalFace(faceI))
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Face " << faceI << " specified in set "
<< faces.name()
<< " is not an external face of the mesh." << endl
@ -747,7 +739,7 @@ int main(int argc, char *argv[])
}
else
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Invalid source type " << sourceType << endl
<< "Valid source types are 'patches' 'set'" << exit(FatalError);
}

4
applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.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
@ -319,7 +319,7 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
// Check that the face is valid
if (min(newFace) < 0)
{
FatalErrorIn("void mergePolyMesh::addMesh(const polyMesh&)")
FatalErrorInFunction
<< "Error in point mapping for face " << faceI
<< ". Old face: " << curFace << " New face: " << newFace
<< abort(FatalError);

4
applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.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
@ -175,7 +175,7 @@ labelList findBaffles(const polyMesh& mesh, const labelList& boundaryFaces)
if (isA<processorPolyPatch>(patches[patchI]))
{
FatalErrorIn("findBaffles(const polyMesh&, const labelList&)")
FatalErrorInFunction
<< "Duplicate face " << faceI
<< " is on a processorPolyPatch."
<< "This is not allowed." << nl

4
applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.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,7 +155,7 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
if (curPatch.coupled())
{
WarningIn("mirrorFvMesh::mirrorFvMesh(const IOobject&)")
WarningInFunction
<< "Found coupled patch " << curPatch.name() << endl
<< " Mirroring faces on coupled patches destroys"
<< " the ordering. This might be fixed by running a dummy"

6
applications/utilities/mesh/manipulation/objToVTK/objToVTK.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 @@ int main(int argc, char *argv[])
if (!OBJfile.good())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot read file " << objName << exit(FatalError);
}
@ -176,7 +176,7 @@ int main(int argc, char *argv[])
{
hasWarned = true;
WarningIn(args.executable())
WarningInFunction
<< "Unrecognized OBJ command " << cmd << nl
<< "In line " << lineStream.str()
<< " at linenumber " << lineNo << nl

8
applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
View File

@ -66,7 +66,7 @@ int main(int argc, char *argv[])
if (fZone.checkParallelSync())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Face zone " << fZone.name()
<< " is not parallel synchronised."
<< " Any coupled face also needs its coupled version to be included"
@ -334,7 +334,7 @@ int main(int argc, char *argv[])
}
else
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Incorrect status for face " << meshFaceI
<< abort(FatalError);
}
@ -359,7 +359,7 @@ int main(int argc, char *argv[])
}
else
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Problem : unvisited face " << faceI
<< " centre:" << mesh.faceCentres()[faceLabels[faceI]]
<< abort(FatalError);
@ -380,7 +380,7 @@ int main(int argc, char *argv[])
mesh.faceZones()[zoneName].resetAddressing(faceLabels, newFlipMap);
if (!mesh.faceZones().write())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Failed writing faceZones" << exit(FatalError);
}
}

58
applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.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
@ -68,10 +68,8 @@ void Foam::meshDualiser::checkPolyTopoChange(const polyTopoChange& meshMod)
{
if (newToOld[newI].size() != 1)
{
FatalErrorIn
(
"meshDualiser::checkPolyTopoChange(const polyTopoChange&)"
) << "duplicate verts:" << newToOld[newI]
FatalErrorInFunction
<< "duplicate verts:" << newToOld[newI]
<< " coords:"
<< UIndirectList<point>(points, newToOld[newI])()
<< abort(FatalError);
@ -189,7 +187,7 @@ bool Foam::meshDualiser::sameDualCell
{
if (!mesh_.isInternalFace(faceI))
{
FatalErrorIn("sameDualCell(const label, const label)")
FatalErrorInFunction
<< "face:" << faceI << " is not internal face."
<< abort(FatalError);
}
@ -236,7 +234,7 @@ Foam::label Foam::meshDualiser::addInternalFace
if (nUnique < facePoints.size())
{
FatalErrorIn("addInternalFace(..)")
FatalErrorInFunction
<< "verts:" << verts << " newFace:" << newFace
<< " face points:" << facePoints
<< abort(FatalError);
@ -607,7 +605,7 @@ void Foam::meshDualiser::createFaceFromInternalFace
// Check: make sure that there is a midpoint on the edge.
if (edgeToDualPoint_[edgeI] == -1)
{
FatalErrorIn("createFacesFromInternalFace(..)")
FatalErrorInFunction
<< "face:" << faceI << " verts:" << f
<< " points:" << UIndirectList<point>(mesh_.points(), f)()
<< " no feature edge between " << f[fp]
@ -718,10 +716,8 @@ void Foam::meshDualiser::createFacesAroundBoundaryPoint
if (faceI < pp.start() || faceI >= pp.start()+pp.size())
{
FatalErrorIn
(
"meshDualiser::createFacesAroundBoundaryPoint(..)"
) << "Walked from face on patch:" << patchI
FatalErrorInFunction
<< "Walked from face on patch:" << patchI
<< " to face:" << faceI
<< " fc:" << mesh_.faceCentres()[faceI]
<< " on patch:" << patches.whichPatch(faceI)
@ -731,10 +727,8 @@ void Foam::meshDualiser::createFacesAroundBoundaryPoint
// Check if different cell.
if (dualCellI != findDualCell(own[faceI], pointI))
{
FatalErrorIn
(
"meshDualiser::createFacesAroundBoundaryPoint(..)"
) << "Different dual cells but no feature edge"
FatalErrorInFunction
<< "Different dual cells but no feature edge"
<< " inbetween point:" << pointI
<< " coord:" << mesh_.points()[pointI]
<< abort(FatalError);
@ -926,12 +920,8 @@ void Foam::meshDualiser::setRefinement
if (faceI != -1)
{
FatalErrorIn
(
"meshDualiser::setRefinement"
"(const labelList&, const labelList&, const labelList&"
", const labelList, polyTopoChange&)"
) << "In split-face-mode (splitFace=true) but not all faces"
FatalErrorInFunction
<< "In split-face-mode (splitFace=true) but not all faces"
<< " marked as feature faces." << endl
<< "First conflicting face:" << faceI
<< " centre:" << mesh_.faceCentres()[faceI]
@ -948,12 +938,8 @@ void Foam::meshDualiser::setRefinement
if (edgeI != -1)
{
const edge& e = mesh_.edges()[edgeI];
FatalErrorIn
(
"meshDualiser::setRefinement"
"(const labelList&, const labelList&, const labelList&"
", const labelList, polyTopoChange&)"
) << "In split-face-mode (splitFace=true) but not all edges"
FatalErrorInFunction
<< "In split-face-mode (splitFace=true) but not all edges"
<< " marked as feature edges." << endl
<< "First conflicting edge:" << edgeI
<< " verts:" << e
@ -979,12 +965,8 @@ void Foam::meshDualiser::setRefinement
{
if (!featureFaceSet[faceI])
{
FatalErrorIn
(
"meshDualiser::setRefinement"
"(const labelList&, const labelList&, const labelList&"
", const labelList, polyTopoChange&)"
) << "Not all boundary faces marked as feature faces."
FatalErrorInFunction
<< "Not all boundary faces marked as feature faces."
<< endl
<< "First conflicting face:" << faceI
<< " centre:" << mesh_.faceCentres()[faceI]
@ -1071,12 +1053,8 @@ void Foam::meshDualiser::setRefinement
if (pointToDualCells_[pointI].size() > 0)
{
FatalErrorIn
(
"meshDualiser::setRefinement"
"(const labelList&, const labelList&, const labelList&"
", const labelList, polyTopoChange&)"
) << "Point " << pointI << " at:" << mesh_.points()[pointI]
FatalErrorInFunction
<< "Point " << pointI << " at:" << mesh_.points()[pointI]
<< " is both in singleCellFeaturePoints"
<< " and multiCellFeaturePoints."
<< abort(FatalError);

2
applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
View File

@ -246,7 +246,7 @@ void simpleMarkFeatures
{
if (faceZones.size() > 0)
{
WarningIn("simpleMarkFeatures(..)")
WarningInFunction
<< "Detected " << faceZones.size()
<< " faceZones. These will not be preserved."
<< endl;

2
applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
View File

@ -189,7 +189,7 @@ int main(int argc, char *argv[])
if (!dictIO.headerOk())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot open specified refinement dictionary "
<< dictPath
<< exit(FatalError);

18
applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
View File

@ -244,11 +244,8 @@ labelList getFaceOrder
{
if (oldToNewFace[faceI] == -1)
{
FatalErrorIn
(
"getFaceOrder"
"(const primitiveMesh&, const labelList&, const labelList&)"
) << "Did not determine new position" << " for face " << faceI
FatalErrorInFunction
<< "Did not determine new position" << " for face " << faceI
<< abort(FatalError);
}
}
@ -386,11 +383,8 @@ labelList getRegionFaceOrder
{
if (oldToNewFace[faceI] == -1)
{
FatalErrorIn
(
"getRegionFaceOrder"
"(const primitveMesh&, const labelList&, const labelList&)"
) << "Did not determine new position"
FatalErrorInFunction
<< "Did not determine new position"
<< " for face " << faceI
<< abort(FatalError);
}
@ -738,7 +732,7 @@ int main(int argc, char *argv[])
if (blockSize < 0 || blockSize >= mesh.nCells())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Block size " << blockSize
<< " should be positive integer"
<< " and less than the number of cells in the mesh."
@ -1118,7 +1112,7 @@ int main(int argc, char *argv[])
if (masterFaceI == 0)
{
FatalErrorIn(args.executable()) << "problem faceI:" << faceI
FatalErrorInFunction
<< " masterFaceI:" << masterFaceI << exit(FatalError);
}
}

21
applications/utilities/mesh/manipulation/setSet/setSet.C
View File

@ -174,12 +174,8 @@ void writeVTK
}
else
{
WarningIn
(
"void writeVTK"
"(const polyMesh& mesh, const topoSet& currentSet,"
"const fileName& vtkName)"
) << "Don't know how to handle set of type " << currentSet.type()
WarningInFunction
<< "Don't know how to handle set of type " << currentSet.type()
<< endl;
}
}
@ -690,7 +686,7 @@ polyMesh::readUpdateState meshReadUpdate(polyMesh& mesh)
}
default:
{
FatalErrorIn("meshReadUpdate(polyMesh&)")
FatalErrorInFunction
<< "Illegal mesh update state "
<< stat << abort(FatalError);
break;
@ -770,11 +766,8 @@ commandStatus parseType
}
else
{
SeriousErrorIn
(
"commandStatus parseType(Time&, polyMesh&, const word&"
", IStringStream&)"
) << "Illegal command " << setType << endl
SeriousErrorInFunction
<< "Illegal command " << setType << endl
<< "Should be one of 'help', 'list', 'time' or a set type :"
<< " 'cellSet', 'faceSet', 'pointSet', 'faceZoneSet'"
<< endl;
@ -839,7 +832,7 @@ int main(int argc, char *argv[])
if (loop && !batch)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Can only loop in batch mode."
<< exit(FatalError);
}
@ -889,7 +882,7 @@ int main(int argc, char *argv[])
// we cannot handle .gz files
if (!isFile(batchFile, false))
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot open file " << batchFile << exit(FatalError);
}

6
applications/utilities/mesh/manipulation/setsToZones/setsToZones.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 @@ int main(int argc, char *argv[])
}
else
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "One of owner or neighbour of internal face "
<< faceI << " should be in cellSet " << cells.name()
<< " to be able to determine orientation." << endl
@ -328,7 +328,7 @@ int main(int argc, char *argv[])
if (!mesh.write())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Failed writing polyMesh."
<< exit(FatalError);
}

2
applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C
View File

@ -82,7 +82,7 @@ int main(int argc, char *argv[])
if (regionName == singleCellName)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot convert region " << singleCellName
<< " since result would overwrite it. Please rename your region."
<< exit(FatalError);

9
applications/utilities/mesh/manipulation/splitMesh/regionSide.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
@ -101,11 +101,8 @@ Foam::label Foam::regionSide::otherEdge
}
}
FatalErrorIn
(
"regionSide::otherEdge(const primitiveMesh&, const label, const label"
", const label)"
) << "Cannot find other edge on face " << faceI << " that uses point "
FatalErrorInFunction
<< "Cannot find other edge on face " << faceI << " that uses point "
<< pointI << " but not point " << freePointI << endl
<< "Edges on face:" << fEdges
<< " verts:" << UIndirectList<edge>(mesh.edges(), fEdges)()

14
applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
View File

@ -75,10 +75,8 @@ label findEdge(const primitiveMesh& mesh, const label v0, const label v1)
}
}
FatalErrorIn
(
"findEdge(const primitiveMesh&, const label, const label)"
) << "Cannot find edge between mesh points " << v0 << " and " << v1
FatalErrorInFunction
<< "Cannot find edge between mesh points " << v0 << " and " << v1
<< abort(FatalError);
return -1;
@ -92,7 +90,7 @@ void checkPatch(const polyBoundaryMesh& bMesh, const word& name)
if (patchI == -1)
{
FatalErrorIn("checkPatch(const polyBoundaryMesh&, const word&)")
FatalErrorInFunction
<< "Cannot find patch " << name << nl
<< "It should be present but of zero size" << endl
<< "Valid patches are " << bMesh.names()
@ -101,7 +99,7 @@ void checkPatch(const polyBoundaryMesh& bMesh, const word& name)
if (bMesh[patchI].size())
{
FatalErrorIn("checkPatch(const polyBoundaryMesh&, const word&)")
FatalErrorInFunction
<< "Patch " << name << " is present but non-zero size"
<< exit(FatalError);
}
@ -143,7 +141,7 @@ int main(int argc, char *argv[])
{
if (!mesh.isInternalFace(faces[i]))
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Face " << faces[i] << " in faceSet " << setName
<< " is not an internal face."
<< exit(FatalError);
@ -282,7 +280,7 @@ int main(int argc, char *argv[])
Info<< "Writing mesh to " << runTime.timeName() << endl;
if (!mesh.write())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Failed writing polyMesh."
<< exit(FatalError);
}

22
applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
View File

@ -126,10 +126,8 @@ void renamePatches
if (isA<coupledPolyPatch>(pp))
{
WarningIn
(
"renamePatches(fvMesh&, const word&, const labelList&"
) << "Encountered coupled patch " << pp.name()
WarningInFunction
<< "Encountered coupled patch " << pp.name()
<< ". Will only rename the patch itself,"
<< " not any referred patches."
<< " This might have to be done by hand."
@ -695,7 +693,7 @@ autoPtr<mapPolyMesh> createRegionMesh
}
else
{
FatalErrorIn("createRegionMesh(..)")
FatalErrorInFunction
<< "Exposed face:" << faceI
<< " fc:" << mesh.faceCentres()[faceI]
<< " has owner region " << ownRegion
@ -1209,7 +1207,7 @@ void getZoneID
}
else
{
FatalErrorIn("getZoneID(..)")
FatalErrorInFunction
<< "Cell " << cellI << " with cell centre "
<< mesh.cellCentres()[cellI]
<< " is multiple zones. This is not allowed." << endl
@ -1267,7 +1265,7 @@ void matchRegions
{
if (zoneNames[procI] != zoneNames[0])
{
FatalErrorIn("matchRegions(..)")
FatalErrorInFunction
<< "cellZones not synchronised across processors." << endl
<< "Master has cellZones " << zoneNames[0] << endl
<< "Processor " << procI
@ -1501,7 +1499,7 @@ int main(int argc, char *argv[])
&& (useCellZones || blockedFacesName.size())
)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "You cannot specify both -cellZonesOnly or -cellZonesFileOnly"
<< " (which specify complete split)"
<< " in combination with -blockedFaces or -cellZones"
@ -1526,7 +1524,7 @@ int main(int argc, char *argv[])
if (insidePoint && largestOnly)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "You cannot specify both -largestOnly"
<< " (keep region with most cells)"
<< " and -insidePoint (keep region containing point)"
@ -1566,7 +1564,7 @@ int main(int argc, char *argv[])
label unzonedCellI = findIndex(zoneID, -1);
if (unzonedCellI != -1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "For the cellZonesOnly option all cells "
<< "have to be in a cellZone." << endl
<< "Cell " << unzonedCellI
@ -1615,7 +1613,7 @@ int main(int argc, char *argv[])
label unzonedCellI = findIndex(newZoneID, -1);
if (unzonedCellI != -1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "For the cellZonesFileOnly option all cells "
<< "have to be in a cellZone." << endl
<< "Cell " << unzonedCellI
@ -2012,7 +2010,7 @@ int main(int argc, char *argv[])
if (regionI == -1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Point " << insidePoint
<< " is not inside the mesh." << nl
<< "Bounding box of the mesh:" << mesh.bounds()

8
applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
View File

@ -177,7 +177,7 @@ void checkPatch(const polyBoundaryMesh& bMesh, const word& name)
if (patchI == -1)
{
FatalErrorIn("checkPatch(const polyBoundaryMesh&, const word&)")
FatalErrorInFunction
<< "Cannot find patch " << name << endl
<< "It should be present and of non-zero size" << endl
<< "Valid patches are " << bMesh.names()
@ -186,7 +186,7 @@ void checkPatch(const polyBoundaryMesh& bMesh, const word& name)
if (bMesh[patchI].empty())
{
FatalErrorIn("checkPatch(const polyBoundaryMesh&, const word&)")
FatalErrorInFunction
<< "Patch " << name << " is present but zero size"
<< exit(FatalError);
}
@ -244,7 +244,7 @@ int main(int argc, char *argv[])
if (partialCover && perfectCover)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot supply both partial and perfect." << endl
<< "Use perfect match option if the patches perfectly align"
<< " (both vertex positions and face centres)" << endl
@ -487,7 +487,7 @@ int main(int argc, char *argv[])
)
)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Failed writing polyMesh."
<< exit(FatalError);
}

4
applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.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
@ -217,7 +217,7 @@ int main(int argc, char *argv[])
if (patchI == -1)
{
FatalErrorIn(args.executable()) << "Illegal patch " << patchName
FatalErrorInFunction
<< nl << "Valid patches are " << mesh.boundaryMesh().names()
<< exit(FatalError);
}

6
applications/utilities/mesh/manipulation/topoSet/topoSet.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
@ -181,7 +181,7 @@ polyMesh::readUpdateState meshReadUpdate(polyMesh& mesh)
}
default:
{
FatalErrorIn("meshReadUpdate(polyMesh&)")
FatalErrorInFunction
<< "Illegal mesh update state "
<< stat << abort(FatalError);
break;
@ -354,7 +354,7 @@ int main(int argc, char *argv[])
default:
WarningIn(args.executable())
WarningInFunction
<< "Unhandled action " << action << endl;
break;
}

2
applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
View File

@ -213,7 +213,7 @@ int main(int argc, char *argv[])
// this is not actually stringent enough:
if (args.options().empty())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "No options supplied, please use one or more of "
"-translate, -rotate or -scale options."
<< exit(FatalError);