From e2ef006b9160ee5ecb3cd5abd7e5abf05139f87d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 10 Nov 2015 17:53:31 +0000
Subject: [PATCH] applications: Update ...ErrorIn -> ...ErrorInFunction Avoids
the clutter and maintenance effort associated with providing the function
signature string.
---
.../dragModels/PDRDragModel/PDRDragModelNew.C | 8 +--
.../XiEqModels/XiEqModel/XiEqModelNew.C | 13 +----
.../XiModels/XiGModels/XiGModel/XiGModelNew.C | 13 +----
.../PDRFoam/XiModels/XiModel/XiModelNew.C | 8 +--
.../SCOPE/SCOPELaminarFlameSpeed.C | 6 +-
.../combustion/chemFoam/createFields.H | 2 +-
.../T/smoluchowskiJumpTFvPatchScalarField.C | 9 +--
.../BCs/U/maxwellSlipUFvPatchVectorField.C | 10 +---
.../rhoCentralFoam/readFluxScheme.H | 6 +-
.../boundaryFoam/interrogateWallPatches.H | 6 +-
.../coalChemistryFoam/createFields.H | 2 +-
.../reactingParcelFoam/createFields.H | 2 +-
.../simpleReactingParcelFoam/createFields.H | 2 +-
.../lagrangian/sprayFoam/createFields.H | 2 +-
.../multiphaseMixtureThermo.C | 14 ++---
.../mixtureViscosityModelNew.C | 9 +--
.../relativeVelocityModel.C | 11 +---
.../solvers/multiphase/interFoam/alphaEqn.H | 4 +-
.../newPhaseChangeTwoPhaseMixture.C | 8 +--
.../dragModels/dragModel/newDragModel.C | 4 +-
.../heatTransferModel/newHeatTransferModel.C | 4 +-
.../diameterModel/newDiameterModel.C | 4 +-
.../multiphaseSystem/multiphaseSystem.C | 16 ++---
.../multiphaseMixture/multiphaseMixture.C | 10 +---
.../interfaceCompositionModels/Henry/Henry.C | 12 +---
.../NonRandomTwoLiquid/NonRandomTwoLiquid.C | 13 +----
.../Saturated/Saturated.C | 12 +---
.../newInterfaceCompositionModel.C | 2 +-
.../massTransferModel/newMassTransferModel.C | 2 +-
.../saturationModel/newSaturationModel.C | 2 +-
.../newSurfaceTensionModel.C | 2 +-
.../aspectRatioModel/newAspectRatioModel.C | 2 +-
.../dragModels/dragModel/newDragModel.C | 2 +-
.../dragModels/segregated/segregated.C | 2 +-
.../heatTransferModel/newHeatTransferModel.C | 2 +-
.../liftModels/Moraga/Moraga.C | 7 +--
.../liftModels/liftModel/newLiftModel.C | 2 +-
.../swarmCorrection/newSwarmCorrection.C | 2 +-
.../newTurbulentDispersionModel.C | 2 +-
.../virtualMassModel/newVirtualMassModel.C | 2 +-
.../newWallLubricationModel.C | 2 +-
.../blendingMethod/newBlendingMethod.C | 2 +-
.../blendingMethods/linear/linear.C | 10 +---
.../diameterModel/newDiameterModel.C | 2 +-
.../phaseModel/phaseModel/newPhaseModel.C | 2 +-
.../phaseModel/phaseModel/phaseModel.C | 4 +-
.../phasePair/phasePair/phasePair.C | 6 +-
.../phasePair/phasePairKey/phasePairKey.C | 10 +---
.../multiphaseSystem/multiphaseSystem.C | 8 +--
.../multiphaseSystem/newMultiphaseSystem.C | 2 +-
...allBoilingWallFunctionFvPatchScalarField.C | 6 +-
...sonJacksonParticleSlipFvPatchVectorField.C | 12 +---
...onJacksonParticleThetaFvPatchScalarField.C | 24 ++------
.../IATE/IATEsources/IATEsource/IATEsource.C | 7 +--
.../twoPhaseSystem/newTwoPhaseSystem.C | 2 +-
.../aspectRatioModel/newAspectRatioModel.C | 2 +-
.../dragModels/dragModel/newDragModel.C | 4 +-
.../dragModels/segregated/segregated.C | 2 +-
.../heatTransferModel/newHeatTransferModel.C | 4 +-
.../liftModels/Moraga/Moraga.C | 7 +--
.../liftModels/liftModel/newLiftModel.C | 4 +-
.../swarmCorrection/newSwarmCorrection.C | 4 +-
.../newTurbulentDispersionModel.C | 4 +-
.../virtualMassModel/newVirtualMassModel.C | 4 +-
.../newWallLubricationModel.C | 4 +-
...sonJacksonParticleSlipFvPatchVectorField.C | 12 +---
...onJacksonParticleThetaFvPatchScalarField.C | 24 ++------
.../blendingMethod/newBlendingMethod.C | 4 +-
.../blendingMethods/linear/linear.C | 12 +---
.../IATE/IATEsources/IATEsource/IATEsource.C | 9 +--
.../diameterModel/newDiameterModel.C | 4 +-
.../orderedPhasePair/orderedPhasePair.C | 4 +-
.../phasePair/phasePair/phasePair.C | 6 +-
.../phasePair/phasePairKey/phasePairKey.C | 12 +---
.../readMechanicalProperties.H | 18 ++----
.../readThermalProperties.H | 18 ++----
.../Test-GAMGAgglomeration.C | 4 +-
.../test/fieldMapping/Test-fieldMapping.C | 10 ++--
.../test/globalIndex/Test-globalIndex.C | 22 +++----
applications/test/hexRef8/Test-hexRef8.C | 8 +--
.../Test-parallel-nonBlocking.C | 2 +-
.../test/primitivePatch/Test-PrimitivePatch.C | 2 +-
applications/test/router/Gather/GatherBase.C | 9 +--
.../test/router/Test-processorRouter.C | 2 +-
applications/test/router/router.C | 21 ++-----
applications/test/syncTools/Test-syncTools.C | 33 +++++------
.../test/tetTetOverlap/Test-tetTetOverlap.C | 4 +-
.../utilities/mesh/advanced/PDRMesh/PDRMesh.C | 14 ++---
.../advanced/autoRefineMesh/autoRefineMesh.C | 6 +-
.../advanced/collapseEdges/collapseEdges.C | 2 +-
.../combinePatchFaces/combinePatchFaces.C | 2 +-
.../mesh/advanced/modifyMesh/modifyMesh.C | 2 +-
.../refineWallLayer/refineWallLayer.C | 2 +-
.../refinementLevel/refinementLevel.C | 4 +-
.../mesh/advanced/selectCells/selectCells.C | 4 +-
.../mesh/advanced/splitCells/splitCells.C | 4 +-
.../Optional/ccm26ToFoam/ccm26ToFoam.C | 16 ++---
.../mesh/conversion/ansysToFoam/ansysToFoam.L | 4 +-
.../mesh/conversion/cfx4ToFoam/cfx4ToFoam.C | 12 ++--
.../mesh/conversion/cfx4ToFoam/hexBlock.C | 22 +++----
.../mesh/conversion/cfx4ToFoam/hexBlock.H | 4 +-
.../fluent3DMeshToFoam/fluent3DMeshToFoam.L | 16 ++---
.../fluentMeshToFoam/create3DCellShape.C | 38 +++---------
.../fluentMeshToFoam/extrudedQuadCellShape.C | 38 +++---------
.../extrudedTriangleCellShape.C | 38 +++---------
.../fluentMeshToFoam/fluentMeshToFoam.L | 19 +++---
.../foamMeshToFluent/fluentFvMesh.C | 4 +-
.../conversion/gambitToFoam/gambitToFoam.L | 6 +-
.../mesh/conversion/gmshToFoam/gmshToFoam.C | 14 ++---
.../ideasUnvToFoam/ideasUnvToFoam.C | 20 +++----
.../mesh/conversion/kivaToFoam/checkPatch.H | 2 +-
.../mesh/conversion/kivaToFoam/kivaToFoam.C | 2 +-
.../mesh/conversion/kivaToFoam/readKivaGrid.H | 4 +-
.../netgenNeutralToFoam/netgenNeutralToFoam.C | 6 +-
.../mesh/conversion/plot3dToFoam/hexBlock.C | 24 +++-----
.../mesh/conversion/plot3dToFoam/hexBlock.H | 4 +-
.../conversion/sammToFoam/calcPointCells.C | 2 +-
.../sammToFoam/createBoundaryFaces.C | 2 +-
.../sammToFoam/createPolyBoundary.C | 6 +-
.../conversion/sammToFoam/createPolyCells.C | 2 +-
.../conversion/sammToFoam/fixCollapsedEdges.C | 2 +-
.../mesh/conversion/sammToFoam/readBoundary.C | 4 +-
.../mesh/conversion/sammToFoam/readCells.C | 15 ++---
.../conversion/star3ToFoam/calcPointCells.C | 2 +-
.../star3ToFoam/createBoundaryFaces.C | 2 +-
.../star3ToFoam/createCoupleMatches.C | 8 +--
.../conversion/star3ToFoam/createPolyCells.C | 2 +-
.../star3ToFoam/fixCollapsedEdges.C | 2 +-
.../star3ToFoam/mergeCoupleFacePoints.C | 8 +--
.../conversion/star3ToFoam/readBoundary.C | 4 +-
.../mesh/conversion/star3ToFoam/readCells.C | 15 ++---
.../mesh/conversion/star3ToFoam/readPoints.C | 2 +-
.../star3ToFoam/readSeparatedPoints.C | 2 +-
.../conversion/tetgenToFoam/tetgenToFoam.C | 8 +--
.../mesh/generation/blockMesh/blockMeshApp.C | 5 +-
.../extrude/extrudeMesh/extrudeMesh.C | 12 ++--
.../extrudeToRegionMesh/extrudeToRegionMesh.C | 46 +++++----------
.../extrude2DMesh/extrude2DMesh.C | 4 +-
.../patchToPoly2DMesh/patchToPoly2DMesh.C | 8 +--
.../DelaunayMesh/DelaunayMeshI.H | 12 ++--
.../DelaunayMesh/DelaunayMeshIO.C | 2 +-
.../DelaunayMesh/DistributedDelaunayMesh.C | 7 +--
.../PrintTable/PrintTable.C | 7 +--
.../backgroundMeshDecomposition.C | 23 +-------
.../backgroundMeshDecompositionTemplates.C | 19 +-----
.../cellShapeControl/cellShapeControl.C | 6 +-
.../cellShapeControlMesh.C | 30 +++-------
.../cellSizeAndAlignmentControl.C | 6 +-
.../fileControl/fileControl.C | 11 +---
.../searchableSurfaceControl.C | 14 ++---
.../cellSizeFunction/cellSizeFunction.C | 11 ++--
.../cellSizeFunction/cellSizeFunction.H | 2 +-
.../surfaceOffsetLinearDistance.C | 20 +------
.../cellSizeCalculationType.C | 7 +--
.../surfaceCellSizeFunction.C | 7 +--
.../conformalVoronoiMesh.C | 24 ++------
.../conformalVoronoiMeshCalcDualMesh.C | 13 +----
.../conformalVoronoiMeshConformToSurface.C | 2 +-
.../conformalVoronoiMeshFeaturePoints.C | 31 ++--------
.../conformalVoronoiMeshI.H | 8 +--
.../conformalVoronoiMeshIO.C | 16 ++---
.../conformalVoronoiMeshZones.C | 20 ++-----
.../featurePointConformerSpecialisations.C | 25 +++-----
.../conformationSurfaces.C | 16 ++---
.../faceAreaWeightModel/faceAreaWeightModel.C | 7 +--
.../autoDensity/autoDensity.C | 10 +---
.../initialPointsMethod/initialPointsMethod.C | 7 +--
.../initialPointsMethod/pointFile/pointFile.C | 2 +-
.../rayShooting/rayShooting.C | 11 +---
.../relaxationModel/relaxationModel.C | 7 +--
.../searchableSurfaceFeatures.C | 7 +--
.../foamyHexMeshBackgroundMesh.C | 4 +-
.../generation/foamyMesh/foamyQuadMesh/CV2D.C | 4 +-
.../foamyMesh/foamyQuadMesh/CV2DI.H | 2 +-
.../foamyMesh/foamyQuadMesh/CV2DIO.C | 16 ++---
.../foamyQuadMesh/insertFeaturePoints.C | 6 +-
.../foamyQuadMesh/shortEdgeFilter2D.C | 8 +--
.../generation/snappyHexMesh/snappyHexMesh.C | 4 +-
.../manipulation/checkMesh/checkGeometry.C | 9 +--
.../manipulation/checkMesh/printMeshStats.C | 2 +-
.../createBaffles/createBaffles.C | 6 +-
.../faceSelection/faceSelection.C | 9 +--
.../faceSelection/faceZoneSelection.C | 14 ++---
.../manipulation/createPatch/createPatch.C | 28 ++++-----
.../manipulation/mergeMeshes/mergePolyMesh.C | 4 +-
.../mergeOrSplitBaffles/mergeOrSplitBaffles.C | 4 +-
.../manipulation/mirrorMesh/mirrorFvMesh.C | 4 +-
.../mesh/manipulation/objToVTK/objToVTK.C | 6 +-
.../orientFaceZone/orientFaceZone.C | 8 +--
.../manipulation/polyDualMesh/meshDualiser.C | 58 ++++++-------------
.../polyDualMesh/polyDualMeshApp.C | 2 +-
.../mesh/manipulation/refineMesh/refineMesh.C | 2 +-
.../manipulation/renumberMesh/renumberMesh.C | 18 ++----
.../mesh/manipulation/setSet/setSet.C | 21 +++----
.../manipulation/setsToZones/setsToZones.C | 6 +-
.../singleCellMesh/singleCellMesh.C | 2 +-
.../mesh/manipulation/splitMesh/regionSide.C | 9 +--
.../mesh/manipulation/splitMesh/splitMesh.C | 14 ++---
.../splitMeshRegions/splitMeshRegions.C | 22 ++++---
.../mesh/manipulation/stitchMesh/stitchMesh.C | 8 +--
.../mesh/manipulation/subsetMesh/subsetMesh.C | 4 +-
.../mesh/manipulation/topoSet/topoSet.C | 6 +-
.../transformPoints/transformPoints.C | 2 +-
.../helpTypes/helpBoundary/helpBoundary.C | 29 ++--------
.../foamHelp/helpTypes/helpType/helpType.C | 12 +---
.../foamHelp/helpTypes/helpType/helpTypeNew.C | 6 +-
.../miscellaneous/foamInfoExec/foamInfoExec.C | 10 ++--
.../decomposePar/decomposePar.C | 6 +-
.../decomposePar/lagrangianFieldDecomposer.C | 21 +------
.../decomposePar/pointFieldDecomposer.C | 8 +--
.../reconstructPar/checkFaceAddressingComp.H | 2 +-
.../reconstructPar/reconstructPar.C | 8 +--
.../reconstructParMesh/reconstructParMesh.C | 8 +--
.../redistributePar/loadOrCreateMesh.C | 14 ++---
.../redistributePar/redistributePar.C | 25 +++-----
.../foamToTecplot360/foamToTecplot360.C | 4 +-
.../foamToTecplot360/tecplotWriter.C | 16 ++---
.../foamToTecplot360/tecplotWriterTemplates.C | 4 +-
.../foamToTetDualMesh/foamToTetDualMesh.C | 9 ++-
.../dataConversion/foamToVTK/foamToVTK.C | 10 ++--
.../dataConversion/smapToFoam/smapToFoam.C | 6 +-
.../vtkPV3Foam/vtkPV3FoamUtils.C | 4 +-
.../vtkPV3blockMesh/vtkPV3blockMeshUtils.C | 4 +-
.../PV3Readers/vtkPV3Readers/vtkPV3Readers.C | 4 +-
.../vtkPV4Foam/vtkPV4FoamUtils.C | 4 +-
.../vtkPV4blockMesh/vtkPV4blockMeshUtils.C | 4 +-
.../PV4Readers/vtkPV4Readers/vtkPV4Readers.C | 4 +-
.../steadyParticleTracksTemplates.C | 23 +-------
.../execFlowFunctionObjects.C | 18 ++----
.../foamListTimes/foamListTimes.C | 2 +-
.../miscellaneous/postChannel/channelIndex.C | 8 +--
.../utilities/postProcessing/noise/noise.C | 6 +-
.../postProcessing/velocityField/Co/Co.C | 4 +-
.../postProcessing/velocityField/Pe/Pe.C | 2 +-
.../streamFunction/streamFunction.C | 6 +-
.../applyBoundaryLayer/applyBoundaryLayer.C | 4 +-
.../changeDictionary/changeDictionary.C | 4 +-
.../dsmcInitialise/dsmcInitialise.C | 2 +-
.../preProcessing/mapFields/mapFields.C | 2 +-
.../preProcessing/mdInitialise/mdInitialise.C | 2 +-
.../preProcessing/setFields/setFields.C | 40 ++++---------
.../preProcessing/viewFactorsGen/shootRays.H | 6 +-
.../SpaldingsLaw/SpaldingsLaw.C | 4 +-
.../tabulatedWallFunction/general/general.C | 23 ++------
.../tabulatedWallFunctionNew.C | 8 +--
.../surfaceBooleanFeatures.C | 6 +-
.../surface/surfaceCheck/surfaceCheck.C | 17 +++---
.../surface/surfaceClean/collapseBase.C | 24 ++++----
.../surface/surfaceCoarsen/surfaceCoarsen.C | 4 +-
.../surface/surfaceConvert/surfaceConvert.C | 4 +-
.../surfaceFeatureConvert.C | 4 +-
.../surfaceFeatureExtract.C | 6 +-
.../surface/surfaceHookUp/surfaceHookUp.C | 2 +-
.../surface/surfaceInertia/surfaceInertia.C | 10 ++--
.../surfaceLambdaMuSmooth.C | 8 +--
.../surfaceMeshConvert/surfaceMeshConvert.C | 14 ++---
.../surfaceMeshConvertTesting.C | 2 +-
.../surfaceMeshExport/surfaceMeshExport.C | 12 ++--
.../surfaceMeshImport/surfaceMeshImport.C | 12 ++--
.../surfaceMeshTriangulate.C | 4 +-
.../surfaceRedistributePar.C | 4 +-
.../surfaceSplitByTopology.C | 4 +-
.../surfaceSplitNonManifolds.C | 16 ++---
.../surface/surfaceSubset/surfaceSubset.C | 10 ++--
.../surfaceTransformPoints.C | 4 +-
.../adiabaticFlameT/adiabaticFlameT.C | 6 +-
.../equilibriumFlameT/equilibriumFlameT.C | 6 +-
.../mixtureAdiabaticFlameT/mixture.H | 4 +-
.../mixtureAdiabaticFlameT.C | 6 +-
.../fvMesh/fvMeshMapper/fvPatchMapper.C | 11 ----
.../schemes/FitData/FitData.C | 7 +--
271 files changed, 851 insertions(+), 1559 deletions(-)
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
index 8a8ab924a3b..3570aebd802 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
@@ -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
@@ -45,10 +45,8 @@ Foam::autoPtr<Foam::PDRDragModel> Foam::PDRDragModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn
- (
- "PDRDragModel::New"
- ) << "Unknown PDRDragModel type "
+ FatalErrorInFunction
+ << "Unknown PDRDragModel type "
<< modelType << nl << nl
<< "Valid PDRDragModels are : " << endl
<< dictionaryConstructorTablePtr_->sortedToc()
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C
index bdedac7a336..82411751fb1 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -44,15 +44,8 @@ Foam::autoPtr<Foam::XiEqModel> Foam::XiEqModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn
- (
- "XiEqModel::New"
- "("
- " const psiuReactionThermo& thermo,"
- " const compressible::RASModel& turbulence,"
- " const volScalarField& Su"
- ")"
- ) << "Unknown XiEqModel type "
+ FatalErrorInFunction
+ << "Unknown XiEqModel type "
<< modelType << nl << nl
<< "Valid XiEqModels are : " << endl
<< dictionaryConstructorTablePtr_->sortedToc()
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C
index d77cfd8da6b..0d7f1afcfb3 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -44,15 +44,8 @@ Foam::autoPtr<Foam::XiGModel> Foam::XiGModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn
- (
- "XiGModel::New"
- "("
- " const psiuReactionThermo& thermo,"
- " const compressible::RASModel& turbulence,"
- " const volScalarField& Su"
- ")"
- ) << "Unknown XiGModel type "
+ FatalErrorInFunction
+ << "Unknown XiGModel type "
<< modelType << nl << nl
<< "Valid XiGModels are : " << endl
<< dictionaryConstructorTablePtr_->sortedToc()
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C
index 04f9b41cd19..a317eb50ec8 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -47,10 +47,8 @@ Foam::autoPtr<Foam::XiModel> Foam::XiModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn
- (
- "XiModel::New"
- ) << "Unknown XiModel type "
+ FatalErrorInFunction
+ << "Unknown XiModel type "
<< modelType << nl << nl
<< "Valid XiModels are : " << endl
<< dictionaryConstructorTablePtr_->sortedToc()
diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
index 7ae51fd5d16..d4d77822878 100644
--- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
+++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -172,7 +172,7 @@ inline Foam::scalar Foam::laminarFlameSpeedModels::SCOPE::SuRef
}
else
{
- FatalErrorIn("laminarFlameSpeedModels::SCOPE::SuRef(scalar phi)")
+ FatalErrorInFunction
<< "phi = " << phi
<< " cannot be handled by SCOPE function with the "
"given coefficients"
@@ -210,7 +210,7 @@ inline Foam::scalar Foam::laminarFlameSpeedModels::SCOPE::Ma
}
else
{
- FatalErrorIn("laminarFlameSpeedModels::SCOPE::Ma(scalar phi)")
+ FatalErrorInFunction
<< "phi = " << phi
<< " cannot be handled by SCOPE function with the "
"given coefficients"
diff --git a/applications/solvers/combustion/chemFoam/createFields.H b/applications/solvers/combustion/chemFoam/createFields.H
index 8855e4501ad..7f6cc121951 100644
--- a/applications/solvers/combustion/chemFoam/createFields.H
+++ b/applications/solvers/combustion/chemFoam/createFields.H
@@ -1,6 +1,6 @@
if (mesh.nCells() != 1)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Solver only applicable to single cell cases"
<< exit(FatalError);
}
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
index 22f5555335d..d9a4a4e7df1 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
@@ -94,15 +94,8 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
|| mag(accommodationCoeff_) > 2.0
)
{
- FatalIOErrorIn
+ FatalIOErrorInFunction
(
- "smoluchowskiJumpTFvPatchScalarField::"
- "smoluchowskiJumpTFvPatchScalarField"
- "("
- " const fvPatch&,"
- " const DimensionedField<scalar, volMesh>&,"
- " const dictionary&"
- ")",
dict
) << "unphysical accommodationCoeff specified"
<< "(0 < accommodationCoeff <= 1)" << endl
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
index 6ec81dd4dc9..4656fe7281e 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -96,14 +96,8 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField
|| mag(accommodationCoeff_) > 2.0
)
{
- FatalIOErrorIn
+ FatalIOErrorInFunction
(
- "maxwellSlipUFvPatchScalarField::maxwellSlipUFvPatchScalarField"
- "("
- "const fvPatch&, "
- "const DimensionedField<vector, volMesh>&, "
- "const dictionary&"
- ")",
dict
) << "unphysical accommodationCoeff_ specified"
<< "(0 < accommodationCoeff_ <= 1)" << endl
diff --git a/applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H b/applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H
index 13f8f02c9c6..e8c28d65c26 100644
--- a/applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H
+++ b/applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H
@@ -7,10 +7,8 @@ if (mesh.schemesDict().readIfPresent("fluxScheme", fluxScheme))
}
else
{
- FatalErrorIn
- (
- "rhoCentralFoam::readFluxScheme"
- ) << "fluxScheme: " << fluxScheme
+ FatalErrorInFunction
+ << "fluxScheme: " << fluxScheme
<< " is not a valid choice. "
<< "Options are: Tadmor, Kurganov"
<< abort(FatalError);
diff --git a/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H b/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H
index 7fd01f0e9eb..513ca54a42f 100644
--- a/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H
+++ b/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H
@@ -36,7 +36,7 @@ forAll(patches, patchi)
|| mag(wallNormal & wallNormal2) < 0.99
)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "wall faces are not parallel for patches "
<< patches[patchId].name() << " and "
<< currPatch.name() << nl
@@ -45,7 +45,7 @@ forAll(patches, patchi)
}
else
{
- FatalErrorIn(args.executable()) << "number of wall faces > 2"
+ FatalErrorInFunction
<< nl << exit(FatalError);
}
}
@@ -54,7 +54,7 @@ forAll(patches, patchi)
if (nWallFaces == 0)
{
- FatalErrorIn(args.executable()) << "No wall patches identified"
+ FatalErrorInFunction
<< exit(FatalError);
}
else
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
index cb41f9a407b..2f9a7ce6f42 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
@@ -17,7 +17,7 @@ const word inertSpecie(thermo.lookup("inertSpecie"));
if (!composition.contains(inertSpecie))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Specified inert specie '" << inertSpecie << "' not found in "
<< "species list. Available species:" << composition.species()
<< exit(FatalError);
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
index 9d05da04250..54f0e9e9b22 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
@@ -17,7 +17,7 @@ const word inertSpecie(thermo.lookup("inertSpecie"));
if (!composition.contains(inertSpecie))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Specified inert specie '" << inertSpecie << "' not found in "
<< "species list. Available species:" << composition.species()
<< exit(FatalError);
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H
index cfabbfb5b05..7a26729e541 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H
@@ -17,7 +17,7 @@ const word inertSpecie(thermo.lookup("inertSpecie"));
if (!composition.contains(inertSpecie))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Specified inert specie '" << inertSpecie << "' not found in "
<< "species list. Available species:" << composition.species()
<< exit(FatalError);
diff --git a/applications/solvers/lagrangian/sprayFoam/createFields.H b/applications/solvers/lagrangian/sprayFoam/createFields.H
index 7cc45050ce4..e043feb221e 100644
--- a/applications/solvers/lagrangian/sprayFoam/createFields.H
+++ b/applications/solvers/lagrangian/sprayFoam/createFields.H
@@ -17,7 +17,7 @@ const word inertSpecie(thermo.lookup("inertSpecie"));
if (!composition.contains(inertSpecie))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Specified inert specie '" << inertSpecie << "' not found in "
<< "species list. Available species:" << composition.species()
<< exit(FatalError);
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
index c8857ce9f2b..55af5942836 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
@@ -717,10 +717,8 @@ Foam::multiphaseMixtureThermo::surfaceTensionForce() const
if (sigma == sigmas_.end())
{
- FatalErrorIn
- (
- "multiphaseMixtureThermo::surfaceTensionForce() const"
- ) << "Cannot find interface " << interfacePair(alpha1, alpha2)
+ FatalErrorInFunction
+ << "Cannot find interface " << interfacePair(alpha1, alpha2)
<< " in list of sigma values"
<< exit(FatalError);
}
@@ -848,12 +846,8 @@ void Foam::multiphaseMixtureThermo::correctContactAngle
if (tp == acap.thetaProps().end())
{
- FatalErrorIn
- (
- "multiphaseMixtureThermo::correctContactAngle"
- "(const phaseModel& alpha1, const phaseModel& alpha2, "
- "fvPatchVectorFieldField& nHatb) const"
- ) << "Cannot find interface " << interfacePair(alpha1, alpha2)
+ FatalErrorInFunction
+ << "Cannot find interface " << interfacePair(alpha1, alpha2)
<< "\n in table of theta properties for patch "
<< acap.patch().name()
<< exit(FatalError);
diff --git a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C
index ecd9c25623c..b36e3f6e77e 100644
--- a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C
+++ b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -46,11 +46,8 @@ Foam::autoPtr<Foam::mixtureViscosityModel> Foam::mixtureViscosityModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn
- (
- "mixtureViscosityModel::New(const volVectorField&, "
- "const surfaceScalarField&)"
- ) << "Unknown mixtureViscosityModel type "
+ FatalErrorInFunction
+ << "Unknown mixtureViscosityModel type "
<< modelType << nl << nl
<< "Valid mixtureViscosityModels are : " << endl
<< dictionaryConstructorTablePtr_->sortedToc()
diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
index 578b23f38b6..be4de6b2c05 100644
--- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -82,13 +82,8 @@ Foam::autoPtr<Foam::relativeVelocityModel> Foam::relativeVelocityModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn
- (
- "relativeVelocityModel::New"
- "("
- "const dictionary&"
- ")"
- ) << "Unknown time scale model type " << modelType
+ FatalErrorInFunction
+ << "Unknown time scale model type " << modelType
<< ", constructor not in hash table" << nl << nl
<< " Valid time scale model types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
diff --git a/applications/solvers/multiphase/interFoam/alphaEqn.H b/applications/solvers/multiphase/interFoam/alphaEqn.H
index a2e9097e309..6a248301376 100644
--- a/applications/solvers/multiphase/interFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/interFoam/alphaEqn.H
@@ -25,7 +25,7 @@
{
if (nAlphaSubCycles > 1)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Sub-cycling is not supported "
"with the CrankNicolson ddt scheme"
<< exit(FatalError);
@@ -36,7 +36,7 @@
}
else
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Only Euler and CrankNicolson ddt schemes are supported"
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
index 0a86459705c..0825368e5c1 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
@@ -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
@@ -62,10 +62,8 @@ Foam::phaseChangeTwoPhaseMixture::New
if (cstrIter == componentsConstructorTablePtr_->end())
{
- FatalErrorIn
- (
- "phaseChangeTwoPhaseMixture::New"
- ) << "Unknown phaseChangeTwoPhaseMixture type "
+ FatalErrorInFunction
+ << "Unknown phaseChangeTwoPhaseMixture type "
<< phaseChangeTwoPhaseMixtureTypeName << endl << endl
<< "Valid phaseChangeTwoPhaseMixtures are : " << endl
<< componentsConstructorTablePtr_->sortedToc()
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
index 72542bc01b1..3bdd49ec7ad 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
@@ -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
@@ -46,7 +46,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("dragModel::New")
+ FatalErrorInFunction
<< "Unknown dragModelType type "
<< dragModelType << endl << endl
<< "Valid dragModel types are : " << endl
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
index aaa972032d0..deabfc900fa 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -50,7 +50,7 @@ Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("heatTransferModel::New")
+ FatalErrorInFunction
<< "Unknown heatTransferModelType type "
<< heatTransferModelType << endl << endl
<< "Valid heatTransferModel types are : " << endl
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C
index b9014f3f46d..b58f00291bb 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C
@@ -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
@@ -48,7 +48,7 @@ Foam::autoPtr<Foam::diameterModel> Foam::diameterModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("diameterModel::New")
+ FatalErrorInFunction
<< "Unknown diameterModelType type "
<< diameterModelType << endl << endl
<< "Valid diameterModel types are : " << endl
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 767600e3940..d0cd5c9b184 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -295,12 +295,8 @@ void Foam::multiphaseSystem::correctContactAngle
if (tp == acap.thetaProps().end())
{
- FatalErrorIn
- (
- "multiphaseSystem::correctContactAngle"
- "(const phaseModel& phase1, const phaseModel& phase2, "
- "fvPatchVectorFieldField& nHatb) const"
- ) << "Cannot find interface " << interfacePair(phase1, phase2)
+ FatalErrorInFunction
+ << "Cannot find interface " << interfacePair(phase1, phase2)
<< "\n in table of theta properties for patch "
<< acap.patch().name()
<< exit(FatalError);
@@ -478,12 +474,8 @@ Foam::multiphaseSystem::multiphaseSystem
if (cAlpha == cAlphas_.end())
{
- WarningIn
- (
- "multiphaseSystem::multiphaseSystem"
- "(const volVectorField& U,"
- "const surfaceScalarField& phi)"
- ) << "Compression coefficient not specified for "
+ WarningInFunction
+ << "Compression coefficient not specified for "
"phase pair ("
<< phase1.name() << ' ' << phase2.name()
<< ") for which a surface tension "
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
index f1305897ba1..1bbd3177af9 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
@@ -288,7 +288,7 @@ Foam::multiphaseMixture::surfaceTensionForce() const
if (sigma == sigmas_.end())
{
- FatalErrorIn("multiphaseMixture::surfaceTensionForce() const")
+ FatalErrorInFunction
<< "Cannot find interface " << interfacePair(alpha1, alpha2)
<< " in list of sigma values"
<< exit(FatalError);
@@ -442,12 +442,8 @@ void Foam::multiphaseMixture::correctContactAngle
if (tp == acap.thetaProps().end())
{
- FatalErrorIn
- (
- "multiphaseMixture::correctContactAngle"
- "(const phase& alpha1, const phase& alpha2, "
- "fvPatchVectorFieldField& nHatb) const"
- ) << "Cannot find interface " << interfacePair(alpha1, alpha2)
+ FatalErrorInFunction
+ << "Cannot find interface " << interfacePair(alpha1, alpha2)
<< "\n in table of theta properties for patch "
<< acap.patch().name()
<< exit(FatalError);
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C
index 06754e2f86b..03b21be4909 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C
@@ -50,16 +50,8 @@ Foam::interfaceCompositionModels::Henry<Thermo, OtherThermo>::Henry
{
if (k_.size() != this->speciesNames_.size())
{
- FatalErrorIn
- (
- "template<class Thermo, class OtherThermo> "
- "Foam::interfaceCompositionModels::Henry<Thermo, OtherThermo>:: "
- "Henry "
- "( "
- "const dictionary& dict, "
- "const phasePair& pair "
- ")"
- ) << "Differing number of species and solubilities"
+ FatalErrorInFunction
+ << "Differing number of species and solubilities"
<< exit(FatalError);
}
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C
index 169580e3cf6..6818c243f16 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C
@@ -63,17 +63,8 @@ NonRandomTwoLiquid
{
if (this->speciesNames_.size() != 2)
{
- FatalErrorIn
- (
- "template<class Thermo, class OtherThermo>"
- "Foam::interfaceCompositionModels::"
- "NonRandomTwoLiquid<Thermo, OtherThermo>::"
- "NonRandomTwoLiquid"
- "( "
- "const dictionary& dict, "
- "const phasePair& pair "
- ")"
- ) << "NonRandomTwoLiquid model is suitable for two species only."
+ FatalErrorInFunction
+ << "NonRandomTwoLiquid model is suitable for two species only."
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C
index c0d9b64e398..435bb7df2a3 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C
@@ -64,16 +64,8 @@ Foam::interfaceCompositionModels::Saturated<Thermo, OtherThermo>::Saturated
{
if (this->speciesNames_.size() != 1)
{
- FatalErrorIn
- (
- "template<class Thermo, class OtherThermo>"
- "Foam::interfaceCompositionModels::Saturated<Thermo, OtherThermo>::"
- "Saturated"
- "( "
- "const dictionary& dict, "
- "const phasePair& pair "
- ")"
- ) << "Saturated model is suitable for one species only."
+ FatalErrorInFunction
+ << "Saturated model is suitable for one species only."
<< exit(FatalError);
}
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C
index 8b04d8f5f1e..16b30556875 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C
@@ -54,7 +54,7 @@ Foam::interfaceCompositionModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("interfaceCompositionModel::New")
+ FatalErrorInFunction
<< "Unknown interfaceCompositionModelType type "
<< interfaceCompositionModelType << endl << endl
<< "Valid interfaceCompositionModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C
index d8ee288ef08..1251c98fe09 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::massTransferModel> Foam::massTransferModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("massTransferModel::New")
+ FatalErrorInFunction
<< "Unknown massTransferModelType type "
<< massTransferModelType << endl << endl
<< "Valid massTransferModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C
index 93770692a50..920d7c62c80 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C
@@ -42,7 +42,7 @@ Foam::autoPtr<Foam::saturationModel> Foam::saturationModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("saturationModel::New")
+ FatalErrorInFunction
<< "Unknown saturationModelType type "
<< saturationModelType << endl << endl
<< "Valid saturationModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C
index 0b016658639..82359c05080 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C
@@ -45,7 +45,7 @@ Foam::surfaceTensionModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("surfaceTensionModel::New")
+ FatalErrorInFunction
<< "Unknown surfaceTensionModelType type "
<< surfaceTensionModelType << endl << endl
<< "Valid surfaceTensionModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
index ff4cb63441f..568c1b26827 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
@@ -45,7 +45,7 @@ Foam::aspectRatioModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("aspectRatioModel::New")
+ FatalErrorInFunction
<< "Unknown aspectRatioModelType type "
<< aspectRatioModelType << endl << endl
<< "Valid aspectRatioModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
index 041468a15b3..e077e31b2d3 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("dragModel::New")
+ FatalErrorInFunction
<< "Unknown dragModelType type "
<< dragModelType << endl << endl
<< "Valid dragModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C
index 2f3e0db6992..00ca3d49ee1 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C
@@ -66,7 +66,7 @@ Foam::dragModels::segregated::~segregated()
Foam::tmp<Foam::volScalarField> Foam::dragModels::segregated::CdRe() const
{
- FatalErrorIn("Foam::dragModels::segregated::CdRe() const")
+ FatalErrorInFunction
<< "Not implemented."
<< "Drag coefficient not defined for the segregated model."
<< exit(FatalError);
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
index 24f02b69b48..8cdb07f2976 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("heatTransferModel::New")
+ FatalErrorInFunction
<< "Unknown heatTransferModelType type "
<< heatTransferModelType << endl << endl
<< "Valid heatTransferModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C
index 5548dfd70af..fa364a68c1a 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C
@@ -79,11 +79,8 @@ Foam::tmp<Foam::volScalarField> Foam::liftModels::Moraga::Cl() const
|| max(sqrSr).value() > 0.04
)
{
- WarningIn
- (
- "Foam::tmp<Foam::volScalarField> "
- "Foam::liftModels::Moraga::Cl() const"
- ) << "Re and/or Sr are out of the range of applicability of the "
+ WarningInFunction
+ << "Re and/or Sr are out of the range of applicability of the "
<< "Moraga model. Clamping to range bounds"
<< endl;
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
index c53ff96e3d3..3da4caee7ce 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::liftModel> Foam::liftModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("liftModel::New")
+ FatalErrorInFunction
<< "Unknown liftModelType type "
<< liftModelType << endl << endl
<< "Valid liftModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
index 651286c3ee0..a7181b43968 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
@@ -45,7 +45,7 @@ Foam::swarmCorrection::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("swarmCorrection::New")
+ FatalErrorInFunction
<< "Unknown swarmCorrectionType type "
<< swarmCorrectionType << endl << endl
<< "Valid swarmCorrection types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
index 14d560969bd..e440e3d1ee6 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
@@ -45,7 +45,7 @@ Foam::turbulentDispersionModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("turbulentDispersionModel::New")
+ FatalErrorInFunction
<< "Unknown turbulentDispersionModelType type "
<< turbulentDispersionModelType << endl << endl
<< "Valid turbulentDispersionModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
index 72f620a424b..4c4ced9ddc1 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::virtualMassModel> Foam::virtualMassModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("virtualMassModel::New")
+ FatalErrorInFunction
<< "Unknown virtualMassModelType type "
<< virtualMassModelType << endl << endl
<< "Valid virtualMassModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
index 9f7d905c197..08dfd7065da 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::wallLubricationModel> Foam::wallLubricationModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("wallLubricationModel::New")
+ FatalErrorInFunction
<< "Unknown wallLubricationModelType type "
<< wallLubricationModelType << endl << endl
<< "Valid wallLubricationModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
index 2dcc6d0a5e8..e2882355683 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
@@ -43,7 +43,7 @@ Foam::autoPtr<Foam::blendingMethod> Foam::blendingMethod::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("blendingMethod::New")
+ FatalErrorInFunction
<< "Unknown blendingMethodType type "
<< blendingMethodType << endl << endl
<< "Valid blendingMethod types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C
index d9bfe2b5985..51066535350 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C
@@ -93,14 +93,8 @@ Foam::blendingMethods::linear::linear
< minPartlyContinuousAlpha_[*iter]
)
{
- FatalErrorIn
- (
- "Foam::blendingMethods::linear::linear"
- "("
- "const dictionary& dict,"
- "const wordList& phaseNames"
- ")"
- ) << "The supplied fully continuous volume fraction for "
+ FatalErrorInFunction
+ << "The supplied fully continuous volume fraction for "
<< *iter
<< " is less than the partly continuous value."
<< endl << exit(FatalError);
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C
index 8db37d2bf02..b58f00291bb 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C
@@ -48,7 +48,7 @@ Foam::autoPtr<Foam::diameterModel> Foam::diameterModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("diameterModel::New")
+ FatalErrorInFunction
<< "Unknown diameterModelType type "
<< diameterModelType << endl << endl
<< "Valid diameterModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C
index 0a577313b22..6c1ca526dbf 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C
@@ -45,7 +45,7 @@ Foam::autoPtr<Foam::phaseModel> Foam::phaseModel::New
if (cstrIter == phaseSystemConstructorTablePtr_->end())
{
- FatalErrorIn("phaseModel::New")
+ FatalErrorInFunction
<< "Unknown phaseModelType type "
<< phaseModelType << endl << endl
<< "Valid phaseModel types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
index b40c4688b39..8d73c1286ce 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
@@ -175,7 +175,7 @@ const Foam::tmp<Foam::volScalarField>& Foam::phaseModel::divU() const
void Foam::phaseModel::divU(const tmp<volScalarField>& divU)
{
- WarningIn("phaseModel::divU(const tmp<volScalarField>& divU)")
+ WarningInFunction
<< "Attempt to set the dilatation rate of an incompressible phase"
<< endl;
}
@@ -196,7 +196,7 @@ const Foam::surfaceScalarField& Foam::phaseModel::DbyA() const
void Foam::phaseModel::DbyA(const tmp<surfaceScalarField>& DbyA)
{
- WarningIn("phaseModel::DbyA(const surfaceScalarField& DbyA)")
+ WarningInFunction
<< "Attempt to set the dilatation rate of an incompressible phase"
<< endl;
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C
index 16478646d7d..70ddd042706 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C
@@ -67,7 +67,7 @@ Foam::phasePair::~phasePair()
const Foam::phaseModel& Foam::phasePair::dispersed() const
{
- FatalErrorIn("Foam::phasePair::dispersed() const")
+ FatalErrorInFunction
<< "Requested dispersed phase from an unordered pair."
<< exit(FatalError);
@@ -77,7 +77,7 @@ const Foam::phaseModel& Foam::phasePair::dispersed() const
const Foam::phaseModel& Foam::phasePair::continuous() const
{
- FatalErrorIn("Foam::phasePair::dispersed() const")
+ FatalErrorInFunction
<< "Requested continuous phase from an unordered pair."
<< exit(FatalError);
@@ -191,7 +191,7 @@ Foam::tmp<Foam::volScalarField> Foam::phasePair::Ta() const
Foam::tmp<Foam::volScalarField> Foam::phasePair::E() const
{
- FatalErrorIn("Foam::phasePair::E() const")
+ FatalErrorInFunction
<< "Requested aspect ratio of the dispersed phase in an unordered pair"
<< exit(FatalError);
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C
index 13ae288f089..da6627b922c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C
@@ -133,14 +133,8 @@ Foam::Istream& Foam::operator>>(Istream& is, phasePairKey& key)
}
else
{
- FatalErrorIn
- (
- "friend Istream& operator>>"
- "("
- "Istream& is, "
- "phasePairKey& key"
- ")"
- ) << "Phase pair type is not recognised. "
+ FatalErrorInFunction
+ << "Phase pair type is not recognised. "
<< temp
<< "Use (phaseDispersed in phaseContinuous) for an ordered"
<< "pair, or (phase1 and pase2) for an unordered pair."
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index fe1e4d4a8dd..2b06f1a7f45 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -400,12 +400,8 @@ void Foam::multiphaseSystem::correctContactAngle
if (tp == acap.thetaProps().end())
{
- FatalErrorIn
- (
- "multiphaseSystem::correctContactAngle"
- "(const phaseModel& phase1, const phaseModel& phase2, "
- "fvPatchVectorFieldField& nHatb) const"
- ) << "Cannot find interface "
+ FatalErrorInFunction
+ << "Cannot find interface "
<< phasePairKey(phase1.name(), phase2.name())
<< "\n in table of theta properties for patch "
<< acap.patch().name()
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C
index 79e3546c491..7ee24aa1aa6 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C
@@ -56,7 +56,7 @@ Foam::autoPtr<Foam::multiphaseSystem> Foam::multiphaseSystem::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("multiphaseSystem::New")
+ FatalErrorInFunction
<< "Unknown multiphaseSystemType type "
<< multiphaseSystemType << endl << endl
<< "Valid multiphaseSystem types are : " << endl
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
index a37553e338f..76b5879ac1d 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
@@ -56,11 +56,7 @@ void alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::checkType()
{
if (!isA<wallFvPatch>(patch()))
{
- FatalErrorIn
- (
- "alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField"
- "::checkType()"
- )
+ FatalErrorInFunction
<< "Patch type for patch " << patch().name() << " must be wall\n"
<< "Current patch type is " << patch().type() << nl
<< exit(FatalError);
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
index ea28dd01b51..c3d306738d0 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
@@ -89,16 +89,8 @@ JohnsonJacksonParticleSlipFvPatchVectorField
|| (specularityCoefficient_.value() > 1)
)
{
- FatalErrorIn
- (
- "("
- "Foam::JohnsonJacksonParticleSlipFvPatchVectorField::"
- "JohnsonJacksonParticleSlipFvPatchVectorField"
- "const fvPatch& p,"
- "const DimensionedField<scalar, volMesh>& iF,"
- "const dictionary& dict"
- ")"
- ) << "The specularity coefficient has to be between 0 and 1"
+ FatalErrorInFunction
+ << "The specularity coefficient has to be between 0 and 1"
<< abort(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
index 93d97c650c7..f4d7dd4ee9e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
@@ -97,16 +97,8 @@ JohnsonJacksonParticleThetaFvPatchScalarField
|| (restitutionCoefficient_.value() > 1)
)
{
- FatalErrorIn
- (
- "Foam::JohnsonJacksonParticleThetaFvPatchScalarField::"
- "JohnsonJacksonParticleThetaFvPatchScalarField"
- "("
- "const fvPatch& p,"
- "const DimensionedField<scalar, volMesh>& iF,"
- "const dictionary& dict"
- ")"
- ) << "The restitution coefficient has to be between 0 and 1"
+ FatalErrorInFunction
+ << "The restitution coefficient has to be between 0 and 1"
<< abort(FatalError);
}
@@ -116,16 +108,8 @@ JohnsonJacksonParticleThetaFvPatchScalarField
|| (specularityCoefficient_.value() > 1)
)
{
- FatalErrorIn
- (
- "Foam::JohnsonJacksonParticleThetaFvPatchScalarField::"
- "JohnsonJacksonParticleThetaFvPatchScalarField"
- "("
- "const fvPatch& p,"
- "const DimensionedField<scalar, volMesh>& iF,"
- "const dictionary& dict"
- ")"
- ) << "The specularity coefficient has to be between 0 and 1"
+ FatalErrorInFunction
+ << "The specularity coefficient has to be between 0 and 1"
<< abort(FatalError);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
index 92e97999207..dd110902b1d 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
@@ -55,11 +55,8 @@ Foam::diameterModels::IATEsource::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn
- (
- "IATEsource::New"
- "(const word& type, const IATE&, const dictionary&)"
- ) << "Unknown IATE source type "
+ FatalErrorInFunction
+ << "Unknown IATE source type "
<< type << nl << nl
<< "Valid IATE source types : " << endl
<< dictionaryConstructorTablePtr_->sortedToc()
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C
index 0324fb2f565..5477ae7c58b 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C
@@ -56,7 +56,7 @@ Foam::autoPtr<Foam::twoPhaseSystem> Foam::twoPhaseSystem::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("twoPhaseSystem::New")
+ FatalErrorInFunction
<< "Unknown twoPhaseSystemType type "
<< twoPhaseSystemType << endl << endl
<< "Valid twoPhaseSystem types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
index ff4cb63441f..568c1b26827 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
@@ -45,7 +45,7 @@ Foam::aspectRatioModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("aspectRatioModel::New")
+ FatalErrorInFunction
<< "Unknown aspectRatioModelType type "
<< aspectRatioModelType << endl << endl
<< "Valid aspectRatioModel types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
index ce06feab070..e077e31b2d3 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
@@ -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
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("dragModel::New")
+ FatalErrorInFunction
<< "Unknown dragModelType type "
<< dragModelType << endl << endl
<< "Valid dragModel types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C
index 4b1fc88ddc5..ca0a145f5bf 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C
@@ -66,7 +66,7 @@ Foam::dragModels::segregated::~segregated()
Foam::tmp<Foam::volScalarField> Foam::dragModels::segregated::CdRe() const
{
- FatalErrorIn("Foam::dragModels::segregated::CdRe() const")
+ FatalErrorInFunction
<< "Not implemented."
<< "Drag coefficient not defined for the segregated model."
<< exit(FatalError);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
index bceb23cacc3..8cdb07f2976 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
@@ -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
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("heatTransferModel::New")
+ FatalErrorInFunction
<< "Unknown heatTransferModelType type "
<< heatTransferModelType << endl << endl
<< "Valid heatTransferModel types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C
index 5548dfd70af..fa364a68c1a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C
@@ -79,11 +79,8 @@ Foam::tmp<Foam::volScalarField> Foam::liftModels::Moraga::Cl() const
|| max(sqrSr).value() > 0.04
)
{
- WarningIn
- (
- "Foam::tmp<Foam::volScalarField> "
- "Foam::liftModels::Moraga::Cl() const"
- ) << "Re and/or Sr are out of the range of applicability of the "
+ WarningInFunction
+ << "Re and/or Sr are out of the range of applicability of the "
<< "Moraga model. Clamping to range bounds"
<< endl;
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
index e8a476d4414..3da4caee7ce 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::liftModel> Foam::liftModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("liftModel::New")
+ FatalErrorInFunction
<< "Unknown liftModelType type "
<< liftModelType << endl << endl
<< "Valid liftModel types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
index 8c8f096a2ea..a7181b43968 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -45,7 +45,7 @@ Foam::swarmCorrection::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("swarmCorrection::New")
+ FatalErrorInFunction
<< "Unknown swarmCorrectionType type "
<< swarmCorrectionType << endl << endl
<< "Valid swarmCorrection types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
index fa267e80d5b..e440e3d1ee6 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -45,7 +45,7 @@ Foam::turbulentDispersionModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("turbulentDispersionModel::New")
+ FatalErrorInFunction
<< "Unknown turbulentDispersionModelType type "
<< turbulentDispersionModelType << endl << endl
<< "Valid turbulentDispersionModel types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
index 82b9b47f170..4c4ced9ddc1 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::virtualMassModel> Foam::virtualMassModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("virtualMassModel::New")
+ FatalErrorInFunction
<< "Unknown virtualMassModelType type "
<< virtualMassModelType << endl << endl
<< "Valid virtualMassModel types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
index b9766e7d52b..08dfd7065da 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::wallLubricationModel> Foam::wallLubricationModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("wallLubricationModel::New")
+ FatalErrorInFunction
<< "Unknown wallLubricationModelType type "
<< wallLubricationModelType << endl << endl
<< "Valid wallLubricationModel types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
index ea28dd01b51..c3d306738d0 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
@@ -89,16 +89,8 @@ JohnsonJacksonParticleSlipFvPatchVectorField
|| (specularityCoefficient_.value() > 1)
)
{
- FatalErrorIn
- (
- "("
- "Foam::JohnsonJacksonParticleSlipFvPatchVectorField::"
- "JohnsonJacksonParticleSlipFvPatchVectorField"
- "const fvPatch& p,"
- "const DimensionedField<scalar, volMesh>& iF,"
- "const dictionary& dict"
- ")"
- ) << "The specularity coefficient has to be between 0 and 1"
+ FatalErrorInFunction
+ << "The specularity coefficient has to be between 0 and 1"
<< abort(FatalError);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
index 93d97c650c7..f4d7dd4ee9e 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
@@ -97,16 +97,8 @@ JohnsonJacksonParticleThetaFvPatchScalarField
|| (restitutionCoefficient_.value() > 1)
)
{
- FatalErrorIn
- (
- "Foam::JohnsonJacksonParticleThetaFvPatchScalarField::"
- "JohnsonJacksonParticleThetaFvPatchScalarField"
- "("
- "const fvPatch& p,"
- "const DimensionedField<scalar, volMesh>& iF,"
- "const dictionary& dict"
- ")"
- ) << "The restitution coefficient has to be between 0 and 1"
+ FatalErrorInFunction
+ << "The restitution coefficient has to be between 0 and 1"
<< abort(FatalError);
}
@@ -116,16 +108,8 @@ JohnsonJacksonParticleThetaFvPatchScalarField
|| (specularityCoefficient_.value() > 1)
)
{
- FatalErrorIn
- (
- "Foam::JohnsonJacksonParticleThetaFvPatchScalarField::"
- "JohnsonJacksonParticleThetaFvPatchScalarField"
- "("
- "const fvPatch& p,"
- "const DimensionedField<scalar, volMesh>& iF,"
- "const dictionary& dict"
- ")"
- ) << "The specularity coefficient has to be between 0 and 1"
+ FatalErrorInFunction
+ << "The specularity coefficient has to be between 0 and 1"
<< abort(FatalError);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
index 95b277fd99f..e2882355683 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -43,7 +43,7 @@ Foam::autoPtr<Foam::blendingMethod> Foam::blendingMethod::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("blendingMethod::New")
+ FatalErrorInFunction
<< "Unknown blendingMethodType type "
<< blendingMethodType << endl << endl
<< "Valid blendingMethod types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C
index 48dcd0855e2..f89804bb7d3 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -93,14 +93,8 @@ Foam::blendingMethods::linear::linear
> maxPartlyDispersedAlpha_[*iter]
)
{
- FatalErrorIn
- (
- "Foam::blendingMethods::linear::linear"
- "("
- "const dictionary& dict,"
- "const wordList& phaseNames"
- ")"
- ) << "The supplied fully dispersed volume fraction for "
+ FatalErrorInFunction
+ << "The supplied fully dispersed volume fraction for "
<< *iter
<< " is greater than the partly dispersed value."
<< endl << exit(FatalError);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
index 84db2829087..27fd28d68da 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
@@ -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
@@ -56,11 +56,8 @@ Foam::diameterModels::IATEsource::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn
- (
- "IATEsource::New"
- "(const word& type, const IATE&, const dictionary&)"
- ) << "Unknown IATE source type "
+ FatalErrorInFunction
+ << "Unknown IATE source type "
<< type << nl << nl
<< "Valid IATE source types : " << endl
<< dictionaryConstructorTablePtr_->sortedToc()
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C
index b9014f3f46d..b58f00291bb 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C
@@ -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
@@ -48,7 +48,7 @@ Foam::autoPtr<Foam::diameterModel> Foam::diameterModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("diameterModel::New")
+ FatalErrorInFunction
<< "Unknown diameterModelType type "
<< diameterModelType << endl << endl
<< "Valid diameterModel types are : " << endl
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C
index 808208ea997..5e983b7c19d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -85,7 +85,7 @@ Foam::tmp<Foam::volScalarField> Foam::orderedPhasePair::E() const
{
if (!aspectRatio_.valid())
{
- FatalErrorIn("Foam::orderedPhasePair::E() const")
+ FatalErrorInFunction
<< "Aspect ratio model not specified for " << *this << "."
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.C
index 0f77a41ad0d..ef4f6abb8e8 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.C
@@ -82,7 +82,7 @@ Foam::phasePair::~phasePair()
const Foam::phaseModel& Foam::phasePair::dispersed() const
{
- FatalErrorIn("Foam::phasePair::dispersed() const")
+ FatalErrorInFunction
<< "Requested dispersed phase from an unordered pair."
<< exit(FatalError);
@@ -92,7 +92,7 @@ const Foam::phaseModel& Foam::phasePair::dispersed() const
const Foam::phaseModel& Foam::phasePair::continuous() const
{
- FatalErrorIn("Foam::phasePair::dispersed() const")
+ FatalErrorInFunction
<< "Requested continuous phase from an unordered pair."
<< exit(FatalError);
@@ -185,7 +185,7 @@ Foam::tmp<Foam::volScalarField> Foam::phasePair::Ta() const
Foam::tmp<Foam::volScalarField> Foam::phasePair::E() const
{
- FatalErrorIn("Foam::phasePair::E() const")
+ FatalErrorInFunction
<< "Requested aspect ratio of the dispersed phase in an unordered pair"
<< exit(FatalError);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePairKey/phasePairKey.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePairKey/phasePairKey.C
index 4280dd5fb3b..d203fb03494 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePairKey/phasePairKey.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePairKey/phasePairKey.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -125,14 +125,8 @@ Foam::Istream& Foam::operator>>(Istream& is, phasePairKey& key)
}
else
{
- FatalErrorIn
- (
- "friend Istream& operator>>"
- "("
- "Istream& is, "
- "phasePairKey& key"
- ")"
- ) << "Phase pair type is not recognised. "
+ FatalErrorInFunction
+ << "Phase pair type is not recognised. "
<< temp
<< "Use (phaseDispersed in phaseContinuous) for an ordered"
<< "pair, or (phase1 and pase2) for an unordered pair."
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H
index 4f85d6dad8c..eca43adbf7a 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H
@@ -61,10 +61,8 @@
}
else
{
- FatalErrorIn
- (
- "readMechanicalProperties.H"
- ) << "Valid type entries are uniform or field for rho"
+ FatalErrorInFunction
+ << "Valid type entries are uniform or field for rho"
<< abort(FatalError);
}
@@ -119,10 +117,8 @@
}
else
{
- FatalErrorIn
- (
- "readMechanicalProperties.H"
- ) << "Valid type entries are uniform or field for E"
+ FatalErrorInFunction
+ << "Valid type entries are uniform or field for E"
<< abort(FatalError);
}
@@ -175,10 +171,8 @@
}
else
{
- FatalErrorIn
- (
- "readMechanicalProperties.H"
- ) << "Valid type entries are uniform or field for nu"
+ FatalErrorInFunction
+ << "Valid type entries are uniform or field for nu"
<< abort(FatalError);
}
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H
index afcff762e4d..45327c2b4be 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H
@@ -96,10 +96,8 @@ if (thermalStress)
}
else
{
- FatalErrorIn
- (
- "readThermalProperties.H"
- ) << "Valid type entries are uniform or field for C"
+ FatalErrorInFunction
+ << "Valid type entries are uniform or field for C"
<< abort(FatalError);
}
@@ -154,10 +152,8 @@ if (thermalStress)
}
else
{
- FatalErrorIn
- (
- "readThermalProperties.H"
- ) << "Valid type entries are uniform or field for K"
+ FatalErrorInFunction
+ << "Valid type entries are uniform or field for K"
<< abort(FatalError);
}
@@ -212,10 +208,8 @@ if (thermalStress)
}
else
{
- FatalErrorIn
- (
- "readThermalProperties.H"
- ) << "Valid type entries are uniform or field for alpha"
+ FatalErrorInFunction
+ << "Valid type entries are uniform or field for alpha"
<< abort(FatalError);
}
diff --git a/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C b/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C
index 2dd7905294c..940bc871abb 100644
--- a/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C
+++ b/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C
@@ -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
@@ -130,7 +130,7 @@ int main(int argc, char *argv[])
);
if (!ok)
{
- WarningIn(args.executable())
+ WarningInFunction
<< "At level " << level
<< " there are " << coarseSize
<< " agglomerated cells but " << newCoarseSize
diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C
index e4bc1967778..38a4b110f96 100644
--- a/applications/test/fieldMapping/Test-fieldMapping.C
+++ b/applications/test/fieldMapping/Test-fieldMapping.C
@@ -225,7 +225,7 @@ int main(int argc, char *argv[])
{
if (mesh.V().size() != mesh.nCells())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Volume not mapped. V:" << mesh.V().size()
<< " nCells:" << mesh.nCells()
<< exit(FatalError);
@@ -238,7 +238,7 @@ int main(int argc, char *argv[])
if (mag(newVol-totalVol)/totalVol > 1e-10)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Volume loss: old volume:" << totalVol
<< " new volume:" << newVol
<< exit(FatalError);
@@ -260,7 +260,7 @@ int main(int argc, char *argv[])
if (notEqual(max, 1.0, 1e-10) || notEqual(min, 1.0, 1e-10))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Uniform volVectorField not preserved."
<< " Min and max should both be 1.0. min:" << min
<< " max:" << max
@@ -284,7 +284,7 @@ int main(int argc, char *argv[])
if (notEqual(max, 0.0, 1e-10) || notEqual(min, 0.0, 1e-10))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Linear profile not preserved."
<< " Min and max should both be 0.0. min:" << min
<< " max:" << max
@@ -307,7 +307,7 @@ int main(int argc, char *argv[])
if (notEqual(max, 1.0, 1e-10) || notEqual(min, 1.0, 1e-10))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Uniform surfaceScalarField not preserved."
<< " Min and max should both be 1.0. min:" << min
<< " max:" << max
diff --git a/applications/test/globalIndex/Test-globalIndex.C b/applications/test/globalIndex/Test-globalIndex.C
index 11078c858bb..0de4f04b3c3 100644
--- a/applications/test/globalIndex/Test-globalIndex.C
+++ b/applications/test/globalIndex/Test-globalIndex.C
@@ -53,14 +53,14 @@ int main(int argc, char *argv[])
if (globalNumbering.localSize() != mesh.nCells())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Problem." << abort(FatalError);
}
if (!Pstream::parRun())
{
- WarningIn(args.executable())
+ WarningInFunction
<< "globalIndex class is only useful in parallel code."
<< endl;
}
@@ -77,14 +77,14 @@ int main(int argc, char *argv[])
if (procI != Pstream::myProcNo() || localCellI != cellI)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Problem. cellI:" << cellI << " localCellI:" << localCellI
<< " procI:" << procI << abort(FatalError);
}
if (!globalNumbering.isLocal(globalCellI))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Problem. cellI:" << cellI << " globalCellI:" << globalCellI
<< " not local" << abort(FatalError);
}
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
if (mesh.nCells() < 1)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Test needs to be run on a case with at least one"
<< " cell per processor." << abort(FatalError);
}
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
if (procI != Pstream::myProcNo()-1)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Problem. global:" << prevProcCellI
<< " expected on processor:" << Pstream::myProcNo()-1
<< " but is calculated to be on procI:" << procI
@@ -118,14 +118,14 @@ int main(int argc, char *argv[])
if (globalNumbering.isLocal(prevProcCellI))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Problem. globalCellI:" << prevProcCellI
<< " calculated as local" << abort(FatalError);
}
if (!globalNumbering.isLocal(procI, prevProcCellI))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Problem. globalCellI:" << prevProcCellI
<< " not calculated as local on processor:" << procI
<< abort(FatalError);
@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
if (procI != Pstream::myProcNo()+1)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Problem. global:" << nextProcCellI
<< " expected on processor:" << Pstream::myProcNo()+1
<< " but is calculated to be on procI:" << procI
@@ -149,14 +149,14 @@ int main(int argc, char *argv[])
if (globalNumbering.isLocal(nextProcCellI))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Problem. globalCellI:" << nextProcCellI
<< " calculated as local" << abort(FatalError);
}
if (!globalNumbering.isLocal(procI, nextProcCellI))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Problem. globalCellI:" << nextProcCellI
<< " not calculated as local on processor:" << procI
<< abort(FatalError);
diff --git a/applications/test/hexRef8/Test-hexRef8.C b/applications/test/hexRef8/Test-hexRef8.C
index 44a6094076d..f79628fd8c0 100644
--- a/applications/test/hexRef8/Test-hexRef8.C
+++ b/applications/test/hexRef8/Test-hexRef8.C
@@ -309,7 +309,7 @@ int main(int argc, char *argv[])
{
if (mesh.V().size() != mesh.nCells())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Volume not mapped. V:" << mesh.V().size()
<< " nCells:" << mesh.nCells()
<< exit(FatalError);
@@ -322,7 +322,7 @@ int main(int argc, char *argv[])
if (mag(newVol-totalVol)/totalVol > 1e-10)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Volume loss: old volume:" << totalVol
<< " new volume:" << newVol
<< exit(FatalError);
@@ -344,7 +344,7 @@ int main(int argc, char *argv[])
if (notEqual(max, 1.0, 1e-10) || notEqual(min, 1.0, 1e-10))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Uniform volVectorField not preserved."
<< " Min and max should both be 1.0. min:" << min
<< " max:" << max
@@ -389,7 +389,7 @@ int main(int argc, char *argv[])
if (notEqual(max, 1.0, 1e-10) || notEqual(min, 1.0, 1e-10))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Uniform surfaceScalarField not preserved."
<< " Min and max should both be 1.0. min:" << min
<< " max:" << max
diff --git a/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C b/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C
index ea27cfc7dfc..88c0a24571c 100644
--- a/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C
+++ b/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C
@@ -169,7 +169,7 @@ int main(int argc, char *argv[])
if (data != procI)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "From processor " << procI << " received " << data
<< " but expected " << procI
<< exit(FatalError);
diff --git a/applications/test/primitivePatch/Test-PrimitivePatch.C b/applications/test/primitivePatch/Test-PrimitivePatch.C
index 60d321b2b7c..3f5e9161e3c 100644
--- a/applications/test/primitivePatch/Test-PrimitivePatch.C
+++ b/applications/test/primitivePatch/Test-PrimitivePatch.C
@@ -71,7 +71,7 @@ void checkFaceEdges
if (edges[myEdges[fp]] != edge(f[fp], f[fp1]))
{
- FatalErrorIn("checkFaceEdges")
+ FatalErrorInFunction
<< "Edges of face not in face point order:"
<< "face:" << faceI << " localF:" << f
<< " faceEdges:" << myEdges
diff --git a/applications/test/router/Gather/GatherBase.C b/applications/test/router/Gather/GatherBase.C
index 553e41a818a..e3f281db7e4 100644
--- a/applications/test/router/Gather/GatherBase.C
+++ b/applications/test/router/Gather/GatherBase.C
@@ -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
@@ -70,11 +70,8 @@ IndexType GatherBase::offset
{
if (values.size() != indices.size())
{
- FatalErrorIn
- (
- "GatherBase::offset(const List<DataType>&, "
- "const List<IndexType>&, AddOp)"
- ) << "Input data and indices lists not equal size." << endl
+ FatalErrorInFunction
+ << "Input data and indices lists not equal size." << endl
<< "data size:" << values.size()
<< " indices:" << indices.size()
<< abort(FatalError);
diff --git a/applications/test/router/Test-processorRouter.C b/applications/test/router/Test-processorRouter.C
index 580277ee7ee..2c6e5b1e6dc 100644
--- a/applications/test/router/Test-processorRouter.C
+++ b/applications/test/router/Test-processorRouter.C
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
if (!Pstream::parRun())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Please run in parallel" << exit(FatalError);
}
diff --git a/applications/test/router/router.C b/applications/test/router/router.C
index 84420a907c5..0b55495beaa 100644
--- a/applications/test/router/router.C
+++ b/applications/test/router/router.C
@@ -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
@@ -125,12 +125,8 @@ void Foam::router::fixWeights
if (minNodeI == -1)
{
- WarningIn
- (
- "Foam::router::fixWeights"
- "(const label startNodeI, const label endNodeI,"
- "const label nodeI, const label prevNodeI)"
- ) << "Cannot route from node " << nodeI
+ WarningInFunction
+ << "Cannot route from node " << nodeI
<< " since all neigbours of node "
<< "already allocated:" << endl;
@@ -138,12 +134,7 @@ void Foam::router::fixWeights
{
label nbrNodeI = myNeighbours[neighbourI];
- WarningIn
- (
- "Foam::router::fixWeights"
- "(const label startNodeI, const label endNodeI,"
- "const label nodeI, const label prevNodeI)"
- ) << " neighbour:" << nbrNodeI
+ WarningInFunction
<< " weight:" << weights_[nbrNodeI] << endl;
}
return;
@@ -292,7 +283,7 @@ bool Foam::router::route(const labelList& path, const label pathValue)
{
if (pathValue >= 0)
{
- FatalErrorIn("router::route(const labelList&, const label)")
+ FatalErrorInFunction
<< "Illegal pathValue " << pathValue << exit(FatalError);
}
@@ -382,7 +373,7 @@ Foam::labelList Foam::router::getRoute(const label pathValue) const
if (pathNodeI == -1)
{
- FatalErrorIn("router::getRoute(const label)")
+ FatalErrorInFunction
<< "No route with value " << pathValue << endl;
}
diff --git a/applications/test/syncTools/Test-syncTools.C b/applications/test/syncTools/Test-syncTools.C
index f7379b8cd5a..f9a77643844 100644
--- a/applications/test/syncTools/Test-syncTools.C
+++ b/applications/test/syncTools/Test-syncTools.C
@@ -29,7 +29,6 @@ Description
\*---------------------------------------------------------------------------*/
-
#include "syncTools.H"
#include "argList.H"
#include "polyMesh.H"
@@ -81,7 +80,7 @@ void testPackedList(const polyMesh& mesh, Random& rndGen)
|| maxEdgeValues[i] != label(maxBits.get(i))
)
{
- FatalErrorIn("testPackedList()")
+ FatalErrorInFunction
<< "edge:" << i
<< " minlabel:" << edgeValues[i]
<< " minbits:" << bits.get(i)
@@ -128,7 +127,7 @@ void testPackedList(const polyMesh& mesh, Random& rndGen)
|| maxPointValues[i] != label(maxBits.get(i))
)
{
- FatalErrorIn("testPackedList()")
+ FatalErrorInFunction
<< "point:" << i
<< " at:" << mesh.points()[i]
<< " minlabel:" << pointValues[i]
@@ -170,7 +169,7 @@ void testPackedList(const polyMesh& mesh, Random& rndGen)
|| maxFaceValues[faceI] != label(maxBits.get(faceI))
)
{
- FatalErrorIn("testPackedList()")
+ FatalErrorInFunction
<< "face:" << faceI
<< " minlabel:" << faceValues[faceI]
<< " minbits:" << bits.get(faceI)
@@ -187,7 +186,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
{
Info<< nl << "Testing Map synchronisation." << endl;
- WarningIn("testSparseData()")
+ WarningInFunction
<< "Position test of sparse data only correct for cases without cyclics"
<< " with shared points." << endl;
@@ -252,7 +251,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
if (fullPt != sparsePt)
{
- FatalErrorIn("testSparseData()")
+ FatalErrorInFunction
<< "point:" << meshPointI
<< " full:" << fullPt
<< " sparse:" << sparsePt
@@ -270,7 +269,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
if (fullPt != sparsePt)
{
- FatalErrorIn("testSparseData()")
+ FatalErrorInFunction
<< "point:" << meshPointI
<< " full:" << fullPt
<< " sparse:" << sparsePt
@@ -335,7 +334,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
if (fullPt != sparsePt)
{
- FatalErrorIn("testSparseData()")
+ FatalErrorInFunction
<< "edge:" << meshEdgeI
<< " points:" << mesh.edges()[meshEdgeI]
<< " full:" << fullPt
@@ -359,7 +358,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
if (fullPt != sparsePt)
{
- FatalErrorIn("testSparseData()")
+ FatalErrorInFunction
<< "Extra edge:" << meshEdgeI
<< " points:" << mesh.edges()[meshEdgeI]
<< " full:" << fullPt
@@ -392,7 +391,7 @@ void testPointSync(const polyMesh& mesh, Random& rndGen)
{
if (mag(syncedPoints[pointI] - mesh.points()[pointI]) > SMALL)
{
- FatalErrorIn("testPointSync()")
+ FatalErrorInFunction
<< "Point " << pointI
<< " original location " << mesh.points()[pointI]
<< " synced location " << syncedPoints[pointI]
@@ -428,13 +427,11 @@ void testPointSync(const polyMesh& mesh, Random& rndGen)
{
if (nMasters[pointI] != 1)
{
- //FatalErrorIn("testPointSync()")
- WarningIn("testPointSync()")
+ WarningInFunction
<< "Point " << pointI
<< " original location " << mesh.points()[pointI]
<< " has " << nMasters[pointI]
<< " masters."
- //<< exit(FatalError);
<< endl;
}
}
@@ -470,7 +467,7 @@ void testEdgeSync(const polyMesh& mesh, Random& rndGen)
if (mag(syncedMids[edgeI] - eMid) > SMALL)
{
- FatalErrorIn("testEdgeSync()")
+ FatalErrorInFunction
<< "Edge " << edgeI
<< " original midpoint " << eMid
<< " synced location " << syncedMids[edgeI]
@@ -507,13 +504,11 @@ void testEdgeSync(const polyMesh& mesh, Random& rndGen)
if (nMasters[edgeI] != 1)
{
const edge& e = edges[edgeI];
- //FatalErrorIn("testEdgeSync()")
- WarningIn("testEdgeSync()")
+ WarningInFunction
<< "Edge " << edgeI
<< " at:" << mesh.points()[e[0]] << mesh.points()[e[1]]
<< " has " << nMasters[edgeI]
<< " masters."
- //<< exit(FatalError);
<< endl;
}
}
@@ -541,7 +536,7 @@ void testFaceSync(const polyMesh& mesh, Random& rndGen)
{
if (mag(syncedFc[faceI] - mesh.faceCentres()[faceI]) > SMALL)
{
- FatalErrorIn("testFaceSync()")
+ FatalErrorInFunction
<< "Face " << faceI
<< " original centre " << mesh.faceCentres()[faceI]
<< " synced centre " << syncedFc[faceI]
@@ -576,7 +571,7 @@ void testFaceSync(const polyMesh& mesh, Random& rndGen)
{
if (nMasters[faceI] != 1)
{
- FatalErrorIn("testFaceSync()")
+ FatalErrorInFunction
<< "Face " << faceI
<< " centre " << mesh.faceCentres()[faceI]
<< " has " << nMasters[faceI]
diff --git a/applications/test/tetTetOverlap/Test-tetTetOverlap.C b/applications/test/tetTetOverlap/Test-tetTetOverlap.C
index df6f2b8f83c..e3149316148 100644
--- a/applications/test/tetTetOverlap/Test-tetTetOverlap.C
+++ b/applications/test/tetTetOverlap/Test-tetTetOverlap.C
@@ -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
@@ -152,7 +152,7 @@ int main(int argc, char *argv[])
if (mag(volInside+volOutside-tetA.mag()) > SMALL)
{
- FatalErrorIn("Test-tetetOverlap")
+ FatalErrorInFunction
<< "Tet volumes do not sum up to input tet."
<< exit(FatalError);
}
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index 6473bb4d88b..e6df9ed9d4c 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -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
@@ -530,7 +530,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);
@@ -543,7 +543,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
@@ -651,7 +651,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]
@@ -689,7 +689,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]
@@ -1151,7 +1151,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
@@ -1167,7 +1167,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;
}
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
index 8daf4edc443..ed30517153a 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
@@ -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);
diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
index 134c735919a..9df985f42ef 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
+++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
@@ -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
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
index f4d5d13418d..9854ec2fef5 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
@@ -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!"
diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
index c3f8bed837d..abd5eb45adc 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
+++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
@@ -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);
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
index 2872db86d94..ba5b7f85482 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
+++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
@@ -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);
diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
index a992deb519e..b3af03b509a 100644
--- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
+++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
@@ -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"
diff --git a/applications/utilities/mesh/advanced/selectCells/selectCells.C b/applications/utilities/mesh/advanced/selectCells/selectCells.C
index 86eddffcf45..c71929e5003 100644
--- a/applications/utilities/mesh/advanced/selectCells/selectCells.C
+++ b/applications/utilities/mesh/advanced/selectCells/selectCells.C
@@ -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);
diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C
index ec1a480ad87..0e1eb5b1e50 100644
--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C
@@ -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);
}
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
index 239bb208320..deda5581f8b 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
@@ -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);
diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
index f569b19612a..8e2a1749a93 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -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);
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
index 2c4d7b0eaa9..c3d2fef0732 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
@@ -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);
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C b/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C
index 1bbf6f55692..094627f7dab 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C
@@ -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);
}
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H b/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H
index 097cf1c8166..adec113adfe 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H
@@ -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);
}
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index 830fecbb233..75a1cfcbc78 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -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.."
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C b/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C
index 47cffc1789f..c0da25a0151 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C
@@ -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
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedQuadCellShape.C b/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedQuadCellShape.C
index 44a60f1128f..c7aec883907 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedQuadCellShape.C
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedQuadCellShape.C
@@ -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);
}
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedTriangleCellShape.C b/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedTriangleCellShape.C
index c3f482ad92e..ccf77d8258d 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedTriangleCellShape.C
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/extrudedTriangleCellShape.C
@@ -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);
}
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
index ad55312e1c4..a040ca4195c 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
@@ -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"
diff --git a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
index 05c27a15df5..0353caf74b5 100644
--- a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
+++ b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
@@ -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
diff --git a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
index 9f3f615dc67..2de3fa2932e 100644
--- a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+++ b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
@@ -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);
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
index e606af501ee..5ed5279c9c1 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
@@ -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;
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
index a0b6465a953..874f787119e 100644
--- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
+++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
@@ -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 "
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/checkPatch.H b/applications/utilities/mesh/conversion/kivaToFoam/checkPatch.H
index dd4a6f2d0b0..6e9eaae3819 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/checkPatch.H
+++ b/applications/utilities/mesh/conversion/kivaToFoam/checkPatch.H
@@ -88,7 +88,7 @@
}
else
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "bc not defined for active cell = " << i
<< exit(FatalError);
}
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
index 36067bd18ea..99d522f7414 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
+++ b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
@@ -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);
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
index 1505b74e457..a8ffe7b6b6b 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
+++ b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
@@ -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);
diff --git a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
index 1259c1bbc54..065e36119b4 100644
--- a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
+++ b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
@@ -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;
diff --git a/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.C b/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.C
index 97a8a7c6ce2..73060e1d2c8 100644
--- a/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.C
+++ b/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.C
@@ -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);
}
diff --git a/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.H b/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.H
index 3a91b036bbb..f7a1f82ee79 100644
--- a/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.H
+++ b/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.H
@@ -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);
}
diff --git a/applications/utilities/mesh/conversion/sammToFoam/calcPointCells.C b/applications/utilities/mesh/conversion/sammToFoam/calcPointCells.C
index 801b0a86391..d646428ade7 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/calcPointCells.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/calcPointCells.C
@@ -36,7 +36,7 @@ void Foam::sammMesh::calcPointCells() const
if (pointCellsPtr_)
{
- FatalErrorIn("sammMesh::calcPointCells()")
+ FatalErrorInFunction
<< "PointCells already calculated"
<< abort(FatalError);
}
diff --git a/applications/utilities/mesh/conversion/sammToFoam/createBoundaryFaces.C b/applications/utilities/mesh/conversion/sammToFoam/createBoundaryFaces.C
index a6ec4baf16d..b9ec74dabe3 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/createBoundaryFaces.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/createBoundaryFaces.C
@@ -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
diff --git a/applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C b/applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C
index 1442909f3d7..25c44471770 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C
@@ -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);
}
diff --git a/applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C b/applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C
index ed1ecc23172..0e2d71bd5c8 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C
@@ -173,7 +173,7 @@ void Foam::sammMesh::createPolyCells()
}
else
{
- FatalErrorIn("void starMesh::createPolyCells()")
+ FatalErrorInFunction
<< "Error in internal face insertion"
<< abort(FatalError);
}
diff --git a/applications/utilities/mesh/conversion/sammToFoam/fixCollapsedEdges.C b/applications/utilities/mesh/conversion/sammToFoam/fixCollapsedEdges.C
index 307c74e5771..edaf23a1cd5 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/fixCollapsedEdges.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/fixCollapsedEdges.C
@@ -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
diff --git a/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C b/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C
index e81bbae2335..86aa2d6c1e2 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C
@@ -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;
diff --git a/applications/utilities/mesh/conversion/sammToFoam/readCells.C b/applications/utilities/mesh/conversion/sammToFoam/readCells.C
index ea65b78b208..c46270c312b 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/readCells.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/readCells.C
@@ -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);
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/calcPointCells.C b/applications/utilities/mesh/conversion/star3ToFoam/calcPointCells.C
index 668a452425f..044196c392a 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/calcPointCells.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/calcPointCells.C
@@ -36,7 +36,7 @@ void Foam::starMesh::calcPointCells() const
if (pointCellsPtr_)
{
- FatalErrorIn("starMesh::calcPointCells() const")
+ FatalErrorInFunction
<< "pointCells already calculated"
<< abort(FatalError);
}
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C b/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C
index 61dd9f7a0fb..976274c6a99 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/createBoundaryFaces.C
@@ -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
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
index 6ded0c84260..9f35fcb89b0 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
@@ -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 "
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createPolyCells.C b/applications/utilities/mesh/conversion/star3ToFoam/createPolyCells.C
index c74fcccd913..084cf6eebdb 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/createPolyCells.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/createPolyCells.C
@@ -173,7 +173,7 @@ void Foam::starMesh::createPolyCells()
}
else
{
- FatalErrorIn("void starMesh::createPolyCells()")
+ FatalErrorInFunction
<< "Error in internal face insertion"
<< abort(FatalError);
}
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/fixCollapsedEdges.C b/applications/utilities/mesh/conversion/star3ToFoam/fixCollapsedEdges.C
index 422866f44c1..931d1a638d1 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/fixCollapsedEdges.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/fixCollapsedEdges.C
@@ -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
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C b/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C
index 2e7a3cfa9c6..f71573c1120 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C
@@ -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
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/readBoundary.C b/applications/utilities/mesh/conversion/star3ToFoam/readBoundary.C
index 63aa38e0282..10b80fbcd7b 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/readBoundary.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/readBoundary.C
@@ -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;
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/readCells.C b/applications/utilities/mesh/conversion/star3ToFoam/readCells.C
index b485a6115d5..265de9c72fc 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/readCells.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/readCells.C
@@ -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);
}
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C b/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C
index 19138a30114..3965e6e94bf 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/readPoints.C
@@ -107,7 +107,7 @@ void Foam::starMesh::readPoints(const scalar scaleFactor)
}
else
{
- FatalErrorIn("starMesh::readPoints()")
+ FatalErrorInFunction
<< "Cannot read file " << pointsFileName
<< abort(FatalError);
}
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/readSeparatedPoints.C b/applications/utilities/mesh/conversion/star3ToFoam/readSeparatedPoints.C
index c13376dfd2d..73782190c27 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/readSeparatedPoints.C
+++ b/applications/utilities/mesh/conversion/star3ToFoam/readSeparatedPoints.C
@@ -58,7 +58,7 @@ void Foam::starMesh::readPoints(const scalar scaleFactor)
}
else
{
- FatalErrorIn("starMesh::readPoints()")
+ FatalErrorInFunction
<< "Cannot read file " << pointsFileName
<< abort(FatalError);
}
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index f56e4997921..2a4de9c57b0 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
@@ -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"
@@ -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;
}
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
index d1cbc0f4946..6e050b39dd0 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
@@ -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);
}
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index a7ec45eef47..c7f141a8b7d 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -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);
}
@@ -947,7 +947,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);
@@ -960,7 +960,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() << ")"
@@ -1047,7 +1047,7 @@ int main(int argc, char *argv[])
if (!mesh.write())
{
- FatalErrorIn(args.executable()) << "Failed writing mesh"
+ FatalErrorInFunction
<< exit(FatalError);
}
@@ -1060,7 +1060,7 @@ int main(int argc, char *argv[])
<< nl << endl;
if (!addedCells.write())
{
- FatalErrorIn(args.executable()) << "Failed writing cellSet"
+ FatalErrorInFunction
<< addedCells.name()
<< exit(FatalError);
}
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index e9444d0eae2..ff0837e690c 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -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
@@ -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);
@@ -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);
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C
index 178df8fa4a4..5f6de0801d8 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C
@@ -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);
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C
index 114b3706416..9f57be29290 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.C
@@ -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);
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H
index 3d015f2e94a..44c830b4520 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H
@@ -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;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
index 644f48bde28..a2865609aca 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
@@ -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;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
index 425966a511d..7a672354ecd 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
@@ -954,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)
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.C
index 79df1e7c69a..3e64caa7171 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.C
@@ -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);
}
}
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
index 25e0f9a73e7..01d69a23769 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
@@ -834,24 +834,14 @@ 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);
}
if (!decomposerPtr_().parallelAware())
{
- FatalErrorIn
- (
- "void Foam::backgroundMeshDecomposition::initialRefinement() const"
- )
+ FatalErrorInFunction
<< "You have selected decomposition method "
<< decomposerPtr_().typeName
<< " which is not parallel aware." << endl
@@ -1217,14 +1207,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);
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C
index 4201caa5d8f..b6332107620 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C
@@ -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;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
index 15c67d6857c..ca65462488b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
@@ -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
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
index e7f7f5816c2..301e6b8074e 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
@@ -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);
}
}
@@ -440,11 +431,8 @@ Foam::cellShapeControlMesh::cellShapeControlMesh(const Time& runTime)
}
else
{
- FatalErrorIn
- (
- "Foam::cellShapeControlMesh::cellShapeControlMesh"
- "(const Time&)"
- ) << "Cell size point field is not the same size as the "
+ FatalErrorInFunction
+ << "Cell size point field is not the same size as the "
<< "mesh."
<< abort(FatalError);
}
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C
index 24eafe7cacf..4551fe2c6f4 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C
@@ -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
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
index 981b18817a2..921298660d8 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
@@ -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
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
index 319a3808ddf..851a773b065 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
@@ -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);
}
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
index 9f7f5d5e7aa..c0db55e5586 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
@@ -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
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
index c7cf2201f24..a6d802523bb 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
@@ -197,7 +197,7 @@ public:
const pointField& pts
)
{
- WarningIn("cellSizeFunction::setCellSize(const pointField&)")
+ WarningInFunction
<< "Not overloaded."
<< endl;
return false;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
index 36b02aa7a91..2502c3a6cbf 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
@@ -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;
}
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C
index 0abe372910e..2e925b9b32c 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.C
@@ -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
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C
index c74a552e222..cac18370218 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.C
@@ -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
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 9cc9862129a..601fcc95a7b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -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);
@@ -1614,7 +1602,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);
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index e88ee943690..2e351cf81af 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -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
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index bbe6337c599..fdc4ef43548 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -649,7 +649,7 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation()
if (iterationNo == maxIterations)
{
- WarningIn("conformalVoronoiMesh::conformToSurface()")
+ WarningInFunction
<< "Maximum surface conformation iterations ("
<< maxIterations << ") reached." << endl;
}
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
index f9a690c6d32..d886d195c0d 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
@@ -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;
}
}
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
index e3ef651d0fa..190e493322f 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
@@ -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;
}
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index 1c50486f97d..714cb2bfe2f 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -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);
}
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshZones.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshZones.C
index 2bb549e3058..9bb7e33f958 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshZones.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshZones.C
@@ -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 "
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
index f119ccc056c..56c5929343b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
@@ -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
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
index 8723f438481..464dd646ba3 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
@@ -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 : "
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
index 049d99abb22..6388c0c6c88 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.C
@@ -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
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
index db905881a5a..5ce01e23b57 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
@@ -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;
}
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
index 631ab3ebc8a..11007841552 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.C
@@ -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
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
index 0e510a4a687..bea71b9b5c6 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
@@ -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;
}
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/rayShooting/rayShooting.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/rayShooting/rayShooting.C
index bbed38b476b..103a09c23ae 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/rayShooting/rayShooting.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/rayShooting/rayShooting.C
@@ -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;
}
}
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
index 78b1820866d..e47cbf4aaa1 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.C
@@ -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
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.C
index cd9eb68312e..16dc56814d5 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.C
@@ -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()
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
index fc99f0fd054..68460e22e82 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
@@ -72,7 +72,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."
@@ -367,7 +367,7 @@ tmp<scalarField> signedDistance
}
else
{
- FatalErrorIn("signedDistance()")
+ FatalErrorInFunction
<< "getVolumeType failure, neither INSIDE or OUTSIDE"
<< exit(FatalError);
}
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
index fdb73d17e73..f8cdecfd6fa 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
@@ -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);
// }
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H
index b5c3563ceae..9e04cdcbbfc 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H
@@ -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
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DIO.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DIO.C
index 0048a07b32f..3896131c1f2 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DIO.C
@@ -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);
}
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertFeaturePoints.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertFeaturePoints.C
index 740bff886b3..6ac1bc9bab7 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertFeaturePoints.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertFeaturePoints.C
@@ -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;
}
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
index bac5c87ca1d..9220ca7bedf 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
@@ -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;
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index c6906a6c920..9c328113690 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -555,7 +555,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
@@ -1290,7 +1290,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
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
index 68c316f24d2..2060a4687ec 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
@@ -402,13 +402,8 @@ bool Foam::checkCoupledPoints
if (f.size() != nbrPoints[bFaceI].size())
{
- FatalErrorIn
- (
- "Foam::checkCoupledPoints\n"
- "(\n"
- " const polyMesh&, const bool, labelHashSet*\n"
- ")\n"
- ) << "Local face size : " << f.size()
+ FatalErrorInFunction
+ << "Local face size : " << f.size()
<< " does not equal neighbour face size : "
<< nbrPoints[bFaceI].size()
<< abort(FatalError);
diff --git a/applications/utilities/mesh/manipulation/checkMesh/printMeshStats.C b/applications/utilities/mesh/manipulation/checkMesh/printMeshStats.C
index 9d49ffa2a93..f7e34d6ab56 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/printMeshStats.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/printMeshStats.C
@@ -29,7 +29,7 @@ void Foam::printMeshStats(const polyMesh& mesh, const bool allTopology)
if (returnReduce(mesh.nInternalPoints(), minOp<label>()) == -1)
{
- WarningIn("Foam::printMeshStats(const polyMesh&, const bool)")
+ WarningInFunction
<< "Some processors have their points sorted into internal"
<< " and external and some do not." << endl
<< "This can cause problems later on." << endl;
diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index 66bc3bcb111..b53d29c836f 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -313,7 +313,7 @@ void createFaces
{
if (patchWarned.insert(patchI))
{
- WarningIn("createFaces(..)")
+ WarningInFunction
<< "Found boundary face (in patch "
<< pp.name()
<< ") in faceZone " << fZone.name()
@@ -770,7 +770,7 @@ int main(int argc, char *argv[])
if (!hasWarned)
{
hasWarned = true;
- WarningIn(args.executable())
+ WarningInFunction
<< "Setting field on boundary faces to zero." << endl
<< "You might have to edit these fields." << endl;
}
diff --git a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.C b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.C
index 57a6b554c79..25d8b3272c5 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.C
@@ -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()
diff --git a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.C b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.C
index bdc6d84e67d..5b81ea35320 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceZoneSelection.C
@@ -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);
}
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index deefbaef38c..da6b2ec09c6 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -284,10 +284,8 @@ void separateList
}
else
{
- FatalErrorIn
- (
- "separateList(const vectorField&, UList<vector>&)"
- ) << "Sizes of field and transformation not equal. field:"
+ FatalErrorInFunction
+ << "Sizes of field and transformation not equal. field:"
<< field.size() << " transformation:" << separation.size()
<< abort(FatalError);
}
@@ -306,11 +304,8 @@ void syncPoints
{
if (points.size() != mesh.nPoints())
{
- FatalErrorIn
- (
- "syncPoints"
- "(const polyMesh&, pointField&, const CombineOp&, const point&)"
- ) << "Number of values " << points.size()
+ FatalErrorInFunction
+ << "Number of values " << points.size()
<< " is not equal to the number of points in the mesh "
<< mesh.nPoints() << abort(FatalError);
}
@@ -470,11 +465,8 @@ void syncPoints
{
if (hasTransformation)
{
- WarningIn
- (
- "syncPoints"
- "(const polyMesh&, pointField&, const CombineOp&, const point&)"
- ) << "There are decomposed cyclics in this mesh with"
+ WarningInFunction
+ << "There are decomposed cyclics in this mesh with"
<< " transformations." << endl
<< "This is not supported. The result will be incorrect"
<< endl;
@@ -671,7 +663,7 @@ int main(int argc, char *argv[])
if (destPatchI == -1)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "patch " << patchName << " not added. Problem."
<< abort(FatalError);
}
@@ -728,7 +720,7 @@ int main(int argc, char *argv[])
if (mesh.isInternalFace(faceI))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Face " << faceI << " specified in set "
<< faces.name()
<< " is not an external face of the mesh." << endl
@@ -747,7 +739,7 @@ int main(int argc, char *argv[])
}
else
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Invalid source type " << sourceType << endl
<< "Valid source types are 'patches' 'set'" << exit(FatalError);
}
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
index afe8c1ce63d..41e2aac9374 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -319,7 +319,7 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
// Check that the face is valid
if (min(newFace) < 0)
{
- FatalErrorIn("void mergePolyMesh::addMesh(const polyMesh&)")
+ FatalErrorInFunction
<< "Error in point mapping for face " << faceI
<< ". Old face: " << curFace << " New face: " << newFace
<< abort(FatalError);
diff --git a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
index e35efbd3a65..6db0d3abc63 100644
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -175,7 +175,7 @@ labelList findBaffles(const polyMesh& mesh, const labelList& boundaryFaces)
if (isA<processorPolyPatch>(patches[patchI]))
{
- FatalErrorIn("findBaffles(const polyMesh&, const labelList&)")
+ FatalErrorInFunction
<< "Duplicate face " << faceI
<< " is on a processorPolyPatch."
<< "This is not allowed." << nl
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
index a13f5ace435..5df88a4f3bb 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -155,7 +155,7 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
if (curPatch.coupled())
{
- WarningIn("mirrorFvMesh::mirrorFvMesh(const IOobject&)")
+ WarningInFunction
<< "Found coupled patch " << curPatch.name() << endl
<< " Mirroring faces on coupled patches destroys"
<< " the ordering. This might be fixed by running a dummy"
diff --git a/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C b/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
index ebaf8737b83..e0da25a5262 100644
--- a/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
+++ b/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
if (!OBJfile.good())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot read file " << objName << exit(FatalError);
}
@@ -176,7 +176,7 @@ int main(int argc, char *argv[])
{
hasWarned = true;
- WarningIn(args.executable())
+ WarningInFunction
<< "Unrecognized OBJ command " << cmd << nl
<< "In line " << lineStream.str()
<< " at linenumber " << lineNo << nl
diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C b/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
index e446a5d81bd..1e92368b09e 100644
--- a/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
+++ b/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
if (fZone.checkParallelSync())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Face zone " << fZone.name()
<< " is not parallel synchronised."
<< " Any coupled face also needs its coupled version to be included"
@@ -334,7 +334,7 @@ int main(int argc, char *argv[])
}
else
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Incorrect status for face " << meshFaceI
<< abort(FatalError);
}
@@ -359,7 +359,7 @@ int main(int argc, char *argv[])
}
else
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Problem : unvisited face " << faceI
<< " centre:" << mesh.faceCentres()[faceLabels[faceI]]
<< abort(FatalError);
@@ -380,7 +380,7 @@ int main(int argc, char *argv[])
mesh.faceZones()[zoneName].resetAddressing(faceLabels, newFlipMap);
if (!mesh.faceZones().write())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Failed writing faceZones" << exit(FatalError);
}
}
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
index a86343da254..ce6e15e9fa7 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -68,10 +68,8 @@ void Foam::meshDualiser::checkPolyTopoChange(const polyTopoChange& meshMod)
{
if (newToOld[newI].size() != 1)
{
- FatalErrorIn
- (
- "meshDualiser::checkPolyTopoChange(const polyTopoChange&)"
- ) << "duplicate verts:" << newToOld[newI]
+ FatalErrorInFunction
+ << "duplicate verts:" << newToOld[newI]
<< " coords:"
<< UIndirectList<point>(points, newToOld[newI])()
<< abort(FatalError);
@@ -189,7 +187,7 @@ bool Foam::meshDualiser::sameDualCell
{
if (!mesh_.isInternalFace(faceI))
{
- FatalErrorIn("sameDualCell(const label, const label)")
+ FatalErrorInFunction
<< "face:" << faceI << " is not internal face."
<< abort(FatalError);
}
@@ -236,7 +234,7 @@ Foam::label Foam::meshDualiser::addInternalFace
if (nUnique < facePoints.size())
{
- FatalErrorIn("addInternalFace(..)")
+ FatalErrorInFunction
<< "verts:" << verts << " newFace:" << newFace
<< " face points:" << facePoints
<< abort(FatalError);
@@ -607,7 +605,7 @@ void Foam::meshDualiser::createFaceFromInternalFace
// Check: make sure that there is a midpoint on the edge.
if (edgeToDualPoint_[edgeI] == -1)
{
- FatalErrorIn("createFacesFromInternalFace(..)")
+ FatalErrorInFunction
<< "face:" << faceI << " verts:" << f
<< " points:" << UIndirectList<point>(mesh_.points(), f)()
<< " no feature edge between " << f[fp]
@@ -718,10 +716,8 @@ void Foam::meshDualiser::createFacesAroundBoundaryPoint
if (faceI < pp.start() || faceI >= pp.start()+pp.size())
{
- FatalErrorIn
- (
- "meshDualiser::createFacesAroundBoundaryPoint(..)"
- ) << "Walked from face on patch:" << patchI
+ FatalErrorInFunction
+ << "Walked from face on patch:" << patchI
<< " to face:" << faceI
<< " fc:" << mesh_.faceCentres()[faceI]
<< " on patch:" << patches.whichPatch(faceI)
@@ -731,10 +727,8 @@ void Foam::meshDualiser::createFacesAroundBoundaryPoint
// Check if different cell.
if (dualCellI != findDualCell(own[faceI], pointI))
{
- FatalErrorIn
- (
- "meshDualiser::createFacesAroundBoundaryPoint(..)"
- ) << "Different dual cells but no feature edge"
+ FatalErrorInFunction
+ << "Different dual cells but no feature edge"
<< " inbetween point:" << pointI
<< " coord:" << mesh_.points()[pointI]
<< abort(FatalError);
@@ -926,12 +920,8 @@ void Foam::meshDualiser::setRefinement
if (faceI != -1)
{
- FatalErrorIn
- (
- "meshDualiser::setRefinement"
- "(const labelList&, const labelList&, const labelList&"
- ", const labelList, polyTopoChange&)"
- ) << "In split-face-mode (splitFace=true) but not all faces"
+ FatalErrorInFunction
+ << "In split-face-mode (splitFace=true) but not all faces"
<< " marked as feature faces." << endl
<< "First conflicting face:" << faceI
<< " centre:" << mesh_.faceCentres()[faceI]
@@ -948,12 +938,8 @@ void Foam::meshDualiser::setRefinement
if (edgeI != -1)
{
const edge& e = mesh_.edges()[edgeI];
- FatalErrorIn
- (
- "meshDualiser::setRefinement"
- "(const labelList&, const labelList&, const labelList&"
- ", const labelList, polyTopoChange&)"
- ) << "In split-face-mode (splitFace=true) but not all edges"
+ FatalErrorInFunction
+ << "In split-face-mode (splitFace=true) but not all edges"
<< " marked as feature edges." << endl
<< "First conflicting edge:" << edgeI
<< " verts:" << e
@@ -979,12 +965,8 @@ void Foam::meshDualiser::setRefinement
{
if (!featureFaceSet[faceI])
{
- FatalErrorIn
- (
- "meshDualiser::setRefinement"
- "(const labelList&, const labelList&, const labelList&"
- ", const labelList, polyTopoChange&)"
- ) << "Not all boundary faces marked as feature faces."
+ FatalErrorInFunction
+ << "Not all boundary faces marked as feature faces."
<< endl
<< "First conflicting face:" << faceI
<< " centre:" << mesh_.faceCentres()[faceI]
@@ -1071,12 +1053,8 @@ void Foam::meshDualiser::setRefinement
if (pointToDualCells_[pointI].size() > 0)
{
- FatalErrorIn
- (
- "meshDualiser::setRefinement"
- "(const labelList&, const labelList&, const labelList&"
- ", const labelList, polyTopoChange&)"
- ) << "Point " << pointI << " at:" << mesh_.points()[pointI]
+ FatalErrorInFunction
+ << "Point " << pointI << " at:" << mesh_.points()[pointI]
<< " is both in singleCellFeaturePoints"
<< " and multiCellFeaturePoints."
<< abort(FatalError);
diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
index 9f7b6057ed6..f0c4c16d71b 100644
--- a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
@@ -246,7 +246,7 @@ void simpleMarkFeatures
{
if (faceZones.size() > 0)
{
- WarningIn("simpleMarkFeatures(..)")
+ WarningInFunction
<< "Detected " << faceZones.size()
<< " faceZones. These will not be preserved."
<< endl;
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
index 2e32767822e..05a548eeeec 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
@@ -189,7 +189,7 @@ int main(int argc, char *argv[])
if (!dictIO.headerOk())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot open specified refinement dictionary "
<< dictPath
<< exit(FatalError);
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 1c7748c1bf6..65f1f25b457 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -244,11 +244,8 @@ labelList getFaceOrder
{
if (oldToNewFace[faceI] == -1)
{
- FatalErrorIn
- (
- "getFaceOrder"
- "(const primitiveMesh&, const labelList&, const labelList&)"
- ) << "Did not determine new position" << " for face " << faceI
+ FatalErrorInFunction
+ << "Did not determine new position" << " for face " << faceI
<< abort(FatalError);
}
}
@@ -386,11 +383,8 @@ labelList getRegionFaceOrder
{
if (oldToNewFace[faceI] == -1)
{
- FatalErrorIn
- (
- "getRegionFaceOrder"
- "(const primitveMesh&, const labelList&, const labelList&)"
- ) << "Did not determine new position"
+ FatalErrorInFunction
+ << "Did not determine new position"
<< " for face " << faceI
<< abort(FatalError);
}
@@ -738,7 +732,7 @@ int main(int argc, char *argv[])
if (blockSize < 0 || blockSize >= mesh.nCells())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Block size " << blockSize
<< " should be positive integer"
<< " and less than the number of cells in the mesh."
@@ -1118,7 +1112,7 @@ int main(int argc, char *argv[])
if (masterFaceI == 0)
{
- FatalErrorIn(args.executable()) << "problem faceI:" << faceI
+ FatalErrorInFunction
<< " masterFaceI:" << masterFaceI << exit(FatalError);
}
}
diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index a30f49767ed..07b146f6746 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -174,12 +174,8 @@ void writeVTK
}
else
{
- WarningIn
- (
- "void writeVTK"
- "(const polyMesh& mesh, const topoSet& currentSet,"
- "const fileName& vtkName)"
- ) << "Don't know how to handle set of type " << currentSet.type()
+ WarningInFunction
+ << "Don't know how to handle set of type " << currentSet.type()
<< endl;
}
}
@@ -690,7 +686,7 @@ polyMesh::readUpdateState meshReadUpdate(polyMesh& mesh)
}
default:
{
- FatalErrorIn("meshReadUpdate(polyMesh&)")
+ FatalErrorInFunction
<< "Illegal mesh update state "
<< stat << abort(FatalError);
break;
@@ -770,11 +766,8 @@ commandStatus parseType
}
else
{
- SeriousErrorIn
- (
- "commandStatus parseType(Time&, polyMesh&, const word&"
- ", IStringStream&)"
- ) << "Illegal command " << setType << endl
+ SeriousErrorInFunction
+ << "Illegal command " << setType << endl
<< "Should be one of 'help', 'list', 'time' or a set type :"
<< " 'cellSet', 'faceSet', 'pointSet', 'faceZoneSet'"
<< endl;
@@ -839,7 +832,7 @@ int main(int argc, char *argv[])
if (loop && !batch)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Can only loop in batch mode."
<< exit(FatalError);
}
@@ -889,7 +882,7 @@ int main(int argc, char *argv[])
// we cannot handle .gz files
if (!isFile(batchFile, false))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot open file " << batchFile << exit(FatalError);
}
diff --git a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
index 60484b356a2..da157f75773 100644
--- a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
+++ b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -211,7 +211,7 @@ int main(int argc, char *argv[])
}
else
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "One of owner or neighbour of internal face "
<< faceI << " should be in cellSet " << cells.name()
<< " to be able to determine orientation." << endl
@@ -328,7 +328,7 @@ int main(int argc, char *argv[])
if (!mesh.write())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Failed writing polyMesh."
<< exit(FatalError);
}
diff --git a/applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C b/applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C
index 5289a03d9db..7ce51edf612 100644
--- a/applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C
+++ b/applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
if (regionName == singleCellName)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot convert region " << singleCellName
<< " since result would overwrite it. Please rename your region."
<< exit(FatalError);
diff --git a/applications/utilities/mesh/manipulation/splitMesh/regionSide.C b/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
index 50decb45d39..324143751c5 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
+++ b/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -101,11 +101,8 @@ Foam::label Foam::regionSide::otherEdge
}
}
- FatalErrorIn
- (
- "regionSide::otherEdge(const primitiveMesh&, const label, const label"
- ", const label)"
- ) << "Cannot find other edge on face " << faceI << " that uses point "
+ FatalErrorInFunction
+ << "Cannot find other edge on face " << faceI << " that uses point "
<< pointI << " but not point " << freePointI << endl
<< "Edges on face:" << fEdges
<< " verts:" << UIndirectList<edge>(mesh.edges(), fEdges)()
diff --git a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
index f1ed44e653f..7d40e2449a6 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
+++ b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
@@ -75,10 +75,8 @@ label findEdge(const primitiveMesh& mesh, const label v0, const label v1)
}
}
- FatalErrorIn
- (
- "findEdge(const primitiveMesh&, const label, const label)"
- ) << "Cannot find edge between mesh points " << v0 << " and " << v1
+ FatalErrorInFunction
+ << "Cannot find edge between mesh points " << v0 << " and " << v1
<< abort(FatalError);
return -1;
@@ -92,7 +90,7 @@ void checkPatch(const polyBoundaryMesh& bMesh, const word& name)
if (patchI == -1)
{
- FatalErrorIn("checkPatch(const polyBoundaryMesh&, const word&)")
+ FatalErrorInFunction
<< "Cannot find patch " << name << nl
<< "It should be present but of zero size" << endl
<< "Valid patches are " << bMesh.names()
@@ -101,7 +99,7 @@ void checkPatch(const polyBoundaryMesh& bMesh, const word& name)
if (bMesh[patchI].size())
{
- FatalErrorIn("checkPatch(const polyBoundaryMesh&, const word&)")
+ FatalErrorInFunction
<< "Patch " << name << " is present but non-zero size"
<< exit(FatalError);
}
@@ -143,7 +141,7 @@ int main(int argc, char *argv[])
{
if (!mesh.isInternalFace(faces[i]))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Face " << faces[i] << " in faceSet " << setName
<< " is not an internal face."
<< exit(FatalError);
@@ -282,7 +280,7 @@ int main(int argc, char *argv[])
Info<< "Writing mesh to " << runTime.timeName() << endl;
if (!mesh.write())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Failed writing polyMesh."
<< exit(FatalError);
}
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index 6565776cdf2..da3c2ac7c83 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -126,10 +126,8 @@ void renamePatches
if (isA<coupledPolyPatch>(pp))
{
- WarningIn
- (
- "renamePatches(fvMesh&, const word&, const labelList&"
- ) << "Encountered coupled patch " << pp.name()
+ WarningInFunction
+ << "Encountered coupled patch " << pp.name()
<< ". Will only rename the patch itself,"
<< " not any referred patches."
<< " This might have to be done by hand."
@@ -695,7 +693,7 @@ autoPtr<mapPolyMesh> createRegionMesh
}
else
{
- FatalErrorIn("createRegionMesh(..)")
+ FatalErrorInFunction
<< "Exposed face:" << faceI
<< " fc:" << mesh.faceCentres()[faceI]
<< " has owner region " << ownRegion
@@ -1209,7 +1207,7 @@ void getZoneID
}
else
{
- FatalErrorIn("getZoneID(..)")
+ FatalErrorInFunction
<< "Cell " << cellI << " with cell centre "
<< mesh.cellCentres()[cellI]
<< " is multiple zones. This is not allowed." << endl
@@ -1267,7 +1265,7 @@ void matchRegions
{
if (zoneNames[procI] != zoneNames[0])
{
- FatalErrorIn("matchRegions(..)")
+ FatalErrorInFunction
<< "cellZones not synchronised across processors." << endl
<< "Master has cellZones " << zoneNames[0] << endl
<< "Processor " << procI
@@ -1501,7 +1499,7 @@ int main(int argc, char *argv[])
&& (useCellZones || blockedFacesName.size())
)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "You cannot specify both -cellZonesOnly or -cellZonesFileOnly"
<< " (which specify complete split)"
<< " in combination with -blockedFaces or -cellZones"
@@ -1526,7 +1524,7 @@ int main(int argc, char *argv[])
if (insidePoint && largestOnly)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "You cannot specify both -largestOnly"
<< " (keep region with most cells)"
<< " and -insidePoint (keep region containing point)"
@@ -1566,7 +1564,7 @@ int main(int argc, char *argv[])
label unzonedCellI = findIndex(zoneID, -1);
if (unzonedCellI != -1)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "For the cellZonesOnly option all cells "
<< "have to be in a cellZone." << endl
<< "Cell " << unzonedCellI
@@ -1615,7 +1613,7 @@ int main(int argc, char *argv[])
label unzonedCellI = findIndex(newZoneID, -1);
if (unzonedCellI != -1)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "For the cellZonesFileOnly option all cells "
<< "have to be in a cellZone." << endl
<< "Cell " << unzonedCellI
@@ -2012,7 +2010,7 @@ int main(int argc, char *argv[])
if (regionI == -1)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Point " << insidePoint
<< " is not inside the mesh." << nl
<< "Bounding box of the mesh:" << mesh.bounds()
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 8e64c28a381..c6409dbf988 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -177,7 +177,7 @@ void checkPatch(const polyBoundaryMesh& bMesh, const word& name)
if (patchI == -1)
{
- FatalErrorIn("checkPatch(const polyBoundaryMesh&, const word&)")
+ FatalErrorInFunction
<< "Cannot find patch " << name << endl
<< "It should be present and of non-zero size" << endl
<< "Valid patches are " << bMesh.names()
@@ -186,7 +186,7 @@ void checkPatch(const polyBoundaryMesh& bMesh, const word& name)
if (bMesh[patchI].empty())
{
- FatalErrorIn("checkPatch(const polyBoundaryMesh&, const word&)")
+ FatalErrorInFunction
<< "Patch " << name << " is present but zero size"
<< exit(FatalError);
}
@@ -244,7 +244,7 @@ int main(int argc, char *argv[])
if (partialCover && perfectCover)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot supply both partial and perfect." << endl
<< "Use perfect match option if the patches perfectly align"
<< " (both vertex positions and face centres)" << endl
@@ -487,7 +487,7 @@ int main(int argc, char *argv[])
)
)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Failed writing polyMesh."
<< exit(FatalError);
}
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
index 63d91ac1788..180c736b92d 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
+++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -217,7 +217,7 @@ int main(int argc, char *argv[])
if (patchI == -1)
{
- FatalErrorIn(args.executable()) << "Illegal patch " << patchName
+ FatalErrorInFunction
<< nl << "Valid patches are " << mesh.boundaryMesh().names()
<< exit(FatalError);
}
diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSet.C b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
index a64c051a09c..4112e4df19f 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSet.C
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -181,7 +181,7 @@ polyMesh::readUpdateState meshReadUpdate(polyMesh& mesh)
}
default:
{
- FatalErrorIn("meshReadUpdate(polyMesh&)")
+ FatalErrorInFunction
<< "Illegal mesh update state "
<< stat << abort(FatalError);
break;
@@ -354,7 +354,7 @@ int main(int argc, char *argv[])
default:
- WarningIn(args.executable())
+ WarningInFunction
<< "Unhandled action " << action << endl;
break;
}
diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index 692cfd76db3..aa946b1e562 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -213,7 +213,7 @@ int main(int argc, char *argv[])
// this is not actually stringent enough:
if (args.options().empty())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "No options supplied, please use one or more of "
"-translate, -rotate or -scale options."
<< exit(FatalError);
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C
index 9fd46f35c10..fcde0657ee6 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C
@@ -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
@@ -92,14 +92,7 @@ void Foam::helpTypes::helpBoundary::execute
bool abortVar(env("FOAM_ABORT"));
if (abortVar)
{
- FatalErrorIn
- (
- "void Foam::helpTypes::helpBoundary::execute"
- "("
- "const argList&, "
- "const fvMesh&"
- ")"
- )
+ FatalErrorInFunction
<< "Please unset FOAM_ABORT to use this utlity"
<< exit(FatalError);
}
@@ -155,27 +148,13 @@ void Foam::helpTypes::helpBoundary::execute
}
else
{
- FatalErrorIn
- (
- "void Foam::helpTypes::helpBoundary::execute"
- "("
- "const argList&, "
- "const fvMesh&"
- ")"
- )
+ FatalErrorInFunction
<< "Unable to read field " << fieldName << exit(FatalError);
}
}
else if (args.optionReadIfPresent("fixedValue", fieldName))
{
- FatalErrorIn
- (
- "void Foam::helpTypes::helpBoundary::execute"
- "("
- "const argList&, "
- "const fvMesh&"
- ")"
- )
+ FatalErrorInFunction
<< "-field option must be specified when using the -fixedValue "
<< "option" << exit(FatalError);
}
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C
index 65c3fcaca67..d20e9061aaa 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpType.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -146,15 +146,7 @@ void Foam::helpType::displayDoc
}
else
{
- FatalErrorIn
- (
- "void Foam::helpType::displayDoc"
- "("
- "const word&, "
- "const string&, "
- "const bool"
- ")"
- )
+ FatalErrorInFunction
<< "No help for type " << className << " found."
<< " Valid options include:" << SortableList<word>(parser.toc())
<< exit(FatalError);
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpTypeNew.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpTypeNew.C
index 607ca9b4355..c6e45dd6882 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpTypeNew.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpType/helpTypeNew.C
@@ -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
@@ -43,14 +43,14 @@ Foam::autoPtr<Foam::helpType> Foam::helpType::New
// exit without stack trace
if (helpTypeName == "-help")
{
- FatalErrorIn("helpType::New()")
+ FatalErrorInFunction
<< "Valid helpType selections are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError);
}
else
{
- FatalErrorIn("helpType::New()")
+ FatalErrorInFunction
<< "Unknown helpType type " << helpTypeName << nl
<< "Valid helpType selections are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << nl
diff --git a/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C b/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
index e0dda32b2a7..74d9028c2bb 100644
--- a/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
+++ b/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
@@ -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
@@ -143,7 +143,7 @@ int main(int argc, char *argv[])
}
else
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot find sub-entry " << entryNames[i]
<< " in entry " << args["entry"]
<< " in dictionary " << dictFileName;
@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
/*
if (ent[1] != token::BEGIN_BLOCK)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot find entry "
<< args["entry"]
<< " in dictionary " << dictFileName
@@ -183,7 +183,7 @@ int main(int argc, char *argv[])
}
else
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot find entry "
<< entryName
<< " in dictionary " << dictFileName;
@@ -204,7 +204,7 @@ int main(int argc, char *argv[])
}
else
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot open file " << dictFileName;
FatalError.exit(1);
}
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index 60206085415..165c7c273f4 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -283,7 +283,7 @@ int main(int argc, char *argv[])
// Sanity check on previously decomposed case
if (nProcs != nDomains)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Specified -fields, but the case was decomposed with "
<< nProcs << " domains"
<< nl
@@ -329,7 +329,7 @@ int main(int argc, char *argv[])
if (procDirsProblem)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Case is already decomposed with " << nProcs
<< " domains, use the -force option or manually" << nl
<< "remove processor directories before decomposing. e.g.,"
@@ -640,7 +640,7 @@ int main(int argc, char *argv[])
// Check
if (celli < 0 || celli >= mesh.nCells())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Illegal cell number " << celli
<< " for particle with index " << iter().index()
<< " at position " << iter().position() << nl
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
index 817d0a9f646..361c930ad24 100644
--- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
+++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,6 @@ Description
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
Foam::lagrangianFieldDecomposer::lagrangianFieldDecomposer
(
const polyMesh& mesh,
@@ -77,22 +76,8 @@ Foam::lagrangianFieldDecomposer::lagrangianFieldDecomposer
// if (mappedTetFace == -1)
// {
- // FatalErrorIn
- // (
- // "Foam::lagrangianFieldDecomposer"
- // "::lagrangianFieldDecomposer"
- // "("
- // "const polyMesh& mesh, "
- // "const polyMesh& procMesh, "
- // "const labelList& faceProcAddressing, "
- // "const labelList& cellProcAddressing, "
- // "const word& cloudName, "
- // "const Cloud<indexedParticle>& "
- // "lagrangianPositions, "
- // "const List<SLList<indexedParticle*>*>& "
- // "cellParticles"
- // ")"
- // ) << "Face lookup failure." << nl
+ // FatalErrorInFunction
+ // << "Face lookup failure." << nl
// << abort(FatalError);
// }
diff --git a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.C b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.C
index 3934fdc021d..92b9a4c4e45 100644
--- a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.C
+++ b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -67,10 +67,8 @@ Foam::pointFieldDecomposer::patchFieldDecomposer::patchFieldDecomposer
{
hasUnmapped_ = true;
- FatalErrorIn
- (
- "pointFieldDecomposer::patchFieldDecomposer()"
- ) << "Incomplete patch point addressing"
+ FatalErrorInFunction
+ << "Incomplete patch point addressing"
<< abort(FatalError);
}
}
diff --git a/applications/utilities/parallelProcessing/reconstructPar/checkFaceAddressingComp.H b/applications/utilities/parallelProcessing/reconstructPar/checkFaceAddressingComp.H
index 733d64f5ff0..03458a29644 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/checkFaceAddressingComp.H
+++ b/applications/utilities/parallelProcessing/reconstructPar/checkFaceAddressingComp.H
@@ -23,7 +23,7 @@
if (minFaceIndex < 1)
{
- WarningIn(args.executable())
+ WarningInFunction
<< "parallel decomposition addressing." << endl
<< "It looks like you are trying to reconstruct the case "
<< "decomposed with an earlier version of FOAM, which could\n"
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
index 38a3c90f2fe..cbe43b7ff59 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
{
if (noLagrangian)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot specify noLagrangian and lagrangianFields "
<< "options together."
<< exit(FatalError);
@@ -168,7 +168,7 @@ int main(int argc, char *argv[])
if (!nProcs)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "No processor* directories found"
<< exit(FatalError);
}
@@ -207,7 +207,7 @@ int main(int argc, char *argv[])
if (timeDirs.empty())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "No times selected"
<< exit(FatalError);
}
@@ -347,7 +347,7 @@ int main(int argc, char *argv[])
}
else if (meshStat != procStat)
{
- WarningIn(args.executable())
+ WarningInFunction
<< "readUpdate for the reconstructed mesh:"
<< meshStat << nl
<< "readUpdate for the processor meshes :"
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index cfa77f70235..dbe38743b24 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -268,7 +268,7 @@ autoPtr<mapPolyMesh> mergeSharedPoints
}
else
{
- FatalErrorIn("fvMeshDistribute::mergeSharedPoints()")
+ FatalErrorInFunction
<< "Problem. oldPointI:" << oldPointI
<< " newPointI:" << newPointI << abort(FatalError);
}
@@ -301,7 +301,7 @@ boundBox procBounds
if (pointsInstance != databases[procI].timeName())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Your time was specified as " << databases[procI].timeName()
<< " but there is no polyMesh/points in that time." << endl
<< "(there is a points file in " << pointsInstance
@@ -497,7 +497,7 @@ int main(int argc, char *argv[])
if (runTime.writeFormat() == IOstream::ASCII && mergeTol < writeTol)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Your current settings specify ASCII writing with "
<< IOstream::defaultPrecision() << " digits precision." << endl
<< "Your merging tolerance (" << mergeTol << ") is finer than this."
@@ -726,7 +726,7 @@ int main(int argc, char *argv[])
if (!masterMesh.write())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Failed writing polyMesh."
<< exit(FatalError);
}
diff --git a/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C b/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C
index aa792712108..5b248783bce 100644
--- a/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C
+++ b/applications/utilities/parallelProcessing/redistributePar/loadOrCreateMesh.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -236,10 +236,8 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
if (patchI >= patches.size())
{
- FatalErrorIn
- (
- "createMesh(const Time&, const fileName&, const bool)"
- ) << "Non-processor patches not synchronised."
+ FatalErrorInFunction
+ << "Non-processor patches not synchronised."
<< endl
<< "Processor " << Pstream::myProcNo()
<< " has only " << patches.size()
@@ -254,10 +252,8 @@ Foam::autoPtr<Foam::fvMesh> Foam::loadOrCreateMesh
|| name != patches[patchI].name()
)
{
- FatalErrorIn
- (
- "createMesh(const Time&, const fileName&, const bool)"
- ) << "Non-processor patches not synchronised."
+ FatalErrorInFunction
+ << "Non-processor patches not synchronised."
<< endl
<< "Master patch " << patchI
<< " name:" << type
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index 7cc21c4adc8..92afcdbaec5 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -82,7 +82,7 @@ scalar getMergeDistance
if (runTime.writeFormat() == IOstream::ASCII && mergeTol < writeTol)
{
- FatalErrorIn("getMergeDistance")
+ FatalErrorInFunction
<< "Your current settings specify ASCII writing with "
<< IOstream::defaultPrecision() << " digits precision." << endl
<< "Your merging tolerance (" << mergeTol << ") is finer than this."
@@ -272,7 +272,7 @@ void readFields
if (haveMesh[Pstream::myProcNo()] && objectNames != masterNames)
{
- FatalErrorIn("readFields()")
+ FatalErrorInFunction
<< "differing fields of type " << GeoField::typeName
<< " on processors." << endl
<< "Master has:" << masterNames << endl
@@ -373,11 +373,8 @@ void compareFields
{
if (mag(b[cellI] - a[cellI]) > tolDim)
{
- FatalErrorIn
- (
- "compareFields"
- "(const scalar, const volVectorField&, const volVectorField&)"
- ) << "Did not map volVectorField correctly:" << nl
+ FatalErrorInFunction
+ << "Did not map volVectorField correctly:" << nl
<< "cell:" << cellI
<< " transfer b:" << b[cellI]
<< " real cc:" << a[cellI]
@@ -401,12 +398,8 @@ void compareFields
{
if (mag(aBoundary[i] - bBoundary[i]) > tolDim)
{
- WarningIn
- (
- "compareFields"
- "(const scalar, const volVectorField&"
- ", const volVectorField&)"
- ) << "Did not map volVectorField correctly:"
+ WarningInFunction
+ << "Did not map volVectorField correctly:"
<< endl
<< "patch:" << patchI << " patchFace:" << i
<< " cc:" << endl
@@ -441,7 +434,7 @@ int main(int argc, char *argv[])
if (env("FOAM_SIGFPE"))
{
- WarningIn(args.executable())
+ WarningInFunction
<< "Detected floating point exception trapping (FOAM_SIGFPE)."
<< " This might give" << nl
<< " problems when mapping fields. Switch it off in case"
@@ -550,7 +543,7 @@ int main(int argc, char *argv[])
if (!decomposer().parallelAware())
{
- WarningIn(args.executable())
+ WarningInFunction
<< "You have selected decomposition method "
<< decomposer().typeName
<< " which does" << endl
@@ -596,7 +589,7 @@ int main(int argc, char *argv[])
if (nonProcI == -1)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot find non-processor patch on processor "
<< Pstream::myProcNo() << endl
<< " Current patches:" << patches.names() << abort(FatalError);
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
index 617811cfec2..3cf58fde370 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
@@ -224,14 +224,14 @@ int main(int argc, char *argv[])
if (nearCellValue)
{
- WarningIn(args.executable())
+ WarningInFunction
<< "Using neighbouring cell value instead of patch value"
<< nl << endl;
}
if (noPointValues)
{
- WarningIn(args.executable())
+ WarningInFunction
<< "Outputting cell values only" << nl << endl;
}
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.C
index f545c8d2036..f19ebf36f46 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.C
@@ -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
@@ -69,7 +69,7 @@ Pout<< endl
)
)
{
-// FatalErrorIn("tecplotWriter::writeInit(..) const")
+// FatalErrorInFunction
// << "Error in TECINI112." << exit(FatalError);
}
}
@@ -148,7 +148,7 @@ Pout<< "zoneName:" << zoneName
)
)
{
-// FatalErrorIn("tecplotWriter::writePolyhedralZone(..) const")
+// FatalErrorInFunction
// << "Error in TECZNE112." << exit(FatalError);
}
}
@@ -228,7 +228,7 @@ Pout<< "zoneName:" << zoneName
)
)
{
-// FatalErrorIn("tecplotWriter::writePolygonalZone(..) const")
+// FatalErrorInFunction
// << "Error in TECZNE112." << exit(FatalError);
}
}
@@ -308,7 +308,7 @@ Pout<< "zoneName:" << zoneName
)
)
{
-// FatalErrorIn("tecplotWriter::writePolygonalZone(..) const")
+// FatalErrorInFunction
// << "Error in TECZNE112." << exit(FatalError);
}
}
@@ -379,7 +379,7 @@ void Foam::tecplotWriter::writeConnectivity(const fvMesh& mesh) const
)
)
{
-// FatalErrorIn("tecplotWriter::writeConnectivity(const fvMesh&) const")
+// FatalErrorInFunction
// << "Error in TECPOLY112." << exit(FatalError);
}
}
@@ -493,7 +493,7 @@ void Foam::tecplotWriter::writeConnectivity
)
)
{
-// FatalErrorIn("tecplotWriter::writeConnectivity(..) const")
+// FatalErrorInFunction
// << "Error in TECPOLY112." << exit(FatalError);
}
}
@@ -505,7 +505,7 @@ Pout<< "writeEnd" << endl;
if (!TECEND112())
{
-// FatalErrorIn("tecplotWriter::writeEnd() const")
+// FatalErrorInFunction
// << "Error in TECEND112." << exit(FatalError);
}
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C
index 95095cdff19..16416593cb4 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C
@@ -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
@@ -57,7 +57,7 @@ void Foam::tecplotWriter::writeField(const Field<Type>& fld) const
if (!TECDAT112(&size, floats.begin(), &IsDouble))
{
-// FatalErrorIn("tecplotWriter::writeField(..) const")
+// FatalErrorInFunction
// << "Error in TECDAT112." << exit(FatalError);
}
}
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
index 2fe59bdc5af..888d274dea3 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
@@ -29,7 +29,6 @@ Description
\*---------------------------------------------------------------------------*/
-
#include "argList.H"
#include "fvMesh.H"
#include "volFields.H"
@@ -120,7 +119,7 @@ void ReadAndMapFields
}
//else
//{
- // FatalErrorIn("ReadAndMapFields(..)")
+ // FatalErrorInFunction
// << "Face " << faceI << " from index " << index
// << " is not a boundary face." << abort(FatalError);
//}
@@ -128,7 +127,7 @@ void ReadAndMapFields
}
//else
//{
- // WarningIn("ReadAndMapFields(..)")
+ // WarningInFunction
// << "Point " << pointI << " at "
// << tetDualMesh.points()[pointI]
// << " has no dual correspondence." << endl;
@@ -188,7 +187,7 @@ int main(int argc, char *argv[])
if (pointDualAddressing.size() != tetDualMesh.nPoints())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Size " << pointDualAddressing.size()
<< " of addressing map " << pointDualAddressing.objectPath()
<< " differs from number of points in mesh "
@@ -218,7 +217,7 @@ int main(int argc, char *argv[])
label faceI = -index-1;
if (faceI < mesh.nInternalFaces())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Face " << faceI << " from index " << index
<< " is not a boundary face."
<< " nInternalFaces:" << mesh.nInternalFaces()
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index 2ef824b1694..b11a5c9c685 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -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
@@ -332,7 +332,7 @@ int main(int argc, char *argv[])
if (binary && (sizeof(floatScalar) != 4 || sizeof(label) != 4))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "floatScalar and/or label are not 4 bytes in size" << nl
<< "Hence cannot use binary VTK format. Please use -ascii"
<< exit(FatalError);
@@ -342,7 +342,7 @@ int main(int argc, char *argv[])
if (nearCellValue)
{
- WarningIn(args.executable())
+ WarningInFunction
<< "Using neighbouring cell value instead of patch value"
<< nl << endl;
}
@@ -351,7 +351,7 @@ int main(int argc, char *argv[])
if (noPointValues)
{
- WarningIn(args.executable())
+ WarningInFunction
<< "Outputting cell values only" << nl << endl;
}
@@ -1235,7 +1235,7 @@ int main(int argc, char *argv[])
);
if (system(cmd.c_str()) == -1)
{
- WarningIn(args.executable())
+ WarningInFunction
<< "Could not execute command " << cmd << endl;
}
}
diff --git a/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C b/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
index 7c6c462a39c..2b186d88bad 100644
--- a/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
+++ b/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
if (!smapFile.good())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot open SMAP file " << smapFile.name()
<< exit(FatalError);
}
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
&& fieldName.wordToken() != "CELL"
)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Expected first CELL, found "
<< fieldName
<< exit(FatalError);
@@ -222,7 +222,7 @@ int main(int argc, char *argv[])
if (cell != 0)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Expected first SMAP dummy entry to be cell 0, found "
<< cell
<< exit(FatalError);
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtils.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtils.C
index 10551b1ad93..00430a61445 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtils.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtils.C
@@ -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
@@ -90,7 +90,7 @@ void Foam::vtkPV3Foam::AddToBlock
{
if (blockDO)
{
- FatalErrorIn("Foam::vtkPV3Foam::AddToBlock")
+ FatalErrorInFunction
<< "Block already has a vtkDataSet assigned to it"
<< endl;
return;
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMeshUtils.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMeshUtils.C
index da8a942a626..fb26fceba1b 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMeshUtils.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMeshUtils.C
@@ -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
@@ -84,7 +84,7 @@ void Foam::vtkPV3blockMesh::AddToBlock
{
if (blockDO)
{
- FatalErrorIn("Foam::vtkPV3blockMesh::AddToBlock")
+ FatalErrorInFunction
<< "Block already has a vtkDataSet assigned to it"
<< endl;
return;
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/vtkPV3Readers.C b/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/vtkPV3Readers.C
index 4daf45fc481..5740476e665 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/vtkPV3Readers.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/vtkPV3Readers.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -93,7 +93,7 @@ void Foam::vtkPV3Readers::AddToBlock
{
if (blockDO)
{
- FatalErrorIn("Foam::vtkPV3Readers::AddToBlock")
+ FatalErrorInFunction
<< "Block already has a vtkDataSet assigned to it"
<< endl;
return;
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUtils.C b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUtils.C
index 707914711bc..18573ec94f9 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUtils.C
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUtils.C
@@ -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
@@ -90,7 +90,7 @@ void Foam::vtkPV4Foam::AddToBlock
{
if (blockDO)
{
- FatalErrorIn("Foam::vtkPV4Foam::AddToBlock")
+ FatalErrorInFunction
<< "Block already has a vtkDataSet assigned to it"
<< endl;
return;
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMeshUtils.C b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMeshUtils.C
index d0a55bbd7b1..7cb10730580 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMeshUtils.C
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/vtkPV4blockMesh/vtkPV4blockMeshUtils.C
@@ -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
@@ -84,7 +84,7 @@ void Foam::vtkPV4blockMesh::AddToBlock
{
if (blockDO)
{
- FatalErrorIn("Foam::vtkPV4blockMesh::AddToBlock")
+ FatalErrorInFunction
<< "Block already has a vtkDataSet assigned to it"
<< endl;
return;
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/vtkPV4Readers.C b/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/vtkPV4Readers.C
index 710fcc361ba..dfb95119998 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/vtkPV4Readers.C
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/vtkPV4Readers/vtkPV4Readers.C
@@ -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
@@ -93,7 +93,7 @@ void Foam::vtkPV4Readers::AddToBlock
{
if (blockDO)
{
- FatalErrorIn("Foam::vtkPV4Readers::AddToBlock")
+ FatalErrorInFunction
<< "Block already has a vtkDataSet assigned to it"
<< endl;
return;
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C
index 3dcc365c1de..edf43c9a293 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C
@@ -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
@@ -57,15 +57,7 @@ tmp<Field<Type> > readParticleField
return tmp<Field<Type> >(new Field<Type>(newField.xfer()));
}
- FatalErrorIn
- (
- "template<class Type>"
- "void readParticleField"
- "("
- "const word&, "
- "const IOobjectList"
- ")"
- )
+ FatalErrorInFunction
<< "error: cloud field name " << name << " not found"
<< abort(FatalError);
@@ -94,16 +86,7 @@ void readFields
}
else
{
- FatalErrorIn
- (
- "template<class Type>"
- "void readFields"
- "("
- "PtrList<List<Type> >&, "
- "const List<word>&, "
- "const IOobjectList&"
- ")"
- )
+ FatalErrorInFunction
<< "Unable to read field " << fieldNames[j]
<< abort(FatalError);
}
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
index 8e0c2ce7cf4..aa4ecba0926 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
@@ -84,12 +84,8 @@ wordList ReadUniformFields
if (iter == localNamesSet.end())
{
- FatalErrorIn
- (
- "ReadFields<class GeoField>"
- "(const IOobjectList&, PtrList<GeoField>&"
- ", const bool)"
- ) << "Fields not synchronised across processors." << endl
+ FatalErrorInFunction
+ << "Fields not synchronised across processors." << endl
<< "Master has fields " << masterNames
<< " processor " << Pstream::myProcNo()
<< " has fields " << localNames << exit(FatalError);
@@ -102,12 +98,8 @@ wordList ReadUniformFields
forAllConstIter(HashSet<word>, localNamesSet, iter)
{
- FatalErrorIn
- (
- "ReadFields<class GeoField>"
- "(const IOobjectList&, PtrList<GeoField>&"
- ", const bool)"
- ) << "Fields not synchronised across processors." << endl
+ FatalErrorInFunction
+ << "Fields not synchronised across processors." << endl
<< "Master has fields " << masterNames
<< " processor " << Pstream::myProcNo()
<< " has fields " << localNames << exit(FatalError);
@@ -400,7 +392,7 @@ void calc
}
else
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Incorrect dimensions of phi: " << phi.dimensions()
<< nl << exit(FatalError);
}
diff --git a/applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C b/applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C
index 8659f0205fd..88be47e53df 100644
--- a/applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C
+++ b/applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
if (!nProcs)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "No processor* directories found"
<< exit(FatalError);
}
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C
index bd1c302481a..501fea6203b 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C
@@ -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
@@ -113,7 +113,7 @@ void Foam::channelIndex::walkOppositeFaces
if (oppositeFaceI == -1)
{
- FatalErrorIn("channelIndex::walkOppositeFaces(..)")
+ FatalErrorInFunction
<< "Face:" << faceI << " owner cell:" << ownCell
<< " is not a hex?" << abort(FatalError);
}
@@ -135,7 +135,7 @@ void Foam::channelIndex::walkOppositeFaces
if (oppositeFaceI == -1)
{
- FatalErrorIn("channelIndex::walkOppositeFaces(..)")
+ FatalErrorInFunction
<< "Face:" << faceI << " neighbour cell:" << neiCell
<< " is not a hex?" << abort(FatalError);
}
@@ -247,7 +247,7 @@ Foam::channelIndex::channelIndex
if (patchI == -1)
{
- FatalErrorIn("channelIndex::channelIndex(const polyMesh&)")
+ FatalErrorInFunction
<< "Illegal patch " << patchNames[i]
<< ". Valid patches are " << patches.name()
<< exit(FatalError);
diff --git a/applications/utilities/postProcessing/noise/noise.C b/applications/utilities/postProcessing/noise/noise.C
index 6b6628f0802..4f4cb599ff0 100644
--- a/applications/utilities/postProcessing/noise/noise.C
+++ b/applications/utilities/postProcessing/noise/noise.C
@@ -107,7 +107,7 @@ Foam::scalar checkUniformTimeStep(const scalarField& t)
if (mag(deltaT - dT) > SMALL)
{
- FatalErrorIn("checkUniformTimeStep(const scalarField&)")
+ FatalErrorInFunction
<< "Unable to process data with a variable time step"
<< exit(FatalError);
}
@@ -115,7 +115,7 @@ Foam::scalar checkUniformTimeStep(const scalarField& t)
}
else
{
- FatalErrorIn("checkUniformTimeStep(const scalarField&)")
+ FatalErrorInFunction
<< "Unable to create FFT with a single value"
<< exit(FatalError);
}
@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
if (t.size() < N)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Block size N = " << N
<< " is larger than number of data = " << t.size()
<< exit(FatalError);
diff --git a/applications/utilities/postProcessing/velocityField/Co/Co.C b/applications/utilities/postProcessing/velocityField/Co/Co.C
index 9e6d6d2485e..03718ef523a 100644
--- a/applications/utilities/postProcessing/velocityField/Co/Co.C
+++ b/applications/utilities/postProcessing/velocityField/Co/Co.C
@@ -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
@@ -104,7 +104,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
}
else
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Incorrect dimensions of phi: " << phi.dimensions()
<< abort(FatalError);
}
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Pe.C b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
index a82837d83cd..999e287d946 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Pe.C
+++ b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
@@ -241,7 +241,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
}
else
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Incorrect dimensions of phi: " << phi.dimensions()
<< abort(FatalError);
}
diff --git a/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C b/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
index 2c59611d316..620c4fdb78b 100644
--- a/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
+++ b/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
if (nD != 2)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Case is not 2D, stream-function cannot be computed"
<< exit(FatalError);
}
@@ -232,7 +232,7 @@ int main(int argc, char *argv[])
}
else
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot find initialisation face or a cell."
<< abort(FatalError);
}
@@ -476,7 +476,7 @@ int main(int argc, char *argv[])
}
else
{
- WarningIn(args.executable())
+ WarningInFunction
<< "Flux field does not exist."
<< " Stream function not calculated" << endl;
}
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index 4f2a30fb5f4..146878e272d 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
if (!args.optionFound("ybl") && !args.optionFound("Cbl"))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Neither option 'ybl' or 'Cbl' have been provided to calculate "
<< "the boundary-layer thickness.\n"
<< "Please choose either 'ybl' OR 'Cbl'."
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
}
else if (args.optionFound("ybl") && args.optionFound("Cbl"))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Both 'ybl' and 'Cbl' have been provided to calculate "
<< "the boundary-layer thickness.\n"
<< "Please choose either 'ybl' OR 'Cbl'."
diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
index a6b18b6114f..98906f927d1 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
@@ -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
@@ -420,7 +420,7 @@ int main(int argc, char *argv[])
instantList times = timeSelector::selectIfPresent(runTime, args);
if (times.size() < 1)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "No times selected." << exit(FatalError);
}
runTime.setTime(times[0], 0);
diff --git a/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C b/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C
index 45025948263..e873f10d770 100644
--- a/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C
+++ b/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
if (!mesh.write())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Failed writing dsmcCloud."
<< nl << exit(FatalError);
}
diff --git a/applications/utilities/preProcessing/mapFields/mapFields.C b/applications/utilities/preProcessing/mapFields/mapFields.C
index 929776d9df6..2147dbfeb3f 100644
--- a/applications/utilities/preProcessing/mapFields/mapFields.C
+++ b/applications/utilities/preProcessing/mapFields/mapFields.C
@@ -278,7 +278,7 @@ int main(int argc, char *argv[])
}
else
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Unknown mapMethod " << mapMethod << ". Valid options are: "
<< "mapNearest, interpolate and cellPointInterpolate"
<< exit(FatalError);
diff --git a/applications/utilities/preProcessing/mdInitialise/mdInitialise.C b/applications/utilities/preProcessing/mdInitialise/mdInitialise.C
index ef2686f3b79..7af246cb25d 100644
--- a/applications/utilities/preProcessing/mdInitialise/mdInitialise.C
+++ b/applications/utilities/preProcessing/mdInitialise/mdInitialise.C
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
if (!mesh.write())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Failed writing moleculeCloud."
<< nl << exit(FatalError);
}
diff --git a/applications/utilities/preProcessing/setFields/setFields.C b/applications/utilities/preProcessing/setFields/setFields.C
index 0dbc03540f5..eedce844bc3 100644
--- a/applications/utilities/preProcessing/setFields/setFields.C
+++ b/applications/utilities/preProcessing/setFields/setFields.C
@@ -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
@@ -106,22 +106,14 @@ bool setCellFieldType
if (!field.write())
{
- FatalErrorIn
- (
- "void setCellFieldType"
- "(const fvMesh& mesh, const labelList& selectedCells,"
- "Istream& fieldValueStream)"
- ) << "Failed writing field " << fieldName << endl;
+ FatalErrorInFunction
+ << "Failed writing field " << fieldName << endl;
}
}
else
{
- WarningIn
- (
- "void setCellFieldType"
- "(const fvMesh& mesh, const labelList& selectedCells,"
- "Istream& fieldValueStream)"
- ) << "Field " << fieldName << " not found" << endl;
+ WarningInFunction
+ << "Field " << fieldName << " not found" << endl;
// Consume value
(void)pTraits<Type>(fieldValueStream);
@@ -177,7 +169,7 @@ public:
)
)
{
- WarningIn("setCellField::iNew::operator()(Istream& is)")
+ WarningInFunction
<< "field type " << fieldType << " not currently supported"
<< endl;
}
@@ -266,7 +258,7 @@ bool setFaceFieldType
if (!hasWarned)
{
hasWarned = true;
- WarningIn("setFaceFieldType(..)")
+ WarningInFunction
<< "Ignoring internal face " << facei
<< ". Suppressing further warnings." << endl;
}
@@ -302,22 +294,14 @@ bool setFaceFieldType
if (!field.write())
{
- FatalErrorIn
- (
- "void setFaceFieldType"
- "(const fvMesh& mesh, const labelList& selectedFaces,"
- "Istream& fieldValueStream)"
- ) << "Failed writing field " << field.name() << exit(FatalError);
+ FatalErrorInFunction
+ << "Failed writing field " << field.name() << exit(FatalError);
}
}
else
{
- WarningIn
- (
- "void setFaceFieldType"
- "(const fvMesh& mesh, const labelList& selectedFaces,"
- "Istream& fieldValueStream)"
- ) << "Field " << fieldName << " not found" << endl;
+ WarningInFunction
+ << "Field " << fieldName << " not found" << endl;
// Consume value
(void)pTraits<Type>(fieldValueStream);
@@ -373,7 +357,7 @@ public:
)
)
{
- WarningIn("setFaceField::iNew::operator()(Istream& is)")
+ WarningInFunction
<< "field type " << fieldType << " not currently supported"
<< endl;
}
diff --git a/applications/utilities/preProcessing/viewFactorsGen/shootRays.H b/applications/utilities/preProcessing/viewFactorsGen/shootRays.H
index d20b204f036..20d1c5066d3 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/shootRays.H
+++ b/applications/utilities/preProcessing/viewFactorsGen/shootRays.H
@@ -60,10 +60,8 @@ for (label procI = 0; procI < Pstream::nProcs(); procI++)
endAgg.append(globalNumbering.toGlobal(procI, remAgg));
if (startIndex.size() > maxDynListLength)
{
- FatalErrorIn
- (
- "shootRays"
- ) << "Dynamic list need from capacity."
+ FatalErrorInFunction
+ << "Dynamic list need from capacity."
<< "Actual size maxDynListLength : "
<< maxDynListLength
<< abort(FatalError);
diff --git a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/SpaldingsLaw/SpaldingsLaw.C b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/SpaldingsLaw/SpaldingsLaw.C
index fc0df720ba3..24834c227f2 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/SpaldingsLaw/SpaldingsLaw.C
+++ b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/SpaldingsLaw/SpaldingsLaw.C
@@ -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
@@ -104,7 +104,7 @@ void Foam::tabulatedWallFunctions::SpaldingsLaw::invertFunction()
if (iter == maxIters_)
{
- WarningIn("SpaldingsLaw::invertFunction()")
+ WarningInFunction
<< "Newton iterations not converged:" << nl
<< " iters = " << iter << ", error = " << error << endl;
}
diff --git a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C
index 3ef4cdfd24f..73d87c004bb 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C
+++ b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C
@@ -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
@@ -119,15 +119,8 @@ Foam::scalar Foam::tabulatedWallFunctions::general::interpolate
}
default:
{
- FatalErrorIn
- (
- "tabulatedWallFunctions::general::interpolate"
- "("
- "const scalar, "
- "const scalarList&, "
- "const scalarList&"
- ")"
- ) << "Unknown interpolation method" << nl
+ FatalErrorInFunction
+ << "Unknown interpolation method" << nl
<< abort(FatalError);
}
}
@@ -154,14 +147,8 @@ Foam::tabulatedWallFunctions::general::general
List<Tuple2<scalar, scalar> > inputTable = coeffDict_.lookup("inputTable");
if (inputTable.size() < 2)
{
- FatalErrorIn
- (
- "tabulatedWallFunctions::general::general"
- "("
- "const dictionary&, "
- "const polyMesh&"
- ")"
- ) << "Input table must have at least 2 values" << nl
+ FatalErrorInFunction
+ << "Input table must have at least 2 values" << nl
<< exit(FatalError);
}
diff --git a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C
index 89c6a95fb0e..0c2c1a19243 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C
+++ b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/tabulatedWallFunction/tabulatedWallFunctionNew.C
@@ -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
@@ -49,10 +49,8 @@ autoPtr<tabulatedWallFunction> tabulatedWallFunction::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn
- (
- "tabulatedWallFunction::New(const dictionary&, const polyMesh&)"
- ) << "Unknown tabulatedWallFunction type " << twfTypeName
+ FatalErrorInFunction
+ << "Unknown tabulatedWallFunction type " << twfTypeName
<< nl << nl << "Valid tabulatedWallFunction types are:" << nl
<< dictionaryConstructorTablePtr_->toc()
<< exit(FatalError);
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index 97a7fb4730e..ea697d17336 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
@@ -437,7 +437,7 @@ int main(int argc, char *argv[])
if (!validActions.found(action))
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Unsupported action " << action << endl
<< "Supported actions:" << validActions.toc() << abort(FatalError);
}
@@ -468,7 +468,7 @@ int main(int argc, char *argv[])
if (invertedSpace && validActions[action] == booleanSurface::DIFFERENCE)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Inverted space only makes sense for union or intersection."
<< exit(FatalError);
}
@@ -708,7 +708,7 @@ int main(int argc, char *argv[])
}
else
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Unsupported booleanSurface:booleanOpType and space "
<< action << " " << invertedSpace
<< abort(FatalError);
diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
index 6ec067aa847..fa3ab851ef3 100644
--- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C
+++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
@@ -57,7 +57,7 @@ bool validTri
{
if (f[fp] < 0 || f[fp] >= surf.points().size())
{
- WarningIn("validTri(const triSurface&, const label)")
+ WarningInFunction
<< "triangle " << faceI << " vertices " << f
<< " uses point indices outside point range 0.."
<< surf.points().size()-1 << endl;
@@ -67,7 +67,7 @@ bool validTri
if ((f[0] == f[1]) || (f[0] == f[2]) || (f[1] == f[2]))
{
- WarningIn("validTri(const triSurface&, const label)")
+ WarningInFunction
<< "triangle " << faceI
<< " uses non-unique vertices " << f
<< " coords:" << f.points(surf.points())
@@ -100,7 +100,7 @@ bool validTri
&& ((f[2] == nbrF[0]) || (f[2] == nbrF[1]) || (f[2] == nbrF[2]))
)
{
- WarningIn("validTri(const triSurface&, const label)")
+ WarningInFunction
<< "triangle " << faceI << " vertices " << f
<< " has the same vertices as triangle " << nbrFaceI
<< " vertices " << nbrF
@@ -146,11 +146,8 @@ labelList countBins
if ((index < 0) || (index >= nBins))
{
- WarningIn
- (
- "countBins(const scalar, const scalar, const label"
- ", const scalarField&)"
- ) << "value " << val << " at index " << i
+ WarningInFunction
+ << "value " << val << " at index " << i
<< " outside range " << min << " .. " << max << endl;
if (index < 0)
@@ -257,7 +254,7 @@ int main(int argc, char *argv[])
if (region < 0 || region >= regionSize.size())
{
- WarningIn(args.executable())
+ WarningInFunction
<< "Triangle " << faceI << " vertices " << surf[faceI]
<< " has region " << region << " which is outside the range"
<< " of regions 0.." << surf.patches().size()-1
@@ -371,7 +368,7 @@ int main(int argc, char *argv[])
if (triQ[minIndex] < SMALL)
{
- WarningIn(args.executable()) << "Minimum triangle quality is "
+ WarningInFunction
<< triQ[minIndex] << ". This might give problems in"
<< " self-intersection testing later on." << endl;
}
diff --git a/applications/utilities/surface/surfaceClean/collapseBase.C b/applications/utilities/surface/surfaceClean/collapseBase.C
index ceb834b56f1..0bf67176286 100644
--- a/applications/utilities/surface/surfaceClean/collapseBase.C
+++ b/applications/utilities/surface/surfaceClean/collapseBase.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -175,7 +175,7 @@ static void splitTri
}
else
{
- FatalErrorIn("splitTri(..)")
+ FatalErrorInFunction
<< "Edge " << e << " not part of triangle " << f
<< " fp:" << fp
<< " fp1:" << fp1
@@ -206,14 +206,14 @@ static bool insertSorted
{
if (findIndex(sortedVerts, vertI) != -1)
{
- FatalErrorIn("insertSorted(..)") << "Trying to insert vertex " << vertI
+ FatalErrorInFunction
<< " which is already in list of sorted vertices "
<< sortedVerts << abort(FatalError);
}
if (weight <= 0 || weight >= 1)
{
- FatalErrorIn("insertSorted(..)") << "Trying to insert vertex " << vertI
+ FatalErrorInFunction
<< " with illegal weight " << weight
<< " into list of sorted vertices "
<< sortedVerts << abort(FatalError);
@@ -228,7 +228,7 @@ static bool insertSorted
if (mag(w - weight) < SMALL)
{
- WarningIn("insertSorted(..)")
+ WarningInFunction
<< "Trying to insert weight " << weight << " which is close to"
<< " existing weight " << w << " in " << sortedWeights
<< endl;
@@ -359,7 +359,7 @@ static void markCollapsedFaces
// Mark face as being collapsed
if (faceToEdge[faceI] != -1)
{
- FatalErrorIn("markCollapsedFaces(..)")
+ FatalErrorInFunction
<< "Cannot collapse face " << faceI << " since "
<< " is marked to be collapsed both to edge "
<< faceToEdge[faceI] << " and " << edgeI
@@ -386,7 +386,7 @@ static void markRegion
{
if (faceToEdge[faceI] == -1 || collapseRegion[faceI] != -1)
{
- FatalErrorIn("markRegion(..)")
+ FatalErrorInFunction
<< "Problem : crossed into uncollapsed/regionized face"
<< abort(FatalError);
}
@@ -422,7 +422,7 @@ static void markRegion
}
else if (collapseRegion[nbrFaceI] != regionI)
{
- FatalErrorIn("markRegion(..)")
+ FatalErrorInFunction
<< "Edge:" << edgeI << " between face " << faceI
<< " with region " << regionI
<< " and face " << nbrFaceI
@@ -494,7 +494,7 @@ static label edgeType
}
else if (usesRegion != region)
{
- FatalErrorIn("edgeRegion") << abort(FatalError);
+ FatalErrorInFunction << abort(FatalError);
}
else
{
@@ -519,7 +519,7 @@ static label edgeType
{
if (usesRegion == -1)
{
- FatalErrorIn("edgeRegion") << abort(FatalError);
+ FatalErrorInFunction << abort(FatalError);
return -2;
}
else
@@ -640,7 +640,7 @@ static void projectNonSpanPoints
if (!pHit.hit())
{
- FatalErrorIn("projectNonSpanPoints")
+ FatalErrorInFunction
<< abort(FatalError);
}
@@ -737,7 +737,7 @@ static void getSplitVerts
if (i0 == -1 || i1 == -1)
{
- FatalErrorIn("getSplitVerts")
+ FatalErrorInFunction
<< "Did not find edge in projected vertices." << nl
<< "region:" << regionI << nl
<< "spanPoints:" << spanPoints
diff --git a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
index 4fcb9b1978d..7603f8a4a85 100644
--- a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
+++ b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
@@ -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
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
if (reduction <= 0 || reduction > 1)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Reduction factor " << reduction
<< " should be within 0..1" << endl
<< "(it is the reduction in number of vertices)"
diff --git a/applications/utilities/surface/surfaceConvert/surfaceConvert.C b/applications/utilities/surface/surfaceConvert/surfaceConvert.C
index 5d826824d07..1d79b08059b 100644
--- a/applications/utilities/surface/surfaceConvert/surfaceConvert.C
+++ b/applications/utilities/surface/surfaceConvert/surfaceConvert.C
@@ -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
@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
if (importName == exportName)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Output file " << exportName << " would overwrite input file."
<< exit(FatalError);
}
diff --git a/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C b/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
index fadf9a7ec78..8e4d178462b 100644
--- a/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
+++ b/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
@@ -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
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
// disable inplace editing
if (importName == exportName)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Output file " << exportName << " would overwrite input file."
<< exit(FatalError);
}
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index db28d8fbe1d..a763c90c29d 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -73,7 +73,7 @@ scalar calcVertexNormalWeight
if (index == -1)
{
- FatalErrorIn("calcVertexNormals()")
+ FatalErrorInFunction
<< "Point not in face" << abort(FatalError);
}
@@ -853,7 +853,7 @@ surfaceFeatures::edgeStatus checkFlatRegionEdge
}
else if (dir == 0)
{
- FatalErrorIn("problem.")
+ FatalErrorInFunction
<< exit(FatalError);
}
else
@@ -1083,7 +1083,7 @@ int main(int argc, char *argv[])
}
else
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "No initial feature set. Provide either one"
<< " of extractFromFile (to read existing set)" << nl
<< " or extractFromSurface (to construct new set from angle)"
diff --git a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
index 7813eaba790..4c5a91d1080 100644
--- a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
+++ b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
@@ -471,7 +471,7 @@ int main(int argc, char *argv[])
if (eFaces.size() != 1)
{
- WarningIn(args.executable())
+ WarningInFunction
<< "Edge is attached to " << eFaces.size()
<< " faces." << endl;
diff --git a/applications/utilities/surface/surfaceInertia/surfaceInertia.C b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
index 6b30f610b13..fa714c2bb50 100644
--- a/applications/utilities/surface/surfaceInertia/surfaceInertia.C
+++ b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
@@ -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
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
if (m < 0)
{
- WarningIn(args.executable() + "::main")
+ WarningInFunction
<< "Negative mass detected, the surface may be inside-out." << endl;
}
@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
while ((magSqr(eVal) < VSMALL) && pertI < 10)
{
- WarningIn(args.executable() + "::main")
+ WarningInFunction
<< "No eigenValues found, shape may have symmetry, "
<< "perturbing inertia tensor diagonal" << endl;
@@ -320,7 +320,7 @@ int main(int argc, char *argv[])
}
else
{
- WarningIn(args.executable() + "::main")
+ WarningInFunction
<< "Non-unique eigenvectors, cannot compute transformation "
<< "from Cartesian axes" << endl;
@@ -337,7 +337,7 @@ int main(int argc, char *argv[])
if (f[0] == f[1] || f[0] == f[2] || f[1] == f[2])
{
- WarningIn(args.executable())
+ WarningInFunction
<< "Illegal triangle " << faceI << " vertices " << f
<< " coords " << f.points(surf.points()) << endl;
}
diff --git a/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C b/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
index d1e725faee2..6c1cf3cf7b4 100644
--- a/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
+++ b/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
@@ -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
@@ -109,7 +109,7 @@ void getFixedPoints
if (!matchedAll)
{
- WarningIn("getFixedPoints(const edgeMesh&, const pointField&)")
+ WarningInFunction
<< "Did not match all feature points to points on the surface"
<< endl;
}
@@ -150,14 +150,14 @@ int main(int argc, char *argv[])
if (lambda < 0 || lambda > 1)
{
- FatalErrorIn(args.executable()) << "Illegal relaxation factor "
+ FatalErrorInFunction
<< lambda << endl
<< "0: no change 1: move vertices to average of neighbours"
<< exit(FatalError);
}
if (mu < 0 || mu > 1)
{
- FatalErrorIn(args.executable()) << "Illegal relaxation factor "
+ FatalErrorInFunction
<< mu << endl
<< "0: no change 1: move vertices to average of neighbours"
<< exit(FatalError);
diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
index 849cf6ea716..17e22f8c07f 100644
--- a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
+++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
@@ -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
@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
// disable inplace editing
if (importName == exportName)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Output file " << exportName << " would overwrite input file."
<< exit(FatalError);
}
@@ -196,8 +196,7 @@ int main(int argc, char *argv[])
if (!csDictIoPtr->headerOk())
{
- FatalErrorIn(args.executable())
- << "Cannot open coordinateSystems file\n "
+ FatalErrorInFunction
<< csDictIoPtr->objectPath() << nl
<< exit(FatalError);
}
@@ -211,7 +210,7 @@ int main(int argc, char *argv[])
const label csIndex = csLst.findIndex(csName);
if (csIndex < 0)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot find -from " << csName << nl
<< "available coordinateSystems: " << csLst.toc() << nl
<< exit(FatalError);
@@ -227,7 +226,7 @@ int main(int argc, char *argv[])
const label csIndex = csLst.findIndex(csName);
if (csIndex < 0)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot find -to " << csName << nl
<< "available coordinateSystems: " << csLst.toc() << nl
<< exit(FatalError);
@@ -240,8 +239,7 @@ int main(int argc, char *argv[])
// maybe fix this later
if (fromCsys.valid() && toCsys.valid())
{
- FatalErrorIn(args.executable())
- << "Only allowed '-from' or '-to' option at the moment."
+ FatalErrorInFunction
<< exit(FatalError);
}
}
diff --git a/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C b/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
index 896f2b27451..12bd9f32e22 100644
--- a/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
+++ b/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
if (importName == exportName)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Output file " << exportName << " would overwrite input file."
<< exit(FatalError);
}
diff --git a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
index bfc46ccd758..4b8d230080a 100644
--- a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
+++ b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
@@ -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
@@ -176,8 +176,7 @@ int main(int argc, char *argv[])
if (!ioPtr->headerOk())
{
- FatalErrorIn(args.executable())
- << "Cannot open coordinateSystems file\n "
+ FatalErrorInFunction
<< ioPtr->objectPath() << nl
<< exit(FatalError);
}
@@ -191,7 +190,7 @@ int main(int argc, char *argv[])
const label csIndex = csLst.findIndex(csName);
if (csIndex < 0)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot find -from " << csName << nl
<< "available coordinateSystems: " << csLst.toc() << nl
<< exit(FatalError);
@@ -207,7 +206,7 @@ int main(int argc, char *argv[])
const label csIndex = csLst.findIndex(csName);
if (csIndex < 0)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot find -to " << csName << nl
<< "available coordinateSystems: " << csLst.toc() << nl
<< exit(FatalError);
@@ -220,8 +219,7 @@ int main(int argc, char *argv[])
// maybe fix this later
if (fromCsys.valid() && toCsys.valid())
{
- FatalErrorIn(args.executable())
- << "Only allowed '-from' or '-to' option at the moment."
+ FatalErrorInFunction
<< exit(FatalError);
}
}
diff --git a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
index a8a09386818..2bf0c9c014e 100644
--- a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
+++ b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
@@ -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
@@ -189,8 +189,7 @@ int main(int argc, char *argv[])
if (!ioPtr->headerOk())
{
- FatalErrorIn(args.executable())
- << "Cannot open coordinateSystems file\n "
+ FatalErrorInFunction
<< ioPtr->objectPath() << nl
<< exit(FatalError);
}
@@ -204,7 +203,7 @@ int main(int argc, char *argv[])
const label csIndex = csLst.findIndex(csName);
if (csIndex < 0)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot find -from " << csName << nl
<< "available coordinateSystems: " << csLst.toc() << nl
<< exit(FatalError);
@@ -220,7 +219,7 @@ int main(int argc, char *argv[])
const label csIndex = csLst.findIndex(csName);
if (csIndex < 0)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot find -to " << csName << nl
<< "available coordinateSystems: " << csLst.toc() << nl
<< exit(FatalError);
@@ -233,8 +232,7 @@ int main(int argc, char *argv[])
// maybe fix this later
if (fromCsys.valid() && toCsys.valid())
{
- FatalErrorIn(args.executable())
- << "Only allowed '-from' or '-to' option at the moment."
+ FatalErrorInFunction
<< exit(FatalError);
}
}
diff --git a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
index 098f9e019c8..580411eda64 100644
--- a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
+++ b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
@@ -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
@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
if (zoneIDs.empty())
{
- WarningIn(args.executable())
+ WarningInFunction
<< "Cannot find any faceZone name matching "
<< zoneName << endl;
}
diff --git a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
index 6e4db35a0bd..03195b46647 100644
--- a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
+++ b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
@@ -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
@@ -137,7 +137,7 @@ int main(int argc, char *argv[])
if (!Pstream::parRun())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Please run this program on the decomposed case."
<< " It will read surface " << surfFileName
<< " and decompose it such that it overlaps the mesh bounding box."
diff --git a/applications/utilities/surface/surfaceSplitByTopology/surfaceSplitByTopology.C b/applications/utilities/surface/surfaceSplitByTopology/surfaceSplitByTopology.C
index 93a7caa3655..3e924513692 100644
--- a/applications/utilities/surface/surfaceSplitByTopology/surfaceSplitByTopology.C
+++ b/applications/utilities/surface/surfaceSplitByTopology/surfaceSplitByTopology.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
if (iterationNo == iterationLimit)
{
- WarningIn("surfaceSplitByTopology")
+ WarningInFunction
<< "Iteration limit of " << iterationLimit << "reached" << endl;
}
diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
index 184d326e268..e3a4bc56de1 100644
--- a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
+++ b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
@@ -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
@@ -152,14 +152,14 @@ void testSortedEdgeFaces(const triSurface& surf)
{
if (findIndex(sortMyFaces, myFaces[i]) == -1)
{
- FatalErrorIn("testSortedEdgeFaces(..)") << abort(FatalError);
+ FatalErrorInFunction << abort(FatalError);
}
}
forAll(sortMyFaces, i)
{
if (findIndex(myFaces, sortMyFaces[i]) == -1)
{
- FatalErrorIn("testSortedEdgeFaces(..)") << abort(FatalError);
+ FatalErrorInFunction << abort(FatalError);
}
}
}
@@ -299,7 +299,7 @@ label findEdge
}
- FatalErrorIn("findEdge(..)") << "Cannot find edge with labels " << v0
+ FatalErrorInFunction
<< ' ' << v1 << " in candidates " << edgeLabels
<< " with vertices:" << UIndirectList<edge>(surf.edges(), edgeLabels)()
<< abort(FatalError);
@@ -338,7 +338,7 @@ label otherEdge
}
}
- FatalErrorIn("otherEdge(..)") << "Cannot find other edge on face " << faceI
+ FatalErrorInFunction
<< " verts:" << surf.localPoints()[faceI]
<< " connected to point " << pointI
<< " faceEdges:" << UIndirectList<edge>(surf.edges(), fEdges)()
@@ -404,7 +404,7 @@ void walkSplitLine
if (eFaces.size() != 2)
{
- FatalErrorIn("walkSplitPoint(..)")
+ FatalErrorInFunction
<< "Can only handle edges with 2 or 4 edges for now."
<< abort(FatalError);
}
@@ -419,7 +419,7 @@ void walkSplitLine
}
else
{
- FatalErrorIn("walkSplitPoint(..)") << abort(FatalError);
+ FatalErrorInFunction << abort(FatalError);
}
}
while (true);
@@ -539,7 +539,7 @@ void calcPointVecs
surf.write("errorSurf.obj");
- FatalErrorIn("calcPointVecs(..)")
+ FatalErrorInFunction
<< "Cannot find two faces using border edge " << edgeI
<< " verts:" << edges[edgeI]
<< " eFaces:" << eFaces << endl
diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubset.C b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
index c0ae6bd2418..562b7bd302c 100644
--- a/applications/utilities/surface/surfaceSubset/surfaceSubset.C
+++ b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
@@ -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
@@ -93,7 +93,7 @@ int main(int argc, char *argv[])
if (markedZone.size() && markedZone.size() != 2)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "zone specification should be two points, min and max of "
<< "the boundingbox" << endl
<< "zone:" << markedZone
@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
|| markedPoints[pointI] >= surf1.nPoints()
)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "localPoint label " << markedPoints[pointI]
<< "out of range."
<< " The mesh has got "
@@ -170,7 +170,7 @@ int main(int argc, char *argv[])
|| markedEdges[edgeI] >= surf1.nEdges()
)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "edge label " << markedEdges[edgeI]
<< "out of range."
<< " The mesh has got "
@@ -323,7 +323,7 @@ int main(int argc, char *argv[])
|| markedFaces[faceI] >= surf1.size()
)
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Face label " << markedFaces[faceI] << "out of range."
<< " The mesh has got "
<< surf1.size() << " faces."
diff --git a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
index 8bdcd357417..e4653d1d61a 100644
--- a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
+++ b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
@@ -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
@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
if (args.options().empty())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "No options supplied, please use one or more of "
"-translate, -rotate or -scale options."
<< exit(FatalError);
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
index 9c51adb8b46..51aaab6669b 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
+++ b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
@@ -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
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
// Check controlFile stream is OK
if (!controlFile.good())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot read file " << controlFileName
<< exit(FatalError);
}
@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
// Check thermoData stream is OK
if (!thermoDataFile.good())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot read file " << thermoDataFileName
<< exit(FatalError);
}
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
index 9879031cf8e..4642bde45f5 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
+++ b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
@@ -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
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
// Check controlFile stream is OK
if (!controlFile.good())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot read file " << controlFileName
<< abort(FatalError);
}
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
// Check thermoData stream is OK
if (!thermoDataFile.good())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot read file " << thermoDataFileName
<< abort(FatalError);
}
diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixture.H b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixture.H
index f5bd3dcd5a9..cf5d7e81b20 100644
--- a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixture.H
+++ b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixture.H
@@ -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
@@ -78,7 +78,7 @@ public:
if (volTot > 1.001 || volTot < 0.999)
{
- FatalErrorIn("mixture::mixture(istream& is)")
+ FatalErrorInFunction
<< "Sum of volume fractions for Mixture " << name_
<< " = " << volTot << endl
<< "Should equal one."
diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
index 742de4b8077..358bb7ab0fc 100644
--- a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
+++ b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
@@ -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
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
// Check controlFile stream is OK
if (!controlFile.good())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot read file " << controlFileName
<< abort(FatalError);
}
@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
// Check thermoData stream is OK
if (!thermoDataFile.good())
{
- FatalErrorIn(args.executable())
+ FatalErrorInFunction
<< "Cannot read file " << thermoDataFileName
<< abort(FatalError);
}
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
index 9c0ff2cec67..a1039f2a71b 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
@@ -92,11 +92,9 @@ void Foam::fvPatchMapper::calcAddressing() const
{
if (min(addr) < 0)
{
- //FatalErrorIn
WarningInFunction
<< "Unmapped entry in patch mapping for patch "
<< patch_.index() << " named " << patch_.name()
- //<< abort(FatalError);
<< endl;
}
}
@@ -294,13 +292,4 @@ const Foam::scalarListList& Foam::fvPatchMapper::weights() const
}
-// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
-
-
// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
index 6c3500e17fd..ba213d0d08e 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
@@ -253,11 +253,8 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit
{
// if (iIt == 7)
// {
- // WarningIn
- // (
- // "FitData<Polynomial>::calcFit"
- // "(const List<point>& C, const label facei"
- // ) << "Cannot fit face " << facei << " iteration " << iIt
+ // WarningInFunction
+ // << "Cannot fit face " << facei << " iteration " << iIt
// << " with sum of weights " << sum(coeffsi) << nl
// << " Weights " << coeffsi << nl
// << " Linear weights " << wLin << " " << 1 - wLin << nl
--
GitLab