diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/pEqn.H b/applications/solvers/multiphase/interCondensingEvaporatingFoam/pEqn.H
index c2b043c57b6812ae61d990af8f3e21566ca05453..62de08953304eb25b89d32a6ffe596b5d72ef88b 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<tmp<volScalarField> > vDot = mixture->vDot();
+ Pair<tmp<volScalarField>> 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 adc2598e8604077cc9ae8b6c2e52b4a0144794e2..7543b9c856df38b97c7a10ef16cdc74c25874713 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::tmp<Foam::volScalarField> >
+Foam::Pair<Foam::tmp<Foam::volScalarField>>
Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDotAlphal() const
{
const volScalarField& T = mesh_.lookupObject<volScalarField>("T");
@@ -76,7 +76,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDotAlphal() const
dimensionedScalar T0("0", dimTemperature, 0.0);
- return Pair<tmp<volScalarField> >
+ return Pair<tmp<volScalarField>>
(
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::tmp<Foam::volScalarField> >
+Foam::Pair<Foam::tmp<Foam::volScalarField>>
Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDot() const
{
@@ -110,7 +110,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDot() const
dimensionedScalar T0("0", dimTemperature, 0.0);
- return Pair<tmp<volScalarField> >
+ return Pair<tmp<volScalarField>>
(
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::tmp<Foam::volScalarField> >
+Foam::Pair<Foam::tmp<Foam::volScalarField>>
Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDotDeltaT() const
{
volScalarField limitedAlpha1
@@ -142,7 +142,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDotDeltaT() const
const dimensionedScalar& TSat = thermo.TSat();
- return Pair<tmp<volScalarField> >
+ return Pair<tmp<volScalarField>>
(
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 424a8a7c2a3879fab6188ed0e9d0ec53770f5577..dd23e970248687f674cb5fa808e961d0695012fe 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<tmp<volScalarField> > mDotAlphal() const;
+ virtual Pair<tmp<volScalarField>> mDotAlphal() const;
//- Return the mass condensation and vaporisation rates as coefficients
- virtual Pair<tmp<volScalarField> > mDot() const;
+ virtual Pair<tmp<volScalarField>> 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<tmp<volScalarField> > mDotDeltaT() const;
+ virtual Pair<tmp<volScalarField>> 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 9727f5978dc84cc5804f568b0a3601fb9078a42a..fe8923d3afde1c8e449148a5bdc8a79c1beee7eb 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::tmp<Foam::volScalarField> >
+Foam::Pair<Foam::tmp<Foam::volScalarField>>
Foam::temperaturePhaseChangeTwoPhaseMixture::vDotAlphal() const
{
volScalarField alphalCoeff
@@ -73,9 +73,9 @@ Foam::temperaturePhaseChangeTwoPhaseMixture::vDotAlphal() const
*(1.0/mixture_.rho1() - 1.0/mixture_.rho2())
);
- Pair<tmp<volScalarField> > mDotAlphal = this->mDotAlphal();
+ Pair<tmp<volScalarField>> mDotAlphal = this->mDotAlphal();
- return Pair<tmp<volScalarField> >
+ return Pair<tmp<volScalarField>>
(
alphalCoeff*mDotAlphal[0],
alphalCoeff*mDotAlphal[1]
@@ -83,13 +83,13 @@ Foam::temperaturePhaseChangeTwoPhaseMixture::vDotAlphal() const
}
-Foam::Pair<Foam::tmp<Foam::volScalarField> >
+Foam::Pair<Foam::tmp<Foam::volScalarField>>
Foam::temperaturePhaseChangeTwoPhaseMixture::vDot() const
{
dimensionedScalar pCoeff(1.0/mixture_.rho1() - 1.0/mixture_.rho2());
- Pair<tmp<volScalarField> > mDot = this->mDot();
+ Pair<tmp<volScalarField>> mDot = this->mDot();
- return Pair<tmp<volScalarField> >(pCoeff*mDot[0], pCoeff*mDot[1]);
+ return Pair<tmp<volScalarField>>(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 9ecd5a544db7f7ed50a861a60b865dbca507a949..f829297ad88b9064ed306b1d051dca5436a7a09b 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<tmp<volScalarField> > mDotAlphal() const = 0;
+ virtual Pair<tmp<volScalarField>> mDotAlphal() const = 0;
//- Return the mass condensation and vaporisation rates as coefficients
- virtual Pair<tmp<volScalarField> > mDot() const = 0;
+ virtual Pair<tmp<volScalarField>> 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<tmp<volScalarField> > mDotDeltaT() const = 0;
+ virtual Pair<tmp<volScalarField>> 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<tmp<volScalarField> > vDotAlphal() const;
+ Pair<tmp<volScalarField>> vDotAlphal() const;
//- Return the volumetric condensation and vaporisation rates as
// coefficients
- Pair<tmp<volScalarField> > vDot() const;
+ Pair<tmp<volScalarField>> 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 7229f68010461a8f7a9a7a961fd72d05c529f595..821d7d5ff0e9fc1bd3658ae268af54b4c6bc58cc 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<Vb::Point> pointFile::initialPoints() const
if (points.empty())
{
- FatalErrorIn("List<Vb::Point> pointFile::initialPoints() const")
+ FatalErrorInFunction
<< "Point file contain no points"
<< exit(FatalError) << endl;
}
@@ -128,7 +128,7 @@ List<Vb::Point> pointFile::initialPoints() const
if (points.empty())
{
- FatalErrorIn("List<Vb::Point> pointFile::initialPoints() const")
+ FatalErrorInFunction
<< "Point file contain no points"
<< exit(FatalError) << endl;
}
@@ -170,7 +170,7 @@ List<Vb::Point> pointFile::initialPoints() const
}
else
{
- FatalErrorIn("List<Vb::Point> 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 7e1da272c69c6ecde08cff5f234ab5783950bc34..6e460ff9f961d858362c6c27fef80d9c93442e09 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 5daf5b1660c750f2cc7b1ae55665b16f2eb00011..60f9a2e31d832ba009996de0e89f97dac618e251 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 827d089fc771aa54bb3c1022b3ed6f7b7ef7c856..adaec0eb8e4c40cd927b1fa57213ea59386c63f7 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -1058,7 +1058,7 @@ Foam::tmp<Foam::scalarField> 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 1209423b777d456cb63bae06fe292f341d6d8765..4f61b2df63c6cd28501d95cf0c2037108fa9bee1 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<interpolation<vector> > gradInterForceInterpPtr_;
+ autoPtr<interpolation<vector>> gradInterForceInterpPtr_;
public:
@@ -87,9 +87,9 @@ public:
InterfaceForce(const InterfaceForce& gf);
//- Construct and return a clone
- virtual autoPtr<ParticleForce<CloudType> > clone() const
+ virtual autoPtr<ParticleForce<CloudType>> clone() const
{
- return autoPtr<ParticleForce<CloudType> >
+ return autoPtr<ParticleForce<CloudType>>
(
new InterfaceForce<CloudType>(*this)
);
diff --git a/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C b/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C
index 14616b7225e9bb5d192373868fa0ddf38de7a531..02034a8aca128a93ef458b2a0ffe325849635f35 100644
--- a/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C
+++ b/src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C
@@ -76,7 +76,7 @@ void Foam::reactionsSensitivityAnalysis<chemistryType>::calculateSpeciesRR
)
{
- tmp<DimensionedField<scalar, volMesh> > RRt
+ tmp<DimensionedField<scalar, volMesh>> RRt
(
new DimensionedField<scalar, volMesh>
(
diff --git a/src/regionModels/doc/regionBoundaryConditionsDoc.H b/src/regionModels/doc/regionBoundaryConditionsDoc.H
index 7f4981d4adfc7da91892935f987879044a740a7d..7f9286d5d50a1313e234f5f582680811026bc175 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
@}