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

applications: Update ...ErrorIn -> ...ErrorInFunction

Browse Source 
Avoids the clutter and maintenance effort associated with providing the
function signature string.
This commit is contained in:
Henry Weller
2015-11-10 17:53:31 +00:00
parent 735ce9cce7
commit e2ef006b91
271 changed files with 851 additions and 1559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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"