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

Merge branch 'master' of develop.openfoam.com:Development/OpenFOAM-plus into feature-shared-file

Browse Source 
Conflicts:
	applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
	applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
	applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C
	applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
	applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.C
	applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
	applications/utilities/postProcessing/velocityField/Co/Co.C
	applications/utilities/postProcessing/velocityField/Pe/Pe.C
	applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
	applications/utilities/preProcessing/changeDictionary/changeDictionary.C
	applications/utilities/preProcessing/setFields/setFields.C
	applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
	applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
	applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
	applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
	src/OpenFOAM/db/IOobject/IOobject.C
	src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
	src/OpenFOAM/db/IOobjects/IOField/IOField.C
	src/OpenFOAM/db/IOobjects/IOList/IOList.C
	src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
	src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
	src/OpenFOAM/db/Time/findInstance.C
	src/OpenFOAM/db/regIOobject/regIOobject.C
	src/OpenFOAM/db/regIOobject/regIOobjectI.H
	src/OpenFOAM/db/regIOobject/regIOobjectRead.C
	src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
	src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.C
	src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
	src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
	src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.C
	src/dynamicMesh/motionSolver/componentDisplacement/componentDisplacementMotionSolver.C
	src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
	src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
	src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
	src/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C
	src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.C
	src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C
	src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
	src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
	src/lagrangian/basic/Cloud/CloudIO.C
	src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
	src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.C
	src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformTemplates.C
	src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C
	src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
	src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C
This commit is contained in:
mattijs
2016-01-25 16:29:04 +00:00
parent e424059208 14aee79198
commit 9e3ce4ec7f
6907 changed files with 140540 additions and 44093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,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:"