From cad9467374a4018d68900f21eadab7646721b87d Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Tue, 10 Nov 2015 16:55:03 +0000 Subject: [PATCH] src/finiteVolume: Update ...ErrorIn -> ...ErrorInFunction Avoids the clutter and maintenance effort associated with providing the function signature string. --- .../cfdTools/general/MRF/MRFZone.C | 11 +--- .../SRF/SRFModel/SRFModel/SRFModelNew.C | 8 +-- .../cfdTools/general/adjustPhi/adjustPhi.C | 11 +--- .../general/findRefCell/findRefCell.C | 30 +--------- .../general/include/checkPatchFieldTypes.H | 4 +- .../porosityModel/porosityModel.C | 24 ++------ .../porosityModel/porosityModelNew.C | 13 +--- .../solutionControl/solutionControl.C | 4 +- .../basic/calculated/calculatedFvPatchField.C | 36 +++-------- .../directionMixedFvPatchField.C | 14 +---- .../fixedGradient/fixedGradientFvPatchField.C | 14 +---- .../basic/fixedValue/fixedValueFvPatchField.C | 14 +---- .../basic/mixed/mixedFvPatchField.C | 14 +---- .../constraint/cyclic/cyclicFvPatchField.C | 21 +------ .../cyclicACMI/cyclicACMIFvPatchField.C | 21 +------ .../cyclicAMI/cyclicAMIFvPatchField.C | 21 +------ .../constraint/empty/emptyFvPatchField.C | 59 ++++--------------- .../processor/processorFvPatchField.C | 41 ++++--------- .../processor/processorFvPatchScalarField.C | 8 +-- .../processorCyclicFvPatchField.C | 32 ++-------- .../symmetry/symmetryFvPatchField.C | 21 +------ .../symmetryPlane/symmetryPlaneFvPatchField.C | 21 +------ .../constraint/wedge/wedgeFvPatchField.C | 21 +------ .../derived/advective/advectiveFvPatchField.C | 19 ++---- .../externalCoupledMixedFvPatchField.C | 35 ++--------- .../fanPressureFvPatchScalarField.C | 4 +- .../fixedFluxPressureFvPatchScalarField.C | 4 +- .../flowRateInletVelocityFvPatchVectorField.C | 14 ++--- .../fluxCorrectedVelocityFvPatchVectorField.C | 7 +-- .../freestreamPressureFvPatchScalarField.C | 2 +- .../mappedField/mappedPatchFieldBase.C | 14 ++--- .../mappedFixedInternalValueFvPatchField.C | 10 ++-- .../mappedFixedValueFvPatchField.C | 7 +-- .../mappedFlowRateFvPatchVectorField.C | 8 +-- ...mappedVelocityFluxFixedValueFvPatchField.C | 46 +++------------ .../outletMappedUniformInletFvPatchField.C | 8 +-- ...tedInletOutletVelocityFvPatchVectorField.C | 9 +-- ...eDirectedInletVelocityFvPatchVectorField.C | 8 +-- ...tOutletParSlipVelocityFvPatchVectorField.C | 9 +-- .../pressureInletVelocityFvPatchVectorField.C | 4 +- ...malInletOutletVelocityFvPatchVectorField.C | 9 +-- .../supersonicFreestreamFvPatchVectorField.C | 18 ++---- ...lFlowRateInletVelocityFvPatchVectorField.C | 8 +-- .../syringePressureFvPatchScalarField.C | 2 +- .../timeVaryingMappedFixedValueFvPatchField.C | 31 +++------- .../totalPressureFvPatchScalarField.C | 8 +-- ...sityKineticEnergyInletFvPatchScalarField.C | 14 +---- .../uniformTotalPressureFvPatchScalarField.C | 4 +- .../waveSurfacePressureFvPatchScalarField.C | 5 +- .../fvPatchFields/fvPatchField/fvPatchField.C | 24 ++------ .../fvPatchField/fvPatchFieldNew.C | 27 +++------ .../constraint/cyclic/cyclicFvsPatchField.C | 22 ++----- .../cyclicACMI/cyclicACMIFvsPatchField.C | 22 ++----- .../cyclicAMI/cyclicAMIFvsPatchField.C | 22 ++----- .../constraint/empty/emptyFvsPatchField.C | 22 ++----- .../processor/processorFvsPatchField.C | 22 ++----- .../processorCyclicFvsPatchField.C | 22 ++----- .../symmetry/symmetryFvsPatchField.C | 22 ++----- .../symmetryPlaneFvsPatchField.C | 22 ++----- .../constraint/wedge/wedgeFvsPatchField.C | 22 ++----- .../fvsPatchField/fvsPatchField.C | 23 ++------ .../fvsPatchField/fvsPatchFieldNew.C | 25 +++----- .../convectionScheme/convectionScheme.C | 28 +++------ .../gaussConvectionScheme.H | 4 +- .../d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C | 8 +-- .../CoEulerDdtScheme/CoEulerDdtScheme.C | 16 ++--- .../CrankNicolsonDdtScheme.C | 14 ++--- .../CrankNicolsonDdtScheme.H | 3 +- .../EulerDdtScheme/EulerDdtScheme.C | 14 ++--- .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C | 16 ++--- .../backwardDdtScheme/backwardDdtScheme.C | 14 ++--- .../ddtSchemes/ddtScheme/ddtScheme.C | 6 +- .../localEulerDdtScheme/localEulerDdtScheme.C | 12 ++-- .../divSchemes/divScheme/divScheme.C | 8 +-- .../gradSchemes/gradScheme/gradScheme.C | 10 +--- .../cellLimitedGrad/cellLimitedGrad.H | 5 +- .../cellMDLimitedGrad/cellMDLimitedGrad.H | 5 +- .../faceLimitedGrad/faceLimitedGrad.H | 5 +- .../faceMDLimitedGrad/faceMDLimitedGrad.H | 5 +- .../laplacianScheme/laplacianScheme.C | 8 +-- .../CentredFitSnGrad/CentredFitSnGradData.C | 15 ++--- .../limitedSnGrad/limitedSnGrad.H | 3 +- .../snGradSchemes/snGradScheme/snGradScheme.C | 8 +-- .../fvMatrices/fvMatrix/fvMatrix.C | 55 ++++++----------- .../fvMatrices/fvMatrix/fvMatrixSolve.C | 3 +- .../cellToCell/extendedCellToCellStencil.C | 9 +-- .../globalIndexStencils/cellToCellStencil.C | 4 +- .../cellToFace/extendedCellToFaceStencil.C | 9 +-- .../extendedUpwindCellToFaceStencil.C | 14 ++--- .../FECCellToFaceStencil.C | 28 ++++----- .../globalIndexStencils/cellToFaceStencil.C | 4 +- .../faceToCell/extendedFaceToCellStencil.C | 9 +-- .../fvMesh/fvBoundaryMesh/fvBoundaryMesh.C | 14 ++--- src/finiteVolume/fvMesh/fvMesh.C | 14 ++--- src/finiteVolume/fvMesh/fvMeshGeometry.C | 18 +++--- .../fvMesh/fvMeshMapper/fvPatchMapper.C | 38 ++++-------- .../fvMesh/fvMeshMapper/fvSurfaceMapper.C | 23 +++----- .../fvMesh/fvMeshSubset/fvMeshSubset.C | 33 ++++------- .../regionCoupled/regionCoupledFvPatch.C | 16 +---- .../fvMesh/fvPatches/fvPatch/fvPatchNew.C | 4 +- .../singleCellFvMesh/singleCellFvMesh.C | 20 +++---- .../patchDistMethod/patchDistMethod.C | 2 +- .../fvMesh/wallDist/wallDist/wallDist.C | 2 +- .../interpolation/interpolationNew.C | 9 +-- .../interpolationCellPointI.H | 12 +--- .../interpolationCellPointWallModifiedI.H | 13 +--- .../interpolationPointMVC/pointMVCWeight.C | 12 +--- .../fvFieldMappers/MapFvSurfaceField.H | 12 +--- .../mapping/fvFieldMappers/MapFvVolField.H | 12 +--- .../limitedSchemes/Gamma/Gamma.H | 4 +- .../limitedSchemes/Limited/Limited.H | 4 +- .../limitedSchemes/Phi/Phi.H | 4 +- .../limitedSchemes/PhiScheme/PhiScheme.C | 9 +-- .../filteredLinear2/filteredLinear2.H | 6 +- .../filteredLinear2/filteredLinear2V.H | 6 +- .../filteredLinear3/filteredLinear3.H | 4 +- .../filteredLinear3/filteredLinear3V.H | 4 +- .../limitedCubic/limitedCubic.H | 4 +- .../limitedCubic/limitedCubicV.H | 4 +- .../limitedLinear/limitedLinear.H | 4 +- .../limitedSurfaceInterpolationScheme.C | 18 ++---- .../multivariateSurfaceInterpolationScheme.C | 7 +-- .../schemes/CoBlended/CoBlended.H | 12 ++-- .../schemes/FitData/FitData.C | 12 ++-- .../schemes/cellCoBlended/cellCoBlended.H | 10 ++-- .../schemes/clippedLinear/clippedLinear.H | 4 +- .../schemes/fixedBlended/fixedBlended.H | 6 +- .../surfaceInterpolationScheme.C | 14 ++--- 128 files changed, 492 insertions(+), 1307 deletions(-) diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C index 916345b07..42c6e0483 100644 --- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C +++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C @@ -289,16 +289,7 @@ Foam::MRFZone::MRFZone if (!cellZoneFound) { - FatalErrorIn - ( - "MRFZone" - "(" - "const word&, " - "const fvMesh&, " - "const dictionary&, " - "const word&" - ")" - ) + FatalErrorInFunction << "cannot find MRF cellZone " << cellZoneName_ << exit(FatalError); } diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C index 68002a02e..afcf8cef5 100644 --- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.C +++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModelNew.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,10 +57,8 @@ Foam::autoPtr Foam::SRF::SRFModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn - ( - "SRFModel::New(const fvMesh&)" - ) << "Unknown SRFModel type " + FatalErrorInFunction + << "Unknown SRFModel type " << modelType << nl << nl << "Valid SRFModel types are :" << nl << dictionaryConstructorTablePtr_->sortedToc() diff --git a/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C b/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C index 9a175a429..6f0742b26 100644 --- a/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C +++ b/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C @@ -103,15 +103,8 @@ bool Foam::adjustPhi } else if (mag(fixedMassOut - massIn)/totalFlux > 1e-8) { - FatalErrorIn - ( - "adjustPhi" - "(" - "surfaceScalarField&, " - "const volVectorField&," - "volScalarField&" - ")" - ) << "Continuity error cannot be removed by adjusting the" + FatalErrorInFunction + << "Continuity error cannot be removed by adjusting the" " outflow.\nPlease check the velocity boundary conditions" " and/or run potentialFoam to initialise the outflow." << nl << "Total flux : " << totalFlux << nl diff --git a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C index 46dcf8411..0d24e83a7 100644 --- a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C +++ b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C @@ -52,16 +52,8 @@ void Foam::setRefCell if (refCelli < 0 || refCelli >= field.mesh().nCells()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "void Foam::setRefCell\n" - " (\n" - " const volScalarField&,\n" - " const volScalarField&,\n" - " const dictionary&,\n" - " label& scalar&,\n" - " bool\n" - ")", dict ) << "Illegal master cellID " << refCelli << ". Should be 0.." << field.mesh().nCells() @@ -95,16 +87,8 @@ void Foam::setRefCell if (sumHasRef != 1) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "void Foam::setRefCell\n" - " (\n" - " const volScalarField&,\n" - " const volScalarField&,\n" - " const dictionary&,\n" - " label& scalar&,\n" - " bool\n" - " )", dict ) << "Unable to set reference cell for field " << field.name() << nl << " Reference point " << refPointName @@ -115,16 +99,8 @@ void Foam::setRefCell } else { - FatalIOErrorIn + FatalIOErrorInFunction ( - "void Foam::setRefCell\n" - " (\n" - " const volScalarField&,\n" - " const volScalarField&,\n" - " const dictionary&,\n" - " label& scalar&,\n" - " bool\n" - " )", dict ) << "Unable to set reference cell for field " << field.name() << nl diff --git a/src/finiteVolume/cfdTools/general/include/checkPatchFieldTypes.H b/src/finiteVolume/cfdTools/general/include/checkPatchFieldTypes.H index f50dc6f89..475cb4c19 100644 --- a/src/finiteVolume/cfdTools/general/include/checkPatchFieldTypes.H +++ b/src/finiteVolume/cfdTools/general/include/checkPatchFieldTypes.H @@ -1,6 +1,6 @@ if (!isA(k_.boundaryField()[patchi])) { - FatalErrorIn("wall-function evaluation") + FatalErrorInFunction << k_.boundaryField()[patchi].type() << " is the wrong k patchField type for wall-functions on patch " << curPatch.name() << nl @@ -10,7 +10,7 @@ if (!isA(k_.boundaryField()[patchi])) if (!isA(epsilon_.boundaryField()[patchi])) { - FatalErrorIn("wall-function evaluation") + FatalErrorInFunction << epsilon_.boundaryField()[patchi].type() << " is the wrong epsilon patchField type for wall-functions on patch " << curPatch.name() << nl diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C index 613248b05..b02cef7cc 100644 --- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C +++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.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 @@ -43,13 +43,8 @@ void Foam::porosityModel::adjustNegativeResistance(dimensionedVector& resist) if (maxCmpt < 0) { - FatalErrorIn - ( - "void Foam::porosityModel::adjustNegativeResistance" - "(" - "dimensionedVector&" - ")" - ) << "Negative resistances are invalid, resistance = " << resist + FatalErrorInFunction + << "Negative resistances are invalid, resistance = " << resist << exit(FatalError); } else @@ -123,17 +118,8 @@ Foam::porosityModel::porosityModel if (!foundZone && Pstream::master()) { - FatalErrorIn - ( - "Foam::porosityModel::porosityModel" - "(" - "const word&, " - "const word&, " - "const fvMesh&, " - "const dictionary&" - "const word&, " - ")" - ) << "cannot find porous cellZone " << zoneName_ + FatalErrorInFunction + << "cannot find porous cellZone " << zoneName_ << exit(FatalError); } } diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.C b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.C index d0fe20353..592ff1f96 100644 --- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.C +++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.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 @@ -45,16 +45,7 @@ Foam::autoPtr Foam::porosityModel::New if (cstrIter == meshConstructorTablePtr_->end()) { - FatalErrorIn - ( - "porosityModel::New" - "(" - "const word&, " - "const fvMesh&, " - "const dictionary&, " - "const word&" - ")" - ) + FatalErrorInFunction << "Unknown " << typeName << " type " << modelType << nl << nl << "Valid " << typeName << " types are:" << nl << meshConstructorTablePtr_->sortedToc() diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C index 5cd926913..da151d335 100644 --- a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C +++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C @@ -81,7 +81,7 @@ void Foam::solutionControl::read(const bool absTolOnly) } else { - FatalErrorIn("bool Foam::solutionControl::read()") + FatalErrorInFunction << "Residual data for " << iter().keyword() << " must be specified as a dictionary" << exit(FatalError); @@ -107,7 +107,7 @@ void Foam::solutionControl::read(const bool absTolOnly) } else { - FatalErrorIn("bool Foam::solutionControl::read()") + FatalErrorInFunction << "Residual data for " << iter().keyword() << " must be specified as a dictionary" << exit(FatalError); diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C index 9f25a143e..401e45688 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.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 @@ -147,12 +147,8 @@ Foam::calculatedFvPatchField::valueInternalCoeffs const tmp& ) const { - FatalErrorIn - ( - "calculatedFvPatchField::" - "valueInternalCoeffs(const tmp&) const" - ) << "\n " - "valueInternalCoeffs cannot be called for a calculatedFvPatchField" + FatalErrorInFunction + << "cannot be called for a calculatedFvPatchField" << "\n on patch " << this->patch().name() << " of field " << this->dimensionedInternalField().name() << " in file " << this->dimensionedInternalField().objectPath() @@ -171,12 +167,8 @@ Foam::calculatedFvPatchField::valueBoundaryCoeffs const tmp& ) const { - FatalErrorIn - ( - "calculatedFvPatchField::" - "valueBoundaryCoeffs(const tmp&) const" - ) << "\n " - "valueBoundaryCoeffs cannot be called for a calculatedFvPatchField" + FatalErrorInFunction + << "cannot be called for a calculatedFvPatchField" << "\n on patch " << this->patch().name() << " of field " << this->dimensionedInternalField().name() << " in file " << this->dimensionedInternalField().objectPath() @@ -192,13 +184,8 @@ template Foam::tmp > Foam::calculatedFvPatchField::gradientInternalCoeffs() const { - FatalErrorIn - ( - "calculatedFvPatchField::" - "gradientInternalCoeffs() const" - ) << "\n " - "gradientInternalCoeffs cannot be called for a " - "calculatedFvPatchField" + FatalErrorInFunction + << "cannot be called for a calculatedFvPatchField" << "\n on patch " << this->patch().name() << " of field " << this->dimensionedInternalField().name() << " in file " << this->dimensionedInternalField().objectPath() @@ -214,13 +201,8 @@ template Foam::tmp > Foam::calculatedFvPatchField::gradientBoundaryCoeffs() const { - FatalErrorIn - ( - "calculatedFvPatchField::" - "gradientBoundaryCoeffs() const" - ) << "\n " - "gradientBoundaryCoeffs cannot be called for a " - "calculatedFvPatchField" + FatalErrorInFunction + << "cannot be called for a calculatedFvPatchField" << "\n on patch " << this->patch().name() << " of field " << this->dimensionedInternalField().name() << " in file " << this->dimensionedInternalField().objectPath() diff --git a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C index 49bfa5961..200dabf29 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.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 @@ -58,16 +58,8 @@ Foam::directionMixedFvPatchField::directionMixedFvPatchField { if (notNull(iF) && mapper.hasUnmapped()) { - WarningIn - ( - "directionMixedFvPatchField::directionMixedFvPatchField\n" - "(\n" - " const directionMixedFvPatchField&,\n" - " const fvPatch&,\n" - " const DimensionedField&,\n" - " const fvPatchFieldMapper&\n" - ")\n" - ) << "On field " << iF.name() << " patch " << p.name() + WarningInFunction + << "On field " << iF.name() << " patch " << p.name() << " patchField " << this->type() << " : mapper does not map all values." << nl << " To avoid this warning fully specify the mapping in derived" diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C index 33974a547..112ddb42f 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.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 @@ -59,16 +59,8 @@ fixedGradientFvPatchField::fixedGradientFvPatchField { if (notNull(iF) && mapper.hasUnmapped()) { - WarningIn - ( - "fixedGradientFvPatchField::fixedGradientFvPatchField\n" - "(\n" - " const fixedGradientFvPatchField&,\n" - " const fvPatch&,\n" - " const DimensionedField&,\n" - " const fvPatchFieldMapper&\n" - ")\n" - ) << "On field " << iF.name() << " patch " << p.name() + WarningInFunction + << "On field " << iF.name() << " patch " << p.name() << " patchField " << this->type() << " : mapper does not map all values." << nl << " To avoid this warning fully specify the mapping in derived" diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C index 951cdda5a..6ab4ce6e1 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.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 @@ -68,16 +68,8 @@ fixedValueFvPatchField::fixedValueFvPatchField { if (notNull(iF) && mapper.hasUnmapped()) { - WarningIn - ( - "fixedValueFvPatchField::fixedValueFvPatchField\n" - "(\n" - " const fixedValueFvPatchField&,\n" - " const fvPatch&,\n" - " const DimensionedField&,\n" - " const fvPatchFieldMapper&\n" - ")\n" - ) << "On field " << iF.name() << " patch " << p.name() + WarningInFunction + << "On field " << iF.name() << " patch " << p.name() << " patchField " << this->type() << " : mapper does not map all values." << nl << " To avoid this warning fully specify the mapping in derived" diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C index 68c82a493..23eef7e24 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.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 @@ -62,16 +62,8 @@ mixedFvPatchField::mixedFvPatchField { if (notNull(iF) && mapper.hasUnmapped()) { - WarningIn - ( - "mixedFvPatchField::mixedFvPatchField\n" - "(\n" - " const mixedFvPatchField&,\n" - " const fvPatch&,\n" - " const DimensionedField&,\n" - " const fvPatchFieldMapper&\n" - ")\n" - ) << "On field " << iF.name() << " patch " << p.name() + WarningInFunction + << "On field " << iF.name() << " patch " << p.name() << " patchField " << this->type() << " : mapper does not map all values." << nl << " To avoid this warning fully specify the mapping in derived" diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C index 0e23db6c3..9090ec02b 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.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 @@ -59,16 +59,7 @@ cyclicFvPatchField::cyclicFvPatchField { if (!isA(this->patch())) { - FatalErrorIn - ( - "cyclicFvPatchField::cyclicFvPatchField" - "(" - "const cyclicFvPatchField& ," - "const fvPatch&, " - "const DimensionedField&, " - "const fvPatchFieldMapper&" - ")" - ) << " patch type '" << p.type() + FatalErrorInFunction << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() << " of field " << this->dimensionedInternalField().name() @@ -91,14 +82,8 @@ cyclicFvPatchField::cyclicFvPatchField { if (!isA(p)) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "cyclicFvPatchField::cyclicFvPatchField" - "(" - "const fvPatch&, " - "const Field&, " - "const dictionary&" - ")", dict ) << " patch type '" << p.type() << "' not constraint type '" << typeName << "'" diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C index 9cdbff68e..33db8bfe6 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,16 +56,7 @@ Foam::cyclicACMIFvPatchField::cyclicACMIFvPatchField { if (!isA(this->patch())) { - FatalErrorIn - ( - "cyclicACMIFvPatchField::cyclicACMIFvPatchField" - "(" - "const cyclicACMIFvPatchField& ," - "const fvPatch&, " - "const DimensionedField&, " - "const fvPatchFieldMapper&" - ")" - ) << " patch type '" << p.type() + FatalErrorInFunction << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() << " of field " << this->dimensionedInternalField().name() @@ -89,14 +80,8 @@ Foam::cyclicACMIFvPatchField::cyclicACMIFvPatchField { if (!isA(p)) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "cyclicACMIFvPatchField::cyclicACMIFvPatchField" - "(" - "const fvPatch&, " - "const DimensionedField&, " - "const dictionary&" - ")", dict ) << " patch type '" << p.type() << "' not constraint type '" << typeName << "'" diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C index 3fe24cfad..b4d804c97 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.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 @@ -53,16 +53,7 @@ Foam::cyclicAMIFvPatchField::cyclicAMIFvPatchField { if (!isA(this->patch())) { - FatalErrorIn - ( - "cyclicAMIFvPatchField::cyclicAMIFvPatchField" - "(" - "const cyclicAMIFvPatchField& ," - "const fvPatch&, " - "const DimensionedField&, " - "const fvPatchFieldMapper&" - ")" - ) << " patch type '" << p.type() + FatalErrorInFunction << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() << " of field " << this->dimensionedInternalField().name() @@ -86,14 +77,8 @@ Foam::cyclicAMIFvPatchField::cyclicAMIFvPatchField { if (!isA(p)) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "cyclicAMIFvPatchField::cyclicAMIFvPatchField" - "(" - "const fvPatch&, " - "const DimensionedField&, " - "const dictionary&" - ")", dict ) << " patch type '" << p.type() << "' not constraint type '" << typeName << "'" diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C index 0f93df198..49357e3bf 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.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 @@ -26,15 +26,10 @@ License #include "emptyFvPatchField.H" #include "fvPatchFieldMapper.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -emptyFvPatchField::emptyFvPatchField +Foam::emptyFvPatchField::emptyFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -45,7 +40,7 @@ emptyFvPatchField::emptyFvPatchField template -emptyFvPatchField::emptyFvPatchField +Foam::emptyFvPatchField::emptyFvPatchField ( const emptyFvPatchField&, const fvPatch& p, @@ -57,16 +52,7 @@ emptyFvPatchField::emptyFvPatchField { if (!isType(p)) { - FatalErrorIn - ( - "emptyFvPatchField::emptyFvPatchField\n" - "(\n" - " const emptyFvPatchField&,\n" - " const fvPatch& p,\n" - " const DimensionedField& iF,\n" - " const fvPatchFieldMapper& mapper\n" - ")\n" - ) << "\n patch type '" << p.type() + FatalErrorInFunction << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() << " of field " << this->dimensionedInternalField().name() @@ -77,7 +63,7 @@ emptyFvPatchField::emptyFvPatchField template -emptyFvPatchField::emptyFvPatchField +Foam::emptyFvPatchField::emptyFvPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -88,14 +74,8 @@ emptyFvPatchField::emptyFvPatchField { if (!isType(p)) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "emptyFvPatchField::emptyFvPatchField\n" - "(\n" - " const fvPatch& p,\n" - " const Field& field,\n" - " const dictionary& dict\n" - ")\n", dict ) << "\n patch type '" << p.type() << "' not constraint type '" << typeName << "'" @@ -108,7 +88,7 @@ emptyFvPatchField::emptyFvPatchField template -emptyFvPatchField::emptyFvPatchField +Foam::emptyFvPatchField::emptyFvPatchField ( const emptyFvPatchField& ptf ) @@ -123,7 +103,7 @@ emptyFvPatchField::emptyFvPatchField template -emptyFvPatchField::emptyFvPatchField +Foam::emptyFvPatchField::emptyFvPatchField ( const emptyFvPatchField& ptf, const DimensionedField& iF @@ -136,28 +116,11 @@ emptyFvPatchField::emptyFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void emptyFvPatchField::updateCoeffs() +void Foam::emptyFvPatchField::updateCoeffs() { - //- Check moved to checkMesh. Test here breaks down if multiple empty - // patches. - //if - //( - // this->patch().patch().size() - // % this->dimensionedInternalField().mesh().nCells() - //) - //{ - // FatalErrorIn("emptyFvPatchField::updateCoeffs()") - // << "This mesh contains patches of type empty but is not" - // << "1D or 2D\n" - // " by virtue of the fact that the number of faces of this\n" - // " empty patch is not divisible by the number of cells." - // << exit(FatalError); - //} + // Check moved to checkMesh. + // Test here fails if multiple empty patches. } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C index 8d81c408f..287bebfb3 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.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,16 +88,7 @@ Foam::processorFvPatchField::processorFvPatchField { if (!isA(this->patch())) { - FatalErrorIn - ( - "processorFvPatchField::processorFvPatchField\n" - "(\n" - " const processorFvPatchField& ptf,\n" - " const fvPatch& p,\n" - " const DimensionedField& iF,\n" - " const fvPatchFieldMapper& mapper\n" - ")\n" - ) << "\n patch type '" << p.type() + FatalErrorInFunction << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() << " of field " << this->dimensionedInternalField().name() @@ -106,7 +97,7 @@ Foam::processorFvPatchField::processorFvPatchField } if (debug && !ptf.ready()) { - FatalErrorIn("processorFvPatchField::processorFvPatchField(..)") + FatalErrorInFunction << "On patch " << procPatch_.name() << " outstanding request." << abort(FatalError); } @@ -132,14 +123,8 @@ Foam::processorFvPatchField::processorFvPatchField { if (!isA(p)) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "processorFvPatchField::processorFvPatchField\n" - "(\n" - " const fvPatch& p,\n" - " const Field& field,\n" - " const dictionary& dict\n" - ")\n", dict ) << "\n patch type '" << p.type() << "' not constraint type '" << typeName << "'" @@ -169,7 +154,7 @@ Foam::processorFvPatchField::processorFvPatchField { if (debug && !ptf.ready()) { - FatalErrorIn("processorFvPatchField::processorFvPatchField(..)") + FatalErrorInFunction << "On patch " << procPatch_.name() << " outstanding request." << abort(FatalError); } @@ -194,7 +179,7 @@ Foam::processorFvPatchField::processorFvPatchField { if (debug && !ptf.ready()) { - FatalErrorIn("processorFvPatchField::processorFvPatchField(..)") + FatalErrorInFunction << "On patch " << procPatch_.name() << " outstanding request." << abort(FatalError); } @@ -216,7 +201,7 @@ Foam::processorFvPatchField::patchNeighbourField() const { if (debug && !this->ready()) { - FatalErrorIn("processorFvPatchField::patchNeighbourField()") + FatalErrorInFunction << "On patch " << procPatch_.name() << " outstanding request." << abort(FatalError); @@ -333,10 +318,8 @@ void Foam::processorFvPatchField::initInterfaceMatrixUpdate // Fast path. if (debug && !this->ready()) { - FatalErrorIn - ( - "processorFvPatchField::initInterfaceMatrixUpdate(..)" - ) << "On patch " << procPatch_.name() + FatalErrorInFunction + << "On patch " << procPatch_.name() << " outstanding request." << abort(FatalError); } @@ -454,10 +437,8 @@ void Foam::processorFvPatchField::initInterfaceMatrixUpdate // Fast path. if (debug && !this->ready()) { - FatalErrorIn - ( - "processorFvPatchField::initInterfaceMatrixUpdate(..)" - ) << "On patch " << procPatch_.name() + FatalErrorInFunction + << "On patch " << procPatch_.name() << " outstanding request." << abort(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C index 1164f3146..40ba0865f 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.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 @@ -49,10 +49,8 @@ void processorFvPatchField::initInterfaceMatrixUpdate // Fast path. if (debug && !this->ready()) { - FatalErrorIn - ( - "processorFvPatchField::initInterfaceMatrixUpdate(..)" - ) << "On patch " << procPatch_.name() + FatalErrorInFunction + << "On patch " << procPatch_.name() << " outstanding request." << abort(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C index 3a0f7fd1b..59483e6ee 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.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 @@ -72,16 +72,7 @@ Foam::processorCyclicFvPatchField::processorCyclicFvPatchField { if (!isType(this->patch())) { - FatalErrorIn - ( - "processorCyclicFvPatchField::processorCyclicFvPatchField\n" - "(\n" - " const processorCyclicFvPatchField& ptf,\n" - " const fvPatch& p,\n" - " const DimensionedField& iF,\n" - " const fvPatchFieldMapper& mapper\n" - ")\n" - ) << "\n patch type '" << p.type() + FatalErrorInFunction << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() << " of field " << this->dimensionedInternalField().name() @@ -105,14 +96,8 @@ Foam::processorCyclicFvPatchField::processorCyclicFvPatchField { if (!isType(p)) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "processorCyclicFvPatchField::processorCyclicFvPatchField\n" - "(\n" - " const fvPatch& p,\n" - " const Field& field,\n" - " const dictionary& dict\n" - ")\n", dict ) << "\n patch type '" << p.type() << "' not constraint type '" << typeName << "'" @@ -124,15 +109,8 @@ Foam::processorCyclicFvPatchField::processorCyclicFvPatchField if (Pstream::defaultCommsType == Pstream::scheduled) { - WarningIn - ( - "processorCyclicFvPatchField::processorCyclicFvPatchField\n" - "(\n" - " const fvPatch& p,\n" - " const DimensionedField& iF,\n" - " const dictionary& dict\n" - ")\n" - ) << "Scheduled communication with split cyclics not supported." + WarningInFunction + << "Scheduled communication with split cyclics not supported." << endl; } } diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C index 870795327..c6a2dc126 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.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 @@ -56,16 +56,7 @@ symmetryFvPatchField::symmetryFvPatchField { if (!isType(this->patch())) { - FatalErrorIn - ( - "symmetryFvPatchField::symmetryFvPatchField\n" - "(\n" - " const symmetryFvPatchField& ptf,\n" - " const fvPatch& p,\n" - " const DimensionedField& iF,\n" - " const fvPatchFieldMapper& mapper\n" - ")\n" - ) << "\n patch type '" << p.type() + FatalErrorInFunction << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() << " of field " << this->dimensionedInternalField().name() @@ -87,14 +78,8 @@ symmetryFvPatchField::symmetryFvPatchField { if (!isType(p)) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "symmetryFvPatchField::symmetryFvPatchField\n" - "(\n" - " const fvPatch& p,\n" - " const Field& field,\n" - " const dictionary& dict\n" - ")\n", dict ) << "\n patch type '" << p.type() << "' not constraint type '" << typeName << "'" diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C index 053a56689..7ab5a129d 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,16 +54,7 @@ Foam::symmetryPlaneFvPatchField::symmetryPlaneFvPatchField { if (!isType(this->patch())) { - FatalErrorIn - ( - "symmetryPlaneFvPatchField::symmetryPlaneFvPatchField\n" - "(\n" - " const symmetryPlaneFvPatchField& ptf,\n" - " const fvPatch& p,\n" - " const DimensionedField& iF,\n" - " const fvPatchFieldMapper& mapper\n" - ")\n" - ) << "\n patch type '" << p.type() + FatalErrorInFunction << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() << " of field " << this->dimensionedInternalField().name() @@ -86,14 +77,8 @@ Foam::symmetryPlaneFvPatchField::symmetryPlaneFvPatchField { if (!isType(p)) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "symmetryPlaneFvPatchField::symmetryPlaneFvPatchField\n" - "(\n" - " const fvPatch& p,\n" - " const Field& field,\n" - " const dictionary& dict\n" - ")\n", dict ) << "\n patch type '" << p.type() << "' not constraint type '" << typeName << "'" diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C index 73955b7c2..03f382fa2 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.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 @@ -56,16 +56,7 @@ Foam::wedgeFvPatchField::wedgeFvPatchField { if (!isType(this->patch())) { - FatalErrorIn - ( - "wedgeFvPatchField::wedgeFvPatchField\n" - "(\n" - " const wedgeFvPatchField& ptf,\n" - " const fvPatch& p,\n" - " const DimensionedField& iF,\n" - " const fvPatchFieldMapper& mapper\n" - ")\n" - ) << "\n patch type '" << p.type() + FatalErrorInFunction << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() << " of field " << this->dimensionedInternalField().name() @@ -87,14 +78,8 @@ Foam::wedgeFvPatchField::wedgeFvPatchField { if (!isType(p)) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "wedgeFvPatchField::wedgeFvPatchField\n" - "(\n" - " const fvPatch& p,\n" - " const Field& field,\n" - " dictionary& dict\n" - ")\n", dict ) << "\n patch type '" << p.type() << "' not constraint type '" << typeName << "'" diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C index 86c7aaa14..a2c2dc888 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.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 @@ -106,15 +106,8 @@ Foam::advectiveFvPatchField::advectiveFvPatchField if (lInf_ < 0.0) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "advectiveFvPatchField::" - "advectiveFvPatchField" - "(" - "const fvPatch&, " - "const DimensionedField&, " - "const dictionary&" - ")", dict ) << "unphysical lInf specified (lInf < 0)" << nl << " on patch " << this->patch().name() @@ -252,8 +245,7 @@ void Foam::advectiveFvPatchField::updateCoeffs() } else { - FatalErrorIn("advectiveFvPatchField::updateCoeffs()") - << " Unsupported temporal differencing scheme : " + FatalErrorInFunction << ddtScheme << nl << " on patch " << this->patch().name() << " of field " << this->dimensionedInternalField().name() @@ -285,10 +277,7 @@ void Foam::advectiveFvPatchField::updateCoeffs() } else { - FatalErrorIn - ( - "advectiveFvPatchField::updateCoeffs()" - ) << " Unsupported temporal differencing scheme : " + FatalErrorInFunction << ddtScheme << "\n on patch " << this->patch().name() << " of field " << this->dimensionedInternalField().name() diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C index f930a1ef5..a62cbc38c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -280,12 +280,7 @@ void Foam::externalCoupledMixedFvPatchField::wait() const { if (totalTime > timeOut_) { - FatalErrorIn - ( - "void " - "Foam::externalCoupledMixedFvPatchField::wait() " - "const" - ) + FatalErrorInFunction << "Wait time exceeded time out time of " << timeOut_ << " s" << abort(FatalError); } @@ -327,14 +322,7 @@ void Foam::externalCoupledMixedFvPatchField::initialiseRead { if (!is.good()) { - FatalErrorIn - ( - "void Foam::externalCoupledMixedFvPatchField::" - "initialiseRead" - "(" - "IFstream&" - ") const" - ) + FatalErrorInFunction << "Unable to open data transfer file " << is.name() << " for patch " << this->patch().name() << exit(FatalError); @@ -352,14 +340,7 @@ void Foam::externalCoupledMixedFvPatchField::initialiseRead } else { - FatalErrorIn - ( - "void Foam::externalCoupledMixedFvPatchField::" - "initialiseRead" - "(" - "IFstream&" - ") const" - ) + FatalErrorInFunction << "Unable to scan forward to appropriate read position for " << "data transfer file " << is.name() << " for patch " << this->patch().name() @@ -394,13 +375,7 @@ void Foam::externalCoupledMixedFvPatchField::readData } else { - FatalErrorIn - ( - "void Foam::externalCoupledMixedFvPatchField::readData" - "(" - "const fileName&" - ")" - ) + FatalErrorInFunction << "Insufficient data for patch " << this->patch().name() << " in file " << is.name() diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C index 9e0726e6a..dab997711 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.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 @@ -148,7 +148,7 @@ void Foam::fanPressureFvPatchScalarField::updateCoeffs() } else { - FatalErrorIn("fanPressureFvPatchScalarField::updateCoeffs()") + FatalErrorInFunction << "dimensions of phi are not correct" << "\n on patch " << patch().name() << " of field " << dimensionedInternalField().name() diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C index 0a5a4b480..936e702aa 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.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 @@ -148,7 +148,7 @@ void Foam::fixedFluxPressureFvPatchScalarField::updateCoeffs() if (curTimeIndex_ != this->db().time().timeIndex()) { - FatalErrorIn("fixedFluxPressureFvPatchScalarField::updateCoeffs()") + FatalErrorInFunction << "updateCoeffs(const scalarField& snGradp) MUST be called before" " updateCoeffs() or evaluate() to set the boundary gradient." << exit(FatalError); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C index b5948bed4..083810898 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.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 @@ -88,12 +88,8 @@ flowRateInletVelocityFvPatchVectorField } else { - FatalIOErrorIn + FatalIOErrorInFunction ( - "flowRateInletVelocityFvPatchVectorField::" - "flowRateInletVelocityFvPatchVectorField" - "(const fvPatch&, const DimensionedField&," - " const dictionary&)", dict ) << "Please supply either 'volumetricFlowRate' or" << " 'massFlowRate' and 'rho'" << exit(FatalIOError); @@ -179,10 +175,8 @@ void Foam::flowRateInletVelocityFvPatchVectorField::updateCoeffs() // Use constant density if (rhoInlet_ < 0) { - FatalErrorIn - ( - "flowRateInletVelocityFvPatchVectorField::updateCoeffs()" - ) << "Did not find registered density field " << rhoName_ + FatalErrorInFunction + << "Did not find registered density field " << rhoName_ << " and no constant density 'rhoInlet' specified" << exit(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C index a3f738739..ac76973cb 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.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 @@ -124,10 +124,7 @@ void Foam::fluxCorrectedVelocityFvPatchVectorField::evaluate } else { - FatalErrorIn - ( - "fluxCorrectedVelocityFvPatchVectorField::evaluate()" - ) + FatalErrorInFunction << "dimensions of phi are incorrect\n" << " on patch " << this->patch().name() << " of field " << this->dimensionedInternalField().name() diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C index c2f272244..b50eac91b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C @@ -141,7 +141,7 @@ void Foam::freestreamPressureFvPatchScalarField::updateCoeffs() } else { - FatalErrorIn("freestreamPressureFvPatchScalarField::updateCoeffs()") + FatalErrorInFunction << "dimensions of phi are not correct" << "\n on patch " << this->patch().name() << " of field " << this->dimensionedInternalField().name() diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C index 03edc6c48..5e8c48df9 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -243,10 +243,8 @@ tmp > mappedPatchFieldBase::mappedField() const if (nbrPatchID < 0) { - FatalErrorIn - ( - "void mappedPatchFieldBase::updateCoeffs()" - )<< "Unable to find sample patch " << mapper_.samplePatch() + FatalErrorInFunction + << "Unable to find sample patch " << mapper_.samplePatch() << " in region " << mapper_.sampleRegion() << " for patch " << patchField_.patch().name() << nl << abort(FatalError); @@ -284,10 +282,8 @@ tmp > mappedPatchFieldBase::mappedField() const } default: { - FatalErrorIn - ( - "mappedPatchFieldBase::updateCoeffs()" - )<< "Unknown sampling mode: " << mapper_.mode() + FatalErrorInFunction + << "Unknown sampling mode: " << mapper_.mode() << nl << abort(FatalError); } } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C index 680d3f89f..ba3a0e020 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.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 @@ -121,10 +121,8 @@ void Foam::mappedFixedInternalValueFvPatchField::updateCoeffs() { case mappedPatchBase::NEARESTCELL: { - FatalErrorIn - ( - "void mappedFixedValueFvPatchField::updateCoeffs()" - ) << "Cannot apply " + FatalErrorInFunction + << "Cannot apply " << mappedPatchBase::sampleModeNames_ [ mappedPatchBase::NEARESTCELL @@ -171,7 +169,7 @@ void Foam::mappedFixedInternalValueFvPatchField::updateCoeffs() } default: { - FatalErrorIn("mappedFixedValueFvPatchField::updateCoeffs()") + FatalErrorInFunction << "Unknown sampling mode: " << mpp.mode() << abort(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C index 851344194..0100f0973 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.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,10 +107,7 @@ const mappedPatchBase& mappedFixedValueFvPatchField::mapper { if (!isA(p.patch())) { - FatalErrorIn - ( - "mappedFixedValueFvPatchField::mapper()" - ) << "\n patch type '" << p.patch().type() + FatalErrorInFunction << "' not type '" << mappedPatchBase::typeName << "'" << "\n for patch " << p.patch().name() << " of field " << iF.name() diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C index 63aadec6a..ecd04b5e7 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.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 @@ -165,10 +165,8 @@ void Foam::mappedFlowRateFvPatchVectorField::updateCoeffs() } else { - FatalErrorIn - ( - "mappedFlowRateFvPatchVectorField::updateCoeffs()" - ) << "dimensions of " << phiName_ << " are incorrect" << nl + FatalErrorInFunction + << "dimensions of " << phiName_ << " are incorrect" << nl << " on patch " << this->patch().name() << " of field " << this->dimensionedInternalField().name() << " in file " << this->dimensionedInternalField().objectPath() diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C index 00be69fc8..713b94492 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.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,17 +59,8 @@ mappedVelocityFluxFixedValueFvPatchField { if (!isA(this->patch().patch())) { - FatalErrorIn - ( - "mappedVelocityFluxFixedValueFvPatchField::" - "mappedVelocityFluxFixedValueFvPatchField" - "(" - "const mappedVelocityFluxFixedValueFvPatchField&, " - "const fvPatch&, " - "const DimensionedField&, " - "const fvPatchFieldMapper&" - ")" - ) << "Patch type '" << p.type() + FatalErrorInFunction + << "Patch type '" << p.type() << "' not type '" << mappedPatchBase::typeName << "'" << " for patch " << p.name() << " of field " << dimensionedInternalField().name() @@ -92,16 +83,8 @@ mappedVelocityFluxFixedValueFvPatchField { if (!isA(this->patch().patch())) { - FatalErrorIn - ( - "mappedVelocityFluxFixedValueFvPatchField::" - "mappedVelocityFluxFixedValueFvPatchField" - "(" - "const fvPatch&, " - "const DimensionedField&, " - "const dictionary&" - ")" - ) << "Patch type '" << p.type() + FatalErrorInFunction + << "Patch type '" << p.type() << "' not type '" << mappedPatchBase::typeName << "'" << " for patch " << p.name() << " of field " << dimensionedInternalField().name() @@ -115,16 +98,8 @@ mappedVelocityFluxFixedValueFvPatchField ); if (mpp.mode() == mappedPolyPatch::NEARESTCELL) { - FatalErrorIn - ( - "mappedVelocityFluxFixedValueFvPatchField::" - "mappedVelocityFluxFixedValueFvPatchField" - "(" - "const fvPatch&, " - "const DimensionedField&, " - "const dictionary&" - ")" - ) << "Patch " << p.name() + FatalErrorInFunction + << "Patch " << p.name() << " of type '" << p.type() << "' can not be used in 'nearestCell' mode" << " of field " << dimensionedInternalField().name() @@ -234,11 +209,8 @@ void Foam::mappedVelocityFluxFixedValueFvPatchField::updateCoeffs() } default: { - FatalErrorIn - ( - "mappedVelocityFluxFixedValueFvPatchField::" - "updateCoeffs()" - ) << "patch can only be used in NEARESTPATCHFACE, " + FatalErrorInFunction + << "patch can only be used in NEARESTPATCHFACE, " << "NEARESTPATCHFACEAMI or NEARESTFACE mode" << nl << abort(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C index 46c021c7f..7804ed43f 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.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 @@ -126,10 +126,8 @@ void Foam::outletMappedUniformInletFvPatchField::updateCoeffs() if (outletPatchID < 0) { - FatalErrorIn - ( - "void outletMappedUniformInletFvPatchField::updateCoeffs()" - ) << "Unable to find outlet patch " << outletPatchName_ + FatalErrorInFunction + << "Unable to find outlet patch " << outletPatchName_ << abort(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C index 14e704c50..a6a18a61c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.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 @@ -169,11 +169,8 @@ void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::updateCoeffs() } else { - FatalErrorIn - ( - "pressureDirectedInletOutletVelocityFvPatchVectorField::" - "updateCoeffs()" - ) << "dimensions of phi are not correct" + FatalErrorInFunction + << "dimensions of phi are not correct" << "\n on patch " << this->patch().name() << " of field " << this->dimensionedInternalField().name() << " in file " << this->dimensionedInternalField().objectPath() diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C index 11b8f7f32..d5a74f7a9 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.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 @@ -162,10 +162,8 @@ void Foam::pressureDirectedInletVelocityFvPatchVectorField::updateCoeffs() } else { - FatalErrorIn - ( - "pressureDirectedInletVelocityFvPatchVectorField::updateCoeffs()" - ) << "dimensions of phi are not correct" + FatalErrorInFunction + << "dimensions of phi are not correct" << "\n on patch " << this->patch().name() << " of field " << this->dimensionedInternalField().name() << " in file " << this->dimensionedInternalField().objectPath() diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C index 0eb6a5203..0e1535047 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.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,11 +143,8 @@ void Foam::pressureInletOutletParSlipVelocityFvPatchVectorField::updateCoeffs() } else { - FatalErrorIn - ( - "pressureInletOutletParSlipVelocityFvPatchVectorField::" - "updateCoeffs()" - ) << "dimensions of phi are not correct" << nl + FatalErrorInFunction + << "dimensions of phi are not correct" << nl << " on patch " << this->patch().name() << " of field " << this->dimensionedInternalField().name() << " in file " << this->dimensionedInternalField().objectPath() diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C index 3482deefb..08a6334ec 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.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 @@ -130,7 +130,7 @@ void Foam::pressureInletVelocityFvPatchVectorField::updateCoeffs() } else { - FatalErrorIn("pressureInletVelocityFvPatchVectorField::updateCoeffs()") + FatalErrorInFunction << "dimensions of phi are not correct" << "\n on patch " << this->patch().name() << " of field " << this->dimensionedInternalField().name() diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C index 52b7d6529..70ce9aded 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.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 @@ -139,11 +139,8 @@ void Foam::pressureNormalInletOutletVelocityFvPatchVectorField::updateCoeffs() } else { - FatalErrorIn - ( - "pressureNormalInletOutletVelocityFvPatchVectorField::" - "updateCoeffs()" - ) << "dimensions of phi are not correct" + FatalErrorInFunction + << "dimensions of phi are not correct" << "\n on patch " << this->patch().name() << " of field " << this->dimensionedInternalField().name() << " in file " << this->dimensionedInternalField().objectPath() diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C index 2f2195c8f..2d4b1691c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.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 @@ -107,11 +107,8 @@ supersonicFreestreamFvPatchVectorField if (pInf_ < SMALL) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "supersonicFreestreamFvPatchVectorField::" - "supersonicFreestreamFvPatchVectorField" - "(const fvPatch&, const vectorField&, const dictionary&)", dict ) << " unphysical pInf specified (pInf <= 0.0)" << "\n on patch " << this->patch().name() @@ -183,10 +180,7 @@ void Foam::supersonicFreestreamFvPatchVectorField::updateCoeffs() if (MachInf < 1.0) { - FatalErrorIn - ( - "supersonicFreestreamFvPatchVectorField::updateCoeffs()" - ) << " MachInf < 1.0, free stream must be supersonic" + FatalErrorInFunction << "\n on patch " << this->patch().name() << " of field " << this->dimensionedInternalField().name() << " in file " << this->dimensionedInternalField().objectPath() @@ -283,10 +277,8 @@ void Foam::supersonicFreestreamFvPatchVectorField::updateCoeffs() } else // If subsonic { - FatalErrorIn - ( - "supersonicFreestreamFvPatchVectorField::updateCoeffs()" - ) << "unphysical subsonic inflow has been generated" + FatalErrorInFunction + << "unphysical subsonic inflow has been generated" << "\n on patch " << this->patch().name() << " of field " << this->dimensionedInternalField().name() << " in file " diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C index 859006cd4..e86d92d5d 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.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,10 +155,8 @@ void Foam::swirlFlowRateInletVelocityFvPatchVectorField::updateCoeffs() } else { - FatalErrorIn - ( - "swirlFlowRateInletVelocityFvPatchVectorField::updateCoeffs()" - ) << "dimensions of " << phiName_ << " are incorrect" << nl + FatalErrorInFunction + << "dimensions of " << phiName_ << " are incorrect" << nl << " on patch " << this->patch().name() << " of field " << this->dimensionedInternalField().name() << " in file " << this->dimensionedInternalField().objectPath() diff --git a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C index 3318c15dd..20690258a 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C @@ -213,7 +213,7 @@ void Foam::syringePressureFvPatchScalarField::updateCoeffs() } else { - FatalErrorIn("syringePressureFvPatchScalarField::updateCoeffs()") + FatalErrorInFunction << "dimensions of phi are not correct" << "\n on patch " << this->patch().name() << " of field " << this->dimensionedInternalField().name() diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C index 48c3af199..f52abedfd 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.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 @@ -127,15 +127,8 @@ timeVaryingMappedFixedValueFvPatchField && mapMethod_ != "nearest" ) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "timeVaryingMappedFixedValueFvPatchField::\n" - "timeVaryingMappedFixedValueFvPatchField\n" - "(\n" - " const fvPatch&\n" - " const DimensionedField&\n" - " const dictionary&\n" - ")\n", dict ) << "mapMethod should be one of 'planarInterpolation'" << ", 'nearest'" << exit(FatalIOError); @@ -339,10 +332,8 @@ void timeVaryingMappedFixedValueFvPatchField::checkTable() if (!foundTime) { - FatalErrorIn - ( - "timeVaryingMappedFixedValueFvPatchField::checkTable()" - ) << "Cannot find starting sampling values for current time " + FatalErrorInFunction + << "Cannot find starting sampling values for current time " << this->db().time().value() << nl << "Have sampling values for times " << pointToPointPlanarInterpolation::timeNames(sampleTimes_) << nl @@ -405,11 +396,8 @@ void timeVaryingMappedFixedValueFvPatchField::checkTable() if (vals.size() != mapperPtr_().sourceSize()) { - FatalErrorIn - ( - "timeVaryingMappedFixedValueFvPatchField::" - "checkTable()" - ) << "Number of values (" << vals.size() + FatalErrorInFunction + << "Number of values (" << vals.size() << ") differs from the number of points (" << mapperPtr_().sourceSize() << ") in file " << vals.objectPath() << exit(FatalError); @@ -463,11 +451,8 @@ void timeVaryingMappedFixedValueFvPatchField::checkTable() if (vals.size() != mapperPtr_().sourceSize()) { - FatalErrorIn - ( - "timeVaryingMappedFixedValueFvPatchField::" - "checkTable()" - ) << "Number of values (" << vals.size() + FatalErrorInFunction + << "Number of values (" << vals.size() << ") differs from the number of points (" << mapperPtr_().sourceSize() << ") in file " << vals.objectPath() << exit(FatalError); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C index c6af05f25..b7b46003c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.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 @@ -204,10 +204,8 @@ void Foam::totalPressureFvPatchScalarField::updateCoeffs } else { - FatalErrorIn - ( - "totalPressureFvPatchScalarField::updateCoeffs()" - ) << " rho or psi set inconsistently, rho = " << rhoName_ + FatalErrorInFunction + << " rho or psi set inconsistently, rho = " << rhoName_ << ", psi = " << psiName_ << ".\n" << " Set either rho or psi or neither depending on the " "definition of total pressure." << nl diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C index a50669414..432d1e908 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.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 @@ -77,16 +77,8 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField if (intensity_ < 0 || intensity_ > 1) { - FatalErrorIn - ( - "turbulentIntensityKineticEnergyInletFvPatchScalarField::" - "turbulentIntensityKineticEnergyInletFvPatchScalarField" - "(" - "const fvPatch&, " - "const DimensionedField&, " - "const dictionary&" - ")" - ) << "Turbulence intensity should be specified as a fraction 0-1 " + FatalErrorInFunction + << "Turbulence intensity should be specified as a fraction 0-1 " "of the mean velocity\n" " value given is " << intensity_ << nl << " on patch " << this->patch().name() diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C index 7b7c08ed9..5cfd99db2 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.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 @@ -199,7 +199,7 @@ void Foam::uniformTotalPressureFvPatchScalarField::updateCoeffs } else { - FatalErrorIn("uniformTotalPressureFvPatchScalarField::updateCoeffs()") + FatalErrorInFunction << " rho or psi set inconsitently, rho = " << rhoName_ << ", psi = " << psiName_ << ".\n" << " Set either rho or psi or neither depending on the " diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C index ba6db1315..04d46c8ee 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C @@ -208,10 +208,7 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs() } default: { - FatalErrorIn - ( - "waveSurfacePressureFvPatchScalarField::updateCoeffs()" - ) << " Unsupported temporal differencing scheme : " + FatalErrorInFunction << ddtSchemeName << nl << " on patch " << this->patch().name() << " of field " << this->dimensionedInternalField().name() diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C index 21aad2c1c..d276bf045 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.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 @@ -135,15 +135,8 @@ Foam::fvPatchField::fvPatchField } else { - FatalIOErrorIn + FatalIOErrorInFunction ( - "fvPatchField::fvPatchField" - "(" - "const fvPatch& p," - "const DimensionedField& iF," - "const dictionary& dict," - "const bool valueRequired" - ")", dict ) << "Essential entry 'value' missing" << exit(FatalIOError); @@ -196,7 +189,7 @@ void Foam::fvPatchField::check(const fvPatchField& ptf) const { if (&patch_ != &(ptf.patch_)) { - FatalErrorIn("PatchField::check(const fvPatchField&)") + FatalErrorInFunction << "different patches for fvPatchFields" << abort(FatalError); } @@ -433,10 +426,8 @@ void Foam::fvPatchField::operator*= { if (&patch_ != &ptf.patch()) { - FatalErrorIn - ( - "PatchField::operator*=(const fvPatchField& ptf)" - ) << "incompatible patches for patch fields" + FatalErrorInFunction + << "incompatible patches for patch fields" << abort(FatalError); } @@ -452,10 +443,7 @@ void Foam::fvPatchField::operator/= { if (&patch_ != &ptf.patch()) { - FatalErrorIn - ( - "PatchField::operator/=(const fvPatchField& ptf)" - ) << " incompatible patches for patch fields" + FatalErrorInFunction << abort(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C index e9eed24fa..a88caa7b6 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.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 @@ -49,11 +49,8 @@ Foam::tmp > Foam::fvPatchField::New if (cstrIter == patchConstructorTablePtr_->end()) { - FatalErrorIn - ( - "fvPatchField::New(const word&, const word&, const fvPatch&," - "const DimensionedField&)" - ) << "Unknown patchField type " + FatalErrorInFunction + << "Unknown patchField type " << patchFieldType << nl << nl << "Valid patchField types are :" << endl << patchConstructorTablePtr_->sortedToc() @@ -134,11 +131,8 @@ Foam::tmp > Foam::fvPatchField::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "fvPatchField::New(const fvPatch&, " - "const DimensionedField&, " - "const dictionary&)", dict ) << "Unknown patchField type " << patchFieldType << " for patch type " << p.type() << nl << nl @@ -163,11 +157,8 @@ Foam::tmp > Foam::fvPatchField::New && patchTypeCstrIter() != cstrIter() ) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "fvPatchField::New(const fvPatch&, " - "const DimensionedField&, " - "const dictionary&)", dict ) << "inconsistent patch and patchField types for \n" " patch type " << p.type() @@ -203,12 +194,8 @@ Foam::tmp > Foam::fvPatchField::New if (cstrIter == patchMapperConstructorTablePtr_->end()) { - FatalErrorIn - ( - "fvPatchField::New(const fvPatchField&, " - "const fvPatch&, const DimensionedField&, " - "const fvPatchFieldMapper&)" - ) << "Unknown patchField type " << ptf.type() << nl << nl + FatalErrorInFunction + << "Unknown patchField type " << ptf.type() << nl << nl << "Valid patchField types are :" << endl << patchMapperConstructorTablePtr_->sortedToc() << exit(FatalError); diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C index fc6aa90d6..6134ed61f 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.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 @@ -58,16 +58,8 @@ cyclicFvsPatchField::cyclicFvsPatchField { if (!isA(this->patch())) { - FatalErrorIn - ( - "cyclicFvsPatchField::cyclicFvsPatchField\n" - "(\n" - " const cyclicFvsPatchField& ptf,\n" - " const fvPatch& p,\n" - " const DimensionedField& iF,\n" - " const fvPatchFieldMapper& mapper\n" - ")\n" - ) << "Field type does not correspond to patch type for patch " + FatalErrorInFunction + << "Field type does not correspond to patch type for patch " << this->patch().index() << "." << endl << "Field type: " << typeName << endl << "Patch type: " << this->patch().type() @@ -89,14 +81,8 @@ cyclicFvsPatchField::cyclicFvsPatchField { if (!isA(p)) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "cyclicFvsPatchField::cyclicFvsPatchField\n" - "(\n" - " const fvPatch& p,\n" - " const DimensionedField& iF,\n" - " const dictionary& dict\n" - ")\n", dict ) << "patch " << this->patch().index() << " not cyclic type. " << "Patch type = " << p.type() diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.C index 7fc9d7688..d230e64d5 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicACMI/cyclicACMIFvsPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,16 +53,8 @@ Foam::cyclicACMIFvsPatchField::cyclicACMIFvsPatchField { if (!isA(this->patch())) { - FatalErrorIn - ( - "cyclicACMIFvsPatchField::cyclicACMIFvsPatchField\n" - "(" - "const cyclicACMIFvsPatchField&, " - "const fvPatch&, " - "const DimensionedField&, " - "const fvPatchFieldMapper&" - ")" - ) << "Field type does not correspond to patch type for patch " + FatalErrorInFunction + << "Field type does not correspond to patch type for patch " << this->patch().index() << "." << endl << "Field type: " << typeName << endl << "Patch type: " << this->patch().type() @@ -84,14 +76,8 @@ Foam::cyclicACMIFvsPatchField::cyclicACMIFvsPatchField { if (!isA(p)) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "cyclicACMIFvsPatchField::cyclicACMIFvsPatchField" - "(" - "const fvPatch&, " - "const Field&, " - "const dictionary&" - ")", dict ) << "patch " << this->patch().index() << " not cyclicACMI type. " << "Patch type = " << p.type() diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.C index 0ffe6b9c9..4b92ffe89 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.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 @@ -53,16 +53,8 @@ Foam::cyclicAMIFvsPatchField::cyclicAMIFvsPatchField { if (!isA(this->patch())) { - FatalErrorIn - ( - "cyclicAMIFvsPatchField::cyclicAMIFvsPatchField\n" - "(" - "const cyclicAMIFvsPatchField&, " - "const fvPatch&, " - "const DimensionedField&, " - "const fvPatchFieldMapper&" - ")" - ) << "Field type does not correspond to patch type for patch " + FatalErrorInFunction + << "Field type does not correspond to patch type for patch " << this->patch().index() << "." << endl << "Field type: " << typeName << endl << "Patch type: " << this->patch().type() @@ -84,14 +76,8 @@ Foam::cyclicAMIFvsPatchField::cyclicAMIFvsPatchField { if (!isA(p)) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "cyclicAMIFvsPatchField::cyclicAMIFvsPatchField" - "(" - "const fvPatch&, " - "const Field&, " - "const dictionary&" - ")", dict ) << "patch " << this->patch().index() << " not cyclicAMI type. " << "Patch type = " << p.type() diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C index c8929e376..3af9ea316 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.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 @@ -58,16 +58,8 @@ emptyFvsPatchField::emptyFvsPatchField { if (!isType(this->patch())) { - FatalErrorIn - ( - "emptyFvsPatchField::emptyFvsPatchField\n" - "(\n" - " const emptyFvsPatchField&,\n" - " const fvPatch& p,\n" - " const DimensionedField& iF,\n" - " const fvPatchFieldMapper& mapper\n" - ")\n" - ) << "Field type does not correspond to patch type for patch " + FatalErrorInFunction + << "Field type does not correspond to patch type for patch " << this->patch().index() << "." << endl << "Field type: " << typeName << endl << "Patch type: " << this->patch().type() @@ -88,14 +80,8 @@ emptyFvsPatchField::emptyFvsPatchField { if (!isType(p)) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "emptyFvsPatchField::emptyFvsPatchField\n" - "(\n" - " const fvPatch& p,\n" - " const Field& field,\n" - " const dictionary& dict\n" - ")\n", dict ) << "patch " << this->patch().index() << " not empty type. " << "Patch type = " << p.type() diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C index 68a89e8a7..68eaf0481 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.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 @@ -72,16 +72,8 @@ processorFvsPatchField::processorFvsPatchField { if (!isType(this->patch())) { - FatalErrorIn - ( - "processorFvsPatchField::processorFvsPatchField\n" - "(\n" - " const processorFvsPatchField& ptf,\n" - " const fvPatch& p,\n" - " const DimensionedField& iF,\n" - " const fvPatchFieldMapper& mapper\n" - ")\n" - ) << "Field type does not correspond to patch type for patch " + FatalErrorInFunction + << "Field type does not correspond to patch type for patch " << this->patch().index() << "." << endl << "Field type: " << typeName << endl << "Patch type: " << this->patch().type() @@ -103,14 +95,8 @@ processorFvsPatchField::processorFvsPatchField { if (!isType(p)) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "processorFvsPatchField::processorFvsPatchField\n" - "(\n" - " const fvPatch& p,\n" - " const Field& field,\n" - " const dictionary& dict\n" - ")\n", dict ) << "patch " << this->patch().index() << " not processor type. " << "Patch type = " << p.type() diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C index fd63df9dd..e633442ac 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.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 @@ -72,16 +72,8 @@ processorCyclicFvsPatchField::processorCyclicFvsPatchField { if (!isType(this->patch())) { - FatalErrorIn - ( - "processorCyclicFvsPatchField::processorCyclicFvsPatchField\n" - "(\n" - " const processorCyclicFvsPatchField& ptf,\n" - " const fvPatch& p,\n" - " const DimensionedField& iF,\n" - " const fvPatchFieldMapper& mapper\n" - ")\n" - ) << "Field type does not correspond to patch type for patch " + FatalErrorInFunction + << "Field type does not correspond to patch type for patch " << this->patch().index() << "." << endl << "Field type: " << typeName << endl << "Patch type: " << this->patch().type() @@ -103,14 +95,8 @@ processorCyclicFvsPatchField::processorCyclicFvsPatchField { if (!isType(p)) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "processorCyclicFvsPatchField::processorCyclicFvsPatchField\n" - "(\n" - " const fvPatch& p,\n" - " const Field& field,\n" - " const dictionary& dict\n" - ")\n", dict ) << "patch " << this->patch().index() << " not processor type. " << "Patch type = " << p.type() diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C index 21ec54082..104052a54 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.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 @@ -56,16 +56,8 @@ symmetryFvsPatchField::symmetryFvsPatchField { if (!isType(this->patch())) { - FatalErrorIn - ( - "symmetryFvsPatchField::symmetryFvsPatchField\n" - "(\n" - " const symmetryFvsPatchField& ptf,\n" - " const fvPatch& p,\n" - " const DimensionedField& iF,\n" - " const fvPatchFieldMapper& mapper\n" - ")\n" - ) << "Field type does not correspond to patch type for patch " + FatalErrorInFunction + << "Field type does not correspond to patch type for patch " << this->patch().index() << "." << endl << "Field type: " << typeName << endl << "Patch type: " << this->patch().type() @@ -86,14 +78,8 @@ symmetryFvsPatchField::symmetryFvsPatchField { if (!isType(p)) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "symmetryFvsPatchField::symmetryFvsPatchField\n" - "(\n" - " const fvPatch& p,\n" - " const Field& field,\n" - " const dictionary& dict\n" - ")\n", dict ) << "patch " << this->patch().index() << " not symmetry type. " << "Patch type = " << p.type() diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C index 9e3477d58..ade5b53c0 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,16 +56,8 @@ symmetryPlaneFvsPatchField::symmetryPlaneFvsPatchField { if (!isType(this->patch())) { - FatalErrorIn - ( - "symmetryPlaneFvsPatchField::symmetryPlaneFvsPatchField\n" - "(\n" - " const symmetryPlaneFvsPatchField& ptf,\n" - " const fvPatch& p,\n" - " const DimensionedField& iF,\n" - " const fvPatchFieldMapper& mapper\n" - ")\n" - ) << "Field type does not correspond to patch type for patch " + FatalErrorInFunction + << "Field type does not correspond to patch type for patch " << this->patch().index() << "." << endl << "Field type: " << typeName << endl << "Patch type: " << this->patch().type() @@ -86,14 +78,8 @@ symmetryPlaneFvsPatchField::symmetryPlaneFvsPatchField { if (!isType(p)) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "symmetryPlaneFvsPatchField::symmetryPlaneFvsPatchField\n" - "(\n" - " const fvPatch& p,\n" - " const Field& field,\n" - " const dictionary& dict\n" - ")\n", dict ) << "patch " << this->patch().index() << " not symmetryPlane type. " << "Patch type = " << p.type() diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C index efa68137b..ec31c57f1 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.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 @@ -56,16 +56,8 @@ wedgeFvsPatchField::wedgeFvsPatchField { if (!isType(this->patch())) { - FatalErrorIn - ( - "wedgeFvsPatchField::wedgeFvsPatchField\n" - "(\n" - " const wedgeFvsPatchField& ptf,\n" - " const fvPatch& p,\n" - " const DimensionedField& iF,\n" - " const fvPatchFieldMapper& mapper\n" - ")\n" - ) << "Field type does not correspond to patch type for patch " + FatalErrorInFunction + << "Field type does not correspond to patch type for patch " << this->patch().index() << "." << endl << "Field type: " << typeName << endl << "Patch type: " << this->patch().type() @@ -86,14 +78,8 @@ wedgeFvsPatchField::wedgeFvsPatchField { if (!isType(p)) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "wedgeFvsPatchField::wedgeFvsPatchField\n" - "(\n" - " const fvPatch& p,\n" - " const Field& field,\n" - " dictionary& dict\n" - ")\n", dict ) << "patch " << this->patch().index() << " not wedge type. " << "Patch type = " << p.type() diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C index 99dea901d..713f876c7 100644 --- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.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 @@ -98,14 +98,8 @@ fvsPatchField::fvsPatchField } else { - FatalIOErrorIn + FatalIOErrorInFunction ( - "fvsPatchField::fvsPatchField\n" - "(\n" - " const fvPatch& p,\n" - " const DimensionedField& iF,\n" - " const dictionary& dict\n" - ")\n", dict ) << "essential value entry not provided" << exit(FatalIOError); @@ -152,7 +146,7 @@ void fvsPatchField::check(const fvsPatchField& ptf) const { if (&patch_ != &(ptf.patch_)) { - FatalErrorIn("PatchField::check(const fvsPatchField&)") + FatalErrorInFunction << "different patches for fvsPatchFields" << abort(FatalError); } @@ -244,10 +238,8 @@ void fvsPatchField::operator*= { if (&patch_ != &ptf.patch()) { - FatalErrorIn - ( - "PatchField::operator*=(const fvsPatchField& ptf)" - ) << "incompatible patches for patch fields" + FatalErrorInFunction + << "incompatible patches for patch fields" << abort(FatalError); } @@ -263,10 +255,7 @@ void fvsPatchField::operator/= { if (&patch_ != &ptf.patch()) { - FatalErrorIn - ( - "PatchField::operator/=(const fvsPatchField& ptf)" - ) << " incompatible patches for patch fields" + FatalErrorInFunction << abort(FatalError); } diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C index 038b874f1..b1f0d186d 100644 --- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C +++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.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 @@ -52,11 +52,8 @@ tmp > fvsPatchField::New if (cstrIter == patchConstructorTablePtr_->end()) { - FatalErrorIn - ( - "fvsPatchField::New(const word&, const word&, const fvPatch&" - ", const Field&)" - ) << "Unknown patchField type " + FatalErrorInFunction + << "Unknown patchField type " << patchFieldType << nl << nl << "Valid patchField types are :" << endl << patchConstructorTablePtr_->sortedToc() @@ -130,10 +127,8 @@ tmp > fvsPatchField::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "fvsPatchField::New(const fvPatch&, const Field&, " - "const dictionary&)", dict ) << "Unknown patchField type " << patchFieldType << " for patch type " << p.type() << nl << nl @@ -158,10 +153,8 @@ tmp > fvsPatchField::New && patchTypeCstrIter() != cstrIter() ) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "fvsPatchFieldconst fvPatch&, const Field&, " - "const dictionary&)", dict ) << "inconsistent patch and patchField types for \n" " patch type " << p.type() @@ -199,12 +192,8 @@ tmp > fvsPatchField::New if (cstrIter == patchMapperConstructorTablePtr_->end()) { - FatalErrorIn - ( - "fvsPatchField::New(const fvsPatchField&, " - "const fvPatch&, const Field&, " - "const fvPatchFieldMapper&)" - ) << "Unknown patchField type " << ptf.type() << nl << nl + FatalErrorInFunction + << "Unknown patchField type " << ptf.type() << nl << nl << "Valid patchField types are :" << endl << patchMapperConstructorTablePtr_->sortedToc() << exit(FatalError); diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C index 14290732f..a7bbdeed7 100644 --- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C +++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.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 @@ -71,10 +71,8 @@ tmp > convectionScheme::New if (schemeData.eof()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "convectionScheme::New" - "(const fvMesh&, const surfaceScalarField&, Istream&)", schemeData ) << "Convection scheme not specified" << endl << endl << "Valid convection schemes are :" << endl @@ -89,10 +87,8 @@ tmp > convectionScheme::New if (cstrIter == IstreamConstructorTablePtr_->end()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "convectionScheme::New" - "(const fvMesh&, const surfaceScalarField&, Istream&)", schemeData ) << "Unknown convection scheme " << schemeName << nl << nl << "Valid convection schemes are :" << endl @@ -126,12 +122,8 @@ tmp > convectionScheme::New if (schemeData.eof()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "convectionScheme::New" - "(const fvMesh&, " - "const typename multivariateSurfaceInterpolationScheme" - "::fieldTable&, const surfaceScalarField&, Istream&)", schemeData ) << "Convection scheme not specified" << endl << endl << "Valid convection schemes are :" << endl @@ -146,12 +138,8 @@ tmp > convectionScheme::New if (cstrIter == MultivariateConstructorTablePtr_->end()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "convectionScheme::New" - "(const fvMesh&, " - "const typename multivariateSurfaceInterpolationScheme" - "::fieldTable&, const surfaceScalarField&, Istream&)", schemeData ) << "Unknown convection scheme " << schemeName << nl << nl << "Valid convection schemes are :" << endl @@ -177,10 +165,8 @@ void convectionScheme::operator=(const convectionScheme& cs) { if (this == &cs) { - FatalErrorIn - ( - "convectionScheme::operator=(const convectionScheme&)" - ) << "attempted assignment to self" + FatalErrorInFunction + << "attempted assignment to self" << abort(FatalError); } } diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H index 158ff21a1..83b50416e 100644 --- a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H +++ b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H @@ -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 @@ -120,7 +120,7 @@ public: { fileNameList controlDictFiles(findEtcFiles("controlDict")); - IOWarningIn("gaussConvectionScheme", is) + IOWarningInFunction(is) << "Unbounded 'Gauss' div scheme used in " "steady-state solver, use 'bounded Gauss' " "to ensure boundedness.\n" diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C index e884642c7..da2492411 100644 --- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C +++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.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,9 +57,8 @@ tmp > d2dt2Scheme::New if (schemeData.eof()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "d2dt2Scheme::New(const fvMesh&, Istream&)", schemeData ) << "D2dt2 scheme not specified" << endl << endl << "Valid d2dt2 schemes are :" << endl @@ -74,9 +73,8 @@ tmp > d2dt2Scheme::New if (cstrIter == IstreamConstructorTablePtr_->end()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "d2dt2Scheme::New(const fvMesh&, Istream&)", schemeData ) << "Unknown d2dt2 scheme " << schemeName << nl << nl << "Valid d2dt2 schemes are :" << endl diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C index b35a6d2d4..64cfa8994 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.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 @@ -141,7 +141,7 @@ tmp CoEulerDdtScheme::CofrDeltaT() const } else { - FatalErrorIn("CoEulerDdtScheme::CofrDeltaT() const") + FatalErrorInFunction << "Incorrect dimensions of phi: " << phi.dimensions() << abort(FatalError); @@ -717,10 +717,8 @@ CoEulerDdtScheme::fvcDdtUfCorr } else { - FatalErrorIn - ( - "CoEulerDdtScheme::fvcDdtPhiCorr" - ) << "dimensions of Uf are not correct" + FatalErrorInFunction + << "dimensions of Uf are not correct" << abort(FatalError); return fluxFieldType::null(); @@ -781,10 +779,8 @@ CoEulerDdtScheme::fvcDdtPhiCorr } else { - FatalErrorIn - ( - "CoEulerDdtScheme::fvcDdtPhiCorr" - ) << "dimensions of phi are not correct" + FatalErrorInFunction + << "dimensions of phi are not correct" << abort(FatalError); return fluxFieldType::null(); diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C index 7513ac287..79f89460b 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.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 @@ -1323,10 +1323,8 @@ CrankNicolsonDdtScheme::fvcDdtUfCorr } else { - FatalErrorIn - ( - "CrankNicolsonDdtScheme::fvcDdtPhiCorr" - ) << "dimensions of Uf are not correct" + FatalErrorInFunction + << "dimensions of Uf are not correct" << abort(FatalError); return fluxFieldType::null(); @@ -1420,10 +1418,8 @@ CrankNicolsonDdtScheme::fvcDdtPhiCorr } else { - FatalErrorIn - ( - "CrankNicolsonDdtScheme::fvcDdtPhiCorr" - ) << "dimensions of phi are not correct" + FatalErrorInFunction + << "dimensions of phi are not correct" << abort(FatalError); return fluxFieldType::null(); diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H index 1568890de..db2c5a08f 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H +++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H @@ -208,9 +208,8 @@ public: { if (ocCoeff_ < 0 || ocCoeff_ > 1) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "CrankNicolsonDdtScheme(const fvMesh& mesh, Istream& is)", is ) << "Off-centreing coefficient = " << ocCoeff_ << " should be >= 0 and <= 1" diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C index 085bb9971..1d64797ac 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.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 @@ -606,10 +606,8 @@ EulerDdtScheme::fvcDdtUfCorr } else { - FatalErrorIn - ( - "EulerDdtScheme::fvcDdtPhiCorr" - ) << "dimensions of Uf are not correct" + FatalErrorInFunction + << "dimensions of Uf are not correct" << abort(FatalError); return fluxFieldType::null(); @@ -670,10 +668,8 @@ EulerDdtScheme::fvcDdtPhiCorr } else { - FatalErrorIn - ( - "EulerDdtScheme::fvcDdtPhiCorr" - ) << "dimensions of phi are not correct" + FatalErrorInFunction + << "dimensions of phi are not correct" << abort(FatalError); return fluxFieldType::null(); diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C index 9693974f5..6873c3843 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.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 @@ -139,7 +139,7 @@ tmp SLTSDdtScheme::SLrDeltaT() const } else { - FatalErrorIn("SLTSDdtScheme::CofrDeltaT() const") + FatalErrorInFunction << "Incorrect dimensions of phi: " << phi.dimensions() << abort(FatalError); } @@ -719,10 +719,8 @@ SLTSDdtScheme::fvcDdtUfCorr } else { - FatalErrorIn - ( - "SLTSDdtScheme::fvcDdtPhiCorr" - ) << "dimensions of Uf are not correct" + FatalErrorInFunction + << "dimensions of Uf are not correct" << abort(FatalError); return fluxFieldType::null(); @@ -783,10 +781,8 @@ SLTSDdtScheme::fvcDdtPhiCorr } else { - FatalErrorIn - ( - "SLTSDdtScheme::fvcDdtPhiCorr" - ) << "dimensions of phi are not correct" + FatalErrorInFunction + << "dimensions of phi are not correct" << abort(FatalError); return fluxFieldType::null(); diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C index 049fd781a..9d17e8dbf 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.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 @@ -828,10 +828,8 @@ backwardDdtScheme::fvcDdtUfCorr } else { - FatalErrorIn - ( - "backwardDdtScheme::fvcDdtPhiCorr" - ) << "dimensions of phi are not correct" + FatalErrorInFunction + << "dimensions of phi are not correct" << abort(FatalError); return fluxFieldType::null(); @@ -906,10 +904,8 @@ backwardDdtScheme::fvcDdtPhiCorr } else { - FatalErrorIn - ( - "backwardDdtScheme::fvcDdtPhiCorr" - ) << "dimensions of phi are not correct" + FatalErrorInFunction + << "dimensions of phi are not correct" << abort(FatalError); return fluxFieldType::null(); diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C index 955234f55..8777ec897 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C @@ -57,9 +57,8 @@ tmp > ddtScheme::New if (schemeData.eof()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "ddtScheme::New(const fvMesh&, Istream&)", schemeData ) << "Ddt scheme not specified" << endl << endl << "Valid ddt schemes are :" << endl @@ -74,9 +73,8 @@ tmp > ddtScheme::New if (cstrIter == IstreamConstructorTablePtr_->end()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "ddtScheme::New(const fvMesh&, Istream&)", schemeData ) << "Unknown ddt scheme " << schemeName << nl << nl << "Valid ddt schemes are :" << endl diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C index 4b56cd4c3..e18f10c95 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C @@ -613,10 +613,8 @@ localEulerDdtScheme::fvcDdtUfCorr } else { - FatalErrorIn - ( - "localEulerDdtScheme::fvcDdtPhiCorr" - ) << "dimensions of Uf are not correct" + FatalErrorInFunction + << "dimensions of Uf are not correct" << abort(FatalError); return fluxFieldType::null(); @@ -677,10 +675,8 @@ localEulerDdtScheme::fvcDdtPhiCorr } else { - FatalErrorIn - ( - "localEulerDdtScheme::fvcDdtPhiCorr" - ) << "dimensions of phi are not correct" + FatalErrorInFunction + << "dimensions of phi are not correct" << abort(FatalError); return fluxFieldType::null(); diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C index 884e4770e..59622c9dc 100644 --- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C +++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.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 @@ -58,9 +58,8 @@ tmp > divScheme::New if (schemeData.eof()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "divScheme::New(const fvMesh&, Istream&)", schemeData ) << "Div scheme not specified" << endl << endl << "Valid div schemes are :" << endl @@ -75,9 +74,8 @@ tmp > divScheme::New if (cstrIter == IstreamConstructorTablePtr_->end()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "divScheme::New(const fvMesh&, Istream&)", schemeData ) << "unknown div scheme " << schemeName << nl << nl diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C index c7f49d3c8..503c8a978 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C +++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.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 @@ -46,10 +46,8 @@ Foam::tmp > Foam::fv::gradScheme::New if (schemeData.eof()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "gradScheme::New" - "(const fvMesh& mesh, Istream& schemeData)", schemeData ) << "Grad scheme not specified" << endl << endl << "Valid grad schemes are :" << endl @@ -64,10 +62,8 @@ Foam::tmp > Foam::fv::gradScheme::New if (cstrIter == IstreamConstructorTablePtr_->end()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "gradScheme::New" - "(const fvMesh& mesh, Istream& schemeData)", schemeData ) << "Unknown grad scheme " << schemeName << nl << nl << "Valid grad schemes are :" << endl diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H index 7e5074234..6ee95bdbc 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H +++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.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 @@ -95,9 +95,8 @@ public: { if (k_ < 0 || k_ > 1) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "cellLimitedGrad(const fvMesh&, Istream& schemeData)", schemeData ) << "coefficient = " << k_ << " should be >= 0 and <= 1" diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H index 1e5530a80..0ef0b44ad 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H +++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.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 @@ -95,9 +95,8 @@ public: { if (k_ < 0 || k_ > 1) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "cellMDLimitedGrad(const fvMesh&, Istream& schemeData)", schemeData ) << "coefficient = " << k_ << " should be >= 0 and <= 1" diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H index 8ff5d8e21..a3ce86766 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H +++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.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 @@ -104,9 +104,8 @@ public: { if (k_ < 0 || k_ > 1) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "faceLimitedGrad(const fvMesh&, Istream& schemeData)", schemeData ) << "coefficient = " << k_ << " should be >= 0 and <= 1" diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H index 6012f0fb2..9da999035 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H +++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.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 @@ -104,9 +104,8 @@ public: { if (k_ < 0 || k_ > 1) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "faceMDLimitedGrad(const fvMesh&, Istream& schemeData)", schemeData ) << "coefficient = " << k_ << " should be >= 0 and <= 1" diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C index c81d53da5..09c7def17 100644 --- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C +++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.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 @@ -56,9 +56,8 @@ tmp > laplacianScheme::New if (schemeData.eof()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "laplacianScheme::New(const fvMesh&, Istream&)", schemeData ) << "Laplacian scheme not specified" << endl << endl << "Valid laplacian schemes are :" << endl @@ -73,9 +72,8 @@ tmp > laplacianScheme::New if (cstrIter == IstreamConstructorTablePtr_->end()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "laplacianScheme::New(const fvMesh&, Istream&)", schemeData ) << "Unknown laplacian scheme " << schemeName << nl << nl << "Valid laplacian schemes are :" << endl diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C index 36a363ea1..f71471dc9 100644 --- a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C +++ b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -156,11 +156,8 @@ void Foam::CentredFitSnGradData::calcFit // (not good fit so increase weight in the centre and weight // for constant and linear terms) - WarningIn - ( - "CentredFitSnGradData::calcFit" - "(const List& 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 @@ -198,10 +195,8 @@ void Foam::CentredFitSnGradData::calcFit } else { - WarningIn - ( - "CentredFitSnGradData::calcFit(..)" - ) << "Could not fit face " << facei + WarningInFunction + << "Could not fit face " << facei << " Coefficients = " << coeffsi << ", reverting to uncorrected." << endl; diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H index c62ca9135..ca9b2a8a5 100644 --- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H +++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H @@ -135,9 +135,8 @@ public: { if (limitCoeff_ < 0 || limitCoeff_ > 1) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "limitedSnGrad(const fvMesh& mesh, Istream& schemeData) : ", schemeData ) << "limitCoeff is specified as " << limitCoeff_ << " but should be >= 0 && <= 1" diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C index 2f8ef75d9..7484c060a 100644 --- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C +++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.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,9 +57,8 @@ tmp > snGradScheme::New if (schemeData.eof()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "snGradScheme::New(const fvMesh&, Istream&)", schemeData ) << "Discretisation scheme not specified" << endl << endl @@ -75,9 +74,8 @@ tmp > snGradScheme::New if (constructorIter == MeshConstructorTablePtr_->end()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "snGradScheme::New(const fvMesh&, Istream&)", schemeData ) << "Unknown discretisation scheme " << schemeName << nl << nl diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C index 42024fee1..882517721 100644 --- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C +++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C @@ -43,11 +43,8 @@ void Foam::fvMatrix::addToInternalField { if (addr.size() != pf.size()) { - FatalErrorIn - ( - "fvMatrix::addToInternalField(const labelUList&, " - "const Field&, Field&)" - ) << "sizes of addressing and field are different" + FatalErrorInFunction + << "sizes of addressing and field are different" << abort(FatalError); } @@ -83,11 +80,8 @@ void Foam::fvMatrix::subtractFromInternalField { if (addr.size() != pf.size()) { - FatalErrorIn - ( - "fvMatrix::addToInternalField(const labelUList&, " - "const Field&, Field&)" - ) << "sizes of addressing and field are different" + FatalErrorInFunction + << "sizes of addressing and field are different" << abort(FatalError); } @@ -531,7 +525,7 @@ void Foam::fvMatrix::relax(const scalar alpha) if (debug) { - InfoIn("fvMatrix::relax(const scalar alpha)") + InfoInFunction << "Relaxing " << psi_.name() << " by " << alpha << endl; } @@ -622,7 +616,7 @@ void Foam::fvMatrix::relax(const scalar alpha) psi_.mesh().comm() ); - InfoIn("fvMatrix::relax(const scalar alpha)") + InfoInFunction << "Matrix dominance test for " << psi_.name() << nl << " number of non-dominant cells : " << nNon << nl << " maximum relative non-dominance : " << maxNon << nl @@ -880,7 +874,7 @@ flux() const { if (!psi_.mesh().fluxRequired(psi_.name())) { - FatalErrorIn("fvMatrix::flux()") + FatalErrorInFunction << "flux requested but " << psi_.name() << " not specified in the fluxRequired sub-dictionary" " of fvSchemes." @@ -964,14 +958,14 @@ void Foam::fvMatrix::operator=(const fvMatrix& fvmv) { if (this == &fvmv) { - FatalErrorIn("fvMatrix::operator=(const fvMatrix&)") + FatalErrorInFunction << "attempted assignment to self" << abort(FatalError); } if (&psi_ != &(fvmv.psi_)) { - FatalErrorIn("fvMatrix::operator=(const fvMatrix&)") + FatalErrorInFunction << "different fields" << abort(FatalError); } @@ -1209,11 +1203,8 @@ void Foam::fvMatrix::operator*= if (faceFluxCorrectionPtr_) { - FatalErrorIn - ( - "fvMatrix::operator*=" - "(const DimensionedField&)" - ) << "cannot scale a matrix containing a faceFluxCorrection" + FatalErrorInFunction + << "cannot scale a matrix containing a faceFluxCorrection" << abort(FatalError); } } @@ -1272,10 +1263,8 @@ void Foam::checkMethod { if (&fvm1.psi() != &fvm2.psi()) { - FatalErrorIn - ( - "checkMethod(const fvMatrix&, const fvMatrix&)" - ) << "incompatible fields for operation " + FatalErrorInFunction + << "incompatible fields for operation " << endl << " " << "[" << fvm1.psi().name() << "] " << op @@ -1285,10 +1274,8 @@ void Foam::checkMethod if (dimensionSet::debug && fvm1.dimensions() != fvm2.dimensions()) { - FatalErrorIn - ( - "checkMethod(const fvMatrix&, const fvMatrix&)" - ) << "incompatible dimensions for operation " + FatalErrorInFunction + << "incompatible dimensions for operation " << endl << " " << "[" << fvm1.psi().name() << fvm1.dimensions()/dimVolume << " ] " << op @@ -1308,11 +1295,7 @@ void Foam::checkMethod { if (dimensionSet::debug && fvm.dimensions()/dimVolume != df.dimensions()) { - FatalErrorIn - ( - "checkMethod(const fvMatrix&, const GeometricField&)" - ) << "incompatible dimensions for operation " + FatalErrorInFunction << endl << " " << "[" << fvm.psi().name() << fvm.dimensions()/dimVolume << " ] " << op @@ -1332,10 +1315,8 @@ void Foam::checkMethod { if (dimensionSet::debug && fvm.dimensions()/dimVolume != dt.dimensions()) { - FatalErrorIn - ( - "checkMethod(const fvMatrix&, const dimensioned&)" - ) << "incompatible dimensions for operation " + FatalErrorInFunction + << "incompatible dimensions for operation " << endl << " " << "[" << fvm.psi().name() << fvm.dimensions()/dimVolume << " ] " << op diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C index d7e7d0a35..ff588e947 100644 --- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C +++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C @@ -87,9 +87,8 @@ Foam::SolverPerformance Foam::fvMatrix::solve } else { - FatalIOErrorIn + FatalIOErrorInFunction ( - "fvMatrix::solve(const dictionary& solverControls)", solverControls ) << "Unknown type " << type << "; currently supported solver types are segregated and coupled" diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.C index 4852332c3..54e0eb446 100644 --- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.C +++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,11 +43,8 @@ Foam::extendedCellToCellStencil::extendedCellToCellStencil(const polyMesh& mesh) if (!cpp.parallel() || cpp.separated()) { - FatalErrorIn - ( - "extendedCellToCellStencil::extendedCellToCellStencil" - "(const polyMesh&)" - ) << "Coupled patches with transformations not supported." + FatalErrorInFunction + << "Coupled patches with transformations not supported." << endl << "Problematic patch " << cpp.name() << exit(FatalError); } diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C index c2bc9d7e7..fd48842f4 100644 --- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C +++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.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 @@ void Foam::cellToCellStencil::merge if (resultI != result.size()) { - FatalErrorIn("cellToCellStencil::merge(..)") + FatalErrorInFunction << "problem" << abort(FatalError); } diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C index a960f5a85..5409e01b9 100644 --- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.C +++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.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 @@ -113,11 +113,8 @@ Foam::extendedCellToFaceStencil::extendedCellToFaceStencil(const polyMesh& mesh) if (!cpp.parallel() || cpp.separated()) { - FatalErrorIn - ( - "extendedCellToFaceStencil::extendedCellToFaceStencil" - "(const polyMesh&)" - ) << "Coupled patches with transformations not supported." + FatalErrorInFunction + << "Coupled patches with transformations not supported." << endl << "Problematic patch " << cpp.name() << exit(FatalError); } diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.C index f63109fa0..e3f4c79eb 100644 --- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.C +++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.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 @@ -168,10 +168,8 @@ void Foam::extendedUpwindCellToFaceStencil::transportStencil } if (n != transportedStencil.size()) { - FatalErrorIn - ( - "extendedUpwindCellToFaceStencil::transportStencil(..)" - ) << "problem:" << faceStencilSet + FatalErrorInFunction + << "problem:" << faceStencilSet << abort(FatalError); } } @@ -190,10 +188,8 @@ void Foam::extendedUpwindCellToFaceStencil::transportStencil } if (n != transportedStencil.size()) { - FatalErrorIn - ( - "extendedUpwindCellToFaceStencil::transportStencil(..)" - ) << "problem:" << faceStencilSet + FatalErrorInFunction + << "problem:" << faceStencilSet << abort(FatalError); } } diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.C index 78425f119..235091fa3 100644 --- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.C +++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.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 @@ void Foam::FECCellToFaceStencil::calcFaceStencil { if (iter.key() == globalOwn || iter.key() == globalNei) { - FatalErrorIn("FECCellToFaceStencil::calcFaceStencil(..)") + FatalErrorInFunction << "problem:" << faceStencilSet << abort(FatalError); } @@ -272,10 +272,8 @@ void Foam::FECCellToFaceStencil::calcFaceStencil { if (iter.key() == globalOwn || iter.key() == globalNei) { - FatalErrorIn - ( - "FECCellToFaceStencil::calcFaceStencil(..)" - ) << "problem:" << faceStencilSet + FatalErrorInFunction + << "problem:" << faceStencilSet << abort(FatalError); } faceStencil[faceI][n++] = iter.key(); @@ -283,7 +281,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil if (n != faceStencil[faceI].size()) { - FatalErrorIn("problem") << "n:" << n + FatalErrorInFunction << " size:" << faceStencil[faceI].size() << abort(FatalError); } @@ -338,10 +336,8 @@ void Foam::FECCellToFaceStencil::calcFaceStencil { if (iter.key() == globalOwn) { - FatalErrorIn - ( - "FECCellToFaceStencil::calcFaceStencil(..)" - ) << "problem:" << faceStencilSet + FatalErrorInFunction + << "problem:" << faceStencilSet << abort(FatalError); } faceStencil[faceI][n++] = iter.key(); @@ -358,7 +354,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil label globalOwn = globalNumbering().toGlobal(own[faceI]); if (faceStencil[faceI][0] != globalOwn) { - FatalErrorIn("FECCellToFaceStencil::calcFaceStencil(..)") + FatalErrorInFunction << "problem:" << faceStencil[faceI] << " globalOwn:" << globalOwn << abort(FatalError); @@ -366,7 +362,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil label globalNei = globalNumbering().toGlobal(nei[faceI]); if (faceStencil[faceI][1] != globalNei) { - FatalErrorIn("FECCellToFaceStencil::calcFaceStencil(..)") + FatalErrorInFunction << "problem:" << faceStencil[faceI] << " globalNei:" << globalNei << abort(FatalError); @@ -387,7 +383,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil label globalOwn = globalNumbering().toGlobal(own[faceI]); if (faceStencil[faceI][0] != globalOwn) { - FatalErrorIn("FECCellToFaceStencil::calcFaceStencil(..)") + FatalErrorInFunction << "problem:" << faceStencil[faceI] << " globalOwn:" << globalOwn << abort(FatalError); @@ -395,7 +391,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil label globalNei = neiGlobalCell[faceI-mesh().nInternalFaces()]; if (faceStencil[faceI][1] != globalNei) { - FatalErrorIn("FECCellToFaceStencil::calcFaceStencil(..)") + FatalErrorInFunction << "problem:" << faceStencil[faceI] << " globalNei:" << globalNei << abort(FatalError); @@ -411,7 +407,7 @@ void Foam::FECCellToFaceStencil::calcFaceStencil label globalOwn = globalNumbering().toGlobal(own[faceI]); if (faceStencil[faceI][0] != globalOwn) { - FatalErrorIn("FECCellToFaceStencil::calcFaceStencil(..)") + FatalErrorInFunction << "problem:" << faceStencil[faceI] << " globalOwn:" << globalOwn << abort(FatalError); diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C index c57cf9e10..f61744941 100644 --- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C +++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.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 @@ void Foam::cellToFaceStencil::merge if (resultI != result.size()) { - FatalErrorIn("cellToFaceStencil::merge(..)") + FatalErrorInFunction << "problem" << abort(FatalError); } diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.C index 4f364dc28..ea4899d57 100644 --- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.C +++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.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,11 +45,8 @@ Foam::extendedFaceToCellStencil::extendedFaceToCellStencil(const polyMesh& mesh) if (!cpp.parallel() || cpp.separated()) { - FatalErrorIn - ( - "extendedFaceToCellStencil::extendedFaceToCellStencil" - "(const polyMesh&)" - ) << "Coupled patches with transformations not supported." + FatalErrorInFunction + << "Coupled patches with transformations not supported." << endl << "Problematic patch " << cpp.name() << exit(FatalError); } diff --git a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C index 035ab4261..0d7f7ebab 100644 --- a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C +++ b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.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 @@ -149,10 +149,8 @@ const Foam::fvPatch& Foam::fvBoundaryMesh::operator[] if (patchI < 0) { - FatalErrorIn - ( - "fvBoundaryMesh::operator[](const word&) const" - ) << "Patch named " << patchName << " not found." << nl + FatalErrorInFunction + << "Patch named " << patchName << " not found." << nl << abort(FatalError); } @@ -169,10 +167,8 @@ Foam::fvPatch& Foam::fvBoundaryMesh::operator[] if (patchI < 0) { - FatalErrorIn - ( - "fvBoundaryMesh::operator[](const word&)" - ) << "Patch named " << patchName << " not found." << nl + FatalErrorInFunction + << "Patch named " << patchName << " not found." << nl << abort(FatalError); } diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C index 3b895bfe3..dc19051e7 100644 --- a/src/finiteVolume/fvMesh/fvMesh.C +++ b/src/finiteVolume/fvMesh/fvMesh.C @@ -466,10 +466,8 @@ void Foam::fvMesh::addFvPatches { if (boundary().size()) { - FatalErrorIn - ( - "fvMesh::addFvPatches(const List&, const bool)" - ) << " boundary already exists" + FatalErrorInFunction + << " boundary already exists" << abort(FatalError); } @@ -586,7 +584,7 @@ void Foam::fvMesh::mapFields(const mapPolyMesh& meshMap) || meshMap.faceMap().size() != nFaces() ) { - FatalErrorIn("fvMesh::mapFields(const mapPolyMesh&)") + FatalErrorInFunction << "mapPolyMesh does not correspond to the old mesh." << " nCells:" << nCells() << " cellMap:" << meshMap.cellMap().size() @@ -815,7 +813,7 @@ void Foam::fvMesh::updateMesh(const mapPolyMesh& mpm) // Few checks if (VPtr_ && (V().size() != mpm.nOldCells())) { - FatalErrorIn("fvMesh::updateMesh(const mapPolyMesh&)") + FatalErrorInFunction << "V:" << V().size() << " not equal to the number of old cells " << mpm.nOldCells() @@ -823,7 +821,7 @@ void Foam::fvMesh::updateMesh(const mapPolyMesh& mpm) } if (V0Ptr_ && (V0Ptr_->size() != mpm.nOldCells())) { - FatalErrorIn("fvMesh::updateMesh(const mapPolyMesh&)") + FatalErrorInFunction << "V0:" << V0Ptr_->size() << " not equal to the number of old cells " << mpm.nOldCells() @@ -831,7 +829,7 @@ void Foam::fvMesh::updateMesh(const mapPolyMesh& mpm) } if (V00Ptr_ && (V00Ptr_->size() != mpm.nOldCells())) { - FatalErrorIn("fvMesh::updateMesh(const mapPolyMesh&)") + FatalErrorInFunction << "V0:" << V00Ptr_->size() << " not equal to the number of old cells " << mpm.nOldCells() diff --git a/src/finiteVolume/fvMesh/fvMeshGeometry.C b/src/finiteVolume/fvMesh/fvMeshGeometry.C index 3c61706f4..b16164fa5 100644 --- a/src/finiteVolume/fvMesh/fvMeshGeometry.C +++ b/src/finiteVolume/fvMesh/fvMeshGeometry.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 @@ -53,7 +53,7 @@ void fvMesh::makeSf() const // if the pointer is already set if (SfPtr_) { - FatalErrorIn("fvMesh::makeSf()") + FatalErrorInFunction << "face areas already exist" << abort(FatalError); } @@ -90,7 +90,7 @@ void fvMesh::makeMagSf() const // if the pointer is already set if (magSfPtr_) { - FatalErrorIn("void fvMesh::makeMagSf()") + FatalErrorInFunction << "mag face areas already exist" << abort(FatalError); } @@ -128,7 +128,7 @@ void fvMesh::makeC() const // if the pointer is already set if (CPtr_) { - FatalErrorIn("fvMesh::makeC()") + FatalErrorInFunction << "cell centres already exist" << abort(FatalError); } @@ -170,7 +170,7 @@ void fvMesh::makeCf() const // if the pointer is already set if (CfPtr_) { - FatalErrorIn("fvMesh::makeCf()") + FatalErrorInFunction << "face centres already exist" << abort(FatalError); } @@ -232,7 +232,7 @@ const volScalarField::DimensionedInternalField& fvMesh::V0() const { if (!V0Ptr_) { - FatalErrorIn("fvMesh::V0() const") + FatalErrorInFunction << "V0 is not available" << abort(FatalError); } @@ -245,7 +245,7 @@ volScalarField::DimensionedInternalField& fvMesh::setV0() { if (!V0Ptr_) { - FatalErrorIn("fvMesh::setV0()") + FatalErrorInFunction << "V0 is not available" << abort(FatalError); } @@ -439,7 +439,7 @@ const surfaceScalarField& fvMesh::phi() const { if (!phiPtr_) { - FatalErrorIn("fvMesh::phi()") + FatalErrorInFunction << "mesh flux field does not exist, is the mesh actually moving?" << abort(FatalError); } @@ -459,7 +459,7 @@ surfaceScalarField& fvMesh::setPhi() { if (!phiPtr_) { - FatalErrorIn("fvMesh::setPhi()") + FatalErrorInFunction << "mesh flux field does not exist, is the mesh actually moving?" << abort(FatalError); } diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C index ada0749df..9c0ff2cec 100644 --- a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C +++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.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 @@ -41,10 +41,8 @@ void Foam::fvPatchMapper::calcAddressing() const || weightsPtr_ ) { - FatalErrorIn - ( - "void fvPatchMapper::calcAddressing() const)" - ) << "Addressing already calculated" + FatalErrorInFunction + << "Addressing already calculated" << abort(FatalError); } @@ -95,10 +93,8 @@ void Foam::fvPatchMapper::calcAddressing() const if (min(addr) < 0) { //FatalErrorIn - WarningIn - ( - "void fvPatchMapper::calcAddressing() const" - ) << "Unmapped entry in patch mapping for patch " + WarningInFunction + << "Unmapped entry in patch mapping for patch " << patch_.index() << " named " << patch_.name() //<< abort(FatalError); << endl; @@ -195,10 +191,8 @@ void Foam::fvPatchMapper::calcAddressing() const { if (min(addr[i]) < 0) { - FatalErrorIn - ( - "void fvPatchMapper::calcAddressing() const" - ) << "Error in patch mapping for patch " + FatalErrorInFunction + << "Error in patch mapping for patch " << patch_.index() << " named " << patch_.name() << abort(FatalError); } @@ -250,10 +244,8 @@ const Foam::labelUList& Foam::fvPatchMapper::directAddressing() const { if (!direct()) { - FatalErrorIn - ( - "const labelUList& fvPatchMapper::directAddressing() const" - ) << "Requested direct addressing for an interpolative mapper." + FatalErrorInFunction + << "Requested direct addressing for an interpolative mapper." << abort(FatalError); } @@ -270,10 +262,8 @@ const Foam::labelListList& Foam::fvPatchMapper::addressing() const { if (direct()) { - FatalErrorIn - ( - "const labelListList& fvPatchMapper::addressing() const" - ) << "Requested interpolative addressing for a direct mapper." + FatalErrorInFunction + << "Requested interpolative addressing for a direct mapper." << abort(FatalError); } @@ -290,10 +280,8 @@ const Foam::scalarListList& Foam::fvPatchMapper::weights() const { if (direct()) { - FatalErrorIn - ( - "const scalarListList& fvPatchMapper::weights() const" - ) << "Requested interpolative weights for a direct mapper." + FatalErrorInFunction + << "Requested interpolative weights for a direct mapper." << abort(FatalError); } diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C index 206f57d47..c9889b703 100644 --- a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C +++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.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 @@ -43,7 +43,7 @@ void Foam::fvSurfaceMapper::calcAddressing() const || insertedObjectLabelsPtr_ ) { - FatalErrorIn("void fvSurfaceMapper::calcAddressing() const)") + FatalErrorInFunction << "Addressing already calculated" << abort(FatalError); } @@ -174,11 +174,8 @@ const Foam::labelUList& Foam::fvSurfaceMapper::directAddressing() const { if (!direct()) { - FatalErrorIn - ( - "const labelUList& fvSurfaceMapper::" - "directAddressing() const" - ) << "Requested direct addressing for an interpolative mapper." + FatalErrorInFunction + << "Requested direct addressing for an interpolative mapper." << abort(FatalError); } @@ -195,10 +192,8 @@ const Foam::labelListList& Foam::fvSurfaceMapper::addressing() const { if (direct()) { - FatalErrorIn - ( - "const labelListList& fvSurfaceMapper::addressing() const" - ) << "Requested interpolative addressing for a direct mapper." + FatalErrorInFunction + << "Requested interpolative addressing for a direct mapper." << abort(FatalError); } @@ -215,10 +210,8 @@ const Foam::scalarListList& Foam::fvSurfaceMapper::weights() const { if (direct()) { - FatalErrorIn - ( - "const scalarListList& fvSurfaceMapper::weights() const" - ) << "Requested interpolative weights for a direct mapper." + FatalErrorInFunction + << "Requested interpolative weights for a direct mapper." << abort(FatalError); } diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C index 3a377e2ff..bb88b6c09 100644 --- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C +++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.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 @@ -46,8 +46,7 @@ bool Foam::fvMeshSubset::checkCellSubset() const { if (fvMeshSubsetPtr_.empty()) { - FatalErrorIn("bool fvMeshSubset::checkCellSubset() const") - << "Mesh subset not set. Please set the cell map using " + FatalErrorInFunction << "void setCellSubset(const labelHashSet& cellsToSubset)" << endl << "before attempting to access subset data" << abort(FatalError); @@ -394,11 +393,8 @@ void Foam::fvMeshSubset::setCellSubset } else if (wantedPatchID < 0 || wantedPatchID >= oldPatches.size()) { - FatalErrorIn - ( - "fvMeshSubset::setCellSubset(const labelHashSet&" - ", const label patchID)" - ) << "Non-existing patch index " << wantedPatchID << endl + FatalErrorInFunction + << "Non-existing patch index " << wantedPatchID << endl << "Should be between 0 and " << oldPatches.size()-1 << abort(FatalError); } @@ -774,11 +770,8 @@ void Foam::fvMeshSubset::setLargeCellSubset if (region.size() != oldCells.size()) { - FatalErrorIn - ( - "fvMeshSubset::setCellSubset(const labelList&" - ", const label, const label, const bool)" - ) << "Size of region " << region.size() + FatalErrorInFunction + << "Size of region " << region.size() << " is not equal to number of cells in mesh " << oldCells.size() << abort(FatalError); } @@ -794,11 +787,8 @@ void Foam::fvMeshSubset::setLargeCellSubset } else if (wantedPatchID < 0 || wantedPatchID >= oldPatches.size()) { - FatalErrorIn - ( - "fvMeshSubset::setCellSubset(const labelList&" - ", const label, const label, const bool)" - ) << "Non-existing patch index " << wantedPatchID << endl + FatalErrorInFunction + << "Non-existing patch index " << wantedPatchID << endl << "Should be between 0 and " << oldPatches.size()-1 << abort(FatalError); } @@ -1045,11 +1035,8 @@ void Foam::fvMeshSubset::setLargeCellSubset if (faceI != nFacesInSet) { - FatalErrorIn - ( - "fvMeshSubset::setCellSubset(const labelList&" - ", const label, const label, const bool)" - ) << "Problem" << abort(FatalError); + FatalErrorInFunction + << "Problem" << abort(FatalError); } diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C index d43c48ac9..6f68e1abf 100644 --- a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.C +++ b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.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 @@ -21,10 +21,6 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . -Description - coupledFvPatch is an abstract base class for patches that couple regions - of the computational domain e.g. cyclic and processor-processor links. - \*---------------------------------------------------------------------------*/ #include "regionCoupledFvPatch.H" @@ -62,18 +58,10 @@ Foam::tmp Foam::regionCoupledFvPatch::internalFieldTransfer } else { - /* - WarningIn - ( - "regionCoupledFvPatch::internalFieldTransfer" - "( const Pstream::commsTypes, const labelUList&)" - " the internal field can not be transfered " - " as the neighbFvPatch are in different meshes " - ); - */ return tmp(new labelField(iF.size(), 0)); } + return tmp(NULL); } diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C index cb8973ebc..257825ea6 100644 --- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C +++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.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 @@ -47,7 +47,7 @@ Foam::autoPtr Foam::fvPatch::New if (cstrIter == polyPatchConstructorTablePtr_->end()) { - FatalErrorIn("fvPatch::New(const polyPatch&, const fvBoundaryMesh&)") + FatalErrorInFunction << "Unknown fvPatch type " << patch.type() << nl << "Valid fvPatch types are :" << polyPatchConstructorTablePtr_->sortedToc() diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C index 22ba9a139..6cb95ee92 100644 --- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C +++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.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 @@ -55,10 +55,8 @@ void Foam::singleCellFvMesh::agglomerateMesh { if (agglom[patchI][i] < 0 || agglom[patchI][i] >= pp.size()) { - FatalErrorIn - ( - "singleCellFvMesh::agglomerateMesh(..)" - ) << "agglomeration on patch " << patchI + FatalErrorInFunction + << "agglomeration on patch " << patchI << " is out of range 0.." << pp.size()-1 << exit(FatalError); } @@ -116,10 +114,8 @@ void Foam::singleCellFvMesh::agglomerateMesh // Check that zone numbers are still the same. if (iter() != nbrZone) { - FatalErrorIn - ( - "singleCellFvMesh::agglomerateMesh(..)" - ) << "agglomeration is not synchronised across" + FatalErrorInFunction + << "agglomeration is not synchronised across" << " coupled patch " << pp.name() << endl << "Local agglomeration " << myZone @@ -206,10 +202,8 @@ void Foam::singleCellFvMesh::agglomerateMesh if (upp.edgeLoops().size() != 1) { - FatalErrorIn - ( - "singleCellFvMesh::agglomerateMesh(..)" - ) << "agglomeration does not create a" + FatalErrorInFunction + << "agglomeration does not create a" << " single, non-manifold" << " face for agglomeration " << myAgglom << " on patch " << patchI diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C index d84a03a5a..617671bef 100644 --- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C +++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C @@ -65,7 +65,7 @@ Foam::autoPtr Foam::patchDistMethod::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("patchDistMethod::New") + FatalErrorInFunction << "Unknown patchDistMethodType type " << patchDistMethodType << endl << endl << "Valid patchDistMethod types are : " << endl diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C index 991592bae..b84c345a1 100644 --- a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C +++ b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C @@ -169,7 +169,7 @@ const Foam::volVectorField& Foam::wallDist::n() const { if (isNull(n_())) { - WarningIn("Foam::wallDist::n()") + WarningInFunction << "n requested but 'nRequired' not specified in the " << (patchTypeName_ & "Dist") << " dictionary" << nl << " Recalculating y and n fields." << endl; diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C b/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C index 4b206b84e..341ad8912 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.C +++ b/src/finiteVolume/interpolation/interpolation/interpolation/interpolationNew.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 @@ -40,11 +40,8 @@ Foam::autoPtr > Foam::interpolation::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn - ( - "interpolation::New(const word&, " - "const GeometricField&)" - ) << "Unknown interpolation type " << interpolationType + FatalErrorInFunction + << "Unknown interpolation type " << interpolationType << " for field " << psi.name() << nl << nl << "Valid interpolation types : " << endl << dictionaryConstructorTablePtr_->sortedToc() diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPointI.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPointI.H index 529e6a799..8d641af37 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPointI.H +++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPointI.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 @@ -72,15 +72,7 @@ inline Type Foam::interpolationCellPoint::interpolate { if (faceI != tetIs.face()) { - FatalErrorIn - ( - "inline Type Foam::interpolationCellPoint::interpolate" - "(" - "const vector& position, " - "const tetIndices& tetIs, " - "const label faceI" - ") const" - ) + FatalErrorInFunction << "specified face " << faceI << " inconsistent with the face " << "stored by tetIndices: " << tetIs.face() << exit(FatalError); diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModifiedI.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModifiedI.H index 7514d6908..b776dae37 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModifiedI.H +++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModifiedI.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 @@ -76,16 +76,7 @@ inline Type Foam::interpolationCellPointWallModified::interpolate { if (faceI != tetIs.face()) { - FatalErrorIn - ( - "inline Type " - "Foam::interpolationCellPointWallModifie::interpolate" - "(" - "const vector& position, " - "const tetIndices& tetIs, " - "const label faceI" - ") const" - ) + FatalErrorInFunction << "specified face " << faceI << " inconsistent with the face " << "stored by tetIndices: " << tetIs.face() << exit(FatalError); diff --git a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.C b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.C index 3891ef4dc..d77af00d4 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.C +++ b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.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 @@ -30,7 +30,7 @@ License namespace Foam { -defineDebugSwitchWithName(pointMVCWeight, "pointMVCWeight", 0); + defineDebugSwitchWithName(pointMVCWeight, "pointMVCWeight", 0); } Foam::scalar Foam::pointMVCWeight::tol(SMALL); @@ -143,14 +143,6 @@ void Foam::pointMVCWeight::calcWeights scalar vNorm = mag(v); v /= vNorm; - // Make sure v points towards the polygon - //if (((v&u[0]) < 0) != (mesh.faceOwner()[faceI] != cellIndex_)) - //{ - // FatalErrorIn("pointMVCWeight::calcWeights(..)") - // << "v:" << v << " u[0]:" << u[0] - // << exit(FatalError); - //} - if ((v & u[0]) < 0) { v = -v; diff --git a/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H b/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H index ec13c40b3..40dfd16f7 100644 --- a/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H +++ b/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.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 @@ -63,14 +63,8 @@ void MapInternalField::operator() { if (field.size() != mapper.surfaceMap().sizeBeforeMapping()) { - FatalErrorIn - ( - "void MapInternalField::operator()\n" - "(\n" - " Field& field,\n" - " const MeshMapper& mapper\n" - ") const" - ) << "Incompatible size before mapping. Field size: " << field.size() + FatalErrorInFunction + << "Incompatible size before mapping. Field size: " << field.size() << " map size: " << mapper.surfaceMap().sizeBeforeMapping() << abort(FatalError); } diff --git a/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvVolField.H b/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvVolField.H index 87458cc6e..db8c9ce72 100644 --- a/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvVolField.H +++ b/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvVolField.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 @@ -63,14 +63,8 @@ void MapInternalField::operator() { if (field.size() != mapper.volMap().sizeBeforeMapping()) { - FatalErrorIn - ( - "void MapInternalField::operator()\n" - "(\n" - " Field& field,\n" - " const MeshMapper& mapper\n" - ") const" - ) << "Incompatible size before mapping. Field size: " << field.size() + FatalErrorInFunction + << "Incompatible size before mapping. Field size: " << field.size() << " map size: " << mapper.volMap().sizeBeforeMapping() << abort(FatalError); } diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Gamma/Gamma.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Gamma/Gamma.H index 672228b4d..20283602f 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Gamma/Gamma.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Gamma/Gamma.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 @@ -65,7 +65,7 @@ public: { if (k_ < 0 || k_ > 1) { - FatalIOErrorIn("GammaLimiter(Istream& is)", is) + FatalIOErrorInFunction(is) << "coefficient = " << k_ << " should be >= 0 and <= 1" << exit(FatalIOError); diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Limited/Limited.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Limited/Limited.H index f6c8f9419..48291ea36 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Limited/Limited.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Limited/Limited.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 @@ -55,7 +55,7 @@ class LimitedLimiter { if (lowerBound_ > upperBound_) { - FatalIOErrorIn("checkParameters()", is) + FatalIOErrorInFunction(is) << "Invalid bounds. Lower = " << lowerBound_ << " Upper = " << upperBound_ << ". Lower bound is higher than the upper bound." diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Phi/Phi.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Phi/Phi.H index cdbaf1ea6..92ae81094 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Phi/Phi.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Phi/Phi.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 @@ -61,7 +61,7 @@ public: { if (k_ < 0 || k_ > 1) { - FatalIOErrorIn("PhiLimiter(Istream& is)", is) + FatalIOErrorInFunction(is) << "coefficient = " << k_ << " should be >= 0 and <= 1" << exit(FatalIOError); diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C index 8126f7cc1..28cc9fa1d 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.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 @@ -76,11 +76,8 @@ Foam::PhiScheme::limiter } else if (this->faceFlux_.dimensions() != dimVelocity*dimArea) { - FatalErrorIn - ( - "PhiScheme::limiter" - "(const GeometricField& phi)" - ) << "dimensions of faceFlux are not correct" + FatalErrorInFunction + << "dimensions of faceFlux are not correct" << exit(FatalError); } diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H index 308d40b6b..99a136ef5 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.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 @@ -84,7 +84,7 @@ public: { if (k_ < 0 || k_ > 1) { - FatalIOErrorIn("filteredLinearV2Limiter(Istream& is)", is) + FatalIOErrorInFunction(is) << "coefficient = " << k_ << " should be >= 0 and <= 1" << exit(FatalIOError); @@ -92,7 +92,7 @@ public: if (l_ < 0 || l_ > 1) { - FatalIOErrorIn("filteredLinearV2Limiter(Istream& is)", is) + FatalIOErrorInFunction(is) << "coefficient = " << l_ << " should be >= 0 and <= 1" << exit(FatalIOError); diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2V.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2V.H index c22ea1646..bc4639718 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2V.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2V.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 @@ -84,7 +84,7 @@ public: { if (k_ < 0 || k_ > 1) { - FatalIOErrorIn("filteredLinear2VLimiter(Istream& is)", is) + FatalIOErrorInFunction(is) << "coefficient = " << k_ << " should be >= 0 and <= 1" << exit(FatalIOError); @@ -92,7 +92,7 @@ public: if (l_ < 0 || l_ > 1) { - FatalIOErrorIn("filteredLinear2VLimiter(Istream& is)", is) + FatalIOErrorInFunction(is) << "coefficient = " << l_ << " should be >= 0 and <= 1" << exit(FatalIOError); diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.H index b99f2a549..52e3d8ab5 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.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 @@ -74,7 +74,7 @@ public: { if (k_ < 0 || k_ > 1) { - FatalIOErrorIn("filteredLinear3Limiter(Istream& is)", is) + FatalIOErrorInFunction(is) << "coefficient = " << k_ << " should be >= 0 and <= 1" << exit(FatalIOError); diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.H index 075515ed6..7083b3800 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.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 @@ -74,7 +74,7 @@ public: { if (k_ < 0 || k_ > 1) { - FatalIOErrorIn("filteredLinear3VLimiter(Istream& is)", is) + FatalIOErrorInFunction(is) << "coefficient = " << k_ << " should be >= 0 and <= 1" << exit(FatalIOError); diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubic.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubic.H index 1dbe08775..de85f2684 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubic.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubic.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 @@ -66,7 +66,7 @@ public: { if (k_ < 0 || k_ > 1) { - FatalIOErrorIn("limitedCubicLimiter(Istream& is)", is) + FatalIOErrorInFunction(is) << "coefficient = " << k_ << " should be >= 0 and <= 1" << exit(FatalIOError); diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubicV.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubicV.H index 3fb771ae3..391313b7f 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubicV.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedCubic/limitedCubicV.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 @@ -66,7 +66,7 @@ public: { if (k_ < 0 || k_ > 1) { - FatalIOErrorIn("limitedCubicVLimiter(Istream& is)", is) + FatalIOErrorInFunction(is) << "coefficient = " << k_ << " should be >= 0 and <= 1" << exit(FatalIOError); diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedLinear/limitedLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedLinear/limitedLinear.H index dcdfd75de..260ab8271 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedLinear/limitedLinear.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedLinear/limitedLinear.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 @@ -66,7 +66,7 @@ public: { if (k_ < 0 || k_ > 1) { - FatalIOErrorIn("limitedLinearLimiter(Istream& is)", is) + FatalIOErrorInFunction(is) << "coefficient = " << k_ << " should be >= 0 and <= 1" << exit(FatalIOError); diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C index c50f514da..fa9211235 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.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 @@ -53,10 +53,8 @@ limitedSurfaceInterpolationScheme::New if (schemeData.eof()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "limitedSurfaceInterpolationScheme::" - "New(const fvMesh&, Istream&)", schemeData ) << "Discretisation scheme not specified" << endl << endl @@ -72,10 +70,8 @@ limitedSurfaceInterpolationScheme::New if (constructorIter == MeshConstructorTablePtr_->end()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "limitedSurfaceInterpolationScheme::" - "New(const fvMesh&, Istream&)", schemeData ) << "Unknown discretisation scheme " << schemeName << nl << nl @@ -108,10 +104,8 @@ limitedSurfaceInterpolationScheme::New if (schemeData.eof()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "limitedSurfaceInterpolationScheme::New" - "(const fvMesh&, const surfaceScalarField&, Istream&)", schemeData ) << "Discretisation scheme not specified" << endl << endl @@ -127,10 +121,8 @@ limitedSurfaceInterpolationScheme::New if (constructorIter == MeshFluxConstructorTablePtr_->end()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "limitedSurfaceInterpolationScheme::New" - "(const fvMesh&, const surfaceScalarField&, Istream&)", schemeData ) << "Unknown discretisation scheme " << schemeName << nl << nl diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C index 46bb2e4c2..b2f683dac 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.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 @@ -83,11 +83,8 @@ multivariateSurfaceInterpolationScheme::New if (constructorIter == IstreamConstructorTablePtr_->end()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "multivariateSurfaceInterpolationScheme::New" - "(const fvMesh& mesh, const fieldTable&, " - "const surfaceScalarField&, Istream&)", schemeData ) << "Unknown discretisation scheme " << schemeName << nl << nl << "Valid schemes are :" << endl diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H index b282e36c9..c2aa8498f 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H @@ -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 @@ -143,7 +143,7 @@ public: { if (Co1_ < 0 || Co2_ < 0 || Co1_ >= Co2_) { - FatalIOErrorIn("CoBlended(const fvMesh&, Istream&)", is) + FatalIOErrorInFunction(is) << "coefficients = " << Co1_ << " and " << Co2_ << " should be > 0 and Co2 > Co1" << exit(FatalIOError); @@ -174,7 +174,7 @@ public: { if (Co1_ < 0 || Co2_ < 0 || Co1_ >= Co2_) { - FatalIOErrorIn("CoBlended(const fvMesh&, Istream&)", is) + FatalIOErrorInFunction(is) << "coefficients = " << Co1_ << " and " << Co2_ << " should be > 0 and Co2 > Co1" << exit(FatalIOError); @@ -205,10 +205,8 @@ public: } else if (faceFlux_.dimensions() != dimVelocity*dimArea) { - FatalErrorIn - ( - "CoBlended::blendingFactor()" - ) << "dimensions of faceFlux are not correct" + FatalErrorInFunction + << "dimensions of faceFlux are not correct" << exit(FatalError); } diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C index c1d322ff4..6c3500e17 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.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 @@ -55,7 +55,7 @@ Foam::FitData::FitData // Check input if (linearLimitFactor <= SMALL || linearLimitFactor > 3) { - FatalErrorIn("FitData::FitData(..)") + FatalErrorInFunction << "linearLimitFactor requested = " << linearLimitFactor << " should be between zero and 3" << exit(FatalError); @@ -114,7 +114,7 @@ void Foam::FitData::findFaceDirs if (magk < SMALL) { - FatalErrorIn("findFaceDirs(..)") << " calculated kdir = zero" + FatalErrorInFunction << exit(FatalError); } else @@ -302,10 +302,8 @@ void Foam::FitData::calcFit { // if (debug) // { - WarningIn - ( - "FitData::calcFit(..)" - ) << "Could not fit face " << facei + WarningInFunction + << "Could not fit face " << facei << " Weights = " << coeffsi << ", reverting to linear." << nl << " Linear weights " << wLin << " " << 1 - wLin << endl; diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H index 2fd816b70..11e24700a 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H @@ -153,7 +153,7 @@ public: { if (Co1_ < 0 || Co2_ < 0 || Co1_ >= Co2_) { - FatalIOErrorIn("cellCoBlended(const fvMesh&, Istream&)", is) + FatalIOErrorInFunction(is) << "coefficients = " << Co1_ << " and " << Co2_ << " should be > 0 and Co2 > Co1" << exit(FatalIOError); @@ -184,7 +184,7 @@ public: { if (Co1_ < 0 || Co2_ < 0 || Co1_ >= Co2_) { - FatalIOErrorIn("cellCoBlended(const fvMesh&, Istream&)", is) + FatalIOErrorInFunction(is) << "coefficients = " << Co1_ << " and " << Co2_ << " should be > 0 and Co2 > Co1" << exit(FatalIOError); @@ -215,10 +215,8 @@ public: } else if (faceFlux_.dimensions() != dimVelocity*dimArea) { - FatalErrorIn - ( - "cellCoBlended::blendingFactor()" - ) << "dimensions of faceFlux are not correct" + FatalErrorInFunction + << "dimensions of faceFlux are not correct" << exit(FatalError); } diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H index b69b2a05d..b704841a4 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.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 @@ -65,7 +65,7 @@ class clippedLinear { if (cellSizeRatio_ <= 0 || cellSizeRatio_ > 1) { - FatalErrorIn("clippedLinear::calcWfLimit()") + FatalErrorInFunction << "Given cellSizeRatio of " << cellSizeRatio_ << " is not between 0 and 1" << exit(FatalError); diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H index 083ddc9c4..d521157da 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.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 @@ -109,7 +109,7 @@ public: { if (blendingFactor_ < 0 || blendingFactor_ > 1) { - FatalIOErrorIn("fixedBlended(const fvMesh&, Istream&)", is) + FatalIOErrorInFunction(is) << "coefficient = " << blendingFactor_ << " should be >= 0 and <= 1" << exit(FatalIOError); @@ -146,7 +146,7 @@ public: { if (blendingFactor_ < 0 || blendingFactor_ > 1) { - FatalIOErrorIn("fixedBlended(const fvMesh&, Istream&)", is) + FatalIOErrorInFunction(is) << "coefficient = " << blendingFactor_ << " should be >= 0 and <= 1" << exit(FatalIOError); diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C index 810a72a5c..906821251 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C @@ -48,9 +48,8 @@ tmp > surfaceInterpolationScheme::New { if (schemeData.eof()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "surfaceInterpolationScheme::New(const fvMesh&, Istream&)", schemeData ) << "Discretisation scheme not specified" << endl << endl @@ -75,9 +74,8 @@ tmp > surfaceInterpolationScheme::New if (constructorIter == MeshConstructorTablePtr_->end()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "surfaceInterpolationScheme::New(const fvMesh&, Istream&)", schemeData ) << "Unknown discretisation scheme " << schemeName << nl << nl @@ -101,10 +99,8 @@ tmp > surfaceInterpolationScheme::New { if (schemeData.eof()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "surfaceInterpolationScheme::New" - "(const fvMesh&, const surfaceScalarField&, Istream&)", schemeData ) << "Discretisation scheme not specified" << endl << endl @@ -129,10 +125,8 @@ tmp > surfaceInterpolationScheme::New if (constructorIter == MeshFluxConstructorTablePtr_->end()) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "surfaceInterpolationScheme::New" - "(const fvMesh&, const surfaceScalarField&, Istream&)", schemeData ) << "Unknown discretisation scheme " << schemeName << nl << nl