Commit 56fa7c09 authored by Henry Weller's avatar Henry Weller
Browse files

Update code to use the simpler C++11 template syntax removing spaces between closing ">"s

parent 4eba393f
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
...@@ -55,7 +55,7 @@ PDRkEpsilon::PDRkEpsilon ...@@ -55,7 +55,7 @@ PDRkEpsilon::PDRkEpsilon
const word& modelName const word& modelName
) )
: :
Foam::RASModels::kEpsilon<EddyDiffusivity<compressible::turbulenceModel> > Foam::RASModels::kEpsilon<EddyDiffusivity<compressible::turbulenceModel>>
( (
geometricOneField(), geometricOneField(),
rho, rho,
......
tmp<fv::convectionScheme<scalar> > mvConvection tmp<fv::convectionScheme<scalar>> mvConvection
( (
fv::convectionScheme<scalar>::New fv::convectionScheme<scalar>::New
( (
......
tmp<fv::convectionScheme<scalar> > mvConvection tmp<fv::convectionScheme<scalar>> mvConvection
( (
fv::convectionScheme<scalar>::New fv::convectionScheme<scalar>::New
( (
......
...@@ -25,7 +25,7 @@ fvMesh mesh ...@@ -25,7 +25,7 @@ fvMesh mesh
runTime, runTime,
IOobject::READ_IF_PRESENT IOobject::READ_IF_PRESENT
), ),
xferMove<Field<vector> >(points), xferMove<Field<vector>>(points),
faces.xfer(), faces.xfer(),
owner.xfer(), owner.xfer(),
neighbour.xfer() neighbour.xfer()
......
tmp<fv::convectionScheme<scalar> > mvConvection tmp<fv::convectionScheme<scalar>> mvConvection
( (
fv::convectionScheme<scalar>::New fv::convectionScheme<scalar>::New
( (
......
tmp<fv::convectionScheme<scalar> > mvConvection tmp<fv::convectionScheme<scalar>> mvConvection
( (
fv::convectionScheme<scalar>::New fv::convectionScheme<scalar>::New
( (
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
...@@ -119,7 +119,7 @@ void Foam::mixedFixedValueSlipFvPatchField<Type>::rmap ...@@ -119,7 +119,7 @@ void Foam::mixedFixedValueSlipFvPatchField<Type>::rmap
transformFvPatchField<Type>::rmap(ptf, addr); transformFvPatchField<Type>::rmap(ptf, addr);
const mixedFixedValueSlipFvPatchField<Type>& dmptf = const mixedFixedValueSlipFvPatchField<Type>& dmptf =
refCast<const mixedFixedValueSlipFvPatchField<Type> >(ptf); refCast<const mixedFixedValueSlipFvPatchField<Type>>(ptf);
refValue_.rmap(dmptf.refValue_, addr); refValue_.rmap(dmptf.refValue_, addr);
valueFraction_.rmap(dmptf.valueFraction_, addr); valueFraction_.rmap(dmptf.valueFraction_, addr);
...@@ -127,7 +127,7 @@ void Foam::mixedFixedValueSlipFvPatchField<Type>::rmap ...@@ -127,7 +127,7 @@ void Foam::mixedFixedValueSlipFvPatchField<Type>::rmap
template<class Type> template<class Type>
Foam::tmp<Foam::Field<Type> > Foam::tmp<Foam::Field<Type>>
Foam::mixedFixedValueSlipFvPatchField<Type>::snGrad() const Foam::mixedFixedValueSlipFvPatchField<Type>::snGrad() const
{ {
tmp<vectorField> nHat = this->patch().nf(); tmp<vectorField> nHat = this->patch().nf();
...@@ -167,7 +167,7 @@ void Foam::mixedFixedValueSlipFvPatchField<Type>::evaluate ...@@ -167,7 +167,7 @@ void Foam::mixedFixedValueSlipFvPatchField<Type>::evaluate
template<class Type> template<class Type>
Foam::tmp<Foam::Field<Type> > Foam::tmp<Foam::Field<Type>>
Foam::mixedFixedValueSlipFvPatchField<Type>::snGradTransformDiag() const Foam::mixedFixedValueSlipFvPatchField<Type>::snGradTransformDiag() const
{ {
vectorField nHat(this->patch().nf()); vectorField nHat(this->patch().nf());
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
...@@ -101,9 +101,9 @@ public: ...@@ -101,9 +101,9 @@ public:
); );
//- Construct and return a clone //- Construct and return a clone
virtual tmp<fvPatchField<Type> > clone() const virtual tmp<fvPatchField<Type>> clone() const
{ {
return tmp<fvPatchField<Type> > return tmp<fvPatchField<Type>>
( (
new mixedFixedValueSlipFvPatchField<Type>(*this) new mixedFixedValueSlipFvPatchField<Type>(*this)
); );
...@@ -117,12 +117,12 @@ public: ...@@ -117,12 +117,12 @@ public:
); );
//- Construct and return a clone setting internal field reference //- Construct and return a clone setting internal field reference
virtual tmp<fvPatchField<Type> > clone virtual tmp<fvPatchField<Type>> clone
( (
const DimensionedField<Type, volMesh>& iF const DimensionedField<Type, volMesh>& iF
) const ) const
{ {
return tmp<fvPatchField<Type> > return tmp<fvPatchField<Type>>
( (
new mixedFixedValueSlipFvPatchField<Type>(*this, iF) new mixedFixedValueSlipFvPatchField<Type>(*this, iF)
); );
...@@ -170,7 +170,7 @@ public: ...@@ -170,7 +170,7 @@ public:
// Evaluation functions // Evaluation functions
//- Return gradient at boundary //- Return gradient at boundary
virtual tmp<Field<Type> > snGrad() const; virtual tmp<Field<Type>> snGrad() const;
//- Evaluate the patch field //- Evaluate the patch field
virtual void evaluate virtual void evaluate
...@@ -179,7 +179,7 @@ public: ...@@ -179,7 +179,7 @@ public:
); );
//- Return face-gradient transform diagonal //- Return face-gradient transform diagonal
virtual tmp<Field<Type> > snGradTransformDiag() const; virtual tmp<Field<Type>> snGradTransformDiag() const;
//- Write //- Write
......
...@@ -3,14 +3,14 @@ namespace Foam ...@@ -3,14 +3,14 @@ namespace Foam
//- Interpolate field vf according to direction dir //- Interpolate field vf according to direction dir
template<class Type> template<class Type>
tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
( (
const GeometricField<Type, fvPatchField, volMesh>& vf, const GeometricField<Type, fvPatchField, volMesh>& vf,
const surfaceScalarField& dir, const surfaceScalarField& dir,
const word& reconFieldName = word::null const word& reconFieldName = word::null
) )
{ {
tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsf tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsf
( (
fvc::interpolate fvc::interpolate
( (
......
...@@ -151,7 +151,7 @@ alphac.correctBoundaryConditions(); ...@@ -151,7 +151,7 @@ alphac.correctBoundaryConditions();
surfaceScalarField alphacf("alphacf", fvc::interpolate(alphac)); surfaceScalarField alphacf("alphacf", fvc::interpolate(alphac));
surfaceScalarField alphaPhic("alphaPhic", alphacf*phic); surfaceScalarField alphaPhic("alphaPhic", alphacf*phic);
autoPtr<PhaseIncompressibleTurbulenceModel<singlePhaseTransportModel> > autoPtr<PhaseIncompressibleTurbulenceModel<singlePhaseTransportModel>>
continuousPhaseTurbulence continuousPhaseTurbulence
( (
PhaseIncompressibleTurbulenceModel<singlePhaseTransportModel>::New PhaseIncompressibleTurbulenceModel<singlePhaseTransportModel>::New
......
tmp<fv::convectionScheme<scalar> > mvConvection tmp<fv::convectionScheme<scalar>> mvConvection
( (
fv::convectionScheme<scalar>::New fv::convectionScheme<scalar>::New
( (
......
tmp<fv::convectionScheme<scalar> > mvConvection tmp<fv::convectionScheme<scalar>> mvConvection
( (
fv::convectionScheme<scalar>::New fv::convectionScheme<scalar>::New
( (
......
tmp<fv::convectionScheme<scalar> > mvConvection tmp<fv::convectionScheme<scalar>> mvConvection
( (
fv::convectionScheme<scalar>::New fv::convectionScheme<scalar>::New
( (
......
tmp<fv::convectionScheme<scalar> > mvConvection tmp<fv::convectionScheme<scalar>> mvConvection
( (
fv::convectionScheme<scalar>::New fv::convectionScheme<scalar>::New
( (
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
word alphaScheme("div(phi,alpha)"); word alphaScheme("div(phi,alpha)");
word alpharScheme("div(phirb,alpha)"); word alpharScheme("div(phirb,alpha)");
tmp<fv::ddtScheme<scalar> > ddtAlpha tmp<fv::ddtScheme<scalar>> ddtAlpha
( (
fv::ddtScheme<scalar>::New fv::ddtScheme<scalar>::New
( (
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
scalar ocCoeff = 0; scalar ocCoeff = 0;
if if
( (
isType<fv::EulerDdtScheme<scalar> >(ddtAlpha()) isType<fv::EulerDdtScheme<scalar>>(ddtAlpha())
|| isType<fv::localEulerDdtScheme<scalar> >(ddtAlpha()) || isType<fv::localEulerDdtScheme<scalar>>(ddtAlpha())
) )
{ {
ocCoeff = 0; ocCoeff = 0;
} }
else if (isType<fv::CrankNicolsonDdtScheme<scalar> >(ddtAlpha())) else if (isType<fv::CrankNicolsonDdtScheme<scalar>>(ddtAlpha()))
{ {
if (nAlphaSubCycles > 1) if (nAlphaSubCycles > 1)
{ {
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
} }
ocCoeff = ocCoeff =
refCast<fv::CrankNicolsonDdtScheme<scalar> >(ddtAlpha()).ocCoeff(); refCast<fv::CrankNicolsonDdtScheme<scalar>>(ddtAlpha()).ocCoeff();
} }
else else
{ {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
surfaceScalarField phir("phir", phic*interface.nHatf()); surfaceScalarField phir("phir", phic*interface.nHatf());
Pair<tmp<volScalarField> > vDotAlphal = Pair<tmp<volScalarField>> vDotAlphal =
mixture->vDotAlphal(); mixture->vDotAlphal();
const volScalarField& vDotcAlphal = vDotAlphal[0](); const volScalarField& vDotcAlphal = vDotAlphal[0]();
const volScalarField& vDotvAlphal = vDotAlphal[1](); const volScalarField& vDotvAlphal = vDotAlphal[1]();
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
)/(mesh.magSf().boundaryField()*rAUf.boundaryField()) )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
); );
Pair<tmp<volScalarField> > vDotP = mixture->vDotP(); Pair<tmp<volScalarField>> vDotP = mixture->vDotP();
const volScalarField& vDotcP = vDotP[0](); const volScalarField& vDotcP = vDotP[0]();
const volScalarField& vDotvP = vDotP[1](); const volScalarField& vDotvP = vDotP[1]();
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
)/(mesh.magSf().boundaryField()*rAUf.boundaryField()) )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
); );
Pair<tmp<volScalarField> > vDotP = mixture->vDotP(); Pair<tmp<volScalarField>> vDotP = mixture->vDotP();
const volScalarField& vDotcP = vDotP[0](); const volScalarField& vDotcP = vDotP[0]();
const volScalarField& vDotvP = vDotP[1](); const volScalarField& vDotvP = vDotP[1]();
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
...@@ -63,13 +63,13 @@ Foam::phaseChangeTwoPhaseMixtures::Kunz::Kunz ...@@ -63,13 +63,13 @@ Foam::phaseChangeTwoPhaseMixtures::Kunz::Kunz
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
Foam::Pair<Foam::tmp<Foam::volScalarField> > Foam::Pair<Foam::tmp<Foam::volScalarField>>
Foam::phaseChangeTwoPhaseMixtures::Kunz::mDotAlphal() const Foam::phaseChangeTwoPhaseMixtures::Kunz::mDotAlphal() const
{ {
const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p"); const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p");
volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1))); volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1)));
return Pair<tmp<volScalarField> > return Pair<tmp<volScalarField>>
( (
mcCoeff_*sqr(limitedAlpha1) mcCoeff_*sqr(limitedAlpha1)
*max(p - pSat(), p0_)/max(p - pSat(), 0.01*pSat()), *max(p - pSat(), p0_)/max(p - pSat(), 0.01*pSat()),
...@@ -78,13 +78,13 @@ Foam::phaseChangeTwoPhaseMixtures::Kunz::mDotAlphal() const ...@@ -78,13 +78,13 @@ Foam::phaseChangeTwoPhaseMixtures::Kunz::mDotAlphal() const
); );
} }
Foam::Pair<Foam::tmp<Foam::volScalarField> > Foam::Pair<Foam::tmp<Foam::volScalarField>>
Foam::phaseChangeTwoPhaseMixtures::Kunz::mDotP() const Foam::phaseChangeTwoPhaseMixtures::Kunz::mDotP() const
{ {
const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p"); const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p");
volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1))); volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1)));
return Pair<tmp<volScalarField> > return Pair<tmp<volScalarField>>
( (
mcCoeff_*sqr(limitedAlpha1)*(1.0 - limitedAlpha1) mcCoeff_*sqr(limitedAlpha1)*(1.0 - limitedAlpha1)
*pos(p - pSat())/max(p - pSat(), 0.01*pSat()), *pos(p - pSat())/max(p - pSat(), 0.01*pSat()),
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
...@@ -105,11 +105,11 @@ public: ...@@ -105,11 +105,11 @@ public:
//- Return the mass condensation and vaporisation rates as a //- Return the mass condensation and vaporisation rates as a
// coefficient to multiply (1 - alphal) for the condensation rate // coefficient to multiply (1 - alphal) for the condensation rate
// and a coefficient to multiply alphal for the vaporisation 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 //- Return the mass condensation and vaporisation rates as coefficients
// to multiply (p - pSat) // to multiply (p - pSat)
virtual Pair<tmp<volScalarField> > mDotP() const; virtual Pair<tmp<volScalarField>> mDotP() const;
//- Correct the Kunz phaseChange model //- Correct the Kunz phaseChange model
virtual void correct(); virtual void correct();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment