diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C index 8a8ab924a3..3570aebd80 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,10 +45,8 @@ Foam::autoPtr Foam::PDRDragModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn - ( - "PDRDragModel::New" - ) << "Unknown PDRDragModel type " + FatalErrorInFunction + << "Unknown PDRDragModel type " << modelType << nl << nl << "Valid PDRDragModels are : " << endl << dictionaryConstructorTablePtr_->sortedToc() diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C index bdedac7a33..82411751fb 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,15 +44,8 @@ Foam::autoPtr Foam::XiEqModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn - ( - "XiEqModel::New" - "(" - " const psiuReactionThermo& thermo," - " const compressible::RASModel& turbulence," - " const volScalarField& Su" - ")" - ) << "Unknown XiEqModel type " + FatalErrorInFunction + << "Unknown XiEqModel type " << modelType << nl << nl << "Valid XiEqModels are : " << endl << dictionaryConstructorTablePtr_->sortedToc() diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C index d77cfd8da6..0d7f1afcfb 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,15 +44,8 @@ Foam::autoPtr Foam::XiGModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn - ( - "XiGModel::New" - "(" - " const psiuReactionThermo& thermo," - " const compressible::RASModel& turbulence," - " const volScalarField& Su" - ")" - ) << "Unknown XiGModel type " + FatalErrorInFunction + << "Unknown XiGModel type " << modelType << nl << nl << "Valid XiGModels are : " << endl << dictionaryConstructorTablePtr_->sortedToc() diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C index 04f9b41cd1..a317eb50ec 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,10 +47,8 @@ Foam::autoPtr Foam::XiModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn - ( - "XiModel::New" - ) << "Unknown XiModel type " + FatalErrorInFunction + << "Unknown XiModel type " << modelType << nl << nl << "Valid XiModels are : " << endl << dictionaryConstructorTablePtr_->sortedToc() diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C index 7ae51fd5d1..d4d7782287 100644 --- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C +++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -172,7 +172,7 @@ inline Foam::scalar Foam::laminarFlameSpeedModels::SCOPE::SuRef } else { - FatalErrorIn("laminarFlameSpeedModels::SCOPE::SuRef(scalar phi)") + FatalErrorInFunction << "phi = " << phi << " cannot be handled by SCOPE function with the " "given coefficients" @@ -210,7 +210,7 @@ inline Foam::scalar Foam::laminarFlameSpeedModels::SCOPE::Ma } else { - FatalErrorIn("laminarFlameSpeedModels::SCOPE::Ma(scalar phi)") + FatalErrorInFunction << "phi = " << phi << " cannot be handled by SCOPE function with the " "given coefficients" diff --git a/applications/solvers/combustion/chemFoam/createFields.H b/applications/solvers/combustion/chemFoam/createFields.H index 8855e4501a..7f6cc12195 100644 --- a/applications/solvers/combustion/chemFoam/createFields.H +++ b/applications/solvers/combustion/chemFoam/createFields.H @@ -1,6 +1,6 @@ if (mesh.nCells() != 1) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Solver only applicable to single cell cases" << exit(FatalError); } diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C index 22f5555335..d9a4a4e7df 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C @@ -94,15 +94,8 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField || mag(accommodationCoeff_) > 2.0 ) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "smoluchowskiJumpTFvPatchScalarField::" - "smoluchowskiJumpTFvPatchScalarField" - "(" - " const fvPatch&," - " const DimensionedField&," - " const dictionary&" - ")", dict ) << "unphysical accommodationCoeff specified" << "(0 < accommodationCoeff <= 1)" << endl diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C index 6ec81dd4dc..4656fe7281 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -96,14 +96,8 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField || mag(accommodationCoeff_) > 2.0 ) { - FatalIOErrorIn + FatalIOErrorInFunction ( - "maxwellSlipUFvPatchScalarField::maxwellSlipUFvPatchScalarField" - "(" - "const fvPatch&, " - "const DimensionedField&, " - "const dictionary&" - ")", dict ) << "unphysical accommodationCoeff_ specified" << "(0 < accommodationCoeff_ <= 1)" << endl diff --git a/applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H b/applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H index 13f8f02c9c..e8c28d65c2 100644 --- a/applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H +++ b/applications/solvers/compressible/rhoCentralFoam/readFluxScheme.H @@ -7,10 +7,8 @@ if (mesh.schemesDict().readIfPresent("fluxScheme", fluxScheme)) } else { - FatalErrorIn - ( - "rhoCentralFoam::readFluxScheme" - ) << "fluxScheme: " << fluxScheme + FatalErrorInFunction + << "fluxScheme: " << fluxScheme << " is not a valid choice. " << "Options are: Tadmor, Kurganov" << abort(FatalError); diff --git a/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H b/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H index 7fd01f0e9e..513ca54a42 100644 --- a/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H +++ b/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H @@ -36,7 +36,7 @@ forAll(patches, patchi) || mag(wallNormal & wallNormal2) < 0.99 ) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "wall faces are not parallel for patches " << patches[patchId].name() << " and " << currPatch.name() << nl @@ -45,7 +45,7 @@ forAll(patches, patchi) } else { - FatalErrorIn(args.executable()) << "number of wall faces > 2" + FatalErrorInFunction << nl << exit(FatalError); } } @@ -54,7 +54,7 @@ forAll(patches, patchi) if (nWallFaces == 0) { - FatalErrorIn(args.executable()) << "No wall patches identified" + FatalErrorInFunction << exit(FatalError); } else diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H index cb41f9a407..2f9a7ce6f4 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H @@ -17,7 +17,7 @@ const word inertSpecie(thermo.lookup("inertSpecie")); if (!composition.contains(inertSpecie)) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Specified inert specie '" << inertSpecie << "' not found in " << "species list. Available species:" << composition.species() << exit(FatalError); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H index 9d05da0425..54f0e9e9b2 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H @@ -17,7 +17,7 @@ const word inertSpecie(thermo.lookup("inertSpecie")); if (!composition.contains(inertSpecie)) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Specified inert specie '" << inertSpecie << "' not found in " << "species list. Available species:" << composition.species() << exit(FatalError); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H index cfabbfb5b0..7a26729e54 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H @@ -17,7 +17,7 @@ const word inertSpecie(thermo.lookup("inertSpecie")); if (!composition.contains(inertSpecie)) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Specified inert specie '" << inertSpecie << "' not found in " << "species list. Available species:" << composition.species() << exit(FatalError); diff --git a/applications/solvers/lagrangian/sprayFoam/createFields.H b/applications/solvers/lagrangian/sprayFoam/createFields.H index 7cc45050ce..e043feb221 100644 --- a/applications/solvers/lagrangian/sprayFoam/createFields.H +++ b/applications/solvers/lagrangian/sprayFoam/createFields.H @@ -17,7 +17,7 @@ const word inertSpecie(thermo.lookup("inertSpecie")); if (!composition.contains(inertSpecie)) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Specified inert specie '" << inertSpecie << "' not found in " << "species list. Available species:" << composition.species() << exit(FatalError); diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C index c8857ce9f2..55af594283 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C @@ -717,10 +717,8 @@ Foam::multiphaseMixtureThermo::surfaceTensionForce() const if (sigma == sigmas_.end()) { - FatalErrorIn - ( - "multiphaseMixtureThermo::surfaceTensionForce() const" - ) << "Cannot find interface " << interfacePair(alpha1, alpha2) + FatalErrorInFunction + << "Cannot find interface " << interfacePair(alpha1, alpha2) << " in list of sigma values" << exit(FatalError); } @@ -848,12 +846,8 @@ void Foam::multiphaseMixtureThermo::correctContactAngle if (tp == acap.thetaProps().end()) { - FatalErrorIn - ( - "multiphaseMixtureThermo::correctContactAngle" - "(const phaseModel& alpha1, const phaseModel& alpha2, " - "fvPatchVectorFieldField& nHatb) const" - ) << "Cannot find interface " << interfacePair(alpha1, alpha2) + FatalErrorInFunction + << "Cannot find interface " << interfacePair(alpha1, alpha2) << "\n in table of theta properties for patch " << acap.patch().name() << exit(FatalError); diff --git a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C index ecd9c25623..b36e3f6e77 100644 --- a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C +++ b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,11 +46,8 @@ Foam::autoPtr Foam::mixtureViscosityModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn - ( - "mixtureViscosityModel::New(const volVectorField&, " - "const surfaceScalarField&)" - ) << "Unknown mixtureViscosityModel type " + FatalErrorInFunction + << "Unknown mixtureViscosityModel type " << modelType << nl << nl << "Valid mixtureViscosityModels are : " << endl << dictionaryConstructorTablePtr_->sortedToc() diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C index 578b23f38b..be4de6b2c0 100644 --- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C +++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,13 +82,8 @@ Foam::autoPtr Foam::relativeVelocityModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn - ( - "relativeVelocityModel::New" - "(" - "const dictionary&" - ")" - ) << "Unknown time scale model type " << modelType + FatalErrorInFunction + << "Unknown time scale model type " << modelType << ", constructor not in hash table" << nl << nl << " Valid time scale model types are:" << nl << dictionaryConstructorTablePtr_->sortedToc() diff --git a/applications/solvers/multiphase/interFoam/alphaEqn.H b/applications/solvers/multiphase/interFoam/alphaEqn.H index a2e9097e30..6a24830137 100644 --- a/applications/solvers/multiphase/interFoam/alphaEqn.H +++ b/applications/solvers/multiphase/interFoam/alphaEqn.H @@ -25,7 +25,7 @@ { if (nAlphaSubCycles > 1) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Sub-cycling is not supported " "with the CrankNicolson ddt scheme" << exit(FatalError); @@ -36,7 +36,7 @@ } else { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Only Euler and CrankNicolson ddt schemes are supported" << exit(FatalError); } diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C index 0a86459705..0825368e5c 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -62,10 +62,8 @@ Foam::phaseChangeTwoPhaseMixture::New if (cstrIter == componentsConstructorTablePtr_->end()) { - FatalErrorIn - ( - "phaseChangeTwoPhaseMixture::New" - ) << "Unknown phaseChangeTwoPhaseMixture type " + FatalErrorInFunction + << "Unknown phaseChangeTwoPhaseMixture type " << phaseChangeTwoPhaseMixtureTypeName << endl << endl << "Valid phaseChangeTwoPhaseMixtures are : " << endl << componentsConstructorTablePtr_->sortedToc() diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C index 72542bc01b..3bdd49ec7a 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,7 +46,7 @@ Foam::autoPtr Foam::dragModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("dragModel::New") + FatalErrorInFunction << "Unknown dragModelType type " << dragModelType << endl << endl << "Valid dragModel types are : " << endl diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C index aaa972032d..deabfc900f 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,7 +50,7 @@ Foam::autoPtr Foam::heatTransferModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("heatTransferModel::New") + FatalErrorInFunction << "Unknown heatTransferModelType type " << heatTransferModelType << endl << endl << "Valid heatTransferModel types are : " << endl diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C index b9014f3f46..b58f00291b 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,7 +48,7 @@ Foam::autoPtr Foam::diameterModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("diameterModel::New") + FatalErrorInFunction << "Unknown diameterModelType type " << diameterModelType << endl << endl << "Valid diameterModel types are : " << endl diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C index 767600e394..d0cd5c9b18 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C @@ -295,12 +295,8 @@ void Foam::multiphaseSystem::correctContactAngle if (tp == acap.thetaProps().end()) { - FatalErrorIn - ( - "multiphaseSystem::correctContactAngle" - "(const phaseModel& phase1, const phaseModel& phase2, " - "fvPatchVectorFieldField& nHatb) const" - ) << "Cannot find interface " << interfacePair(phase1, phase2) + FatalErrorInFunction + << "Cannot find interface " << interfacePair(phase1, phase2) << "\n in table of theta properties for patch " << acap.patch().name() << exit(FatalError); @@ -478,12 +474,8 @@ Foam::multiphaseSystem::multiphaseSystem if (cAlpha == cAlphas_.end()) { - WarningIn - ( - "multiphaseSystem::multiphaseSystem" - "(const volVectorField& U," - "const surfaceScalarField& phi)" - ) << "Compression coefficient not specified for " + WarningInFunction + << "Compression coefficient not specified for " "phase pair (" << phase1.name() << ' ' << phase2.name() << ") for which a surface tension " diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C index f1305897ba..1bbd3177af 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C @@ -288,7 +288,7 @@ Foam::multiphaseMixture::surfaceTensionForce() const if (sigma == sigmas_.end()) { - FatalErrorIn("multiphaseMixture::surfaceTensionForce() const") + FatalErrorInFunction << "Cannot find interface " << interfacePair(alpha1, alpha2) << " in list of sigma values" << exit(FatalError); @@ -442,12 +442,8 @@ void Foam::multiphaseMixture::correctContactAngle if (tp == acap.thetaProps().end()) { - FatalErrorIn - ( - "multiphaseMixture::correctContactAngle" - "(const phase& alpha1, const phase& alpha2, " - "fvPatchVectorFieldField& nHatb) const" - ) << "Cannot find interface " << interfacePair(alpha1, alpha2) + FatalErrorInFunction + << "Cannot find interface " << interfacePair(alpha1, alpha2) << "\n in table of theta properties for patch " << acap.patch().name() << exit(FatalError); diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C index 06754e2f86..03b21be490 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C @@ -50,16 +50,8 @@ Foam::interfaceCompositionModels::Henry::Henry { if (k_.size() != this->speciesNames_.size()) { - FatalErrorIn - ( - "template " - "Foam::interfaceCompositionModels::Henry:: " - "Henry " - "( " - "const dictionary& dict, " - "const phasePair& pair " - ")" - ) << "Differing number of species and solubilities" + FatalErrorInFunction + << "Differing number of species and solubilities" << exit(FatalError); } } diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C index 169580e3cf..6818c243f1 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C @@ -63,17 +63,8 @@ NonRandomTwoLiquid { if (this->speciesNames_.size() != 2) { - FatalErrorIn - ( - "template" - "Foam::interfaceCompositionModels::" - "NonRandomTwoLiquid::" - "NonRandomTwoLiquid" - "( " - "const dictionary& dict, " - "const phasePair& pair " - ")" - ) << "NonRandomTwoLiquid model is suitable for two species only." + FatalErrorInFunction + << "NonRandomTwoLiquid model is suitable for two species only." << exit(FatalError); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C index c0d9b64e39..435bb7df2a 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C @@ -64,16 +64,8 @@ Foam::interfaceCompositionModels::Saturated::Saturated { if (this->speciesNames_.size() != 1) { - FatalErrorIn - ( - "template" - "Foam::interfaceCompositionModels::Saturated::" - "Saturated" - "( " - "const dictionary& dict, " - "const phasePair& pair " - ")" - ) << "Saturated model is suitable for one species only." + FatalErrorInFunction + << "Saturated model is suitable for one species only." << exit(FatalError); } } diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C index 8b04d8f5f1..16b3055687 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C @@ -54,7 +54,7 @@ Foam::interfaceCompositionModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("interfaceCompositionModel::New") + FatalErrorInFunction << "Unknown interfaceCompositionModelType type " << interfaceCompositionModelType << endl << endl << "Valid interfaceCompositionModel types are : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C index d8ee288ef0..1251c98fe0 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C @@ -44,7 +44,7 @@ Foam::autoPtr Foam::massTransferModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("massTransferModel::New") + FatalErrorInFunction << "Unknown massTransferModelType type " << massTransferModelType << endl << endl << "Valid massTransferModel types are : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C index 93770692a5..920d7c62c8 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C @@ -42,7 +42,7 @@ Foam::autoPtr Foam::saturationModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("saturationModel::New") + FatalErrorInFunction << "Unknown saturationModelType type " << saturationModelType << endl << endl << "Valid saturationModel types are : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C index 0b01665863..82359c0508 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C @@ -45,7 +45,7 @@ Foam::surfaceTensionModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("surfaceTensionModel::New") + FatalErrorInFunction << "Unknown surfaceTensionModelType type " << surfaceTensionModelType << endl << endl << "Valid surfaceTensionModel types are : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C index ff4cb63441..568c1b2682 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C @@ -45,7 +45,7 @@ Foam::aspectRatioModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("aspectRatioModel::New") + FatalErrorInFunction << "Unknown aspectRatioModelType type " << aspectRatioModelType << endl << endl << "Valid aspectRatioModel types are : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C index 041468a15b..e077e31b2d 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C @@ -44,7 +44,7 @@ Foam::autoPtr Foam::dragModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("dragModel::New") + FatalErrorInFunction << "Unknown dragModelType type " << dragModelType << endl << endl << "Valid dragModel types are : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C index 2f3e0db699..00ca3d49ee 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C @@ -66,7 +66,7 @@ Foam::dragModels::segregated::~segregated() Foam::tmp Foam::dragModels::segregated::CdRe() const { - FatalErrorIn("Foam::dragModels::segregated::CdRe() const") + FatalErrorInFunction << "Not implemented." << "Drag coefficient not defined for the segregated model." << exit(FatalError); diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C index 24f02b69b4..8cdb07f297 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C @@ -44,7 +44,7 @@ Foam::autoPtr Foam::heatTransferModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("heatTransferModel::New") + FatalErrorInFunction << "Unknown heatTransferModelType type " << heatTransferModelType << endl << endl << "Valid heatTransferModel types are : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C index 5548dfd70a..fa364a68c1 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C @@ -79,11 +79,8 @@ Foam::tmp Foam::liftModels::Moraga::Cl() const || max(sqrSr).value() > 0.04 ) { - WarningIn - ( - "Foam::tmp " - "Foam::liftModels::Moraga::Cl() const" - ) << "Re and/or Sr are out of the range of applicability of the " + WarningInFunction + << "Re and/or Sr are out of the range of applicability of the " << "Moraga model. Clamping to range bounds" << endl; } diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C index c53ff96e3d..3da4caee7c 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C @@ -44,7 +44,7 @@ Foam::autoPtr Foam::liftModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("liftModel::New") + FatalErrorInFunction << "Unknown liftModelType type " << liftModelType << endl << endl << "Valid liftModel types are : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C index 651286c3ee..a7181b4396 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C @@ -45,7 +45,7 @@ Foam::swarmCorrection::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("swarmCorrection::New") + FatalErrorInFunction << "Unknown swarmCorrectionType type " << swarmCorrectionType << endl << endl << "Valid swarmCorrection types are : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C index 14d560969b..e440e3d1ee 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C @@ -45,7 +45,7 @@ Foam::turbulentDispersionModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("turbulentDispersionModel::New") + FatalErrorInFunction << "Unknown turbulentDispersionModelType type " << turbulentDispersionModelType << endl << endl << "Valid turbulentDispersionModel types are : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C index 72f620a424..4c4ced9ddc 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C @@ -44,7 +44,7 @@ Foam::autoPtr Foam::virtualMassModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("virtualMassModel::New") + FatalErrorInFunction << "Unknown virtualMassModelType type " << virtualMassModelType << endl << endl << "Valid virtualMassModel types are : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C index 9f7d905c19..08dfd7065d 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C @@ -44,7 +44,7 @@ Foam::autoPtr Foam::wallLubricationModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("wallLubricationModel::New") + FatalErrorInFunction << "Unknown wallLubricationModelType type " << wallLubricationModelType << endl << endl << "Valid wallLubricationModel types are : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C index 2dcc6d0a5e..e288235568 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C @@ -43,7 +43,7 @@ Foam::autoPtr Foam::blendingMethod::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("blendingMethod::New") + FatalErrorInFunction << "Unknown blendingMethodType type " << blendingMethodType << endl << endl << "Valid blendingMethod types are : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C index d9bfe2b598..5106653535 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C @@ -93,14 +93,8 @@ Foam::blendingMethods::linear::linear < minPartlyContinuousAlpha_[*iter] ) { - FatalErrorIn - ( - "Foam::blendingMethods::linear::linear" - "(" - "const dictionary& dict," - "const wordList& phaseNames" - ")" - ) << "The supplied fully continuous volume fraction for " + FatalErrorInFunction + << "The supplied fully continuous volume fraction for " << *iter << " is less than the partly continuous value." << endl << exit(FatalError); diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C index 8db37d2bf0..b58f00291b 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C @@ -48,7 +48,7 @@ Foam::autoPtr Foam::diameterModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("diameterModel::New") + FatalErrorInFunction << "Unknown diameterModelType type " << diameterModelType << endl << endl << "Valid diameterModel types are : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C index 0a577313b2..6c1ca526db 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C @@ -45,7 +45,7 @@ Foam::autoPtr Foam::phaseModel::New if (cstrIter == phaseSystemConstructorTablePtr_->end()) { - FatalErrorIn("phaseModel::New") + FatalErrorInFunction << "Unknown phaseModelType type " << phaseModelType << endl << endl << "Valid phaseModel types are : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C index b40c4688b3..8d73c1286c 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C @@ -175,7 +175,7 @@ const Foam::tmp& Foam::phaseModel::divU() const void Foam::phaseModel::divU(const tmp& divU) { - WarningIn("phaseModel::divU(const tmp& divU)") + WarningInFunction << "Attempt to set the dilatation rate of an incompressible phase" << endl; } @@ -196,7 +196,7 @@ const Foam::surfaceScalarField& Foam::phaseModel::DbyA() const void Foam::phaseModel::DbyA(const tmp& DbyA) { - WarningIn("phaseModel::DbyA(const surfaceScalarField& DbyA)") + WarningInFunction << "Attempt to set the dilatation rate of an incompressible phase" << endl; } diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C index 16478646d7..70ddd04270 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C @@ -67,7 +67,7 @@ Foam::phasePair::~phasePair() const Foam::phaseModel& Foam::phasePair::dispersed() const { - FatalErrorIn("Foam::phasePair::dispersed() const") + FatalErrorInFunction << "Requested dispersed phase from an unordered pair." << exit(FatalError); @@ -77,7 +77,7 @@ const Foam::phaseModel& Foam::phasePair::dispersed() const const Foam::phaseModel& Foam::phasePair::continuous() const { - FatalErrorIn("Foam::phasePair::dispersed() const") + FatalErrorInFunction << "Requested continuous phase from an unordered pair." << exit(FatalError); @@ -191,7 +191,7 @@ Foam::tmp Foam::phasePair::Ta() const Foam::tmp Foam::phasePair::E() const { - FatalErrorIn("Foam::phasePair::E() const") + FatalErrorInFunction << "Requested aspect ratio of the dispersed phase in an unordered pair" << exit(FatalError); diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C index 13ae288f08..da6627b922 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C @@ -133,14 +133,8 @@ Foam::Istream& Foam::operator>>(Istream& is, phasePairKey& key) } else { - FatalErrorIn - ( - "friend Istream& operator>>" - "(" - "Istream& is, " - "phasePairKey& key" - ")" - ) << "Phase pair type is not recognised. " + FatalErrorInFunction + << "Phase pair type is not recognised. " << temp << "Use (phaseDispersed in phaseContinuous) for an ordered" << "pair, or (phase1 and pase2) for an unordered pair." diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C index fe1e4d4a8d..2b06f1a7f4 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C @@ -400,12 +400,8 @@ void Foam::multiphaseSystem::correctContactAngle if (tp == acap.thetaProps().end()) { - FatalErrorIn - ( - "multiphaseSystem::correctContactAngle" - "(const phaseModel& phase1, const phaseModel& phase2, " - "fvPatchVectorFieldField& nHatb) const" - ) << "Cannot find interface " + FatalErrorInFunction + << "Cannot find interface " << phasePairKey(phase1.name(), phase2.name()) << "\n in table of theta properties for patch " << acap.patch().name() diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C index 79e3546c49..7ee24aa1aa 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C @@ -56,7 +56,7 @@ Foam::autoPtr Foam::multiphaseSystem::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("multiphaseSystem::New") + FatalErrorInFunction << "Unknown multiphaseSystemType type " << multiphaseSystemType << endl << endl << "Valid multiphaseSystem types are : " << endl diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C index a37553e338..76b5879ac1 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C @@ -56,11 +56,7 @@ void alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::checkType() { if (!isA(patch())) { - FatalErrorIn - ( - "alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField" - "::checkType()" - ) + FatalErrorInFunction << "Patch type for patch " << patch().name() << " must be wall\n" << "Current patch type is " << patch().type() << nl << exit(FatalError); diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C index ea28dd01b5..c3d306738d 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C @@ -89,16 +89,8 @@ JohnsonJacksonParticleSlipFvPatchVectorField || (specularityCoefficient_.value() > 1) ) { - FatalErrorIn - ( - "(" - "Foam::JohnsonJacksonParticleSlipFvPatchVectorField::" - "JohnsonJacksonParticleSlipFvPatchVectorField" - "const fvPatch& p," - "const DimensionedField& iF," - "const dictionary& dict" - ")" - ) << "The specularity coefficient has to be between 0 and 1" + FatalErrorInFunction + << "The specularity coefficient has to be between 0 and 1" << abort(FatalError); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C index 93d97c650c..f4d7dd4ee9 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C @@ -97,16 +97,8 @@ JohnsonJacksonParticleThetaFvPatchScalarField || (restitutionCoefficient_.value() > 1) ) { - FatalErrorIn - ( - "Foam::JohnsonJacksonParticleThetaFvPatchScalarField::" - "JohnsonJacksonParticleThetaFvPatchScalarField" - "(" - "const fvPatch& p," - "const DimensionedField& iF," - "const dictionary& dict" - ")" - ) << "The restitution coefficient has to be between 0 and 1" + FatalErrorInFunction + << "The restitution coefficient has to be between 0 and 1" << abort(FatalError); } @@ -116,16 +108,8 @@ JohnsonJacksonParticleThetaFvPatchScalarField || (specularityCoefficient_.value() > 1) ) { - FatalErrorIn - ( - "Foam::JohnsonJacksonParticleThetaFvPatchScalarField::" - "JohnsonJacksonParticleThetaFvPatchScalarField" - "(" - "const fvPatch& p," - "const DimensionedField& iF," - "const dictionary& dict" - ")" - ) << "The specularity coefficient has to be between 0 and 1" + FatalErrorInFunction + << "The specularity coefficient has to be between 0 and 1" << abort(FatalError); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C index 92e9799920..dd110902b1 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C @@ -55,11 +55,8 @@ Foam::diameterModels::IATEsource::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn - ( - "IATEsource::New" - "(const word& type, const IATE&, const dictionary&)" - ) << "Unknown IATE source type " + FatalErrorInFunction + << "Unknown IATE source type " << type << nl << nl << "Valid IATE source types : " << endl << dictionaryConstructorTablePtr_->sortedToc() diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C index 0324fb2f56..5477ae7c58 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C @@ -56,7 +56,7 @@ Foam::autoPtr Foam::twoPhaseSystem::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("twoPhaseSystem::New") + FatalErrorInFunction << "Unknown twoPhaseSystemType type " << twoPhaseSystemType << endl << endl << "Valid twoPhaseSystem types are : " << endl diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C index ff4cb63441..568c1b2682 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C @@ -45,7 +45,7 @@ Foam::aspectRatioModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("aspectRatioModel::New") + FatalErrorInFunction << "Unknown aspectRatioModelType type " << aspectRatioModelType << endl << endl << "Valid aspectRatioModel types are : " << endl diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C index ce06feab07..e077e31b2d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,7 +44,7 @@ Foam::autoPtr Foam::dragModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("dragModel::New") + FatalErrorInFunction << "Unknown dragModelType type " << dragModelType << endl << endl << "Valid dragModel types are : " << endl diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C index 4b1fc88ddc..ca0a145f5b 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C @@ -66,7 +66,7 @@ Foam::dragModels::segregated::~segregated() Foam::tmp Foam::dragModels::segregated::CdRe() const { - FatalErrorIn("Foam::dragModels::segregated::CdRe() const") + FatalErrorInFunction << "Not implemented." << "Drag coefficient not defined for the segregated model." << exit(FatalError); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C index bceb23cacc..8cdb07f297 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,7 +44,7 @@ Foam::autoPtr Foam::heatTransferModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("heatTransferModel::New") + FatalErrorInFunction << "Unknown heatTransferModelType type " << heatTransferModelType << endl << endl << "Valid heatTransferModel types are : " << endl diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C index 5548dfd70a..fa364a68c1 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C @@ -79,11 +79,8 @@ Foam::tmp Foam::liftModels::Moraga::Cl() const || max(sqrSr).value() > 0.04 ) { - WarningIn - ( - "Foam::tmp " - "Foam::liftModels::Moraga::Cl() const" - ) << "Re and/or Sr are out of the range of applicability of the " + WarningInFunction + << "Re and/or Sr are out of the range of applicability of the " << "Moraga model. Clamping to range bounds" << endl; } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C index e8a476d441..3da4caee7c 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,7 +44,7 @@ Foam::autoPtr Foam::liftModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("liftModel::New") + FatalErrorInFunction << "Unknown liftModelType type " << liftModelType << endl << endl << "Valid liftModel types are : " << endl diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C index 8c8f096a2e..a7181b4396 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,7 +45,7 @@ Foam::swarmCorrection::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("swarmCorrection::New") + FatalErrorInFunction << "Unknown swarmCorrectionType type " << swarmCorrectionType << endl << endl << "Valid swarmCorrection types are : " << endl diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C index fa267e80d5..e440e3d1ee 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,7 +45,7 @@ Foam::turbulentDispersionModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("turbulentDispersionModel::New") + FatalErrorInFunction << "Unknown turbulentDispersionModelType type " << turbulentDispersionModelType << endl << endl << "Valid turbulentDispersionModel types are : " << endl diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C index 82b9b47f17..4c4ced9ddc 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,7 +44,7 @@ Foam::autoPtr Foam::virtualMassModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("virtualMassModel::New") + FatalErrorInFunction << "Unknown virtualMassModelType type " << virtualMassModelType << endl << endl << "Valid virtualMassModel types are : " << endl diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C index b9766e7d52..08dfd7065d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,7 +44,7 @@ Foam::autoPtr Foam::wallLubricationModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("wallLubricationModel::New") + FatalErrorInFunction << "Unknown wallLubricationModelType type " << wallLubricationModelType << endl << endl << "Valid wallLubricationModel types are : " << endl diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C index ea28dd01b5..c3d306738d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C @@ -89,16 +89,8 @@ JohnsonJacksonParticleSlipFvPatchVectorField || (specularityCoefficient_.value() > 1) ) { - FatalErrorIn - ( - "(" - "Foam::JohnsonJacksonParticleSlipFvPatchVectorField::" - "JohnsonJacksonParticleSlipFvPatchVectorField" - "const fvPatch& p," - "const DimensionedField& iF," - "const dictionary& dict" - ")" - ) << "The specularity coefficient has to be between 0 and 1" + FatalErrorInFunction + << "The specularity coefficient has to be between 0 and 1" << abort(FatalError); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C index 93d97c650c..f4d7dd4ee9 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C @@ -97,16 +97,8 @@ JohnsonJacksonParticleThetaFvPatchScalarField || (restitutionCoefficient_.value() > 1) ) { - FatalErrorIn - ( - "Foam::JohnsonJacksonParticleThetaFvPatchScalarField::" - "JohnsonJacksonParticleThetaFvPatchScalarField" - "(" - "const fvPatch& p," - "const DimensionedField& iF," - "const dictionary& dict" - ")" - ) << "The restitution coefficient has to be between 0 and 1" + FatalErrorInFunction + << "The restitution coefficient has to be between 0 and 1" << abort(FatalError); } @@ -116,16 +108,8 @@ JohnsonJacksonParticleThetaFvPatchScalarField || (specularityCoefficient_.value() > 1) ) { - FatalErrorIn - ( - "Foam::JohnsonJacksonParticleThetaFvPatchScalarField::" - "JohnsonJacksonParticleThetaFvPatchScalarField" - "(" - "const fvPatch& p," - "const DimensionedField& iF," - "const dictionary& dict" - ")" - ) << "The specularity coefficient has to be between 0 and 1" + FatalErrorInFunction + << "The specularity coefficient has to be between 0 and 1" << abort(FatalError); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C index 95b277fd99..e288235568 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ Foam::autoPtr Foam::blendingMethod::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("blendingMethod::New") + FatalErrorInFunction << "Unknown blendingMethodType type " << blendingMethodType << endl << endl << "Valid blendingMethod types are : " << endl diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C index 48dcd0855e..f89804bb7d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -93,14 +93,8 @@ Foam::blendingMethods::linear::linear > maxPartlyDispersedAlpha_[*iter] ) { - FatalErrorIn - ( - "Foam::blendingMethods::linear::linear" - "(" - "const dictionary& dict," - "const wordList& phaseNames" - ")" - ) << "The supplied fully dispersed volume fraction for " + FatalErrorInFunction + << "The supplied fully dispersed volume fraction for " << *iter << " is greater than the partly dispersed value." << endl << exit(FatalError); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C index 84db282908..27fd28d68d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,11 +56,8 @@ Foam::diameterModels::IATEsource::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn - ( - "IATEsource::New" - "(const word& type, const IATE&, const dictionary&)" - ) << "Unknown IATE source type " + FatalErrorInFunction + << "Unknown IATE source type " << type << nl << nl << "Valid IATE source types : " << endl << dictionaryConstructorTablePtr_->sortedToc() diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C index b9014f3f46..b58f00291b 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,7 +48,7 @@ Foam::autoPtr Foam::diameterModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("diameterModel::New") + FatalErrorInFunction << "Unknown diameterModelType type " << diameterModelType << endl << endl << "Valid diameterModel types are : " << endl diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C index 808208ea99..5e983b7c19 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -85,7 +85,7 @@ Foam::tmp Foam::orderedPhasePair::E() const { if (!aspectRatio_.valid()) { - FatalErrorIn("Foam::orderedPhasePair::E() const") + FatalErrorInFunction << "Aspect ratio model not specified for " << *this << "." << exit(FatalError); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.C index 0f77a41ad0..ef4f6abb8e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.C @@ -82,7 +82,7 @@ Foam::phasePair::~phasePair() const Foam::phaseModel& Foam::phasePair::dispersed() const { - FatalErrorIn("Foam::phasePair::dispersed() const") + FatalErrorInFunction << "Requested dispersed phase from an unordered pair." << exit(FatalError); @@ -92,7 +92,7 @@ const Foam::phaseModel& Foam::phasePair::dispersed() const const Foam::phaseModel& Foam::phasePair::continuous() const { - FatalErrorIn("Foam::phasePair::dispersed() const") + FatalErrorInFunction << "Requested continuous phase from an unordered pair." << exit(FatalError); @@ -185,7 +185,7 @@ Foam::tmp Foam::phasePair::Ta() const Foam::tmp Foam::phasePair::E() const { - FatalErrorIn("Foam::phasePair::E() const") + FatalErrorInFunction << "Requested aspect ratio of the dispersed phase in an unordered pair" << exit(FatalError); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePairKey/phasePairKey.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePairKey/phasePairKey.C index 4280dd5fb3..d203fb0349 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePairKey/phasePairKey.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePairKey/phasePairKey.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -125,14 +125,8 @@ Foam::Istream& Foam::operator>>(Istream& is, phasePairKey& key) } else { - FatalErrorIn - ( - "friend Istream& operator>>" - "(" - "Istream& is, " - "phasePairKey& key" - ")" - ) << "Phase pair type is not recognised. " + FatalErrorInFunction + << "Phase pair type is not recognised. " << temp << "Use (phaseDispersed in phaseContinuous) for an ordered" << "pair, or (phase1 and pase2) for an unordered pair." diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H index 4f85d6dad8..eca43adbf7 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H @@ -61,10 +61,8 @@ } else { - FatalErrorIn - ( - "readMechanicalProperties.H" - ) << "Valid type entries are uniform or field for rho" + FatalErrorInFunction + << "Valid type entries are uniform or field for rho" << abort(FatalError); } @@ -119,10 +117,8 @@ } else { - FatalErrorIn - ( - "readMechanicalProperties.H" - ) << "Valid type entries are uniform or field for E" + FatalErrorInFunction + << "Valid type entries are uniform or field for E" << abort(FatalError); } @@ -175,10 +171,8 @@ } else { - FatalErrorIn - ( - "readMechanicalProperties.H" - ) << "Valid type entries are uniform or field for nu" + FatalErrorInFunction + << "Valid type entries are uniform or field for nu" << abort(FatalError); } diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H index afcff762e4..45327c2b4b 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H @@ -96,10 +96,8 @@ if (thermalStress) } else { - FatalErrorIn - ( - "readThermalProperties.H" - ) << "Valid type entries are uniform or field for C" + FatalErrorInFunction + << "Valid type entries are uniform or field for C" << abort(FatalError); } @@ -154,10 +152,8 @@ if (thermalStress) } else { - FatalErrorIn - ( - "readThermalProperties.H" - ) << "Valid type entries are uniform or field for K" + FatalErrorInFunction + << "Valid type entries are uniform or field for K" << abort(FatalError); } @@ -212,10 +208,8 @@ if (thermalStress) } else { - FatalErrorIn - ( - "readThermalProperties.H" - ) << "Valid type entries are uniform or field for alpha" + FatalErrorInFunction + << "Valid type entries are uniform or field for alpha" << abort(FatalError); } diff --git a/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C b/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C index 2dd7905294..940bc871ab 100644 --- a/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C +++ b/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -130,7 +130,7 @@ int main(int argc, char *argv[]) ); if (!ok) { - WarningIn(args.executable()) + WarningInFunction << "At level " << level << " there are " << coarseSize << " agglomerated cells but " << newCoarseSize diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C index e4bc196777..38a4b110f9 100644 --- a/applications/test/fieldMapping/Test-fieldMapping.C +++ b/applications/test/fieldMapping/Test-fieldMapping.C @@ -225,7 +225,7 @@ int main(int argc, char *argv[]) { if (mesh.V().size() != mesh.nCells()) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Volume not mapped. V:" << mesh.V().size() << " nCells:" << mesh.nCells() << exit(FatalError); @@ -238,7 +238,7 @@ int main(int argc, char *argv[]) if (mag(newVol-totalVol)/totalVol > 1e-10) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Volume loss: old volume:" << totalVol << " new volume:" << newVol << exit(FatalError); @@ -260,7 +260,7 @@ int main(int argc, char *argv[]) if (notEqual(max, 1.0, 1e-10) || notEqual(min, 1.0, 1e-10)) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Uniform volVectorField not preserved." << " Min and max should both be 1.0. min:" << min << " max:" << max @@ -284,7 +284,7 @@ int main(int argc, char *argv[]) if (notEqual(max, 0.0, 1e-10) || notEqual(min, 0.0, 1e-10)) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Linear profile not preserved." << " Min and max should both be 0.0. min:" << min << " max:" << max @@ -307,7 +307,7 @@ int main(int argc, char *argv[]) if (notEqual(max, 1.0, 1e-10) || notEqual(min, 1.0, 1e-10)) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Uniform surfaceScalarField not preserved." << " Min and max should both be 1.0. min:" << min << " max:" << max diff --git a/applications/test/globalIndex/Test-globalIndex.C b/applications/test/globalIndex/Test-globalIndex.C index 11078c858b..0de4f04b3c 100644 --- a/applications/test/globalIndex/Test-globalIndex.C +++ b/applications/test/globalIndex/Test-globalIndex.C @@ -53,14 +53,14 @@ int main(int argc, char *argv[]) if (globalNumbering.localSize() != mesh.nCells()) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Problem." << abort(FatalError); } if (!Pstream::parRun()) { - WarningIn(args.executable()) + WarningInFunction << "globalIndex class is only useful in parallel code." << endl; } @@ -77,14 +77,14 @@ int main(int argc, char *argv[]) if (procI != Pstream::myProcNo() || localCellI != cellI) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Problem. cellI:" << cellI << " localCellI:" << localCellI << " procI:" << procI << abort(FatalError); } if (!globalNumbering.isLocal(globalCellI)) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Problem. cellI:" << cellI << " globalCellI:" << globalCellI << " not local" << abort(FatalError); } @@ -95,7 +95,7 @@ int main(int argc, char *argv[]) if (mesh.nCells() < 1) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Test needs to be run on a case with at least one" << " cell per processor." << abort(FatalError); } @@ -109,7 +109,7 @@ int main(int argc, char *argv[]) if (procI != Pstream::myProcNo()-1) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Problem. global:" << prevProcCellI << " expected on processor:" << Pstream::myProcNo()-1 << " but is calculated to be on procI:" << procI @@ -118,14 +118,14 @@ int main(int argc, char *argv[]) if (globalNumbering.isLocal(prevProcCellI)) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Problem. globalCellI:" << prevProcCellI << " calculated as local" << abort(FatalError); } if (!globalNumbering.isLocal(procI, prevProcCellI)) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Problem. globalCellI:" << prevProcCellI << " not calculated as local on processor:" << procI << abort(FatalError); @@ -140,7 +140,7 @@ int main(int argc, char *argv[]) if (procI != Pstream::myProcNo()+1) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Problem. global:" << nextProcCellI << " expected on processor:" << Pstream::myProcNo()+1 << " but is calculated to be on procI:" << procI @@ -149,14 +149,14 @@ int main(int argc, char *argv[]) if (globalNumbering.isLocal(nextProcCellI)) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Problem. globalCellI:" << nextProcCellI << " calculated as local" << abort(FatalError); } if (!globalNumbering.isLocal(procI, nextProcCellI)) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Problem. globalCellI:" << nextProcCellI << " not calculated as local on processor:" << procI << abort(FatalError); diff --git a/applications/test/hexRef8/Test-hexRef8.C b/applications/test/hexRef8/Test-hexRef8.C index 44a6094076..f79628fd8c 100644 --- a/applications/test/hexRef8/Test-hexRef8.C +++ b/applications/test/hexRef8/Test-hexRef8.C @@ -309,7 +309,7 @@ int main(int argc, char *argv[]) { if (mesh.V().size() != mesh.nCells()) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Volume not mapped. V:" << mesh.V().size() << " nCells:" << mesh.nCells() << exit(FatalError); @@ -322,7 +322,7 @@ int main(int argc, char *argv[]) if (mag(newVol-totalVol)/totalVol > 1e-10) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Volume loss: old volume:" << totalVol << " new volume:" << newVol << exit(FatalError); @@ -344,7 +344,7 @@ int main(int argc, char *argv[]) if (notEqual(max, 1.0, 1e-10) || notEqual(min, 1.0, 1e-10)) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Uniform volVectorField not preserved." << " Min and max should both be 1.0. min:" << min << " max:" << max @@ -389,7 +389,7 @@ int main(int argc, char *argv[]) if (notEqual(max, 1.0, 1e-10) || notEqual(min, 1.0, 1e-10)) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Uniform surfaceScalarField not preserved." << " Min and max should both be 1.0. min:" << min << " max:" << max diff --git a/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C b/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C index ea27cfc7df..88c0a24571 100644 --- a/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C +++ b/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C @@ -169,7 +169,7 @@ int main(int argc, char *argv[]) if (data != procI) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "From processor " << procI << " received " << data << " but expected " << procI << exit(FatalError); diff --git a/applications/test/primitivePatch/Test-PrimitivePatch.C b/applications/test/primitivePatch/Test-PrimitivePatch.C index 60d321b2b7..3f5e9161e3 100644 --- a/applications/test/primitivePatch/Test-PrimitivePatch.C +++ b/applications/test/primitivePatch/Test-PrimitivePatch.C @@ -71,7 +71,7 @@ void checkFaceEdges if (edges[myEdges[fp]] != edge(f[fp], f[fp1])) { - FatalErrorIn("checkFaceEdges") + FatalErrorInFunction << "Edges of face not in face point order:" << "face:" << faceI << " localF:" << f << " faceEdges:" << myEdges diff --git a/applications/test/router/Gather/GatherBase.C b/applications/test/router/Gather/GatherBase.C index 553e41a818..e3f281db7e 100644 --- a/applications/test/router/Gather/GatherBase.C +++ b/applications/test/router/Gather/GatherBase.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -70,11 +70,8 @@ IndexType GatherBase::offset { if (values.size() != indices.size()) { - FatalErrorIn - ( - "GatherBase::offset(const List&, " - "const List&, AddOp)" - ) << "Input data and indices lists not equal size." << endl + FatalErrorInFunction + << "Input data and indices lists not equal size." << endl << "data size:" << values.size() << " indices:" << indices.size() << abort(FatalError); diff --git a/applications/test/router/Test-processorRouter.C b/applications/test/router/Test-processorRouter.C index 580277ee7e..2c6e5b1e6d 100644 --- a/applications/test/router/Test-processorRouter.C +++ b/applications/test/router/Test-processorRouter.C @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) if (!Pstream::parRun()) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Please run in parallel" << exit(FatalError); } diff --git a/applications/test/router/router.C b/applications/test/router/router.C index 84420a907c..0b55495bea 100644 --- a/applications/test/router/router.C +++ b/applications/test/router/router.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -125,12 +125,8 @@ void Foam::router::fixWeights if (minNodeI == -1) { - WarningIn - ( - "Foam::router::fixWeights" - "(const label startNodeI, const label endNodeI," - "const label nodeI, const label prevNodeI)" - ) << "Cannot route from node " << nodeI + WarningInFunction + << "Cannot route from node " << nodeI << " since all neigbours of node " << "already allocated:" << endl; @@ -138,12 +134,7 @@ void Foam::router::fixWeights { label nbrNodeI = myNeighbours[neighbourI]; - WarningIn - ( - "Foam::router::fixWeights" - "(const label startNodeI, const label endNodeI," - "const label nodeI, const label prevNodeI)" - ) << " neighbour:" << nbrNodeI + WarningInFunction << " weight:" << weights_[nbrNodeI] << endl; } return; @@ -292,7 +283,7 @@ bool Foam::router::route(const labelList& path, const label pathValue) { if (pathValue >= 0) { - FatalErrorIn("router::route(const labelList&, const label)") + FatalErrorInFunction << "Illegal pathValue " << pathValue << exit(FatalError); } @@ -382,7 +373,7 @@ Foam::labelList Foam::router::getRoute(const label pathValue) const if (pathNodeI == -1) { - FatalErrorIn("router::getRoute(const label)") + FatalErrorInFunction << "No route with value " << pathValue << endl; } diff --git a/applications/test/syncTools/Test-syncTools.C b/applications/test/syncTools/Test-syncTools.C index f7379b8cd5..f9a7764384 100644 --- a/applications/test/syncTools/Test-syncTools.C +++ b/applications/test/syncTools/Test-syncTools.C @@ -29,7 +29,6 @@ Description \*---------------------------------------------------------------------------*/ - #include "syncTools.H" #include "argList.H" #include "polyMesh.H" @@ -81,7 +80,7 @@ void testPackedList(const polyMesh& mesh, Random& rndGen) || maxEdgeValues[i] != label(maxBits.get(i)) ) { - FatalErrorIn("testPackedList()") + FatalErrorInFunction << "edge:" << i << " minlabel:" << edgeValues[i] << " minbits:" << bits.get(i) @@ -128,7 +127,7 @@ void testPackedList(const polyMesh& mesh, Random& rndGen) || maxPointValues[i] != label(maxBits.get(i)) ) { - FatalErrorIn("testPackedList()") + FatalErrorInFunction << "point:" << i << " at:" << mesh.points()[i] << " minlabel:" << pointValues[i] @@ -170,7 +169,7 @@ void testPackedList(const polyMesh& mesh, Random& rndGen) || maxFaceValues[faceI] != label(maxBits.get(faceI)) ) { - FatalErrorIn("testPackedList()") + FatalErrorInFunction << "face:" << faceI << " minlabel:" << faceValues[faceI] << " minbits:" << bits.get(faceI) @@ -187,7 +186,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen) { Info<< nl << "Testing Map synchronisation." << endl; - WarningIn("testSparseData()") + WarningInFunction << "Position test of sparse data only correct for cases without cyclics" << " with shared points." << endl; @@ -252,7 +251,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen) if (fullPt != sparsePt) { - FatalErrorIn("testSparseData()") + FatalErrorInFunction << "point:" << meshPointI << " full:" << fullPt << " sparse:" << sparsePt @@ -270,7 +269,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen) if (fullPt != sparsePt) { - FatalErrorIn("testSparseData()") + FatalErrorInFunction << "point:" << meshPointI << " full:" << fullPt << " sparse:" << sparsePt @@ -335,7 +334,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen) if (fullPt != sparsePt) { - FatalErrorIn("testSparseData()") + FatalErrorInFunction << "edge:" << meshEdgeI << " points:" << mesh.edges()[meshEdgeI] << " full:" << fullPt @@ -359,7 +358,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen) if (fullPt != sparsePt) { - FatalErrorIn("testSparseData()") + FatalErrorInFunction << "Extra edge:" << meshEdgeI << " points:" << mesh.edges()[meshEdgeI] << " full:" << fullPt @@ -392,7 +391,7 @@ void testPointSync(const polyMesh& mesh, Random& rndGen) { if (mag(syncedPoints[pointI] - mesh.points()[pointI]) > SMALL) { - FatalErrorIn("testPointSync()") + FatalErrorInFunction << "Point " << pointI << " original location " << mesh.points()[pointI] << " synced location " << syncedPoints[pointI] @@ -428,13 +427,11 @@ void testPointSync(const polyMesh& mesh, Random& rndGen) { if (nMasters[pointI] != 1) { - //FatalErrorIn("testPointSync()") - WarningIn("testPointSync()") + WarningInFunction << "Point " << pointI << " original location " << mesh.points()[pointI] << " has " << nMasters[pointI] << " masters." - //<< exit(FatalError); << endl; } } @@ -470,7 +467,7 @@ void testEdgeSync(const polyMesh& mesh, Random& rndGen) if (mag(syncedMids[edgeI] - eMid) > SMALL) { - FatalErrorIn("testEdgeSync()") + FatalErrorInFunction << "Edge " << edgeI << " original midpoint " << eMid << " synced location " << syncedMids[edgeI] @@ -507,13 +504,11 @@ void testEdgeSync(const polyMesh& mesh, Random& rndGen) if (nMasters[edgeI] != 1) { const edge& e = edges[edgeI]; - //FatalErrorIn("testEdgeSync()") - WarningIn("testEdgeSync()") + WarningInFunction << "Edge " << edgeI << " at:" << mesh.points()[e[0]] << mesh.points()[e[1]] << " has " << nMasters[edgeI] << " masters." - //<< exit(FatalError); << endl; } } @@ -541,7 +536,7 @@ void testFaceSync(const polyMesh& mesh, Random& rndGen) { if (mag(syncedFc[faceI] - mesh.faceCentres()[faceI]) > SMALL) { - FatalErrorIn("testFaceSync()") + FatalErrorInFunction << "Face " << faceI << " original centre " << mesh.faceCentres()[faceI] << " synced centre " << syncedFc[faceI] @@ -576,7 +571,7 @@ void testFaceSync(const polyMesh& mesh, Random& rndGen) { if (nMasters[faceI] != 1) { - FatalErrorIn("testFaceSync()") + FatalErrorInFunction << "Face " << faceI << " centre " << mesh.faceCentres()[faceI] << " has " << nMasters[faceI] diff --git a/applications/test/tetTetOverlap/Test-tetTetOverlap.C b/applications/test/tetTetOverlap/Test-tetTetOverlap.C index df6f2b8f83..e314931614 100644 --- a/applications/test/tetTetOverlap/Test-tetTetOverlap.C +++ b/applications/test/tetTetOverlap/Test-tetTetOverlap.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -152,7 +152,7 @@ int main(int argc, char *argv[]) if (mag(volInside+volOutside-tetA.mag()) > SMALL) { - FatalErrorIn("Test-tetetOverlap") + FatalErrorInFunction << "Tet volumes do not sum up to input tet." << exit(FatalError); } diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C index 6473bb4d88..e6df9ed9d4 100644 --- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C +++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -530,7 +530,7 @@ label findPatch(const polyBoundaryMesh& patches, const word& patchName) if (patchI == -1) { - FatalErrorIn("findPatch(const polyBoundaryMesh&, const word&)") + FatalErrorInFunction << "Illegal patch " << patchName << nl << "Valid patches are " << patches.names() << exit(FatalError); @@ -543,7 +543,7 @@ label findPatch(const polyBoundaryMesh& patches, const word& patchName) if (newPatch != patchI) { - FatalErrorIn("findPatch(const polyBoundaryMesh&, const word&)") + FatalErrorInFunction << "Patch " << patchName << " should have the same patch index on all processors." << nl << "On my processor it has index " << patchI @@ -651,7 +651,7 @@ int main(int argc, char *argv[]) { if (wantedPatch[iter.key()] != -1) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Face " << iter.key() << " is in faceSet " << setsAndPatches[setI][0] << " destined for patch " << setsAndPatches[setI][1] @@ -689,7 +689,7 @@ int main(int argc, char *argv[]) { if (coupledWantedPatch[iter.key()] != -1) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Face " << iter.key() << " is in faceSet " << coupledAndPatches[setI][0] << " destined for patch " << coupledAndPatches[setI][1] @@ -1151,7 +1151,7 @@ int main(int argc, char *argv[]) if (cellRegion.nRegions() > 1) { - WarningIn(args.executable()) + WarningInFunction << "Removing blocked faces and cells created " << cellRegion.nRegions() << " regions that are not connected via a face." << nl @@ -1167,7 +1167,7 @@ int main(int argc, char *argv[]) if (startFrom != "latestTime") { - WarningIn(args.executable()) + WarningInFunction << "To run splitMeshRegions please set your" << " startFrom entry to latestTime" << endl; } diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C index 8daf4edc44..ed30517153 100644 --- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C +++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C @@ -365,7 +365,7 @@ bool limitRefinementLevel { if (refLevel[cellI] - refLevel[nbr] >= limitDiff) { - FatalErrorIn("limitRefinementLevel") + FatalErrorInFunction << "Level difference between neighbouring cells " << cellI << " and " << nbr << " greater than or equal to " << limitDiff << endl @@ -705,7 +705,7 @@ int main(int argc, char *argv[]) if (nCutLayers > 0 && selectInside) { - WarningIn(args.executable()) + WarningInFunction << "Illogical settings : Both nCutLayers>0 and selectInside true." << endl << "This would mean that inside cells get removed but should be" @@ -728,7 +728,7 @@ int main(int argc, char *argv[]) if (queryMesh.findCell(outsidePoint, -1, false) == -1) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "outsidePoint " << outsidePoint << " is not inside any cell" << exit(FatalError); diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C index 134c735919..9df985f42e 100644 --- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C +++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C @@ -98,7 +98,7 @@ int main(int argc, char *argv[]) if (collapseFaces && collapseFaceSet) { - FatalErrorIn("main(int, char*[])") + FatalErrorInFunction << "Both face zone collapsing and face collapsing have been" << "selected. Choose only one of:" << nl << " -collapseFaces" << nl diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C index f4d5d13418..9854ec2fef 100644 --- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C +++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C @@ -177,7 +177,7 @@ label mergePatchFaces if (newVertI < 0) { - FatalErrorIn("mergePatchFaces") + FatalErrorInFunction << "In set:" << setI << " old face labels:" << allFaceSets[setI] << " new face vertices:" << setFaceVerts[i] << " are unmapped vertices!" diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C index c3f8bed837..abd5eb45ad 100644 --- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C +++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C @@ -399,7 +399,7 @@ int main(int argc, char *argv[]) || (collapseEdge && cellsToSplit) ) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Used more than one mesh modifying module " << "(boundary cutting, cell splitting, edge collapsing)" << nl << "Please do them in separate passes." << exit(FatalError); diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C index 2872db86d9..ba5b7f8548 100644 --- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C +++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C @@ -86,7 +86,7 @@ int main(int argc, char *argv[]) if (!patchSet.size()) { - FatalErrorIn(args.executable()) + FatalErrorInFunction << "Cannot find any patches in set " << patches << endl << "Valid patches are " << mesh.boundaryMesh().names() << exit(FatalError); diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C index a992deb519..b3af03b509 100644 --- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C +++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -240,7 +240,7 @@ int main(int argc, char *argv[]) if (!readLevel && refHeader.headerOk()) { - WarningIn(args.executable()) + WarningInFunction << "Detected " << refHeader.name() << " file in " << polyMesh::defaultRegion << " directory. Please remove to" << " recreate it or use the -readLevel option to use it" diff --git a/applications/utilities/mesh/advanced/selectCells/selectCells.C b/applications/utilities/mesh/advanced/selectCells/selectCells.C index 86eddffcf4..c71929e500 100644 --- a/applications/utilities/mesh/advanced/selectCells/selectCells.C +++ b/applications/utilities/mesh/advanced/selectCells/selectCells.C @@ -174,7 +174,7 @@ void cutBySurface } else { - FatalErrorIn("cutBySurface") + FatalErrorInFunction << "Multiple mesh regions in original mesh" << endl << "Please use splitMeshRegions to separate these" << exit(FatalError); @@ -393,7 +393,7 @@ int main(int argc, char *argv[]) label cellI = queryMesh.findCell(outsidePoint, -1, false); if (returnReduce(cellI, maxOp