diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/pEqn.H b/applications/solvers/multiphase/interCondensingEvaporatingFoam/pEqn.H index c2b043c57b..62de089533 100644 --- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/pEqn.H +++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/pEqn.H @@ -25,7 +25,7 @@ // Update the pressure BCs to ensure flux consistency constrainPressure(p_rgh, U, phiHbyA, rAUf); - Pair > vDot = mixture->vDot(); + Pair> vDot = mixture->vDot(); const volScalarField& vDotc = vDot[0](); const volScalarField& vDotv = vDot[1](); diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C index adc2598e86..7543b9c856 100644 --- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C +++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C @@ -61,7 +61,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::constant // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -Foam::Pair > +Foam::Pair> Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDotAlphal() const { const volScalarField& T = mesh_.lookupObject("T"); @@ -76,7 +76,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDotAlphal() const dimensionedScalar T0("0", dimTemperature, 0.0); - return Pair > + return Pair> ( coeffC_*mixture_.rho2()*max(TSat - T, T0), -coeffE_*mixture_.rho1()*max(T - TSat, T0) @@ -84,7 +84,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDotAlphal() const } -Foam::Pair > +Foam::Pair> Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDot() const { @@ -110,7 +110,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDot() const dimensionedScalar T0("0", dimTemperature, 0.0); - return Pair > + return Pair> ( coeffC_*mixture_.rho2()*limitedAlpha2*max(TSat - T, T0), coeffE_*mixture_.rho1()*limitedAlpha1*max(T - TSat, T0) @@ -118,7 +118,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDot() const } -Foam::Pair > +Foam::Pair> Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDotDeltaT() const { volScalarField limitedAlpha1 @@ -142,7 +142,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDotDeltaT() const const dimensionedScalar& TSat = thermo.TSat(); - return Pair > + return Pair> ( coeffC_*mixture_.rho2()*limitedAlpha2*pos(TSat - T), coeffE_*mixture_.rho1()*limitedAlpha1*pos(T - TSat) diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.H b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.H index 424a8a7c2a..dd23e97024 100644 --- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.H +++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.H @@ -46,7 +46,7 @@ namespace temperaturePhaseChangeTwoPhaseMixtures { /*--------------------------------------------------------------------*\ - Class constant + Class constant \*--------------------------------------------------------------------*/ class constant @@ -88,15 +88,15 @@ public: //- Return the mass condensation and vaporisation rates as a // coefficient to multiply (1 - alphal) for the condensation rate // and a coefficient to multiply alphal for the vaporisation rate - virtual Pair > mDotAlphal() const; + virtual Pair> mDotAlphal() const; //- Return the mass condensation and vaporisation rates as coefficients - virtual Pair > mDot() const; + virtual Pair> mDot() const; //- Return the mass condensation and vaporisation rates as a // coefficient to multiply (Tsat - T) for the condensation rate // and a coefficient to multiply (T - Tsat) for the vaporisation rate - virtual Pair > mDotDeltaT() const; + virtual Pair> mDotDeltaT() const; //- Correct the constant phaseChange model virtual void correct(); diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.C index 9727f5978d..fe8923d3af 100644 --- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.C +++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.C @@ -64,7 +64,7 @@ temperaturePhaseChangeTwoPhaseMixture // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -Foam::Pair > +Foam::Pair> Foam::temperaturePhaseChangeTwoPhaseMixture::vDotAlphal() const { volScalarField alphalCoeff @@ -73,9 +73,9 @@ Foam::temperaturePhaseChangeTwoPhaseMixture::vDotAlphal() const *(1.0/mixture_.rho1() - 1.0/mixture_.rho2()) ); - Pair > mDotAlphal = this->mDotAlphal(); + Pair> mDotAlphal = this->mDotAlphal(); - return Pair > + return Pair> ( alphalCoeff*mDotAlphal[0], alphalCoeff*mDotAlphal[1] @@ -83,13 +83,13 @@ Foam::temperaturePhaseChangeTwoPhaseMixture::vDotAlphal() const } -Foam::Pair > +Foam::Pair> Foam::temperaturePhaseChangeTwoPhaseMixture::vDot() const { dimensionedScalar pCoeff(1.0/mixture_.rho1() - 1.0/mixture_.rho2()); - Pair > mDot = this->mDot(); + Pair> mDot = this->mDot(); - return Pair >(pCoeff*mDot[0], pCoeff*mDot[1]); + return Pair>(pCoeff*mDot[0], pCoeff*mDot[1]); } diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.H b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.H index 9ecd5a544d..f829297ad8 100644 --- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.H +++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.H @@ -130,24 +130,24 @@ public: //- Return the mass condensation and vaporisation rates as a // coefficient to multiply (1 - alphal) for the condensation rate // and a coefficient to multiply alphal for the vaporisation rate - virtual Pair > mDotAlphal() const = 0; + virtual Pair> mDotAlphal() const = 0; //- Return the mass condensation and vaporisation rates as coefficients - virtual Pair > mDot() const = 0; + virtual Pair> mDot() const = 0; //- Return the mass condensation and vaporisation rates as a // coefficient to multiply (Tsat - T) for the condensation rate // and a coefficient to multiply (T - Tsat) for the vaporisation rate - virtual Pair > mDotDeltaT() const = 0; + virtual Pair> mDotDeltaT() const = 0; //- Return the volumetric condensation and vaporisation rates as a // coefficient to multiply (1 - alphal) for the condensation rate // and a coefficient to multiply alphal for the vaporisation rate - Pair > vDotAlphal() const; + Pair> vDotAlphal() const; //- Return the volumetric condensation and vaporisation rates as // coefficients - Pair > vDot() const; + Pair> vDot() const; //- Correct the phaseChange model virtual void correct() = 0; diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C index 7229f68010..821d7d5ff0 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C @@ -97,7 +97,7 @@ List pointFile::initialPoints() const if (points.empty()) { - FatalErrorIn("List pointFile::initialPoints() const") + FatalErrorInFunction << "Point file contain no points" << exit(FatalError) << endl; } @@ -128,7 +128,7 @@ List pointFile::initialPoints() const if (points.empty()) { - FatalErrorIn("List pointFile::initialPoints() const") + FatalErrorInFunction << "Point file contain no points" << exit(FatalError) << endl; } @@ -170,7 +170,7 @@ List pointFile::initialPoints() const } else { - FatalErrorIn("List pointFile::initialPoints() const") + FatalErrorInFunction << "Cannot find points file " << pointsIO.objectPath() << exit(FatalError) << endl; } diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/unwatchedIOdictionary.C b/src/OpenFOAM/db/IOobjects/IOdictionary/unwatchedIOdictionary.C index 7e1da272c6..6e460ff9f9 100644 --- a/src/OpenFOAM/db/IOobjects/IOdictionary/unwatchedIOdictionary.C +++ b/src/OpenFOAM/db/IOobjects/IOdictionary/unwatchedIOdictionary.C @@ -119,7 +119,7 @@ void Foam::unwatchedIOdictionary::addWatch() if (findIndex(files_, f) != -1) { - FatalErrorIn("regIOobject::addWatch()") + FatalErrorInFunction << "Object " << objectPath() << " of type " << type() << " already watched" << abort(FatalError); } diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.C b/src/OpenFOAM/db/regIOobject/regIOobject.C index 5daf5b1660..60f9a2e31d 100644 --- a/src/OpenFOAM/db/regIOobject/regIOobject.C +++ b/src/OpenFOAM/db/regIOobject/regIOobject.C @@ -269,7 +269,7 @@ void Foam::regIOobject::addWatch() label index = time().findWatch(watchIndices_, f); if (index != -1) { - FatalErrorIn("regIOobject::addWatch()") + FatalErrorInFunction << "Object " << objectPath() << " of type " << type() << " already watched with index " << watchIndices_[index] << abort(FatalError); diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C index 827d089fc7..adaec0eb8e 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C +++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C @@ -1058,7 +1058,7 @@ Foam::tmp Foam::polyMesh::movePoints if (newPoints.size() != points_.size()) { - FatalErrorIn("polyMesh::movePoints(const pointField&)") + FatalErrorInFunction << "Size of newPoints " << newPoints.size() << " does not correspond to current mesh points size " << points_.size() diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.H index 1209423b77..4f61b2df63 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.H @@ -64,7 +64,7 @@ class InterfaceForce const scalar C_; //- gradInterForce interpolator - autoPtr > gradInterForceInterpPtr_; + autoPtr> gradInterForceInterpPtr_; public: @@ -87,9 +87,9 @@ public: InterfaceForce(const InterfaceForce& gf); //- Construct and return a clone - virtual autoPtr > clone() const + virtual autoPtr> clone() const { - return autoPtr > + return autoPtr> ( new InterfaceForce(*this) ); diff --git a/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C b/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C index 14616b7225..02034a8aca 100644 --- a/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C +++ b/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C @@ -76,7 +76,7 @@ void Foam::reactionsSensitivityAnalysis::calculateSpeciesRR ) { - tmp > RRt + tmp> RRt ( new DimensionedField ( diff --git a/src/regionModels/doc/regionBoundaryConditionsDoc.H b/src/regionModels/doc/regionBoundaryConditionsDoc.H index 7f4981d4ad..7f9286d5d5 100644 --- a/src/regionModels/doc/regionBoundaryConditionsDoc.H +++ b/src/regionModels/doc/regionBoundaryConditionsDoc.H @@ -25,6 +25,7 @@ License \defgroup grpRegionBoundaryConditions Region boundary conditions @{ + \ingroup grpBoundaryConditions This group contains region model boundary conditions @}