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

GIT: Resolved conflict

Browse Source
This commit is contained in:
Andrew Heather
2015-12-09 16:19:28 +00:00
parent abeef3313d ed2db73e50
commit 5c9dff6146
2311 changed files with 44971 additions and 26546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/utilities/mesh/advanced/PDRMesh/Make/options
View File

@ -10,4 +10,5 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lmeshTools \
-ldynamicMesh \
-lfiniteVolume
-lfiniteVolume \
-lfvOptions

14
applications/utilities/mesh/advanced/PDRMesh/PDRMesh.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
@ -531,7 +531,7 @@ label findPatch(const polyBoundaryMesh& patches, const word& patchName)
if (patchI == -1)
{
FatalErrorIn("findPatch(const polyBoundaryMesh&, const word&)")
FatalErrorInFunction
<< "Illegal patch " << patchName
<< nl << "Valid patches are " << patches.names()
<< exit(FatalError);
@ -544,7 +544,7 @@ label findPatch(const polyBoundaryMesh& patches, const word& patchName)
if (newPatch != patchI)
{
FatalErrorIn("findPatch(const polyBoundaryMesh&, const word&)")
FatalErrorInFunction
<< "Patch " << patchName
<< " should have the same patch index on all processors." << nl
<< "On my processor it has index " << patchI
@ -652,7 +652,7 @@ int main(int argc, char *argv[])
{
if (wantedPatch[iter.key()] != -1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Face " << iter.key()
<< " is in faceSet " << setsAndPatches[setI][0]
<< " destined for patch " << setsAndPatches[setI][1]
@ -690,7 +690,7 @@ int main(int argc, char *argv[])
{
if (coupledWantedPatch[iter.key()] != -1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Face " << iter.key()
<< " is in faceSet " << coupledAndPatches[setI][0]
<< " destined for patch " << coupledAndPatches[setI][1]
@ -1152,7 +1152,7 @@ int main(int argc, char *argv[])
if (cellRegion.nRegions() > 1)
{
WarningIn(args.executable())
WarningInFunction
<< "Removing blocked faces and cells created "
<< cellRegion.nRegions()
<< " regions that are not connected via a face." << nl
@ -1168,7 +1168,7 @@ int main(int argc, char *argv[])
if (startFrom != "latestTime")
{
WarningIn(args.executable())
WarningInFunction
<< "To run splitMeshRegions please set your"
<< " startFrom entry to latestTime" << endl;
}

6
applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
View File

@ -365,7 +365,7 @@ bool limitRefinementLevel
{
if (refLevel[cellI] - refLevel[nbr] >= limitDiff)
{
FatalErrorIn("limitRefinementLevel")
FatalErrorInFunction
<< "Level difference between neighbouring cells "
<< cellI << " and " << nbr
<< " greater than or equal to " << limitDiff << endl
@ -705,7 +705,7 @@ int main(int argc, char *argv[])
if (nCutLayers > 0 && selectInside)
{
WarningIn(args.executable())
WarningInFunction
<< "Illogical settings : Both nCutLayers>0 and selectInside true."
<< endl
<< "This would mean that inside cells get removed but should be"
@ -728,7 +728,7 @@ int main(int argc, char *argv[])
if (queryMesh.findCell(outsidePoint, -1, false) == -1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "outsidePoint " << outsidePoint
<< " is not inside any cell"
<< exit(FatalError);

2
applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
View File

@ -98,7 +98,7 @@ int main(int argc, char *argv[])
if (collapseFaces && collapseFaceSet)
{
FatalErrorIn("main(int, char*[])")
FatalErrorInFunction
<< "Both face zone collapsing and face collapsing have been"
<< "selected. Choose only one of:" << nl
<< " -collapseFaces" << nl

2
applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
View File

@ -177,7 +177,7 @@ label mergePatchFaces
if (newVertI < 0)
{
FatalErrorIn("mergePatchFaces")
FatalErrorInFunction
<< "In set:" << setI << " old face labels:"
<< allFaceSets[setI] << " new face vertices:"
<< setFaceVerts[i] << " are unmapped vertices!"

2
applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
View File

@ -399,7 +399,7 @@ int main(int argc, char *argv[])
|| (collapseEdge && cellsToSplit)
)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Used more than one mesh modifying module "
<< "(boundary cutting, cell splitting, edge collapsing)" << nl
<< "Please do them in separate passes." << exit(FatalError);

2
applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
View File

@ -86,7 +86,7 @@ int main(int argc, char *argv[])
if (!patchSet.size())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot find any patches in set " << patches << endl
<< "Valid patches are " << mesh.boundaryMesh().names()
<< exit(FatalError);

4
applications/utilities/mesh/advanced/refinementLevel/refinementLevel.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
@ -240,7 +240,7 @@ int main(int argc, char *argv[])
if (!readLevel && refHeader.headerOk())
{
WarningIn(args.executable())
WarningInFunction
<< "Detected " << refHeader.name() << " file in "
<< polyMesh::defaultRegion << " directory. Please remove to"
<< " recreate it or use the -readLevel option to use it"

4
applications/utilities/mesh/advanced/selectCells/selectCells.C
View File

@ -174,7 +174,7 @@ void cutBySurface
}
else
{
FatalErrorIn("cutBySurface")
FatalErrorInFunction
<< "Multiple mesh regions in original mesh" << endl
<< "Please use splitMeshRegions to separate these"
<< exit(FatalError);
@ -393,7 +393,7 @@ int main(int argc, char *argv[])
label cellI = queryMesh.findCell(outsidePoint, -1, false);
if (returnReduce(cellI, maxOp<label>()) == -1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "outsidePoint " << outsidePoint
<< " is not inside any cell"
<< exit(FatalError);

4
applications/utilities/mesh/advanced/splitCells/splitCells.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
@ -261,7 +261,7 @@ bool splitHex
if (leftI == -1 || rightI == -1)
{
FatalErrorIn("splitHex") << "Problem : leftI:" << leftI
FatalErrorInFunction
<< " rightI:" << rightI << abort(FatalError);
}

16
applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.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
@ -164,7 +164,7 @@ void CheckError(CCMIOError const &err, const Foam::string& str)
{
if (err != kCCMIONoErr)
{
FatalErrorIn("CheckError")
FatalErrorInFunction
<< str << exit(FatalError);
}
}
@ -625,14 +625,14 @@ int main(int argc, char *argv[])
if (!isFile(ccmFile))
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot read file " << ccmFile
<< exit(FatalError);
}
if (ccmExt != "ccm" && ccmExt != "ccmg")
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Illegal extension " << ccmExt << " for file " << ccmFile
<< nl << "Allowed extensions are '.ccm', '.ccmg'"
<< exit(FatalError);
@ -697,7 +697,7 @@ int main(int argc, char *argv[])
);
if (err != kCCMIONoErr)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Could not read the file."
<< exit(FatalError);
}
@ -838,7 +838,7 @@ int main(int argc, char *argv[])
if (nbr >= foamCellType.size() || own >= foamCellType.size())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "face:" << faceI
<< " nbr:" << nbr
<< " own:" << own
@ -864,7 +864,7 @@ int main(int argc, char *argv[])
{
if (f[fp] < 0 || f[fp] >= foamPoints.size())
{
FatalErrorIn(args.executable()) << "face:" << faceI
FatalErrorInFunction
<< " f:" << f << abort(FatalError);
}
}
@ -1002,7 +1002,7 @@ int main(int argc, char *argv[])
if (meshFaceI != foamOwner.size())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "meshFaceI:" << meshFaceI
<< " nFaces:" << foamOwner.size()
<< abort(FatalError);

4
applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
View File

@ -285,7 +285,7 @@ label findFace(const polyMesh& mesh, const face& f)
}
}
FatalErrorIn("findFace(const polyMesh&, const face&)")
FatalErrorInFunction
<< "Cannot find a face matching " << f
<< exit(FatalError);
@ -320,7 +320,7 @@ int main(int argc, char *argv[])
if (!ansysStream)
{
FatalErrorIn("ansysToFoam::main(int argc, char *argv[])")
FatalErrorInFunction
<< args.executable()
<< ": file " << ansysFile << " not found"
<< exit(FatalError);

12
applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
View File

@ -235,7 +235,7 @@ int main(int argc, char *argv[])
if (blockPFaces.size() != blockNFaces.size())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Inconsistent number of faces for glue pair "
<< glueI << " between blocks " << blockPlabel + 1
<< " and " << blockNlabel + 1
@ -417,7 +417,7 @@ int main(int argc, char *argv[])
if (changedPointMerge == true)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Point merging failed after max number of passes."
<< abort(FatalError);
}
@ -448,7 +448,7 @@ int main(int argc, char *argv[])
if (pointMergeList[PpointLabel] == -1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Unable to merge point " << blockPFacePointI
<< " of face " << blockPFaceLabel
<< " of block " << blockPlabel
@ -470,7 +470,7 @@ int main(int argc, char *argv[])
if (pointMergeList[NpointLabel] == -1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Unable to merge point " << blockNFacePointI
<< " of face " << blockNFaceLabel
<< " of block " << blockNlabel
@ -489,7 +489,7 @@ int main(int argc, char *argv[])
{
if (pointMergeList[pointLabel] > pointLabel)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "ouch" << abort(FatalError);
}
@ -692,7 +692,7 @@ int main(int argc, char *argv[])
}
else
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Unrecognised CFX patch type "
<< cfxPatchTypes[patchI]
<< abort(FatalError);

22
applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.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
@ -136,7 +136,7 @@ labelListList hexBlock::blockCells() const
}
else
{
FatalErrorIn("hexBlock::cellShapes()")
FatalErrorInFunction
<< "Unable to determine block handedness as points "
<< "have not been read in yet"
<< abort(FatalError);
@ -155,10 +155,8 @@ faceList hexBlock::patchFaces(const label direc, const labelList& range) const
{
if (range.size() != 6)
{
FatalErrorIn
(
"patchFaces(const label direc, const labelList& range) const"
) << "Invalid size of the range array: " << range.size()
FatalErrorInFunction
<< "Invalid size of the range array: " << range.size()
<< ". Should be 6 (xMin, xMax, yMin, yMax, zMin, zMax"
<< abort(FatalError);
}
@ -351,10 +349,8 @@ faceList hexBlock::patchFaces(const label direc, const labelList& range) const
default:
{
FatalErrorIn
(
"patchFaces(const label direc, const labelList& range) const"
) << "direction out of range (1 to 6): " << direc
FatalErrorInFunction
<< "direction out of range (1 to 6): " << direc
<< abort(FatalError);
}
}
@ -363,10 +359,8 @@ faceList hexBlock::patchFaces(const label direc, const labelList& range) const
// Do nothing for the right-handed block
if (blockHandedness_ == noPoints)
{
FatalErrorIn
(
"patchFaces(const label direc, const labelList& range) const"
) << "Unable to determine block handedness as points "
FatalErrorInFunction
<< "Unable to determine block handedness as points "
<< "have not been read in yet"
<< abort(FatalError);
}

4
applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.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
@ -124,7 +124,7 @@ public:
{
if (blockHandedness_ == noPoints)
{
FatalErrorIn("hexBlock::points() const")
FatalErrorInFunction
<< "points not read in yet"
<< abort(FatalError);
}

16
applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
View File

@ -750,7 +750,7 @@ endOfSection {space}")"{space}
<*>. {
// This is a catch all.
FatalErrorIn("fluentMeshToFoam::lexer")
FatalErrorInFunction
<< "Do not understand characters: " << YYText() << nl
<< " on line " << lineNo
<< exit(FatalError);
@ -826,7 +826,7 @@ int main(int argc, char *argv[])
if (!fluentStream)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< ": file " << fluentFile << " not found"
<< exit(FatalError);
}
@ -840,7 +840,7 @@ int main(int argc, char *argv[])
if (dimensionOfGrid != 3)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Mesh is not 3D, dimension of grid: " << dimensionOfGrid
<< exit(FatalError);
}
@ -1018,7 +1018,7 @@ int main(int argc, char *argv[])
}
else
{
WarningIn(args.executable())
WarningInFunction
<< "Unknown FaceGroup " << zoneID << " not in a zone"
<< endl;
}
@ -1255,7 +1255,7 @@ int main(int argc, char *argv[])
{
if (!doneWarning)
{
WarningIn(args.executable())
WarningInFunction
<< "Ignoring internal face " << facei
<< " on FaceZone " << zoneID
<< " since owner " << owner[facei] << " or neighbour "
@ -1306,7 +1306,7 @@ int main(int argc, char *argv[])
{
if (!doneWarning)
{
WarningIn(args.executable())
WarningInFunction
<< "Ignoring patch face " << facei
<< " on FaceZone " << zoneID
<< " since owner " << owner[facei] << " or neighbour "
@ -1363,7 +1363,7 @@ int main(int argc, char *argv[])
// Check the face being added as an internal face actually is one
if (neighbour[facei] == -1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Attempt of add internal face " << facei
<< " which is a boundary face"
<< exit(FatalError);
@ -1373,7 +1373,7 @@ int main(int argc, char *argv[])
{
if (!doneWarning)
{
WarningIn(args.executable())
WarningInFunction
<< "Ignoring internal face " << facei
<< " since owner " << owner[facei] << " or neighbour "
<< neighbour[facei] << " outside range of cells 0.."

38
applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.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
@ -74,13 +74,8 @@ cellShape create3DCellShape
// Checking
if (faceLabels.size() != curModel.nFaces())
{
FatalErrorIn
(
"create3DCellShape(const label cellIndex, "
"const labelList& faceLabels, const labelListList& faces, "
"const labelList& owner, const labelList& neighbour, "
"const label fluentCellModelID)"
) << "Number of face labels not equal to"
FatalErrorInFunction
<< "Number of face labels not equal to"
<< "number of face in the model. "
<< "Number of face labels: " << faceLabels.size()
<< " number of faces in model: " << curModel.nFaces()
@ -113,13 +108,8 @@ cellShape create3DCellShape
}
else
{
FatalErrorIn
(
"create3DCellShape(const label cellIndex, "
"const labelList& faceLabels, const labelListList& faces, "
"const labelList& owner, const labelList& neighbour, "
"const label fluentCellModelID)"
) << "face " << curFaceLabel
FatalErrorInFunction
<< "face " << curFaceLabel
<< " does not belong to cell " << cellIndex
<< ". Face owner: " << owner[curFaceLabel] << " neighbour: "
<< neighbour[curFaceLabel]
@ -176,13 +166,8 @@ cellShape create3DCellShape
if (!found)
{
FatalErrorIn
(
"create3DCellShape(const label cellIndex, "
"const labelList& faceLabels, const labelListList& faces, "
"const labelList& owner, const labelList& neighbour, "
"const label fluentCellModelID)"
) << "Cannot find match for first face. "
FatalErrorInFunction
<< "Cannot find match for first face. "
<< "cell model: " << curModel.name() << " first model face: "
<< firstModelFace << " Mesh faces: " << localFaces
<< abort(FatalError);
@ -271,13 +256,8 @@ cellShape create3DCellShape
if (!found)
{
// A model face is not matched. Shape detection failed
FatalErrorIn
(
"create3DCellShape(const label cellIndex, "
"const labelList& faceLabels, const labelListList& faces, "
"const labelList& owner, const labelList& neighbour, "
"const label fluentCellModelID)"
) << "Cannot find match for face "
FatalErrorInFunction
<< "Cannot find match for face "
<< modelFaceI
<< ".\nModel: " << curModel.name() << " model face: "
<< curModelFace << " Mesh faces: " << localFaces

38
applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedQuadCellShape.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,13 +59,8 @@ cellShape extrudedQuadCellShape
// Checking
if (faceLabels.size() != 4)
{
FatalErrorIn
(
"extrudedQuadCellShape(const label cellIndex, "
"const labelList& faceLabels, const faceList& faces, "
"const labelList& owner, const labelList& neighbour, "
"const label pointOffset, faceList& frontAndBackFaces)"
) << "Trying to create a quad with " << faceLabels.size() << " faces"
FatalErrorInFunction
<< "Trying to create a quad with " << faceLabels.size() << " faces"
<< abort(FatalError);
}
@ -80,13 +75,8 @@ cellShape extrudedQuadCellShape
if (curFace.size() != 2)
{
FatalErrorIn
(
"extrudedQuadCellShape(const label cellIndex, "
"const labelList& faceLabels, const faceList& faces, "
"const labelList& owner, const labelList& neighbour, "
"const label pointOffset, faceList& frontAndBackFaces)"
) << "face " << curFaceLabel
FatalErrorInFunction
<< "face " << curFaceLabel
<< "does not have 2 vertices. Number of vertices: " << curFace
<< abort(FatalError);
}
@ -110,13 +100,8 @@ cellShape extrudedQuadCellShape
}
else
{
FatalErrorIn
(
"extrudedQuadCellShape(const label cellIndex, "
"const labelList& faceLabels, const faceList& faces, "
"const labelList& owner, const labelList& neighbour, "
"const label pointOffset, faceList& frontAndBackFaces)"
) << "face " << curFaceLabel
FatalErrorInFunction
<< "face " << curFaceLabel
<< " does not belong to cell " << cellIndex
<< ". Face owner: " << owner[curFaceLabel] << " neighbour: "
<< neighbour[curFaceLabel]
@ -253,13 +238,8 @@ cellShape extrudedQuadCellShape
}
else
{
FatalErrorIn
(
"extrudedQuadCellShape(const label cellIndex, "
"const labelList& faceLabels, const faceList& faces, "
"const labelList& owner, const labelList& neighbour, "
"const label pointOffset, faceList& frontAndBackFaces)"
) << "Problem with edge matching. Edges: " << localFaces
FatalErrorInFunction
<< "Problem with edge matching. Edges: " << localFaces
<< abort(FatalError);
}

38
applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedTriangleCellShape.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
@ -60,13 +60,8 @@ cellShape extrudedTriangleCellShape
// Checking
if (faceLabels.size() != 3)
{
FatalErrorIn
(
"extrudedTriangleCellShape(const label cellIndex, "
"const labelList& faceLabels, const faceList& faces, "
"const labelList& owner, const labelList& neighbour, "
"const label pointOffset, faceList& frontAndBackFaces)"
) << "Trying to create a triangle with " << faceLabels.size()
FatalErrorInFunction
<< "Trying to create a triangle with " << faceLabels.size()
<< " faces"
<< abort(FatalError);
}
@ -82,13 +77,8 @@ cellShape extrudedTriangleCellShape
if (curFace.size() != 2)
{
FatalErrorIn
(
"extrudedTriangleCellShape(const label cellIndex, "
"const labelList& faceLabels, const faceList& faces, "
"const labelList& owner, const labelList& neighbour, "
"const label pointOffset, faceList& frontAndBackFaces)"
) << "face " << curFaceLabel
FatalErrorInFunction
<< "face " << curFaceLabel
<< "does not have 2 vertices. Number of vertices: " << curFace
<< abort(FatalError);
}
@ -112,13 +102,8 @@ cellShape extrudedTriangleCellShape
}
else
{
FatalErrorIn
(
"extrudedTriangleCellShape(const label cellIndex, "
"const labelList& faceLabels, const faceList& faces, "
"const labelList& owner, const labelList& neighbour, "
"const label pointOffset, faceList& frontAndBackFaces)"
) << "face " << curFaceLabel
FatalErrorInFunction
<< "face " << curFaceLabel
<< " does not belong to cell " << cellIndex
<< ". Face owner: " << owner[curFaceLabel] << " neighbour: "
<< neighbour[curFaceLabel]
@ -193,13 +178,8 @@ cellShape extrudedTriangleCellShape
}
else
{
FatalErrorIn
(
"extrudedTriangleCellShape(const label cellIndex, "
"const labelList& faceLabels, const faceList& faces, "
"const labelList& owner, const labelList& neighbour, "
"const label pointOffset, faceList& frontAndBackFaces)"
) << "Problem with edge matching. Edges: " << localFaces
FatalErrorInFunction
<< "Problem with edge matching. Edges: " << localFaces
<< abort(FatalError);
}

19
applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
View File

@ -853,7 +853,7 @@ label findFace(const primitiveMesh& mesh, const face& f)
}
// Didn't find face. Do what?
FatalErrorIn("findFace(const primitiveMesh&, const face&)")
FatalErrorInFunction
<< "Problem : cannot find a single face in the mesh which uses"
<< " vertices " << f << exit(FatalError);
@ -901,7 +901,7 @@ int main(int argc, char *argv[])
if (!fluentStream)
{
FatalErrorIn("fluentToFoam::main(int argc, char *argv[])")
FatalErrorInFunction
<< args.executable()
<< ": file " << fluentFile << " not found"
<< exit(FatalError);
@ -1054,8 +1054,7 @@ int main(int argc, char *argv[])
default:
{
FatalErrorIn("fluentToFoam::main(int argc, char *argv[])")
<< "unrecognised 2-D cell shape: "
FatalErrorInFunction
<< fluentCellModelID[celli]
<< abort(FatalError);
}
@ -1068,7 +1067,7 @@ int main(int argc, char *argv[])
if (faces[faceI].size() != 2)
{
FatalErrorIn("fluentToFoam::main(int argc, char *argv[])")
FatalErrorInFunction
<< "fluentMeshToFoam: a 2-D face defined with "
<< faces[faceI].size() << " points." << endl;
}
@ -1114,7 +1113,7 @@ int main(int argc, char *argv[])
}
else
{
FatalErrorIn("fluentToFoam::main(int argc, char *argv[])")
FatalErrorInFunction
<< "unrecognised 3-D cell shape: "
<< fluentCellModelID[celli]
<< abort(FatalError);
@ -1255,7 +1254,7 @@ int main(int argc, char *argv[])
}
else
{
FatalErrorIn("fluentToFoam::main(int argc, char *argv[])")
FatalErrorInFunction
<< "unrecognised face shape with "
<< patchFaces[faceI].size() << " vertices"
<< abort(FatalError);
@ -1340,7 +1339,7 @@ int main(int argc, char *argv[])
}
else //unknown face regions are not handled
{
FatalErrorIn("fluentToFoam::main(int argc, char *argv[])")
FatalErrorInFunction
<< "fluent patch type " << curPatchType << " not recognised."
<< abort(FatalError);
}
@ -1417,7 +1416,7 @@ int main(int argc, char *argv[])
if (pShapeMesh.isInternalFace(faceI))
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Face " << faceI << " on new patch "
<< patchNames[patchI]
<< " is not an external face of the mesh." << endl
@ -1426,7 +1425,7 @@ int main(int argc, char *argv[])
if (facePatchID[faceI - pShapeMesh.nInternalFaces()]!= -1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Face " << faceI << " on new patch "
<< patchNames[patchI]
<< " has already been marked for repatching to"

4
applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.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
@ -254,7 +254,7 @@ void Foam::fluentFvMesh::writeFluentMesh() const
{
hasWarned = true;
WarningIn("void fluentFvMesh::writeFluentMesh() const")
WarningInFunction
<< "foamMeshToFluent: cell shape for cell "
<< cellI << " only supported by Fluent polyhedral meshes."
<< nl

6
applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
View File

@ -425,7 +425,7 @@ mtype {space}"MTYPE:"{space}
if (curGroupID > 0)
{
FatalErrorIn("gambitToFoam::main")
FatalErrorInFunction
<< "<readCellStreamGroupID>{space}{label} : "
<< "trying to reset group ID while active"
<< abort(FatalError);
@ -582,7 +582,7 @@ mtype {space}"MTYPE:"{space}
<boundaryPatchFaces>{spaceNl}{label}({scalarList}|\n) {
// Vertex-based boundary condition
FatalErrorIn("gambitToFoam::main")
FatalErrorInFunction
<< "<boundaryPatchFaces>{spaceNl}{label}{scalarList} : "
<< "boundary condition specified on vertices not supported"
<< abort(FatalError);
@ -648,7 +648,7 @@ int main(int argc, char *argv[])
if (!gambitStream)
{
FatalErrorIn("gambitToFoam::main")
FatalErrorInFunction
<< args.executable()
<< ": file " << gambitFile << " not found"
<< abort(FatalError);

14
applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
View File

@ -257,7 +257,7 @@ scalar readMeshFormat(IFstream& inFile)
if (asciiFlag != 0)
{
FatalIOErrorIn("readMeshFormat(IFstream&)", inFile)
FatalIOErrorInFunction(inFile)
<< "Can only read ascii msh files."
<< exit(FatalIOError);
}
@ -268,7 +268,7 @@ scalar readMeshFormat(IFstream& inFile)
if (tag != "$EndMeshFormat")
{
FatalIOErrorIn("readMeshFormat(IFstream&)", inFile)
FatalIOErrorInFunction(inFile)
<< "Did not find $ENDNOD tag on line "
<< inFile.lineNumber() << exit(FatalIOError);
}
@ -323,7 +323,7 @@ void readPoints(IFstream& inFile, pointField& points, Map<label>& mshToFoam)
if (tag != "$ENDNOD" && tag != "$EndNodes")
{
FatalIOErrorIn("readPoints(..)", inFile)
FatalIOErrorInFunction(inFile)
<< "Did not find $ENDNOD tag on line "
<< inFile.lineNumber() << exit(FatalIOError);
}
@ -396,7 +396,7 @@ void readPhysNames(IFstream& inFile, Map<word>& physicalNames)
if (tag != "$EndPhysicalNames")
{
FatalIOErrorIn("readPhysicalNames(..)", inFile)
FatalIOErrorInFunction(inFile)
<< "Did not find $EndPhysicalNames tag on line "
<< inFile.lineNumber() << exit(FatalIOError);
}
@ -699,7 +699,7 @@ void readCells
if (tag != "$ENDELM" && tag != "$EndElements")
{
FatalIOErrorIn("readCells(..)", inFile)
FatalIOErrorInFunction(inFile)
<< "Did not find $ENDELM tag on line "
<< inFile.lineNumber() << exit(FatalIOError);
}
@ -723,7 +723,7 @@ void readCells
if (cells.size() == 0)
{
FatalIOErrorIn("readCells(..)", inFile)
FatalIOErrorInFunction(inFile)
<< "No cells read from file " << inFile.name() << nl
<< "Does your file specify any 3D elements (hex=" << MSHHEX
<< ", prism=" << MSHPRISM << ", pyramid=" << MSHPYR
@ -969,7 +969,7 @@ int main(int argc, char *argv[])
}
else
{
WarningIn(args.executable())
WarningInFunction
<< "Could not match gmsh face " << f
<< " to any of the interior or exterior faces"
<< " that share the same 0th point" << endl;

20
applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
View File

@ -222,10 +222,8 @@ void readPoints
{
hasWarned = true;
IOWarningIn
IOWarningInFunction
(
"readPoints(IFstream&, label&, DynamicList<point>"
", DynamicList<label>&)",
is
) << "Points not in order starting at point " << pointI
//<< " at line " << is.lineNumber()
@ -464,7 +462,7 @@ void readCells
{
if (skippedElements.insert(feID))
{
IOWarningIn("readCells(IFstream&, label&)", is)
IOWarningInFunction(is)
<< "Cell type " << feID << " not supported" << endl;
}
is.getLine(line); // Do nothing
@ -552,7 +550,7 @@ void readSets
}
else
{
IOWarningIn("readSets(..)", is)
IOWarningInFunction(is)
<< "When reading patches expect entity type code 8"
<< nl << " Skipping group code " << groupType
<< endl;
@ -672,7 +670,7 @@ int main(int argc, char *argv[])
if (!inFile.good())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot open file " << ideasName
<< exit(FatalError);
}
@ -805,7 +803,7 @@ int main(int argc, char *argv[])
if (findIndex(foamVerts, -1) != -1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cell " << cellI
<< " unv vertices " << cellVerts[cellI]
<< " has some undefined vertices " << foamVerts
@ -824,7 +822,7 @@ int main(int argc, char *argv[])
if (findIndex(foamVerts, -1) != -1)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Boundary face " << bFaceI
<< " unv vertices " << boundaryFaces[bFaceI]
<< " has some undefined vertices " << foamVerts
@ -1045,7 +1043,7 @@ int main(int argc, char *argv[])
{
if (cnt != patchFaces.size())
{
WarningIn(args.executable())
WarningInFunction
<< "For patch " << patchI << " there were "
<< patchFaces.size()-cnt
<< " faces not used because they seem"
@ -1055,7 +1053,7 @@ int main(int argc, char *argv[])
}
else
{
WarningIn(args.executable())
WarningInFunction
<< "Patch "
<< patchI << " has faces that are already "
<< " in use on other boundary-patches,"
@ -1073,7 +1071,7 @@ int main(int argc, char *argv[])
{
if (cellCorrespondence[faceIndices[0]] < 0)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "The face index " << faceIndices[i]
<< " was not found amongst the cells."
<< " This kills the theory that "

2
applications/utilities/mesh/conversion/kivaToFoam/checkPatch.H
View File

@ -88,7 +88,7 @@
}
else
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "bc not defined for active cell = " << i
<< exit(FatalError);
}

2
applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
View File

@ -98,7 +98,7 @@ int main(int argc, char *argv[])
}
else
{
FatalErrorIn("main(int argc, char *argv[])")
FatalErrorInFunction
<< "KIVA file version " << versionName << " not supported"
<< exit(FatalError);

4
applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
View File

@ -2,7 +2,7 @@ ifstream kivaFile(kivaFileName.c_str());
if (!kivaFile.good())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot open file " << kivaFileName
<< exit(FatalError);
}
@ -76,7 +76,7 @@ kivaFile >> mTable;
if (mTable == 0)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "mTable == 0. This is not supported."
" kivaToFoam needs complete neighbour information"
<< exit(FatalError);

6
applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
View File

@ -133,7 +133,7 @@ int main(int argc, char *argv[])
if (domain != 1)
{
WarningIn(args.executable())
WarningInFunction
<< "Cannot handle multiple domains"
<< nl << "Ignoring domain " << domain << " setting on line "
<< str.lineNumber() << endl;
@ -171,7 +171,7 @@ int main(int argc, char *argv[])
if (patchI < 0)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Invalid boundary region number " << patchI
<< " on line " << str.lineNumber()
<< exit(FatalError);
@ -241,7 +241,7 @@ int main(int argc, char *argv[])
if (vertsToBoundary.size())
{
// Didn't find cells connected to boundary faces.
WarningIn(args.executable())
WarningInFunction
<< "There are boundary faces without attached cells."
<< "Boundary faces (as triFaces):" << vertsToBoundary.toc()
<< endl;

24
applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.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
@ -86,7 +86,7 @@ void hexBlock::setHandedness()
if (blockHandedness_ == noPoints)
{
WarningIn("hexBlock::hexBlock::setHandedness()")
WarningInFunction
<< "Cannot determine orientation of block."
<< " Continuing as if right handed." << endl;
blockHandedness_ = right;
@ -233,7 +233,7 @@ labelListList hexBlock::blockCells() const
}
else
{
FatalErrorIn("hexBlock::cellShapes()")
FatalErrorInFunction
<< "Unable to determine block handedness as points "
<< "have not been read in yet"
<< abort(FatalError);
@ -252,10 +252,8 @@ faceList hexBlock::patchFaces(const label direc, const labelList& range) const
{
if (range.size() != 6)
{
FatalErrorIn
(
"patchFaces(const label direc, const labelList& range) const"
) << "Invalid size of the range array: " << range.size()
FatalErrorInFunction
<< "Invalid size of the range array: " << range.size()
<< ". Should be 6 (xMin, xMax, yMin, yMax, zMin, zMax"
<< abort(FatalError);
}
@ -448,10 +446,8 @@ faceList hexBlock::patchFaces(const label direc, const labelList& range) const
default:
{
FatalErrorIn
(
"patchFaces(const label direc, const labelList& range) const"
) << "direction out of range (1 to 6): " << direc
FatalErrorInFunction
<< "direction out of range (1 to 6): " << direc
<< abort(FatalError);
}
}
@ -460,10 +456,8 @@ faceList hexBlock::patchFaces(const label direc, const labelList& range) const
// Do nothing for the right-handed block
if (blockHandedness_ == noPoints)
{
FatalErrorIn
(
"patchFaces(const label direc, const labelList& range) const"
) << "Unable to determine block handedness as points "
FatalErrorInFunction
<< "Unable to determine block handedness as points "
<< "have not been read in yet"
<< abort(FatalError);
}

4
applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.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
@ -124,7 +124,7 @@ public:
{
if (blockHandedness_ == noPoints)
{
FatalErrorIn("hexBlock::points() const")
FatalErrorInFunction
<< "points not read in yet"
<< abort(FatalError);
}

2
applications/utilities/mesh/conversion/sammToFoam/calcPointCells.C
View File

@ -36,7 +36,7 @@ void Foam::sammMesh::calcPointCells() const
if (pointCellsPtr_)
{
FatalErrorIn("sammMesh::calcPointCells()")
FatalErrorInFunction
<< "PointCells already calculated"
<< abort(FatalError);
}

2
applications/utilities/mesh/conversion/sammToFoam/createBoundaryFaces.C
View File

@ -112,7 +112,7 @@ void Foam::sammMesh::createBoundaryFaces()
}
if (!found)
{
FatalErrorIn("sammMesh::createBoundaryFaces()")
FatalErrorInFunction
<< "Face " << faceI
<< " does not have neighbour cell." << endl
<< " face : " << endl << curFace

6
applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C
View File

@ -83,10 +83,8 @@ void Foam::sammMesh::createPolyBoundary()
!= -1
)
{
FatalErrorIn
(
"void sammMesh::createPolyBoundary()"
) << "This looks like an already detected "
FatalErrorInFunction
<< "This looks like an already detected "
<< "internal face"
<< abort(FatalError);
}

2
applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C
View File

@ -173,7 +173,7 @@ void Foam::sammMesh::createPolyCells()
}
else
{
FatalErrorIn("void starMesh::createPolyCells()")
FatalErrorInFunction
<< "Error in internal face insertion"
<< abort(FatalError);
}

2
applications/utilities/mesh/conversion/sammToFoam/fixCollapsedEdges.C
View File

@ -128,7 +128,7 @@ void Foam::sammMesh::fixCollapsedEdges()
if (nNewVertices < 3)
{
FatalErrorIn("void sammMesh::fixCollapsedEdges()")
FatalErrorInFunction
<< "face " << faceI << " of cell " << cellI
<< " is colapsed down to a point or edge, which is "
<< "not permitted" << endl

4
applications/utilities/mesh/conversion/sammToFoam/readBoundary.C
View File

@ -116,7 +116,7 @@ void Foam::sammMesh::readBoundary()
}
else
{
FatalErrorIn("void sammMesh::readBoundary()")
FatalErrorInFunction
<< "Cannot read file "
<< boundaryFileName
<< abort(FatalError);
@ -222,7 +222,7 @@ void Foam::sammMesh::readBoundary()
}
else
{
FatalErrorIn("sammMesh::readBoundary()")
FatalErrorInFunction
<< "No boundary faces in file "
<< boundaryFileName
<< endl;

15
applications/utilities/mesh/conversion/sammToFoam/readCells.C
View File

@ -146,11 +146,8 @@ void Foam::sammMesh::addSAMMcell
// grab the shape from the table
if (!sammShapeLookup[typeFlag] || !sammAddressingTable[typeFlag])
{
FatalErrorIn
(
"sammMesh::addRegularCell(const labelList& labels, "
"const label nCreatedCells)"
) << "SAMM type " << typeFlag << " has no registered label. BUG!"
FatalErrorInFunction
<< "SAMM type " << typeFlag << " has no registered label. BUG!"
<< abort(FatalError);
}
@ -206,7 +203,7 @@ void Foam::sammMesh::readCells()
}
else
{
FatalErrorIn("sammMesh::readCells()")
FatalErrorInFunction
<< "Cannot read file "
<< cellsFileName
<< abort(FatalError);
@ -243,7 +240,7 @@ void Foam::sammMesh::readCells()
{
if (nLabels > 24)
{
FatalErrorIn("sammMesh::readCells()")
FatalErrorInFunction
<< "Unknown SAMM cell. "
<< "More than 24 vertices"
<< abort(FatalError);
@ -251,7 +248,7 @@ void Foam::sammMesh::readCells()
if ((cellsFile >> lineLabel).eof())
{
FatalErrorIn("sammMesh::readCells()")
FatalErrorInFunction
<< "Reached end of cells file before "
<< "all cells are read in."
<< abort(FatalError);
@ -311,7 +308,7 @@ void Foam::sammMesh::readCells()
}
else
{
FatalErrorIn("sammMesh::readCells()")
FatalErrorInFunction
<< "No cells in file "
<< cellsFileName
<< abort(FatalError);

2
applications/utilities/mesh/conversion/star3ToFoam/calcPointCells.C
View File

@ -36,7 +36,7 @@ void Foam::starMesh::calcPointCells() const
if (pointCellsPtr_)
{
FatalErrorIn("starMesh::calcPointCells() const")
FatalErrorInFunction
<< "pointCells already calculated"
<< abort(FatalError);
}

2
applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C
View File

@ -148,7 +148,7 @@ void Foam::starMesh::markBoundaryFaces()
}
if (!found)
{
FatalErrorIn("starMesh::markBoundaryFaces()")
FatalErrorInFunction
<< "Face " << faceI
<< " does not have neighbour cell."
<< " Face : " << endl << curFace << endl

8
applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
View File

@ -1097,7 +1097,7 @@ void Foam::starMesh::createCoupleMatches()
if (edgesToConsider.empty())
{
FatalErrorIn("void starMesh::createCoupleMatches()")
FatalErrorInFunction
<< setprecision(12)
<< "void starMesh::createCoupleMatches() : "
<< endl << "error in face intersection: "
@ -1219,7 +1219,7 @@ void Foam::starMesh::createCoupleMatches()
// Check if there is room for more points
if (nIntFacePoints >= intersectedFace.size())
{
FatalErrorIn("void starMesh::createCoupleMatches()")
FatalErrorInFunction
<< setprecision(12)
<< "void starMesh::createCoupleMatches() : "
<< endl << "error in intersected face: "
@ -1270,7 +1270,7 @@ void Foam::starMesh::createCoupleMatches()
{
if (intersectedFace[checkI] == intersectedFace[checkJ])
{
FatalErrorIn("void starMesh::createCoupleMatches()")
FatalErrorInFunction
<< setprecision(12)
<< "void starMesh::createCoupleMatches() : "
<< endl << "error in intersected face: "
@ -1294,7 +1294,7 @@ void Foam::starMesh::createCoupleMatches()
}
else
{
FatalErrorIn("void starMesh::createCoupleMatches()")
FatalErrorInFunction
<< setprecision(12)
<< "void starMesh::createCoupleMatches() : " << endl
<< "could not find start edge for intersection of couple "

2
applications/utilities/mesh/conversion/star3ToFoam/createPolyCells.C
View File

@ -173,7 +173,7 @@ void Foam::starMesh::createPolyCells()
}
else
{
FatalErrorIn("void starMesh::createPolyCells()")
FatalErrorInFunction
<< "Error in internal face insertion"
<< abort(FatalError);
}

2
applications/utilities/mesh/conversion/star3ToFoam/fixCollapsedEdges.C
View File

@ -127,7 +127,7 @@ void Foam::starMesh::fixCollapsedEdges()
if (nNewVertices < 3)
{
FatalErrorIn("starMesh::fixCollapsedEdges()")
FatalErrorInFunction
<< "Face " << faceI << " of cell " << cellI
<< " is colapsed down to a point or edge, which is "
<< "not permitted" << endl

8
applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C
View File

@ -266,7 +266,7 @@ void Foam::starMesh::mergeCoupleFacePoints()
{
if (renumberPoints[oldFacePoints[pointI]] < 0)
{
FatalErrorIn("starMesh::mergeCoupleFacePoints()")
FatalErrorInFunction
<< "Error in point renumbering. Old face: "
<< oldFacePoints << endl
<< "prelim face: " << prelimFacePoints
@ -306,7 +306,7 @@ void Foam::starMesh::mergeCoupleFacePoints()
{
if (renumberPoints[curLabels[pointI]] == 0)
{
FatalErrorIn("starMesh::mergeCoupleFacePoints()")
FatalErrorInFunction
<< "Error in point merging for cell "
<< cellI << ". STAR index: " << starCellID_[cellI]
<< ". " << endl
@ -360,7 +360,7 @@ void Foam::starMesh::mergeCoupleFacePoints()
{
if (renumberPoints[oldFacePoints[pointI]] < 0)
{
FatalErrorIn("starMesh::mergeCoupleFacePoints()")
FatalErrorInFunction
<< "Error in point renumbering for point "
<< oldFacePoints[pointI]
<< ". Renumbering index is -1." << endl
@ -385,7 +385,7 @@ void Foam::starMesh::mergeCoupleFacePoints()
{
if (renumberPoints[curLabels[pointI]] < 0)
{
FatalErrorIn("starMesh::mergeCoupleFacePoints()")
FatalErrorInFunction
<< "Error in point renumbering for cell "
<< cellI << ". STAR index: " << starCellID_[cellI]
<< ". " << endl

4
applications/utilities/mesh/conversion/star3ToFoam/readBoundary.C
View File

@ -114,7 +114,7 @@ void Foam::starMesh::readBoundary()
}
else
{
FatalErrorIn("starMesh::readBoundary()")
FatalErrorInFunction
<< "Cannot read file "
<< boundaryFileName
<< abort(FatalError);
@ -220,7 +220,7 @@ void Foam::starMesh::readBoundary()
}
else
{
WarningIn("void starMesh::readBoundary()")
WarningInFunction
<< "no boundary faces in file "
<< boundaryFileName
<< endl;

15
applications/utilities/mesh/conversion/star3ToFoam/readCells.C
View File

@ -179,11 +179,8 @@ void Foam::starMesh::addSAMMcell
default:
{
FatalErrorIn
(
"starMesh::addSAMMcell"
"(const labelList& labels, const label nCreatedCells)"
) << "SAMM type " << sammTypeFlag << " is invalid"
FatalErrorInFunction
<< "SAMM type " << sammTypeFlag << " is invalid"
<< abort(FatalError);
}
}
@ -245,7 +242,7 @@ void Foam::starMesh::readCells()
}
else
{
FatalErrorIn("starMesh::readCells()")
FatalErrorInFunction
<< "Cannot read file " << cellsFileName
<< abort(FatalError);
}
@ -294,7 +291,7 @@ void Foam::starMesh::readCells()
{
if ((cellsFile >> lineLabel).eof())
{
FatalErrorIn("starMesh::readCells()")
FatalErrorInFunction
<< "Reached end of cells file before "
<< "all cells are read in."
<< abort(FatalError);
@ -370,7 +367,7 @@ void Foam::starMesh::readCells()
{
if (curShapeLabels[i] < 0)
{
FatalErrorIn("starMesh::readCells()")
FatalErrorInFunction
<< "Invalid vertex found in cell " << cellI
<< ". STAR cell no: " << lineLabel
<< " labels: " << curShapeLabels
@ -381,7 +378,7 @@ void Foam::starMesh::readCells()
}
else
{
FatalErrorIn("starMesh::readCells()")
FatalErrorInFunction
<< "No cells in file " << cellsFileName
<< abort(FatalError);
}

2
applications/utilities/mesh/conversion/star3ToFoam/readPoints.C
View File

@ -107,7 +107,7 @@ void Foam::starMesh::readPoints(const scalar scaleFactor)
}
else
{
FatalErrorIn("starMesh::readPoints()")
FatalErrorInFunction
<< "Cannot read file " << pointsFileName
<< abort(FatalError);
}

2
applications/utilities/mesh/conversion/star3ToFoam/readSeparatedPoints.C
View File

@ -58,7 +58,7 @@ void Foam::starMesh::readPoints(const scalar scaleFactor)
}
else
{
FatalErrorIn("starMesh::readPoints()")
FatalErrorInFunction
<< "Cannot read file " << pointsFileName
<< abort(FatalError);
}

16
applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -88,7 +88,7 @@ label findFace(const primitiveMesh& mesh, const face& f)
}
}
FatalErrorIn("findFace(const primitiveMesh&, const face&)")
FatalErrorInFunction
<< "Cannot find face " << f << " in mesh." << abort(FatalError);
return -1;
@ -135,14 +135,14 @@ int main(int argc, char *argv[])
if (!isFile(nodeFile) || !isFile(eleFile))
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot read " << nodeFile << " or " << eleFile
<< exit(FatalError);
}
if (readFaceFile && !isFile(faceFile))
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot read " << faceFile << endl
<< "Did you run tetgen with -f option?" << endl
<< "If you don't want to read the .face file and thus not have"
@ -225,7 +225,7 @@ int main(int argc, char *argv[])
}
if (pointI != nNodes)
{
FatalIOErrorIn(args.executable().c_str(), nodeStream)
FatalIOErrorInFunction(nodeStream)
<< "Only " << pointI << " nodes present instead of " << nNodes
<< " from header." << exit(FatalIOError);
}
@ -258,7 +258,7 @@ int main(int argc, char *argv[])
if (nPtsPerTet != 4)
{
FatalIOErrorIn(args.executable().c_str(), eleStream)
FatalIOErrorInFunction(eleStream)
<< "Cannot handle tets with "
<< nPtsPerTet << " points per tetrahedron in .ele file" << endl
<< "Can only handle tetrahedra with four points"
@ -267,7 +267,7 @@ int main(int argc, char *argv[])
if (nElemAttr != 0)
{
WarningIn(args.executable())
WarningInFunction
<< "Element attributes (third elemenent in .ele header)"
<< " not used" << endl;
}
@ -377,7 +377,7 @@ int main(int argc, char *argv[])
if (nFaceAttr != 1)
{
FatalIOErrorIn(args.executable().c_str(), faceStream)
FatalIOErrorInFunction(faceStream)
<< "Expect boundary markers to be"
<< " present in .face file." << endl
<< "This is the second number in the header which is now:"

5
applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
View File

@ -146,8 +146,7 @@ int main(int argc, char *argv[])
if (!meshDictIO.headerOk())
{
FatalErrorIn(args.executable())
<< "Cannot open mesh description file\n "
FatalErrorInFunction
<< meshDictIO.objectPath()
<< nl
<< exit(FatalError);
@ -334,7 +333,7 @@ int main(int argc, char *argv[])
mesh.removeFiles();
if (!mesh.write())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Failed writing polyMesh."
<< exit(FatalError);
}

12
applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
View File

@ -138,7 +138,7 @@ label findPatchID(const polyBoundaryMesh& patches, const word& name)
if (patchID == -1)
{
FatalErrorIn("findPatchID(const polyBoundaryMesh&, const word&)")
FatalErrorInFunction
<< "Cannot find patch " << name
<< " in the source mesh.\n"
<< "Valid patch names are " << patches.names()
@ -343,7 +343,7 @@ int main(int argc, char *argv[])
{
if (flipNormals && mode == MESH)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Flipping normals not supported for extrusions from mesh."
<< exit(FatalError);
}
@ -961,7 +961,7 @@ int main(int argc, char *argv[])
{
if (mode == MESH)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot stitch front and back of extrusion since"
<< " in 'mesh' mode (extrusion appended to mesh)."
<< exit(FatalError);
@ -974,7 +974,7 @@ int main(int argc, char *argv[])
if (frontPatchFaces.size() != backPatchFaces.size())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Differing number of faces on front ("
<< frontPatchFaces.size() << ") and back ("
<< backPatchFaces.size() << ")"
@ -1061,7 +1061,7 @@ int main(int argc, char *argv[])
if (!mesh.write())
{
FatalErrorIn(args.executable()) << "Failed writing mesh"
FatalErrorInFunction
<< exit(FatalError);
}
@ -1074,7 +1074,7 @@ int main(int argc, char *argv[])
<< nl << endl;
if (!addedCells.write())
{
FatalErrorIn(args.executable()) << "Failed writing cellSet"
FatalErrorInFunction
<< addedCells.name()
<< exit(FatalError);
}

62
applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
View File

@ -2,8 +2,8 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -175,11 +175,8 @@ label addPatch
}
else
{
FatalErrorIn
(
"addPatch<PatchType>(const polyBoundaryMesh&,"
" const word&, DynamicList<polyPatch*>)"
) << "Already have patch " << patchName
FatalErrorInFunction
<< "Already have patch " << patchName
<< " but of type " << newPatches[patchI]->type()
<< exit(FatalError);
}
@ -233,11 +230,8 @@ label addPatch
}
else
{
FatalErrorIn
(
"addPatch<PatchType>(const polyBoundaryMesh&,"
" const word&, DynamicList<polyPatch*>)"
) << "Already have patch " << patchName
FatalErrorInFunction
<< "Already have patch " << patchName
<< " but of type " << newPatches[patchI]->type()
<< exit(FatalError);
}
@ -436,7 +430,7 @@ void checkZoneInside
label zoneI = zoneID[i];
if (isInternal[zoneI] != mesh.isInternalFace(faceI))
{
FatalErrorIn("checkZoneInside(..)")
FatalErrorInFunction
<< "Zone " << zoneNames[zoneI]
<< " is not consistently all internal or all boundary faces."
<< " Face " << faceI << " at " << mesh.faceCentres()[faceI]
@ -694,7 +688,7 @@ void countExtrudePatches
{
const edge& e = extrudePatch.edges()[edgeI];
const pointField& pts = extrudePatch.localPoints();
WarningIn("countExtrudePatches(..)")
WarningInFunction
<< "Edge " << edgeI
<< "at " << pts[e[0]] << pts[e[1]]
<< " is a coupled edge and inbetween two different zones "
@ -954,20 +948,8 @@ void addCoupledPatches
}
else
{
FatalErrorIn
(
"void addCoupledPatches"
"("
"const fvMesh&, "
"const primitiveFacePatch&, "
"const labelList&, "
"const labelList&, "
"const mapDistribute&, "
"const labelListList&, "
"labelList&, "
"DynamicList<polyPatch*>&"
")"
) << "Unable to determine coupled patch addressing"
FatalErrorInFunction
<< "Unable to determine coupled patch addressing"
<< abort(FatalError);
}
}
@ -1054,7 +1036,7 @@ void addZoneSidePatches
}
else
{
FatalErrorIn("addZoneSidePatches()")
FatalErrorInFunction
<< "Type " << oneDPolyPatchType << " does not exist "
<< exit(FatalError);
}
@ -1475,7 +1457,7 @@ void extrudeGeometricProperties
if (!ok)
{
FatalErrorIn("extrudeGeometricProperties(..)")
FatalErrorInFunction
<< "Failed writing " << faceCentres.objectPath()
<< " and " << cellCentres.objectPath()
<< exit(FatalError);
@ -1503,7 +1485,7 @@ int main(int argc, char *argv[])
Pstream::gatherList(allNames);
Pstream::scatterList(allNames);
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Patches are not synchronised on all processors."
<< " Per processor patches " << allNames
<< exit(FatalError);
@ -1541,7 +1523,7 @@ int main(int argc, char *argv[])
// Check
if (dict.found("faceSets"))
{
FatalIOErrorIn(args.executable().c_str(), dict)
FatalIOErrorInFunction(dict)
<< "Please supply faces to extrude either through 'faceZones'"
<< " or 'faceSets' entry. Found both."
<< exit(FatalIOError);
@ -1585,7 +1567,7 @@ int main(int argc, char *argv[])
if (shellRegionName == regionName)
{
FatalIOErrorIn(args.executable().c_str(), dict)
FatalIOErrorInFunction(dict)
<< "Cannot extrude into same region as mesh." << endl
<< "Mesh region : " << regionName << endl
<< "Shell region : " << shellRegionName
@ -1711,7 +1693,7 @@ int main(int argc, char *argv[])
meshZoneID[i] = faceZones.findZoneID(zoneNames[i]);
if (meshZoneID[i] == -1)
{
FatalIOErrorIn(args.executable().c_str(), dict)
FatalIOErrorInFunction(dict)
<< "Cannot find zone " << zoneNames[i] << endl
<< "Valid zones are " << faceZones.names()
<< exit(FatalIOError);
@ -1758,7 +1740,7 @@ int main(int argc, char *argv[])
zoneShadowIDs[i] = faceZones.findZoneID(zoneShadowNames[i]);
if (zoneShadowIDs[i] == -1)
{
FatalIOErrorIn(args.executable().c_str(), dict)
FatalIOErrorInFunction(dict)
<< "Cannot find zone " << zoneShadowNames[i] << endl
<< "Valid zones are " << faceZones.names()
<< exit(FatalIOError);
@ -1821,7 +1803,7 @@ int main(int argc, char *argv[])
label faceI = iter.key();
if (mesh.isInternalFace(faceI))
{
FatalIOErrorIn(args.executable().c_str(), dict)
FatalIOErrorInFunction(dict)
<< "faceSet " << fz.name()
<< "contains internal faces."
<< " This is not permitted."
@ -1861,7 +1843,7 @@ int main(int argc, char *argv[])
if (nExtrudeFaces != nShadowFaces)
{
FatalIOErrorIn(args.executable().c_str(), dict)
FatalIOErrorInFunction(dict)
<< "Extruded faces " << nExtrudeFaces << endl
<< "is different from shadow faces. " << nShadowFaces
<< "This is not permitted " << endl
@ -1881,7 +1863,7 @@ int main(int argc, char *argv[])
label faceI = iter.key();
if (mesh.isInternalFace(faceI))
{
FatalIOErrorIn(args.executable().c_str(), dict)
FatalIOErrorInFunction(dict)
<< "faceSet " << fz.name()
<< "contains internal faces."
<< " This is not permitted."
@ -2654,7 +2636,7 @@ int main(int argc, char *argv[])
if (!ok)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Failed writing mesh " << regionMesh.name()
<< " at location " << regionMesh.facesInstance()
<< exit(FatalError);
@ -2855,7 +2837,7 @@ int main(int argc, char *argv[])
if (!mesh.write())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Failed writing mesh " << mesh.name()
<< " at location " << mesh.facesInstance()
<< exit(FatalError);

4
applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.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
@ -43,7 +43,7 @@ void Foam::extrude2DMesh::check2D() const
{
if (faces[faceI].size() != 2)
{
FatalErrorIn("void Foam::extrude2DMesh::check2D() const")
FatalErrorInFunction
<< "Face " << faceI << " size " << faces[faceI].size()
<< " is not of size 2: mesh is not a valid two-dimensional "
<< "mesh" << exit(FatalError);

8
applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.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,7 +88,7 @@ void Foam::patchToPoly2DMesh::createNeighbours()
}
else
{
FatalErrorIn("polyMesh neighbour construction")
FatalErrorInFunction
<< abort(FatalError);
}
}
@ -307,7 +307,7 @@ void Foam::patchToPoly2DMesh::createMesh()
{
if (patch_.edgeFaces()[edgeI].size() != 2)
{
FatalErrorIn("patchToPoly2DMesh::patchToPoly2DMesh(..)")
FatalErrorInFunction
<< "internal edge:" << edgeI
<< " patch.edgeFaces()[edgeI]:" << patch_.edgeFaces()[edgeI]
<< abort(FatalError);
@ -323,7 +323,7 @@ void Foam::patchToPoly2DMesh::createMesh()
{
if (patch_.edgeFaces()[edgeI].size() != 1)
{
FatalErrorIn("patchToPoly2DMesh::patchToPoly2DMesh(..)")
FatalErrorInFunction
<< "boundary edge:" << edgeI
<< " patch.edgeFaces()[edgeI]:" << patch_.edgeFaces()[edgeI]
<< abort(FatalError);

12
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H
View File

@ -66,10 +66,8 @@ inline Foam::label Foam::DelaunayMesh<Triangulation>::getNewCellIndex() const
if (id == labelMax)
{
WarningIn
(
"Foam::DelaunayMesh<Triangulation>::getNewCellIndex() const"
) << "Cell counter has overflowed." << endl;
WarningInFunction
<< "Cell counter has overflowed." << endl;
}
return id;
@ -83,10 +81,8 @@ inline Foam::label Foam::DelaunayMesh<Triangulation>::getNewVertexIndex() const
if (id == labelMax)
{
WarningIn
(
"Foam::DelaunayMesh<Triangulation>::getNewVertexIndex() const"
) << "Vertex counter has overflowed." << endl;
WarningInFunction
<< "Vertex counter has overflowed." << endl;
}
return id;

2
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
View File

@ -306,7 +306,7 @@ void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
if (nTotalVertices != label(Triangulation::number_of_vertices()))
{
WarningIn("Foam::conformalVoronoiMesh::printVertexInfo()")
WarningInFunction
<< nTotalVertices << " does not equal "
<< Triangulation::number_of_vertices()
<< endl;

15
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
View File

@ -792,13 +792,7 @@ bool Foam::DistributedDelaunayMesh<Triangulation>::distribute
const boundBox& bb
)
{
notImplemented
(
"Foam::DistributedDelaunayMesh<Triangulation>::distribute"
"("
" const boundBox& bb"
")"
);
NotImplemented;
if (!Pstream::parRun())
{
@ -960,11 +954,8 @@ Foam::DistributedDelaunayMesh<Triangulation>::rangeInsertReferredWithInfo
}
else if (lt == Triangulation::OUTSIDE_AFFINE_HULL)
{
WarningIn
(
"Foam::DistributedDelaunayMesh<Triangulation>"
"::rangeInsertReferredWithInfo"
) << "Point is outside affine hull! pt = " << pointToInsert
WarningInFunction
<< "Point is outside affine hull! pt = " << pointToInsert
<< endl;
}
else if (lt == Triangulation::OUTSIDE_CONVEX_HULL)

7
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.C
View File

@ -222,11 +222,8 @@ void Foam::PrintTable<KeyType, DataType>::operator=
// Check for assignment to self
if (this == &rhs)
{
FatalErrorIn
(
"Foam::PrintTable<KeyType, DataType>::operator="
"(const Foam::PrintTable<KeyType, DataType>&)"
) << "Attempted assignment to self"
FatalErrorInFunction
<< "Attempted assignment to self"
<< abort(FatalError);
}
}

23
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
View File

@ -825,14 +825,7 @@ Foam::backgroundMeshDecomposition::backgroundMeshDecomposition
{
if (!Pstream::parRun())
{
FatalErrorIn
(
"Foam::backgroundMeshDecomposition::backgroundMeshDecomposition"
"("
"const dictionary& coeffsDict, "
"const conformalVoronoiMesh& foamyHexMesh"
")"
)
FatalErrorInFunction
<< "This cannot be used when not running in parallel."
<< exit(FatalError);
}
@ -842,10 +835,7 @@ Foam::backgroundMeshDecomposition::backgroundMeshDecomposition
if (!decomposer.parallelAware())
{
FatalErrorIn
(
"void Foam::backgroundMeshDecomposition::initialRefinement() const"
)
FatalErrorInFunction
<< "You have selected decomposition method "
<< decomposer.typeName
<< " which is not parallel aware." << endl
@ -1214,14 +1204,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorNearestPosition
if (ptNearestProc[pI] < 0)
{
FatalErrorIn
(
"Foam::labelList"
"Foam::backgroundMeshDecomposition::processorNearestPosition"
"("
"const List<point>& pts"
") const"
)
FatalErrorInFunction
<< "The position " << pts[pI]
<< " did not find a nearest point on the background mesh."
<< exit(FatalError);

6
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
View File

@ -30,16 +30,16 @@ Description
The requirements are:
+ To have a decomposition of space which can quickly interrogate an
- To have a decomposition of space which can quickly interrogate an
arbitrary location from any processor to reliably and unambiguously
determine which processor owns the space that the point is in, i.e. as
the vertices move, or need inserted as part of the surface conformation,
send them to the correct proc.
+ To be able to be dynamically built, refined and redistributed to other
- To be able to be dynamically built, refined and redistributed to other
procs the partitioning as the meshing progresses to balance the load.
+ To be able to query whether a sphere (the circumsphere of a Delaunay tet)
- To be able to query whether a sphere (the circumsphere of a Delaunay tet)
overlaps any part of the space defined by the structure, and whether a
ray (Voronoi edge) penetrates any part of the space defined by the
structure, this is what determines if points get referred to a processor.

19
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C
View File

@ -134,14 +134,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorPosition
if (!globalBackgroundBounds_.contains(pt))
{
FatalErrorIn
(
"Foam::labelList"
"Foam::backgroundMeshDecomposition::processorPosition"
"("
"const List<point>&"
") const"
)
FatalErrorInFunction
<< "The position " << pt
<< " is not in any part of the background mesh "
<< globalBackgroundBounds_ << endl
@ -152,14 +145,8 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorPosition
if (debug)
{
WarningIn
(
"Foam::labelList"
"Foam::backgroundMeshDecomposition::processorPosition"
"("
"const List<point>&"
") const"
) << "The position " << pt
WarningInFunction
<< "The position " << pt
<< " was not found in the background mesh "
<< globalBackgroundBounds_ << ", finding nearest."
<< endl;

6
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
View File

@ -350,10 +350,8 @@ void Foam::cellShapeControl::cellSizeAndAlignment
alignment = v;
// FatalErrorIn
// (
// "Foam::conformalVoronoiMesh::setVertexSizeAndAlignment()"
// ) << "Point has bad alignment! "
// FatalErrorInFunction
// << "Point has bad alignment! "
// << pt << " " << size << " " << alignment << nl
// << "Bary Coords = " << bary << nl
// << ch->vertex(0)->info() << nl

30
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
View File

@ -65,10 +65,8 @@ word cellShapeControlMesh::meshSubDir = "cellShapeControlMesh";
//
// if (!surfHit.hit())
// {
// FatalErrorIn
// (
// "Foam::tensor Foam::conformalVoronoiMesh::requiredAlignment"
// ) << "findSurfaceNearest did not find a hit across the surfaces."
// FatalErrorInFunction
// << "findSurfaceNearest did not find a hit across the surfaces."
// << exit(FatalError) << endl;
// }
//
@ -174,13 +172,8 @@ word cellShapeControlMesh::meshSubDir = "cellShapeControlMesh";
//
// if (closestSpokeSurface == -1)
// {
//// WarningIn
//// (
//// "conformalVoronoiMesh::requiredAlignment"
//// "("
//// "const Foam::point& pt"
//// ") const"
//// ) << "No secondary surface hit found in spoke search "
//// WarningInFunction
//// << "No secondary surface hit found in spoke search "
//// << "using " << s
//// << " spokes, try increasing alignmentSearchSpokes."
//// << endl;
@ -203,7 +196,7 @@ word cellShapeControlMesh::meshSubDir = "cellShapeControlMesh";
//
// if (mag(ns) < SMALL)
// {
// FatalErrorIn("conformalVoronoiMesh::requiredAlignment")
// FatalErrorInFunction
// << "Parallel normals detected in spoke search." << nl
// << "point: " << pt << nl
// << "closest surface point: " << surfHit.hitPoint() << nl
@ -355,10 +348,8 @@ void Foam::cellShapeControlMesh::writeTriangulation()
}
else
{
FatalErrorIn
(
"Foam::triangulatedMesh::writeRefinementTriangulation()"
) << "Triangulation is not valid"
FatalErrorInFunction
<< "Triangulation is not valid"
<< abort(FatalError);
}
}
@ -436,11 +427,8 @@ Foam::cellShapeControlMesh::cellShapeControlMesh(const Time& runTime)
}
else
{
FatalErrorIn
(
"Foam::cellShapeControlMesh::cellShapeControlMesh"
"(const Time&)"
) << "Cell alignments point field " << alignments.size()
FatalErrorInFunction
<< "Cell alignments point field " << alignments.size()
<< " is not the same size as the number of vertices"
<< " in the mesh " << this->vertexCount()
<< abort(FatalError);

6
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C
View File

@ -92,10 +92,8 @@ Foam::cellSizeAndAlignmentControl::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
FatalErrorIn
(
"cellSizeAndAlignmentControl::New()"
) << "Unknown cellSizeAndAlignmentControl type "
FatalErrorInFunction
<< "Unknown cellSizeAndAlignmentControl type "
<< cellSizeAndAlignmentControlTypeName
<< endl << endl
<< "Valid cellSizeAndAlignmentControl types are :" << endl

11
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
View File

@ -235,15 +235,8 @@ void Foam::fileControl::initialVertices
if ((pts.size() != sizes.size()) || (pts.size() != alignments.size()))
{
FatalErrorIn
(
"Foam::fileControl::initialVertices"
"("
" pointField&,"
" scalarField&,"
" Field<triad>&"
")"
) << "Size of list of points, sizes and alignments do not match:"
FatalErrorInFunction
<< "Size of list of points, sizes and alignments do not match:"
<< nl
<< "Points size = " << pts.size() << nl
<< "Sizes size = " << sizes.size() << nl

14
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
View File

@ -69,10 +69,7 @@ addToRunTimeSelectionTable
////
//// if (!surfHit.hit())
//// {
//// FatalErrorIn
//// (
//// "Foam::tensor Foam::conformalVoronoiMesh::requiredAlignment"
//// )
//// FatalErrorInFunction
//// << "findSurfaceNearest did not find a hit across the surfaces."
//// << exit(FatalError) << endl;
//// }
@ -125,7 +122,7 @@ addToRunTimeSelectionTable
//
// if (mag(ns) < SMALL)
// {
// WarningIn("conformalVoronoiMesh::requiredAlignment")
// WarningInFunction
// << "Parallel normals detected in spoke search." << nl
// << "point: " << pt << nl
// << "np : " << np << nl
@ -466,11 +463,8 @@ void Foam::searchableSurfaceControl::initialVertices
if (!cellSize(pts[pI], sizes[pI], priority))
{
sizes[pI] = defaultCellSize_;
// FatalErrorIn
// (
// "Foam::searchableSurfaceControl::initialVertices"
// "(pointField&, scalarField&, tensorField&)"
// ) << "Could not calculate cell size"
// FatalErrorInFunction
// << "Could not calculate cell size"
// << abort(FatalError);
}

11
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
View File

@ -82,7 +82,7 @@ Foam::cellSizeFunction::cellSizeFunction
}
else
{
FatalErrorIn("searchableSurfaceControl::searchableSurfaceControl")
FatalErrorInFunction
<< "Unknown mode, expected: inside, outside or bothSides" << nl
<< exit(FatalError);
}
@ -91,7 +91,7 @@ Foam::cellSizeFunction::cellSizeFunction
{
if (mode != "bothSides")
{
WarningIn("searchableSurfaceControl::searchableSurfaceControl")
WarningInFunction
<< "surface does not support volumeType, defaulting mode to "
<< "bothSides."
<< endl;
@ -135,11 +135,8 @@ Foam::autoPtr<Foam::cellSizeFunction> Foam::cellSizeFunction::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
FatalErrorIn
(
"cellSizeFunction::New(dictionary&, "
"const conformalVoronoiMesh&, const searchableSurface&)"
) << "Unknown cellSizeFunction type "
FatalErrorInFunction
<< "Unknown cellSizeFunction type "
<< cellSizeFunctionTypeName
<< endl << endl
<< "Valid cellSizeFunction types are :" << endl

2
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
View File

@ -197,7 +197,7 @@ public:
const pointField& pts
)
{
WarningIn("cellSizeFunction::setCellSize(const pointField&)")
WarningInFunction
<< "Not overloaded."
<< endl;
return false;

20
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
View File

@ -84,15 +84,7 @@ surfaceOffsetLinearDistance::surfaceOffsetLinearDistance
&& coeffsDict().found("linearDistanceCoeff")
)
{
FatalErrorIn
(
"surfaceOffsetLinearDistance::surfaceOffsetLinearDistance"
"("
" const dictionary& initialPointsDict,"
" const searchableSurface& surface,"
" const scalar& defaultCellSize"
")"
)
FatalErrorInFunction
<< "totalDistanceCoeff and linearDistanceCoeff found, "
<< "specify one or other, not both."
<< nl << exit(FatalError) << endl;
@ -114,15 +106,7 @@ surfaceOffsetLinearDistance::surfaceOffsetLinearDistance
}
else
{
FatalErrorIn
(
"surfaceOffsetLinearDistance::surfaceOffsetLinearDistance"
"("
" const dictionary& initialPointsDict,"
" const searchableSurface& surface,"
" const scalar& defaultCellSize"
")"
)
FatalErrorInFunction
<< "totalDistanceCoeff or linearDistanceCoeff not found."
<< nl << exit(FatalError) << endl;
}

7
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C
View File

@ -73,11 +73,8 @@ Foam::autoPtr<Foam::cellSizeCalculationType> Foam::cellSizeCalculationType::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
FatalErrorIn
(
"cellSizeCalculationType::New(dictionary&, "
"const conformalVoronoiMesh&, const searchableSurface&)"
) << "Unknown cellSizeCalculationType type "
FatalErrorInFunction
<< "Unknown cellSizeCalculationType type "
<< cellSizeCalculationTypeTypeName
<< endl << endl
<< "Valid cellSizeCalculationType types are :" << endl

7
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C
View File

@ -77,11 +77,8 @@ Foam::autoPtr<Foam::surfaceCellSizeFunction> Foam::surfaceCellSizeFunction::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
FatalErrorIn
(
"surfaceCellSizeFunction::New(dictionary&, "
"const conformalVoronoiMesh&, const searchableSurface&)"
) << "Unknown surfaceCellSizeFunction type "
FatalErrorInFunction
<< "Unknown surfaceCellSizeFunction type "
<< surfaceCellSizeFunctionTypeName
<< endl << endl
<< "Valid surfaceCellSizeFunction types are :" << endl

24
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
View File

@ -284,11 +284,8 @@ void Foam::conformalVoronoiMesh::insertSurfacePointPairs
}
else
{
WarningIn
(
"Foam::conformalVoronoiMesh::insertSurfacePointPairs"
"(const pointIndexHitAndFeatureList&, const fileName)"
) << meshableSide << ", bad"
WarningInFunction
<< meshableSide << ", bad"
<< endl;
}
}
@ -652,7 +649,7 @@ Foam::face Foam::conformalVoronoiMesh::buildDualFace
// DelaunayMeshTools::drawDelaunayCell(Pout, cc1);
// DelaunayMeshTools::drawDelaunayCell(Pout, cc2);
WarningIn("Foam::conformalVoronoiMesh::buildDualFace")
WarningInFunction
<< "Dual face uses circumcenter defined by a "
<< "Delaunay tetrahedron with no internal "
<< "or boundary points. Defining Delaunay edge ends: "
@ -723,7 +720,7 @@ Foam::label Foam::conformalVoronoiMesh::maxFilterCount
Vertex_handle vA = c->vertex(eit->second);
Vertex_handle vB = c->vertex(eit->third);
FatalErrorIn("Foam::conformalVoronoiMesh::buildDualFace")
FatalErrorInFunction
<< "Dual face uses circumcenter defined by a "
<< "Delaunay tetrahedron with no internal "
<< "or boundary points. Defining Delaunay edge ends: "
@ -780,16 +777,7 @@ bool Foam::conformalVoronoiMesh::ownerAndNeighbour
if (dualCellIndexA == -1 && dualCellIndexB == -1)
{
FatalErrorIn
(
"bool Foam::conformalVoronoiMesh::ownerAndNeighbour"
"("
"Vertex_handle vA,"
"Vertex_handle vB,"
"label& owner,"
"label& neighbour"
") const"
)
FatalErrorInFunction
<< "Attempting to create a face joining "
<< "two unindexed dual cells "
<< exit(FatalError);
@ -1616,7 +1604,7 @@ void Foam::conformalVoronoiMesh::move()
{
if (!vit->referred() && !usedIndices.insert(vit->index()))
{
FatalErrorIn("Foam::conformalVoronoiMesh::move()")
FatalErrorInFunction
<< "Index already used! Could not insert: " << nl
<< vit->info()
<< abort(FatalError);

13
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
View File

@ -234,8 +234,7 @@ void Foam::conformalVoronoiMesh::calcTetMesh
{
patchIndex = patchNames.size() - 1;
WarningIn("Foam::conformalVoronoiMesh::calcTetMesh")
<< "Tet face centre at " << nl
WarningInFunction
<< newFace.centre(points) << nl
<< "did not find a surface patch. Adding to "
<< patchNames[patchIndex]
@ -2479,15 +2478,7 @@ void Foam::conformalVoronoiMesh::sortProcPatches
|| slaves.size() != sortingIndices.size()
)
{
FatalErrorIn
(
"void Foam::conformalVoronoiMesh::sortProcPatches"
"("
"List<DynamicList<face> >& patchFaces, "
"List<DynamicList<label> >& patchOwners, "
"const List<DynamicList<label> >& patchSortingIndices"
") const"
)
FatalErrorInFunction
<< "patch size and size of sorting indices is inconsistent "
<< " for patch " << patchI << nl
<< " faces.size() " << faces.size() << nl

2
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
View File

@ -649,7 +649,7 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation()
if (iterationNo == maxIterations)
{
WarningIn("conformalVoronoiMesh::conformToSurface()")
WarningInFunction
<< "Maximum surface conformation iterations ("
<< maxIterations << ") reached." << endl;
}

31
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
View File

@ -149,11 +149,8 @@ bool Foam::conformalVoronoiMesh::regionIsInside
}
else
{
WarningIn
(
"Foam::conformalVoronoiMesh::regionIsInside"
"(volTypeA, normalA, volTypeB, normalB, masterPtVec)"
) << ""
WarningInFunction
<< ""
<< endl;
return false;
@ -252,16 +249,8 @@ void Foam::conformalVoronoiMesh::createEdgePointGroupByCirculating
}
else
{
WarningIn
(
"Foam::conformalVoronoiMesh::"
"createEdgePointGroupByCirculating"
"("
" const extendedFeatureEdgeMesh&,"
" const pointIndexHit&,"
" DynamicList<Vb>&"
")"
) << "Failed to insert flat/open edge as volType is "
WarningInFunction
<< "Failed to insert flat/open edge as volType is "
<< extendedFeatureEdgeMesh::sideVolumeTypeNames_
[
volType
@ -314,16 +303,8 @@ void Foam::conformalVoronoiMesh::createEdgePointGroupByCirculating
}
else
{
WarningIn
(
"Foam::conformalVoronoiMesh::"
"createEdgePointGroupByCirculating"
"("
" const extendedFeatureEdgeMesh&,"
" const pointIndexHit&,"
" DynamicList<Vb>&"
")"
) << "Faces are parallel but master point is not inside"
WarningInFunction
<< "Faces are parallel but master point is not inside"
<< endl;
}
}

8
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
View File

@ -122,7 +122,7 @@ inline Foam::scalar Foam::conformalVoronoiMesh::averageAnyCellSize
if (sizeSum < 0)
{
WarningIn("averageAnyCellSize(const Delaunay::Finite_facets_iterator&)")
WarningInFunction
<< "sizeSum = " << sizeSum
<< endl;
@ -558,11 +558,7 @@ Foam::conformalVoronoiMesh::decomposition() const
{
if (!Pstream::parRun())
{
FatalErrorIn
(
"inline const Foam::backgroundMeshDecomposition& "
"Foam::conformalVoronoiMesh::decomposition() const"
)
FatalErrorInFunction
<< "The backgroundMeshDecomposition cannot be asked for in serial."
<< exit(FatalError) << endl;
}

16
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
View File

@ -219,7 +219,7 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance)
//
// if (vertexToDualAddressing[vertI] != 0)
// {
// FatalErrorIn("conformalVoronoiMesh::writeMesh(..)")
// FatalErrorInFunction
// << "Delaunay vertex " << vertI
// << " from cell " << cellI
// << " is already mapped to "
@ -239,7 +239,7 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance)
//
// if (vertexToDualAddressing[vertI] > 0)
// {
// FatalErrorIn("conformalVoronoiMesh::writeMesh(..)")
// FatalErrorInFunction
// << "Delaunay vertex " << vertI
// << " from patch " << patchI
// << " local index " << i
@ -310,14 +310,8 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance)
// label pointI = findIndex(pointDualAddressing, -1);
// if (pointI != -1)
// {
// WarningIn
// (
// "conformalVoronoiMesh::writeMesh\n"
// "(\n"
// " const fileName& instance,\n"
// " bool filterFaces\n"
// ")\n"
// ) << "Delaunay vertex " << pointI
// WarningInFunction
// << "Delaunay vertex " << pointI
// << " does not have a corresponding dual cell." << endl;
// }
//
@ -1060,7 +1054,7 @@ void Foam::conformalVoronoiMesh::writeMesh
if (!mesh.write())
{
FatalErrorIn("Foam::conformalVoronoiMesh::writeMesh(..)")
FatalErrorInFunction
<< "Failed writing polyMesh."
<< exit(FatalError);
}

20
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshZones.C
View File

@ -43,7 +43,7 @@ void Foam::conformalVoronoiMesh::calcNeighbourCellCentres
if (neiCc.size() != nBoundaryFaces)
{
FatalErrorIn("conformalVoronoiMesh::calcNeighbourCellCentres(..)")
FatalErrorInFunction
<< "nBoundaries:" << nBoundaryFaces
<< " neiCc:" << neiCc.size()
<< abort(FatalError);
@ -171,12 +171,8 @@ void Foam::conformalVoronoiMesh::findCellZoneInsideWalk
if (keepRegionI == -1)
{
FatalErrorIn
(
"conformalVoronoiMesh::findCellZoneInsideWalk"
"(const polyMesh&, const labelList&"
", const labelList&, labelList&)"
) << "Point " << insidePoint
FatalErrorInFunction
<< "Point " << insidePoint
<< " is not inside the mesh." << nl
<< "Bounding box of the mesh:" << mesh.bounds()
<< exit(FatalError);
@ -193,12 +189,8 @@ void Foam::conformalVoronoiMesh::findCellZoneInsideWalk
}
else if (cellToSurface[cellI] != surfI)
{
WarningIn
(
"conformalVoronoiMesh::findCellZoneInsideWalk"
"(const labelList&, const labelList&"
", const labelList&, const labelList&)"
) << "Cell " << cellI
WarningInFunction
<< "Cell " << cellI
<< " at " << mesh.cellCentres()[cellI]
<< " is inside surface " << surfName
<< " but already marked as being in zone "
@ -251,7 +243,7 @@ Foam::labelList Foam::conformalVoronoiMesh::calcCellZones
&& selectionMethod != surfaceZonesInfo::INSIDEPOINT
)
{
FatalErrorIn("conformalVoronoiMesh::calcCellZones(..)")
FatalErrorInFunction
<< "Trying to use surface "
<< surface.name()
<< " which has non-geometric inside selection method "

25
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
View File

@ -100,15 +100,13 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
}
else if (eS == extendedFeatureEdgeMesh::FLAT)
{
WarningIn("Foam::conformalVoronoiMesh::"
"createSpecialisedFeaturePoint")
WarningInFunction
<< "Edge " << eS << " is flat"
<< endl;
}
else
{
FatalErrorIn("Foam::conformalVoronoiMesh::"
"createSpecialisedFeaturePoint")
FatalErrorInFunction
<< "Edge " << eS << " not concave/convex"
<< exit(FatalError);
}
@ -258,11 +256,7 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
if ((convexEdgeA && convexEdgeB) || (!convexEdgeA && !convexEdgeB))
{
WarningIn
(
"Foam::conformalVoronoiMesh"
"::createSpecialisedFeaturePoint"
)
WarningInFunction
<< "Both or neither of the convex edges share the concave "
<< "edge's normal."
<< " convexEdgeA = " << convexEdgeA
@ -538,15 +532,13 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
}
else if (eS == extendedFeatureEdgeMesh::FLAT)
{
WarningIn("Foam::conformalVoronoiMesh::"
"createSpecialisedFeaturePoint")
WarningInFunction
<< "Edge " << eS << " is flat"
<< endl;
}
else
{
FatalErrorIn("Foam::conformalVoronoiMesh::"
"createSpecialisedFeaturePoint")
FatalErrorInFunction
<< "Edge " << eS << " not concave/convex"
<< exit(FatalError);
}
@ -700,11 +692,8 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
|| (!concaveEdgeA && !concaveEdgeB)
)
{
WarningIn
(
"Foam::conformalVoronoiMesh"
"::createSpecialisedFeaturePoint"
) << "Both or neither of the concave edges share the convex "
WarningInFunction
<< "Both or neither of the concave edges share the convex "
<< "edge's normal."
<< " concaveEdgeA = " << concaveEdgeA
<< " concaveEdgeB = " << concaveEdgeB

16
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
View File

@ -187,11 +187,8 @@ void Foam::conformationSurfaces::readFeatures
}
else
{
WarningIn
(
"Foam::conformationSurfaces::readFeatures"
"(const label, const dictionary&, const word&, label&)"
) << surface.name() << " of type "
WarningInFunction
<< surface.name() << " of type "
<< surface.type() << " does not have features"
<< endl;
}
@ -202,7 +199,7 @@ void Foam::conformationSurfaces::readFeatures
}
else
{
FatalErrorIn("Foam::conformationSurfaces::readFeatures")
FatalErrorInFunction
<< "No valid featureMethod found for surface " << surfaceName
<< nl << "Use \"extendedFeatureEdgeMesh\" "
<< "or \"extractFeatures\"."
@ -252,7 +249,7 @@ void Foam::conformationSurfaces::readFeatures
}
else
{
FatalErrorIn("Foam::conformationSurfaces::readFeatures")
FatalErrorInFunction
<< "No valid featureMethod found for surface " << surfaceName
<< nl << "Use \"extendedFeatureEdgeMesh\" "
<< "or \"extractFeatures\"."
@ -383,7 +380,7 @@ Foam::conformationSurfaces::conformationSurfaces
{
if (!surface.hasVolumeType())
{
WarningIn("conformationSurfaces::conformationSurfaces(..)")
WarningInFunction
<< "Non-baffle surface "
<< surface.name()
<< " does not allow inside/outside queries."
@ -463,9 +460,8 @@ Foam::conformationSurfaces::conformationSurfaces
if (unmatchedKeys.size() > 0)
{
IOWarningIn
IOWarningInFunction
(
"conformationSurfaces::conformationSurfaces(..)",
surfacesDict
) << "Not all entries in conformationSurfaces dictionary were used."
<< " The following entries were not used : "

7
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
View File

@ -70,11 +70,8 @@ autoPtr<faceAreaWeightModel> faceAreaWeightModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
FatalErrorIn
(
"faceAreaWeightModel::New(const dictionary&, "
"const conformalVoronoiMesh&)"
) << "Unknown faceAreaWeightModel type "
FatalErrorInFunction
<< "Unknown faceAreaWeightModel type "
<< faceAreaWeightModelTypeName
<< endl << endl
<< "Valid faceAreaWeightModel types are :" << endl

10
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
View File

@ -896,14 +896,8 @@ autoDensity::autoDensity
{
maxSizeRatio_ = 2.0;
WarningIn
(
"autoDensity::autoDensity"
"("
"const dictionary& initialPointsDict,"
"const conformalVoronoiMesh& foamyHexMesh"
")"
) << "The maxSizeRatio must be greater than one to be sensible, "
WarningInFunction
<< "The maxSizeRatio must be greater than one to be sensible, "
<< "setting to " << maxSizeRatio_
<< endl;
}

7
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
View File

@ -96,11 +96,8 @@ autoPtr<initialPointsMethod> initialPointsMethod::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
FatalErrorIn
(
"initialPointsMethod::New(dictionary&, "
"const conformalVoronoiMesh&)"
) << "Unknown initialPointsMethod type "
FatalErrorInFunction
<< "Unknown initialPointsMethod type "
<< initialPointsMethodTypeName
<< endl << endl
<< "Valid initialPointsMethod types are :" << endl

2
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
View File

@ -91,7 +91,7 @@ List<Vb::Point> pointFile::initialPoints() const
if (points.empty())
{
FatalErrorIn("List<Vb::Point> pointFile::initialPoints() const")
FatalErrorInFunction
<< "Point file contain no points"
<< exit(FatalError) << endl;
}

11
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/rayShooting/rayShooting.C
View File

@ -104,15 +104,8 @@ void rayShooting::splitLine
}
else
{
WarningIn
(
"rayShooting::splitLine"
"("
" const line<point,point>&,"
" const scalar&,"
" DynamicList<Vb::Point>&"
")"
) << "Point perturbation crosses a surface. Not inserting."
WarningInFunction
<< "Point perturbation crosses a surface. Not inserting."
<< endl;
}
}

7
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
View File

@ -73,11 +73,8 @@ autoPtr<relaxationModel> relaxationModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
FatalErrorIn
(
"relaxationModel::New(const dictionary&, "
"const conformalVoronoiMesh&)"
) << "Unknown relaxationModel type "
FatalErrorInFunction
<< "Unknown relaxationModel type "
<< relaxationModelTypeName
<< endl << endl
<< "Valid relaxationModel types are :" << endl

7
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.C
View File

@ -50,11 +50,8 @@ Foam::searchableSurfaceFeatures::New
if (cstrIter == dictConstructorTablePtr_->end())
{
FatalErrorIn
(
"searchableSurfaceFeatures::New(const word&,"
" const searchableSurface&, const dictionary&)"
) << "Unknown searchableSurfaceFeatures type "
FatalErrorInFunction
<< "Unknown searchableSurfaceFeatures type "
<< searchableSurfaceFeaturesType << endl << endl
<< "Valid searchableSurfaceFeatures types : " << endl
<< dictConstructorTablePtr_->sortedToc()

2
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.H
View File

@ -100,7 +100,7 @@ public:
//- Clone
virtual autoPtr<searchableSurfaceFeatures> clone() const
{
notImplemented("autoPtr<searchableSurfaceFeatures> clone() const");
NotImplemented;
return autoPtr<searchableSurfaceFeatures>(NULL);
}

4
applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
View File

@ -73,7 +73,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."
@ -368,7 +368,7 @@ tmp<scalarField> signedDistance
}
else
{
FatalErrorIn("signedDistance()")
FatalErrorInFunction
<< "getVolumeType failure, neither INSIDE or OUTSIDE"
<< exit(FatalError);
}

4
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
View File

@ -229,7 +229,7 @@ void Foam::CV2D::insertPoints(const fileName& pointFileName)
}
else
{
FatalErrorIn("insertInitialPoints")
FatalErrorInFunction
<< "Could not open pointsFile " << pointFileName
<< exit(FatalError);
}
@ -913,7 +913,7 @@ void Foam::CV2D::newPoints()
// }
// else
// {
// FatalErrorIn("CV2D::newPoints() const")
// FatalErrorInFunction
// << "Infinite triangle found in internal mesh"
// << exit(FatalError);
// }

2
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H
View File

@ -61,7 +61,7 @@ inline Foam::label Foam::CV2D::insertPoint
if (nVert == number_of_vertices())
{
WarningIn("Foam::CV2D::insertPoint")
WarningInFunction
<< "Failed to insert point " << toPoint2D(p) << endl;
}
else

16
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DIO.C
View File

@ -151,11 +151,8 @@ void Foam::CV2D::writeFaces(const fileName& fName, bool internalOnly) const
{
if (fc->faceIndex() < 0)
{
FatalErrorIn
(
"Foam::CV2D::writeFaces"
"(const fileName& fName, bool internalOnly)"
)<< "Dual face uses vertex defined by a triangle"
FatalErrorInFunction
<< "Dual face uses vertex defined by a triangle"
" defined by an external point"
<< exit(FatalError);
}
@ -222,7 +219,7 @@ void Foam::CV2D::extractPatches
{
patchIndex = defaultPatchIndex;
WarningIn("Foam::CV2D::extractPatches")
WarningInFunction
<< "Dual face found that is not on a surface "
<< "patch. Adding to CV2D_default_patch."
<< endl;
@ -315,11 +312,8 @@ void Foam::CV2D::calcDual
{
if (fc->faceIndex() < 0)
{
FatalErrorIn
(
"Foam::CV2D::calcDual"
"(point2DField& dualPoints, faceList& dualFaces)"
)<< "Dual face uses vertex defined by a triangle"
FatalErrorInFunction
<< "Dual face uses vertex defined by a triangle"
" defined by an external point"
<< exit(FatalError);
}

6
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertFeaturePoints.C
View File

@ -61,7 +61,7 @@ void Foam::CV2D::insertFeaturePoints()
if (feMeshes.empty())
{
WarningIn("CV2D::insertFeaturePoints")
WarningInFunction
<< "Extended Feature Edge Mesh is empty so no feature points will "
<< "be found." << nl
<< " Use: featureMethod extendedFeatureEdgeMesh;" << nl
@ -341,7 +341,7 @@ void Foam::CV2D::insertFeaturePoints()
}
else
{
WarningIn("void Foam::CV2D::insertFeaturePoints()")
WarningInFunction
<< "Feature Edge " << edges[edgeI] << nl
<< " points(" << points[edges[edgeI].start()]
<< ", " << points[edges[edgeI].end()] << ")" << nl
@ -352,7 +352,7 @@ void Foam::CV2D::insertFeaturePoints()
}
else
{
WarningIn("void Foam::CV2D::insertFeaturePoints()")
WarningInFunction
<< "Point " << featPoint << " is not on the line "
<< line << endl;
}

8
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
View File

@ -109,7 +109,7 @@ void Foam::shortEdgeFilter2D::updateEdgeRegionMap
{
region = startPtRegions[0];
WarningIn("shortEdgeFilter2D()")
WarningInFunction
<< "Both points in edge are in different regions."
<< " Assigning edge to region " << region
<< endl;
@ -495,7 +495,7 @@ Foam::shortEdgeFilter2D::filter()
}
else
{
WarningIn("shortEdgeFilter")
WarningInFunction
<< "Point " << pChain
<< " marked for deletion as well as point "
<< pointI << nl
@ -525,7 +525,7 @@ Foam::shortEdgeFilter2D::filter()
}
else
{
FatalErrorIn("shortEdgeFilter")
FatalErrorInFunction
<< "Only " << newFace.size() << " in face " << faceI
<< exit(FatalError);
}
@ -553,7 +553,7 @@ Foam::shortEdgeFilter2D::filter()
{
if (newPointNumbers[pointI] == -1)
{
WarningIn("shortEdgeFilter")
WarningInFunction
<< pointI << " will be deleted and " << newPointNumbers[pointI]
<< ", so it will not be replaced. "
<< "This will cause edges to be deleted." << endl;

4
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
View File

@ -556,7 +556,7 @@ scalar getMergeDistance(const polyMesh& mesh, const scalar mergeTol)
if (mergeTol < writeTol)
{
FatalErrorIn("getMergeDistance(const polyMesh&, const dictionary&)")
FatalErrorInFunction
<< "Your current settings specify ASCII writing with "
<< IOstream::defaultPrecision() << " digits precision." << nl
<< "Your merging tolerance (" << mergeTol
@ -1452,7 +1452,7 @@ int main(int argc, char *argv[])
if (Pstream::parRun() && !decomposer.parallelAware())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "You have selected decomposition method "
<< decomposer.typeName
<< " which is not parallel aware." << endl

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

@ -404,13 +404,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);

4
applications/utilities/mesh/manipulation/checkMesh/checkTools.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -60,7 +60,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-2014 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()

4
applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.H
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
@ -108,7 +108,7 @@ public:
//- Clone
autoPtr<faceSelection> clone() const
{
notImplemented("autoPtr<faceSelection> clone() const");
NotImplemented;
return autoPtr<faceSelection>(NULL);
}

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);
}

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