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

applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ PDRkEpsilon::PDRkEpsilon
     const word& modelName
 )
 :
-    Foam::RASModels::kEpsilon<EddyDiffusivity<compressible::turbulenceModel> >
+    Foam::RASModels::kEpsilon<EddyDiffusivity<compressible::turbulenceModel>>
     (
         geometricOneField(),
         rho,

applications/solvers/combustion/PDRFoam/bEqn.H

@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (

applications/solvers/combustion/XiFoam/ftEqn.H

@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (

applications/solvers/combustion/chemFoam/createSingleCellMesh.H

@@ -25,7 +25,7 @@ fvMesh mesh
         runTime,
         IOobject::READ_IF_PRESENT
     ),
-    xferMove<Field<vector> >(points),
+    xferMove<Field<vector>>(points),
     faces.xfer(),
     owner.xfer(),
     neighbour.xfer()

applications/solvers/combustion/fireFoam/YEEqn.H

@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (

applications/solvers/combustion/reactingFoam/YEqn.H

@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (

applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,7 +119,7 @@ void Foam::mixedFixedValueSlipFvPatchField<Type>::rmap
     transformFvPatchField<Type>::rmap(ptf, addr);
 
     const mixedFixedValueSlipFvPatchField<Type>& dmptf =
-        refCast<const mixedFixedValueSlipFvPatchField<Type> >(ptf);
+        refCast<const mixedFixedValueSlipFvPatchField<Type>>(ptf);
 
     refValue_.rmap(dmptf.refValue_, addr);
     valueFraction_.rmap(dmptf.valueFraction_, addr);
@@ -127,7 +127,7 @@ void Foam::mixedFixedValueSlipFvPatchField<Type>::rmap
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::mixedFixedValueSlipFvPatchField<Type>::snGrad() const
 {
     tmp<vectorField> nHat = this->patch().nf();
@@ -167,7 +167,7 @@ void Foam::mixedFixedValueSlipFvPatchField<Type>::evaluate
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::mixedFixedValueSlipFvPatchField<Type>::snGradTransformDiag() const
 {
     vectorField nHat(this->patch().nf());

applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,9 +101,9 @@ public:
         );
 
         //- 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)
             );
@@ -117,12 +117,12 @@ public:
         );
 
         //- 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
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new mixedFixedValueSlipFvPatchField<Type>(*this, iF)
             );
@@ -170,7 +170,7 @@ public:
         // Evaluation functions
 
             //- Return gradient at boundary
-            virtual tmp<Field<Type> > snGrad() const;
+            virtual tmp<Field<Type>> snGrad() const;
 
             //- Evaluate the patch field
             virtual void evaluate
@@ -179,7 +179,7 @@ public:
             );
 
             //- Return face-gradient transform diagonal
-            virtual tmp<Field<Type> > snGradTransformDiag() const;
+            virtual tmp<Field<Type>> snGradTransformDiag() const;
 
 
         //- Write

applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H

@@ -3,14 +3,14 @@ namespace Foam
 
 //- Interpolate field vf according to direction dir
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > interpolate
+tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     const surfaceScalarField& dir,
     const word& reconFieldName = word::null
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsf
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsf
     (
         fvc::interpolate
         (

applications/solvers/lagrangian/DPMFoam/createFields.H

@@ -151,7 +151,7 @@ alphac.correctBoundaryConditions();
 surfaceScalarField alphacf("alphacf", fvc::interpolate(alphac));
 surfaceScalarField alphaPhic("alphaPhic", alphacf*phic);
 
-autoPtr<PhaseIncompressibleTurbulenceModel<singlePhaseTransportModel> >
+autoPtr<PhaseIncompressibleTurbulenceModel<singlePhaseTransportModel>>
 continuousPhaseTurbulence
 (
     PhaseIncompressibleTurbulenceModel<singlePhaseTransportModel>::New

applications/solvers/lagrangian/coalChemistryFoam/YEqn.H

@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (

applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H

@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (

applications/solvers/lagrangian/reactingParcelFoam/YEqn.H

@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (

applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H

@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (

applications/solvers/multiphase/interFoam/alphaEqn.H

@@ -2,7 +2,7 @@
     word alphaScheme("div(phi,alpha)");
     word alpharScheme("div(phirb,alpha)");
 
-    tmp<fv::ddtScheme<scalar> > ddtAlpha
+    tmp<fv::ddtScheme<scalar>> ddtAlpha
     (
         fv::ddtScheme<scalar>::New
         (
@@ -15,13 +15,13 @@
     scalar ocCoeff = 0;
     if
     (
-        isType<fv::EulerDdtScheme<scalar> >(ddtAlpha())
+        isType<fv::EulerDdtScheme<scalar>>(ddtAlpha())
-     || isType<fv::localEulerDdtScheme<scalar> >(ddtAlpha())
+     || isType<fv::localEulerDdtScheme<scalar>>(ddtAlpha())
     )
     {
         ocCoeff = 0;
     }
-    else if (isType<fv::CrankNicolsonDdtScheme<scalar> >(ddtAlpha()))
+    else if (isType<fv::CrankNicolsonDdtScheme<scalar>>(ddtAlpha()))
     {
         if (nAlphaSubCycles > 1)
         {
@@ -32,7 +32,7 @@
         }
 
         ocCoeff =
-            refCast<fv::CrankNicolsonDdtScheme<scalar> >(ddtAlpha()).ocCoeff();
+            refCast<fv::CrankNicolsonDdtScheme<scalar>>(ddtAlpha()).ocCoeff();
     }
     else
     {

applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H

@@ -4,7 +4,7 @@
 
     surfaceScalarField phir("phir", phic*interface.nHatf());
 
-    Pair<tmp<volScalarField> > vDotAlphal =
+    Pair<tmp<volScalarField>> vDotAlphal =
         mixture->vDotAlphal();
     const volScalarField& vDotcAlphal = vDotAlphal[0]();
     const volScalarField& vDotvAlphal = vDotAlphal[1]();

applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H

@@ -39,7 +39,7 @@
         )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
     );
 
-    Pair<tmp<volScalarField> > vDotP = mixture->vDotP();
+    Pair<tmp<volScalarField>> vDotP = mixture->vDotP();
     const volScalarField& vDotcP = vDotP[0]();
     const volScalarField& vDotvP = vDotP[1]();
 

applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H

@@ -33,7 +33,7 @@
         )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
     );
 
-    Pair<tmp<volScalarField> > vDotP = mixture->vDotP();
+    Pair<tmp<volScalarField>> vDotP = mixture->vDotP();
     const volScalarField& vDotcP = vDotP[0]();
     const volScalarField& vDotvP = vDotP[1]();
 

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,13 +63,13 @@ Foam::phaseChangeTwoPhaseMixtures::Kunz::Kunz
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::Pair<Foam::tmp<Foam::volScalarField> >
+Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::phaseChangeTwoPhaseMixtures::Kunz::mDotAlphal() const
 {
     const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p");
     volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1)));
 
-    return Pair<tmp<volScalarField> >
+    return Pair<tmp<volScalarField>>
     (
         mcCoeff_*sqr(limitedAlpha1)
        *max(p - pSat(), p0_)/max(p - pSat(), 0.01*pSat()),
@@ -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
 {
     const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p");
     volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1)));
 
-    return Pair<tmp<volScalarField> >
+    return Pair<tmp<volScalarField>>
     (
         mcCoeff_*sqr(limitedAlpha1)*(1.0 - limitedAlpha1)
        *pos(p - pSat())/max(p - pSat(), 0.01*pSat()),

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,11 +105,11 @@ 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
         //  to multiply (p - pSat)
-        virtual Pair<tmp<volScalarField> > mDotP() const;
+        virtual Pair<tmp<volScalarField>> mDotP() const;
 
         //- Correct the Kunz phaseChange model
         virtual void correct();

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,25 +63,25 @@ Foam::phaseChangeTwoPhaseMixtures::Merkle::Merkle
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::Pair<Foam::tmp<Foam::volScalarField> >
+Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::phaseChangeTwoPhaseMixtures::Merkle::mDotAlphal() const
 {
     const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p");
 
-    return Pair<tmp<volScalarField> >
+    return Pair<tmp<volScalarField>>
     (
         mcCoeff_*max(p - pSat(), p0_),
         mvCoeff_*min(p - pSat(), p0_)
     );
 }
 
-Foam::Pair<Foam::tmp<Foam::volScalarField> >
+Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::phaseChangeTwoPhaseMixtures::Merkle::mDotP() const
 {
     const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p");
     volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1)));
 
-    return Pair<tmp<volScalarField> >
+    return Pair<tmp<volScalarField>>
     (
         mcCoeff_*(1.0 - limitedAlpha1)*pos(p - pSat()),
         (-mvCoeff_)*limitedAlpha1*neg(p - pSat())

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,11 +99,11 @@ 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
         //  to multiply (p - pSat)
-        virtual Pair<tmp<volScalarField> > mDotP() const;
+        virtual Pair<tmp<volScalarField>> mDotP() const;
 
         //- Correct the Merkle phaseChange model
         virtual void correct();

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::pCoeff
 }
 
 
-Foam::Pair<Foam::tmp<Foam::volScalarField> >
+Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::mDotAlphal() const
 {
     const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p");
@@ -116,7 +116,7 @@ Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::mDotAlphal() const
 
     volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1)));
 
-    return Pair<tmp<volScalarField> >
+    return Pair<tmp<volScalarField>>
     (
         Cc_*limitedAlpha1*pCoeff*max(p - pSat(), p0_),
 
@@ -125,7 +125,7 @@ Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::mDotAlphal() const
 }
 
 
-Foam::Pair<Foam::tmp<Foam::volScalarField> >
+Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::mDotP() const
 {
     const volScalarField& p = alpha1_.db().lookupObject<volScalarField>("p");
@@ -134,7 +134,7 @@ Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::mDotP() const
     volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1)));
     volScalarField apCoeff(limitedAlpha1*pCoeff);
 
-    return Pair<tmp<volScalarField> >
+    return Pair<tmp<volScalarField>>
     (
         Cc_*(1.0 - limitedAlpha1)*pos(p - pSat())*apCoeff,
 

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,11 +112,11 @@ 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
         //  to multiply (p - pSat)
-        virtual Pair<tmp<volScalarField> > mDotP() const;
+        virtual Pair<tmp<volScalarField>> mDotP() const;
 
         //- Correct the SchnerrSauer phaseChange model
         virtual void correct();

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,26 +50,26 @@ Foam::phaseChangeTwoPhaseMixture::phaseChangeTwoPhaseMixture
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::Pair<Foam::tmp<Foam::volScalarField> >
+Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::phaseChangeTwoPhaseMixture::vDotAlphal() const
 {
     volScalarField alphalCoeff(1.0/rho1() - alpha1_*(1.0/rho1() - 1.0/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]
     );
 }
 
-Foam::Pair<Foam::tmp<Foam::volScalarField> >
+Foam::Pair<Foam::tmp<Foam::volScalarField>>
 Foam::phaseChangeTwoPhaseMixture::vDotP() const
 {
     dimensionedScalar pCoeff(1.0/rho1() - 1.0/rho2());
-    Pair<tmp<volScalarField> > mDotP = this->mDotP();
+    Pair<tmp<volScalarField>> mDotP = this->mDotP();
 
-    return Pair<tmp<volScalarField> >(pCoeff*mDotP[0], pCoeff*mDotP[1]);
+    return Pair<tmp<volScalarField>>(pCoeff*mDotP[0], pCoeff*mDotP[1]);
 }
 
 

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H

@@ -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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -134,20 +134,20 @@ 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
         //  to multiply (p - pSat)
-        virtual Pair<tmp<volScalarField> > mDotP() const = 0;
+        virtual Pair<tmp<volScalarField>> mDotP() 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 to multiply (p - pSat)
-        Pair<tmp<volScalarField> > vDotP() const;
+        Pair<tmp<volScalarField>> vDotP() const;
 
         //- Correct the phaseChange model
         virtual void correct() = 0;

applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -150,10 +150,10 @@ public:
 // Instantiation for multi-component-multi-component pairs
 #define makeInterfaceCompositionType(Type, Thermo, Comp, Mix, Phys, OtherThermo, OtherComp, OtherMix, OtherPhys)\
                                                                                \
-    typedef Thermo<Comp, SpecieMixture<Mix<Phys> > >                           \
+    typedef Thermo<Comp, SpecieMixture<Mix<Phys>>>                           \
         Type##Thermo##Comp##Mix##Phys;                                         \
                                                                                \
-    typedef OtherThermo<OtherComp, OtherMix<OtherPhys> >                       \
+    typedef OtherThermo<OtherComp, OtherMix<OtherPhys>>                       \
         Type##Other##OtherThermo##OtherComp##OtherMix##OtherPhys;              \
                                                                                \
     addInterfaceCompositionToRunTimeSelectionTable                             \
@@ -166,10 +166,10 @@ public:
 // Instantiation for multi-component-single-component pairs
 #define makeSpecieInterfaceCompositionType(Type, Thermo, Comp, Mix, Phys, OtherThermo, OtherComp, OtherMix, OtherPhys)\
                                                                                \
-    typedef Thermo<Comp, SpecieMixture<Mix<Phys> > >                           \
+    typedef Thermo<Comp, SpecieMixture<Mix<Phys>>>                           \
         Type##Thermo##Comp##Mix##Phys;                                         \
                                                                                \
-    typedef OtherThermo<OtherComp, SpecieMixture<OtherMix<OtherPhys> > >       \
+    typedef OtherThermo<OtherComp, SpecieMixture<OtherMix<OtherPhys>>>       \
         Type##Other##OtherThermo##OtherComp##OtherMix##OtherPhys;              \
                                                                                \
     addInterfaceCompositionToRunTimeSelectionTable                             \

applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ void Foam::interfaceCompositionModels::Raoult<Thermo, OtherThermo>::update
 
     forAllIter
     (
-        HashTable<autoPtr<interfaceCompositionModel> >,
+        HashTable<autoPtr<interfaceCompositionModel>>,
         speciesModels_,
         iter
     )

applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,7 +69,7 @@ private:
         volScalarField YNonVapourPrime_;
 
         //- Species' individual composition models
-        HashTable<autoPtr<interfaceCompositionModel> > speciesModels_;
+        HashTable<autoPtr<interfaceCompositionModel>> speciesModels_;
 
 
 public:

applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -353,7 +353,7 @@ Foam::BlendedInterfacialModel<ModelType>::Kf() const
 
 template<class ModelType>
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::BlendedInterfacialModel<ModelType>::F() const
 {
     tmp<volScalarField> f1, f2;
@@ -368,7 +368,7 @@ Foam::BlendedInterfacialModel<ModelType>::F() const
         f2 = blending_.f2(phase1_, phase2_);
     }
 
-    tmp<GeometricField<Type, fvPatchField, volMesh> > x
+    tmp<GeometricField<Type, fvPatchField, volMesh>> x
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (

applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -144,7 +144,7 @@ public:
 
         //- Return the blended force
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh> > F() const;
+        tmp<GeometricField<Type, fvPatchField, volMesh>> F() const;
 
         //- Return the face blended force
         tmp<surfaceScalarField> Ff() const;

applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,7 @@ protected:
         <
             HashTable
             <
-                autoPtr<BlendedInterfacialModel<heatTransferModel> >
+                autoPtr<BlendedInterfacialModel<heatTransferModel>>
             >,
             phasePairKey,
             phasePairKey::hash
@@ -77,7 +77,7 @@ protected:
         <
             HashTable
             <
-                autoPtr<BlendedInterfacialModel<massTransferModel> >
+                autoPtr<BlendedInterfacialModel<massTransferModel>>
             >,
             phasePairKey,
             phasePairKey::hash

applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ protected:
 
         typedef HashTable
         <
-            autoPtr<BlendedInterfacialModel<heatTransferModel> >,
+            autoPtr<BlendedInterfacialModel<heatTransferModel>>,
             phasePairKey,
             phasePairKey::hash
         > heatTransferModelTable;

applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -543,10 +543,10 @@ Foam::volVectorField& Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::setF
 
 
 template<class BasePhaseSystem>
-Foam::autoPtr<Foam::PtrList<Foam::volVectorField> >
+Foam::autoPtr<Foam::PtrList<Foam::volVectorField>>
 Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Fs() const
 {
-    autoPtr<PtrList<volVectorField> > tFs
+    autoPtr<PtrList<volVectorField>> tFs
     (
         new PtrList<volVectorField>(this->phases().size())
     );
@@ -628,13 +628,13 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::setPhiD
 
 
 template<class BasePhaseSystem>
-Foam::autoPtr<Foam::PtrList<Foam::surfaceScalarField> >
+Foam::autoPtr<Foam::PtrList<Foam::surfaceScalarField>>
 Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::phiDs
 (
     const PtrList<volScalarField>& rAUs
 ) const
 {
-    autoPtr<PtrList<surfaceScalarField> > tphiDs
+    autoPtr<PtrList<surfaceScalarField>> tphiDs
     (
         new PtrList<surfaceScalarField>(this->phases().size())
     );

applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,35 +72,35 @@ protected:
 
         typedef HashTable
         <
-            autoPtr<BlendedInterfacialModel<dragModel> >,
+            autoPtr<BlendedInterfacialModel<dragModel>>,
             phasePairKey,
             phasePairKey::hash
         > dragModelTable;
 
         typedef HashTable
         <
-            autoPtr<BlendedInterfacialModel<virtualMassModel> >,
+            autoPtr<BlendedInterfacialModel<virtualMassModel>>,
             phasePairKey,
             phasePairKey::hash
         > virtualMassModelTable;
 
         typedef HashTable
         <
-            autoPtr<BlendedInterfacialModel<liftModel> >,
+            autoPtr<BlendedInterfacialModel<liftModel>>,
             phasePairKey,
             phasePairKey::hash
         > liftModelTable;
 
         typedef HashTable
         <
-            autoPtr<BlendedInterfacialModel<wallLubricationModel> >,
+            autoPtr<BlendedInterfacialModel<wallLubricationModel>>,
             phasePairKey,
             phasePairKey::hash
         > wallLubricationModelTable;
 
         typedef HashTable
         <
-            autoPtr<BlendedInterfacialModel<turbulentDispersionModel> >,
+            autoPtr<BlendedInterfacialModel<turbulentDispersionModel>>,
             phasePairKey,
             phasePairKey::hash
         > turbulentDispersionModelTable;
@@ -187,10 +187,10 @@ public:
         virtual tmp<volVectorField> F(const phasePairKey& key) const;
 
         //- Return the combined force (lift + wall-lubrication)
-        virtual autoPtr<PtrList<volVectorField> > Fs() const;
+        virtual autoPtr<PtrList<volVectorField>> Fs() const;
 
         //- Return the turbulent dispersion force on faces for phase pair
-        virtual autoPtr<PtrList<surfaceScalarField> > phiDs
+        virtual autoPtr<PtrList<surfaceScalarField>> phiDs
         (
             const PtrList<volScalarField>& rAUs
         ) const;

applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ Description
 
 namespace Foam
 {
-      typedef ThermalDiffusivity<PhaseCompressibleTurbulenceModel<phaseModel> >
+      typedef ThermalDiffusivity<PhaseCompressibleTurbulenceModel<phaseModel>>
           phaseCompressibleTurbulenceModel;
 }
 

applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ namespace Foam
     template<class BasicTurbulenceModel>
     class ThermalDiffusivity;
 
-      typedef ThermalDiffusivity<PhaseCompressibleTurbulenceModel<phaseModel> >
+      typedef ThermalDiffusivity<PhaseCompressibleTurbulenceModel<phaseModel>>
           phaseCompressibleTurbulenceModel;
 }
 

applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -236,7 +236,7 @@ protected:
             const word& modelName,
             HashTable
             <
-                autoPtr<BlendedInterfacialModel<modelType> >,
+                autoPtr<BlendedInterfacialModel<modelType>>,
                 phasePairKey,
                 phasePairKey::hash
             >& models
@@ -249,7 +249,7 @@ protected:
             const word& modelName,
             HashTable
             <
-                HashTable<autoPtr<modelType> >,
+                HashTable<autoPtr<modelType>>,
                 phasePairKey,
                 phasePairKey::hash
             >& models

applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,7 +82,7 @@ void Foam::phaseSystem::generatePairsAndSubModels
     const word& modelName,
     HashTable
     <
-        autoPtr<BlendedInterfacialModel<modelType> >,
+        autoPtr<BlendedInterfacialModel<modelType>>,
         phasePairKey,
         phasePairKey::hash
     >& models
@@ -118,7 +118,7 @@ void Foam::phaseSystem::generatePairsAndSubModels
         models.insert
         (
             key,
-            autoPtr<BlendedInterfacialModel<modelType> >
+            autoPtr<BlendedInterfacialModel<modelType>>
             (
                 new BlendedInterfacialModel<modelType>
                 (
@@ -141,7 +141,7 @@ void Foam::phaseSystem::generatePairsAndSubModels
     const word& modelName,
     HashTable
     <
-        HashTable<autoPtr<modelType> >,
+        HashTable<autoPtr<modelType>>,
         phasePairKey,
         phasePairKey::hash
     >& models
@@ -169,7 +169,7 @@ void Foam::phaseSystem::generatePairsAndSubModels
                 models.insert
                 (
                     key,
-                    HashTable<autoPtr<modelType> >()
+                    HashTable<autoPtr<modelType>>()
                 );
             }
 

applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -167,10 +167,10 @@ public:
         virtual tmp<volScalarField> Kd(const phaseModel& phase) const = 0;
 
         //- Return the combined force (lift + wall-lubrication) for phase pair
-        virtual autoPtr<PtrList<Foam::volVectorField> > Fs() const = 0;
+        virtual autoPtr<PtrList<Foam::volVectorField>> Fs() const = 0;
 
         //- Return the turbulent dispersion force on faces for phase pair
-        virtual autoPtr<PtrList<Foam::surfaceScalarField> > phiDs
+        virtual autoPtr<PtrList<Foam::surfaceScalarField>> phiDs
         (
             const PtrList<volScalarField>& rAUs
         ) const = 0;

applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H

@@ -37,7 +37,7 @@ forAll(phases, phasei)
 // Lift, wall-lubrication and turbulent diffusion fluxes
 PtrList<surfaceScalarField> phiFs(phases.size());
 {
-    autoPtr<PtrList<volVectorField> > Fs = fluid.Fs();
+    autoPtr<PtrList<volVectorField>> Fs = fluid.Fs();
 
     forAll(phases, phasei)
     {
@@ -58,7 +58,7 @@ PtrList<surfaceScalarField> phiFs(phases.size());
     }
 }
 {
-    autoPtr<PtrList<surfaceScalarField> > phiDs = fluid.phiDs(rAUs);
+    autoPtr<PtrList<surfaceScalarField>> phiDs = fluid.phiDs(rAUs);
 
     forAll(phases, phasei)
     {

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
 :
     eddyViscosity
     <
-        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
+        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel>>
     >
     (
         type,
@@ -187,7 +187,7 @@ bool Foam::RASModels::kineticTheoryModel::read()
     (
         eddyViscosity
         <
-            RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
+            RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel>>
         >::read()
     )
     {

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,7 +73,7 @@ class kineticTheoryModel
 :
     public eddyViscosity
     <
-        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
+        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel>>
     >
 {
     // Private data

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ Foam::RASModels::phasePressureModel::phasePressureModel
 :
     eddyViscosity
     <
-        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
+        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel>>
     >
     (
         type,
@@ -90,7 +90,7 @@ bool Foam::RASModels::phasePressureModel::read()
     (
         eddyViscosity
         <
-            RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
+            RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel>>
         >::read()
     )
     {

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ class phasePressureModel
 :
     public eddyViscosity
     <
-        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel> >
+        RASModel<EddyDiffusivity<phaseCompressibleTurbulenceModel>>
     >
 {
     // Private data

applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
         RASModel<EddyDiffusivity<ThermalDiffusivity
         <
             PhaseCompressibleTurbulenceModel<phaseModel>
-        > > >
+        >>>
     >
     (
         type,
@@ -192,7 +192,7 @@ bool Foam::RASModels::kineticTheoryModel::read()
             RASModel<EddyDiffusivity<ThermalDiffusivity
             <
                 PhaseCompressibleTurbulenceModel<phaseModel>
-            > > >
+            >>>
         >::read()
     )
     {

applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ class kineticTheoryModel
         RASModel<EddyDiffusivity<ThermalDiffusivity
         <
             PhaseCompressibleTurbulenceModel<phaseModel>
-        > > >
+        >>>
     >
 {
     // Private data

applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ Foam::RASModels::phasePressureModel::phasePressureModel
         RASModel<EddyDiffusivity<ThermalDiffusivity
         <
             PhaseCompressibleTurbulenceModel<phaseModel>
-        > > >
+        >>>
     >
     (
         type,
@@ -96,7 +96,7 @@ bool Foam::RASModels::phasePressureModel::read()
             RASModel<EddyDiffusivity<ThermalDiffusivity
             <
                 PhaseCompressibleTurbulenceModel<phaseModel>
-            > > >
+            >>>
         >::read()
     )
     {

applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ class phasePressureModel
         RASModel<EddyDiffusivity<ThermalDiffusivity
         <
             PhaseCompressibleTurbulenceModel<phaseModel>
-        > > >
+        >>>
     >
 {
     // Private data

applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -251,7 +251,7 @@ Foam::BlendedInterfacialModel<modelType>::Kf() const
 
 template<class modelType>
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::BlendedInterfacialModel<modelType>::F() const
 {
     tmp<volScalarField> f1, f2;
@@ -266,7 +266,7 @@ Foam::BlendedInterfacialModel<modelType>::F() const
         f2 = blending_.f2(pair1In2_.dispersed(), pair2In1_.dispersed());
     }
 
-    tmp<GeometricField<Type, fvPatchField, volMesh> > x
+    tmp<GeometricField<Type, fvPatchField, volMesh>> x
     (
         new GeometricField<Type, fvPatchField, volMesh>
         (

applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,7 +128,7 @@ public:
 
         //- Return the blended force
         template<class Type>
-        tmp<GeometricField<Type, fvPatchField, volMesh> > F() const;
+        tmp<GeometricField<Type, fvPatchField, volMesh>> F() const;
 
         //- Return the face blended force
         tmp<surfaceScalarField> Ff() const;

applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,7 @@ class phaseModel
         autoPtr<diameterModel> dPtr_;
 
         //- Turbulence model
-        autoPtr<PhaseCompressibleTurbulenceModel<phaseModel> > turbulence_;
+        autoPtr<PhaseCompressibleTurbulenceModel<phaseModel>> turbulence_;
 
 
 public:

applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,23 +97,23 @@ class twoPhaseSystem
         HashTable<autoPtr<blendingMethod>, word, word::hash> blendingMethods_;
 
         //- Drag model
-        autoPtr<BlendedInterfacialModel<dragModel> > drag_;
+        autoPtr<BlendedInterfacialModel<dragModel>> drag_;
 
         //- Virtual mass model
-        autoPtr<BlendedInterfacialModel<virtualMassModel> > virtualMass_;
+        autoPtr<BlendedInterfacialModel<virtualMassModel>> virtualMass_;
 
         //- Heat transfer model
-        autoPtr<BlendedInterfacialModel<heatTransferModel> > heatTransfer_;
+        autoPtr<BlendedInterfacialModel<heatTransferModel>> heatTransfer_;
 
         //- Lift model
-        autoPtr<BlendedInterfacialModel<liftModel> > lift_;
+        autoPtr<BlendedInterfacialModel<liftModel>> lift_;
 
         //- Wall lubrication model
-        autoPtr<BlendedInterfacialModel<wallLubricationModel> >
+        autoPtr<BlendedInterfacialModel<wallLubricationModel>>
             wallLubrication_;
 
         //- Wall lubrication model
-        autoPtr<BlendedInterfacialModel<turbulentDispersionModel> >
+        autoPtr<BlendedInterfacialModel<turbulentDispersionModel>>
             turbulentDispersion_;
 
 

applications/test/CompactListList/Test-CompactListList.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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    List<List<label> > lll(5);
+    List<List<label>> lll(5);
     lll[0].setSize(3, 0);
     lll[1].setSize(2, 1);
     lll[2].setSize(6, 2);
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
     cll2(2, 3) = 999;
     Info<< "cll2(2, 3) = " << cll2(2, 3) << nl << endl;
 
-    Info<< "cll2 as List<List<label > > " << cll2()
+    Info<< "cll2 as List<List<label >> " << cll2()
         << endl;
 
     cll2.setSize(3);

applications/test/DynamicList/Test-DynamicList.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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,7 +71,7 @@ void printInfo
 
 int main(int argc, char *argv[])
 {
-    List<DynamicList<label, 1, 0> > ldl(2);
+    List<DynamicList<label, 1, 0>> ldl(2);
 
     ldl[0](0) = 0;
     ldl[0](2) = 2;
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
     }
     Info<< endl;
 
-    List<List<label> > ll(2);
+    List<List<label>> ll(2);
     ll[0].transfer(ldl[0]);
     ll[1].transfer(ldl[1].shrink());
 

applications/test/HashTable2/Test-HashTable2.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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
     Info<< "table1: " << table1 << nl
         << "toc: " << table1.toc() << endl;
 
-    HashTable<label, label, Hash<label> > table2(10);
+    HashTable<label, label, Hash<label>> table2(10);
 
     table2.insert(3, 10);
     table2.insert(5, 12);

applications/test/HashTable3/Test-HashTable3.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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,9 +48,9 @@ int main(int argc, char *argv[])
 
     // ie, a
     // Map<label> map(2 * nSize);
-    // HashTable<label, label, Hash<label> > map(2 * nSize);
+    // HashTable<label, label, Hash<label>> map(2 * nSize);
-    // StaticHashTable<label, label, Hash<label> > map(2 * nSize);
+    // StaticHashTable<label, label, Hash<label>> map(2 * nSize);
-    HashTable<label, label, Hash<label> > map(2 * nSize);
+    HashTable<label, label, Hash<label>> map(2 * nSize);
 
     Info<< "Constructed map of size: " << nSize
         << " (size " << map.size() << " capacity " << map.capacity() << ") "

applications/test/PackedList2/Test-PackedList2.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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,8 +62,8 @@ int main(int argc, char *argv[])
 
     // fullStaticHash is really slow
     // give it lots of slots to help
-    StaticHashTable<nil, label, Hash<label> > emptyStaticHash;
+    StaticHashTable<nil, label, Hash<label>> emptyStaticHash;
-    StaticHashTable<nil, label, Hash<label> > fullStaticHash(100000);
+    StaticHashTable<nil, label, Hash<label>> fullStaticHash(100000);
     for (label i = 0; i < n; i++)
     {
         fullStaticHash.insert(i, nil());

applications/test/PatchTools/Test-PatchTools.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ using namespace Foam;
 //
 //
 //    // Collect local pointFaces
-//    List<List<point> > pointFaceNormals(map.constructSize());
+//    List<List<point>> pointFaceNormals(map.constructSize());
 //    {
 //        const vectorField& faceAreas = mesh.faceAreas();
 //

applications/test/dataEntry/Test-DataEntry.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
         )
     );
 
-    autoPtr<DataEntry<scalar> > dataEntry
+    autoPtr<DataEntry<scalar>> dataEntry
     (
         DataEntry<scalar>::New
         (

applications/test/extendedStencil/Test-ExtendedStencil.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
 //        writeStencilStats(addressing.stencil());
 //
 //        // Collect stencil cell centres
-//        List<List<point> > stencilPoints(mesh.nFaces());
+//        List<List<point>> stencilPoints(mesh.nFaces());
 //        addressing.collectData
 //        (
 //            mesh.C(),
@@ -199,7 +199,7 @@ int main(int argc, char *argv[])
 //        //// Do some interpolation.
 //        //{
 //        //    const labelListList& stencil = addressing.stencil();
-//        //    List<List<scalar> > stencilWeights(stencil.size());
+//        //    List<List<scalar>> stencilWeights(stencil.size());
 //        //    forAll(stencil, faceI)
 //        //    {
 //        //        const labelList& fStencil = stencil[faceI];
@@ -223,7 +223,7 @@ int main(int argc, char *argv[])
 //
 //
 //        // Collect stencil cell centres
-//        List<List<point> > stencilPoints(mesh.nFaces());
+//        List<List<point>> stencilPoints(mesh.nFaces());
 //        addressing.collectData
 //        (
 //            mesh.C(),
@@ -260,7 +260,7 @@ int main(int argc, char *argv[])
 //        //
 //        //
 //        //// Collect stencil cell centres
-//        //List<List<point> > stencilPoints(mesh.nFaces());
+//        //List<List<point>> stencilPoints(mesh.nFaces());
 //        //addressing.collectData
 //        //(
 //        //    mesh.C(),
@@ -295,7 +295,7 @@ int main(int argc, char *argv[])
 //        //
 //        //
 //        //// Collect stencil cell centres
-//        //List<List<point> > stencilPoints(mesh.nFaces());
+//        //List<List<point>> stencilPoints(mesh.nFaces());
 //        //addressing.collectData
 //        //(
 //        //    mesh.C(),
@@ -331,7 +331,7 @@ int main(int argc, char *argv[])
     //
     //    {
     //        // Collect stencil cell centres
-    //        List<List<point> > ownPoints(mesh.nFaces());
+    //        List<List<point>> ownPoints(mesh.nFaces());
     //        addressing.collectData
     //        (
     //            addressing.ownMap(),
@@ -352,7 +352,7 @@ int main(int argc, char *argv[])
     //    }
     //    {
     //        // Collect stencil cell centres
-    //        List<List<point> > neiPoints(mesh.nFaces());
+    //        List<List<point>> neiPoints(mesh.nFaces());
     //        addressing.collectData
     //        (
     //            addressing.neiMap(),
@@ -391,7 +391,7 @@ int main(int argc, char *argv[])
     //
     //    {
     //        // Collect stencil cell centres
-    //        List<List<point> > ownPoints(mesh.nFaces());
+    //        List<List<point>> ownPoints(mesh.nFaces());
     //        addressing.collectData
     //        (
     //            addressing.ownMap(),
@@ -412,7 +412,7 @@ int main(int argc, char *argv[])
     //    }
     //    {
     //        // Collect stencil cell centres
-    //        List<List<point> > neiPoints(mesh.nFaces());
+    //        List<List<point>> neiPoints(mesh.nFaces());
     //        addressing.collectData
     //        (
     //            addressing.neiMap(),
@@ -451,7 +451,7 @@ int main(int argc, char *argv[])
         writeStencilStats(addressing.stencil());
 
         // Collect stencil cell centres
-        List<List<point> > stencilPoints(mesh.nCells());
+        List<List<point>> stencilPoints(mesh.nCells());
         addressing.collectData
         (
             mesh.C(),
@@ -479,7 +479,7 @@ int main(int argc, char *argv[])
         writeStencilStats(addressing.stencil());
 
         // Collect stencil cell centres
-        List<List<point> > stencilPoints(mesh.nCells());
+        List<List<point>> stencilPoints(mesh.nCells());
         addressing.collectData
         (
             mesh.C(),
@@ -507,7 +507,7 @@ int main(int argc, char *argv[])
         writeStencilStats(addressing.stencil());
 
         // Collect stencil cell centres
-        List<List<point> > stencilPoints(mesh.nCells());
+        List<List<point>> stencilPoints(mesh.nCells());
         addressing.collectData
         (
             mesh.C(),
@@ -528,7 +528,7 @@ int main(int argc, char *argv[])
 
 //XXXXXX
 //    // Evaluate
-//    List<List<scalar> > stencilData(faceStencils.size());
+//    List<List<scalar>> stencilData(faceStencils.size());
 //    collectStencilData
 //    (
 //        distMap,

applications/test/extendedStencil/Test-ExtendedStencil2.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
         CFCCellToCellStencil stencil(mesh);
 
         // Construct exchange map and renumber stencil
-        List<Map<label> > compactMap(Pstream::nProcs());
+        List<Map<label>> compactMap(Pstream::nProcs());
         mapDistribute map
         (
             stencil.globalNumbering(),
@@ -142,7 +142,7 @@ int main(int argc, char *argv[])
 
 
         // Collect the data in stencil form
-        List<List<vector> > stencilPoints;
+        List<List<vector>> stencilPoints;
         {
             const volVectorField& fld = mesh.C();
 

applications/test/parallel/Test-parallel.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
         Random rndGen(43544*Pstream::myProcNo());
 
         // Generate random data.
-        List<Tuple2<label, List<scalar> > > complexData(100);
+        List<Tuple2<label, List<scalar>>> complexData(100);
         forAll(complexData, i)
         {
             complexData[i].first() = rndGen.integer(0, Pstream::nProcs()-1);

applications/test/regex/Test-regex.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
-    List<Tuple2<string, string> > rawList(IFstream("testRegexps")());
+    List<Tuple2<string, string>> rawList(IFstream("testRegexps")());
     Info<< "Test expressions:" << rawList << endl;
     IOobject::writeDivider(Info) << endl;
 

applications/test/thermoMixture/Test-thermoMixture.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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
     <
         species::thermo
         <
-            hConstThermo<perfectGas<specie> >,
+            hConstThermo<perfectGas<specie>>,
             sensibleEnthalpy
         >
     > ThermoType;

applications/test/wordRe/Test-wordRe.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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
 
     IOobject::writeDivider(Info);
 
-    List<Tuple2<wordRe, string> > rawList(IFstream("testRegexps")());
+    List<Tuple2<wordRe, string>> rawList(IFstream("testRegexps")());
     Info<< "input list:" << rawList << endl;
     IOobject::writeDivider(Info) << endl;
 

applications/test/xfer/Test-xferList.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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,8 +55,8 @@ int main(int argc, char *argv[])
     Info<< "lstA: " << lstA << endl;
     Info<< "lstC: " << lstC << endl;
 
-    Xfer<List<label> > xA = xferMove(lstA);
+    Xfer<List<label>> xA = xferMove(lstA);
-    Xfer<List<label> > xB;
+    Xfer<List<label>> xB;
 
     List<label> lstB( xA );
 

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-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,7 +129,7 @@ void subsetVolFields
     const label patchI,
     const Type& exposedValue,
     const word GeomVolType,
-    PtrList<GeometricField<Type, fvPatchField, volMesh> >& subFields
+    PtrList<GeometricField<Type, fvPatchField, volMesh>>& subFields
 )
 {
     const fvMesh& baseMesh = subsetter.baseMesh();
@@ -201,7 +201,7 @@ void subsetSurfaceFields
     const label patchI,
     const Type& exposedValue,
     const word GeomSurfType,
-    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >& subFields
+    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>& subFields
 )
 {
     const fvMesh& baseMesh = subsetter.baseMesh();
@@ -580,10 +580,10 @@ int main(int argc, char *argv[])
     );
 
     // Per faceSet the patch to put the baffles into
-    const List<Pair<word> > setsAndPatches(dict.lookup("blockedFaces"));
+    const List<Pair<word>> setsAndPatches(dict.lookup("blockedFaces"));
 
     // Per faceSet the patch to put the coupled baffles into
-    DynamicList<FixedList<word, 3> > coupledAndPatches(10);
+    DynamicList<FixedList<word, 3>> coupledAndPatches(10);
     const dictionary& functionDicts = dict.subDict("coupledFaces");
     forAllConstIter(dictionary, functionDicts, iter)
     {

applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -355,9 +355,9 @@ int main(int argc, char *argv[])
     );
 
     // Read all from the dictionary.
-    List<Pair<point> > pointsToMove(dict.lookup("pointsToMove"));
+    List<Pair<point>> pointsToMove(dict.lookup("pointsToMove"));
-    List<Pair<point> > edgesToSplit(dict.lookup("edgesToSplit"));
+    List<Pair<point>> edgesToSplit(dict.lookup("edgesToSplit"));
-    List<Pair<point> > facesToTriangulate
+    List<Pair<point>> facesToTriangulate
     (
         dict.lookup("facesToTriangulate")
     );
@@ -369,15 +369,15 @@ int main(int argc, char *argv[])
      || facesToTriangulate.size()
     );
 
-    List<Pair<point> > edgesToCollapse(dict.lookup("edgesToCollapse"));
+    List<Pair<point>> edgesToCollapse(dict.lookup("edgesToCollapse"));
 
     bool collapseEdge = edgesToCollapse.size();
 
-    List<Pair<point> > cellsToPyramidise(dict.lookup("cellsToSplit"));
+    List<Pair<point>> cellsToPyramidise(dict.lookup("cellsToSplit"));
 
     bool cellsToSplit = cellsToPyramidise.size();
 
-    // List<Tuple2<pointField,point> >
+    // List<Tuple2<pointField,point>>
     //     cellsToCreate(dict.lookup("cellsToCreate"));
 
     Info<< "Read from " << dict.name() << nl
@@ -442,7 +442,7 @@ int main(int argc, char *argv[])
 
 
     Info<< nl << "Looking up edges to split ..." << nl << endl;
-    Map<List<point> > edgeToCuts(edgesToSplit.size());
+    Map<List<point>> edgeToCuts(edgesToSplit.size());
     forAll(edgesToSplit, i)
     {
         const Pair<point>& pts = edgesToSplit[i];

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-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
     SortableList<scalar> sortedVols(vols);
 
     // All cell labels, sorted per bin.
-    DynamicList<DynamicList<label> > bins;
+    DynamicList<DynamicList<label>> bins;
 
     // Lower/upper limits
     DynamicList<scalar> lowerLimits;

applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -131,7 +131,7 @@ void storeCellInZone
     const label cellI,
     const label cellType,
     Map<label>& typeToZone,
-    List<DynamicList<label> >& zoneCells
+    List<DynamicList<label>>& zoneCells
 )
 {
     if (cellType >= 0)
@@ -1022,7 +1022,7 @@ int main(int argc, char *argv[])
         // From foamCellType physical region to Foam cellZone
         Map<label> typeToZone;
         // Storage for cell zones.
-        List<DynamicList<label> > zoneCells(0);
+        List<DynamicList<label>> zoneCells(0);
 
         forAll(foamCellType, cellI)
         {

applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,8 +66,8 @@ SLList<label> slCellMap;
 SLList<label> slCellType;
 label maxCelli = 0;
 
-PtrList<SLList<label> > slPatchCells;
+PtrList<SLList<label>> slPatchCells;
-PtrList<SLList<label> > slPatchCellFaces;
+PtrList<SLList<label>> slPatchCellFaces;
 
 // Cell types
 Map<word> cellTypes;

applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1578,7 +1578,7 @@ int main(int argc, char *argv[])
 
         // List of patch names and the cellZone(s) they border
         // this is just an info file to make MRF easier to setup
-        List<DynamicList<word> > boundaryZones
+        List<DynamicList<word>> boundaryZones
         (
             pShapeMesh.boundaryMesh().size()
         );

applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -211,7 +211,7 @@ void storeCellInZone
     Map<label>& physToZone,
 
     labelList& zoneToPhys,
-    List<DynamicList<label> >& zoneCells
+    List<DynamicList<label>>& zoneCells
 )
 {
     Map<label>::const_iterator zoneFnd = physToZone.find(regPhys);
@@ -415,10 +415,10 @@ void readCells
     cellShapeList& cells,
 
     labelList& patchToPhys,
-    List<DynamicList<face> >& patchFaces,
+    List<DynamicList<face>>& patchFaces,
 
     labelList& zoneToPhys,
-    List<DynamicList<label> >& zoneCells
+    List<DynamicList<label>>& zoneCells
 )
 {
     Info<< "Starting to read cells at line " << inFile.lineNumber() << endl;
@@ -791,12 +791,12 @@ int main(int argc, char *argv[])
     // Map from patch to gmsh physical region
     labelList patchToPhys;
     // Storage for patch faces.
-    List<DynamicList<face> > patchFaces(0);
+    List<DynamicList<face>> patchFaces(0);
 
     // Map from cellZone to gmsh physical region
     labelList zoneToPhys;
     // Storage for cell zones.
-    List<DynamicList<label> > zoneCells(0);
+    List<DynamicList<label>> zoneCells(0);
 
     // Name per physical region
     Map<word> physicalNames;
@@ -934,7 +934,7 @@ int main(int argc, char *argv[])
     const polyPatch& pp = mesh.boundaryMesh().last();
 
     // Storage for faceZones.
-    List<DynamicList<label> > zoneFaces(patchFaces.size());
+    List<DynamicList<label>> zoneFaces(patchFaces.size());
 
 
     // Go through all the patchFaces and find corresponding face in pp.

applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C

@@ -849,7 +849,7 @@ int main(int argc, char *argv[])
     HashTable<label, label> faceToCell[2];
 
     {
-        HashTable<label, face, Hash<face> > faceToFaceID(boundaryFaces.size());
+        HashTable<label, face, Hash<face>> faceToFaceID(boundaryFaces.size());
         forAll(boundaryFaces, faceI)
         {
             SortableList<label> sortedVerts(boundaryFaces[faceI]);
@@ -862,7 +862,7 @@ int main(int argc, char *argv[])
             forAll(faces, i)
             {
                 SortableList<label> sortedVerts(faces[i]);
-                HashTable<label, face, Hash<face> >::const_iterator fnd =
+                HashTable<label, face, Hash<face>>::const_iterator fnd =
                     faceToFaceID.find(face(sortedVerts));
 
                 if (fnd != faceToFaceID.end())
@@ -956,7 +956,7 @@ int main(int argc, char *argv[])
             }
         }
 
-        List<DynamicList<face> > dynPatchFaces(dofVertIndices.size());
+        List<DynamicList<face>> dynPatchFaces(dofVertIndices.size());
 
         forAll(cellVerts, cellI)
         {

applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H

@@ -232,7 +232,7 @@ const char* kivaPatchNames[nBCs] =
 };
 
 
-List<SLList<face> > pFaces[nBCs];
+List<SLList<face>> pFaces[nBCs];
 
 face quadFace(4);
 face triFace(3);

applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -163,7 +163,7 @@ int main(int argc, char *argv[])
     label maxPatch = 0;
 
     // Boundary faces as three vertices
-    HashTable<label, triFace, Hash<triFace> > vertsToBoundary(nFaces);
+    HashTable<label, triFace, Hash<triFace>> vertsToBoundary(nFaces);
 
     forAll(boundaryFaces, faceI)
     {
@@ -212,7 +212,7 @@ int main(int argc, char *argv[])
 
             // Is there any boundary face with same vertices?
             // (uses commutative hash)
-            HashTable<label, triFace, Hash<triFace> >::iterator iter =
+            HashTable<label, triFace, Hash<triFace>>::iterator iter =
                 vertsToBoundary.find(triFace(f[0], f[1], f[2]));
 
             if (iter != vertsToBoundary.end())
@@ -266,7 +266,7 @@ int main(int argc, char *argv[])
 
     {
         // Sort boundaryFaces by patch.
-        List<DynamicList<face> > allPatchFaces(nPatches);
+        List<DynamicList<face>> allPatchFaces(nPatches);
 
         forAll(boundaryPatch, faceI)
         {

applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,9 +51,9 @@ void Foam::starMesh::createCoupleMatches()
     );
 
     // Store newly created faces for each cell
-    Map<SLList<face> > cellAddedFaces(cellMapSize);
+    Map<SLList<face>> cellAddedFaces(cellMapSize);
 
-    Map<SLList<label> > cellRemovedFaces(cellMapSize);
+    Map<SLList<label>> cellRemovedFaces(cellMapSize);
 
     // In order to remove often allocation, remember the number of live points.
     // If you run out of space in point creation, increase it by the number of
@@ -115,7 +115,7 @@ void Foam::starMesh::createCoupleMatches()
         {
             // Master face is replaced by a set of slave faces
 
-            Map<SLList<label> >::iterator crfIter =
+            Map<SLList<label>>::iterator crfIter =
                 cellRemovedFaces.find(fp.masterCell());
 
             if (crfIter == cellRemovedFaces.end())
@@ -131,7 +131,7 @@ void Foam::starMesh::createCoupleMatches()
                 crfIter().append(fp.masterFace());
             }
 
-            Map<SLList<face> >::iterator cafIter =
+            Map<SLList<face>>::iterator cafIter =
                 cellAddedFaces.find(fp.masterCell());
             if (cafIter == cellAddedFaces.end())
             {
@@ -155,11 +155,11 @@ void Foam::starMesh::createCoupleMatches()
 
             // Master data
             edgeList masterEdges = masterFace.edges();
-            List<SLList<label> > masterEdgePoints(masterEdges.size());
+            List<SLList<label>> masterEdgePoints(masterEdges.size());
 
             // Slave data
             edgeList slaveEdges = slaveFace.edges();
-            List<SLList<label> > slaveEdgePoints(slaveEdges.size());
+            List<SLList<label>> slaveEdgePoints(slaveEdges.size());
 
             // Find common plane
             vector n = masterFace.normal(points_);
@@ -1354,7 +1354,7 @@ void Foam::starMesh::createCoupleMatches()
             // Add the new face to both master and slave
 
             // Master face is replaced by a set of slave faces
-            Map<SLList<label> >::iterator crfMasterIter =
+            Map<SLList<label>>::iterator crfMasterIter =
                 cellRemovedFaces.find(fp.masterCell());
 
             if (crfMasterIter == cellRemovedFaces.end())
@@ -1370,7 +1370,7 @@ void Foam::starMesh::createCoupleMatches()
                 crfMasterIter().append(fp.masterFace());
             }
 
-            Map<SLList<label> >::iterator crfSlaveIter =
+            Map<SLList<label>>::iterator crfSlaveIter =
                 cellRemovedFaces.find(fp.slaveCell());
 
             if (crfSlaveIter == cellRemovedFaces.end())
@@ -1386,7 +1386,7 @@ void Foam::starMesh::createCoupleMatches()
                 crfSlaveIter().append(fp.slaveFace());
             }
 
-            Map<SLList<face> >::iterator cafMasterIter =
+            Map<SLList<face>>::iterator cafMasterIter =
                 cellAddedFaces.find(fp.masterCell());
             if (cafMasterIter == cellAddedFaces.end())
             {
@@ -1401,7 +1401,7 @@ void Foam::starMesh::createCoupleMatches()
                 cafMasterIter().append(intersectedFace);
             }
 
-            Map<SLList<face> >::iterator cafSlaveIter =
+            Map<SLList<face>>::iterator cafSlaveIter =
                 cellAddedFaces.find(fp.slaveCell());
             if (cafSlaveIter == cellAddedFaces.end())
             {

applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -498,7 +498,7 @@ int main(int argc, char *argv[])
 
 
         // Sort boundaryFaces by patch using boundaryPatch.
-        List<DynamicList<face> > allPatchFaces(nPatches);
+        List<DynamicList<face>> allPatchFaces(nPatches);
 
         forAll(boundaryPatch, faceI)
         {

applications/utilities/mesh/generation/blockMesh/blockMeshApp.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -228,7 +228,7 @@ int main(int argc, char *argv[])
     // Read in a list of dictionaries for the merge patch pairs
     if (meshDict.found("mergePatchPairs"))
     {
-        List<Pair<word> > mergePatchPairs
+        List<Pair<word>> mergePatchPairs
         (
             meshDict.lookup("mergePatchPairs")
         );
@@ -254,7 +254,7 @@ int main(int argc, char *argv[])
         HashTable<label> zoneMap(nZones);
 
         // Cells per zone.
-        List<DynamicList<label> > zoneCells(nZones);
+        List<DynamicList<label>> zoneCells(nZones);
 
         // Running cell counter
         label cellI = 0;

applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1927,7 +1927,7 @@ int main(int argc, char *argv[])
             extrudeMeshEdges
         )
     );
-    List<Map<label> > compactMap;
+    List<Map<label>> compactMap;
     const mapDistribute extrudeEdgeFacesMap
     (
         globalExtrudeFaces,

applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
     // Point generator
     autoPtr<extrudeModel> model(extrudeModel::New(extrude2DMeshDict));
 
-    autoPtr<MeshedSurface<face> > fMesh;
+    autoPtr<MeshedSurface<face>> fMesh;
 
     autoPtr<polyMesh> mesh;
 

applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,13 +55,13 @@ using namespace Foam;
 // Main program:
 
 template<class Triangulation, class Type>
-Foam::tmp<Foam::Field<Type> > filterFarPoints
+Foam::tmp<Foam::Field<Type>> filterFarPoints
 (
     const Triangulation& mesh,
     const Field<Type>& field
 )
 {
-    tmp<Field<Type> > tNewField(new Field<Type>(field.size()));
+    tmp<Field<Type>> tNewField(new Field<Type>(field.size()));
     Field<Type>& newField = tNewField();
 
     label added = 0;
@@ -139,7 +139,7 @@ autoPtr<mapDistribute> buildMap
         pointPoints[vit->index()].transfer(indices);
     }
 
-    List<Map<label> > compactMap;
+    List<Map<label>> compactMap;
 
     return autoPtr<mapDistribute>
     (

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -154,8 +154,8 @@ private:
             faceList& faces,
             labelList& owner,
             PtrList<dictionary>& patchDicts,
-            const List<DynamicList<face> >& patchFaces,
+            const List<DynamicList<face>>& patchFaces,
-            const List<DynamicList<label> >& patchOwners
+            const List<DynamicList<label>>& patchOwners
         ) const;
 
         //- Disallow default bitwise copy construct

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,8 +84,8 @@ void Foam::DelaunayMesh<Triangulation>::addPatches
     faceList& faces,
     labelList& owner,
     PtrList<dictionary>& patchDicts,
-    const List<DynamicList<face> >& patchFaces,
+    const List<DynamicList<face>>& patchFaces,
-    const List<DynamicList<label> >& patchOwners
+    const List<DynamicList<label>>& patchOwners
 ) const
 {
     label nPatches = patchFaces.size();
@@ -353,8 +353,8 @@ Foam::DelaunayMesh<Triangulation>::createMesh
     PtrList<dictionary> patchDicts(1);
     patchDicts.set(0, new dictionary());
 
-    List<DynamicList<face> > patchFaces(1, DynamicList<face>());
+    List<DynamicList<face>> patchFaces(1, DynamicList<face>());
-    List<DynamicList<label> > patchOwners(1, DynamicList<label>());
+    List<DynamicList<label>> patchOwners(1, DynamicList<label>());
 
     vertexMap.resize(vertexCount());
     cellMap.setSize(Triangulation::number_of_finite_cells(), -1);

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ public:
 
 private:
 
-        autoPtr<List<boundBox> > allBackgroundMeshBounds_;
+        autoPtr<List<boundBox>> allBackgroundMeshBounds_;
 
 
     // Private Member Functions

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1219,7 +1219,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorNearestPosition
 
 
 
-Foam::List<Foam::List<Foam::pointIndexHit> >
+Foam::List<Foam::List<Foam::pointIndexHit>>
 Foam::backgroundMeshDecomposition::intersectsProcessors
 (
     const List<point>& starts,
@@ -1295,7 +1295,7 @@ Foam::backgroundMeshDecomposition::intersectsProcessors
         segmentIntersectsCandidate
     );
 
-    List<List<pointIndexHit> > segmentHitProcs(starts.size());
+    List<List<pointIndexHit>> segmentHitProcs(starts.size());
 
     // Working storage for assessing processors
     DynamicList<pointIndexHit> tmpProcHits;

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,7 +118,7 @@ class backgroundMeshDecomposition
         autoPtr<bPatch> boundaryFacesPtr_;
 
         //- Search tree for the boundaryFaces_ patch
-        autoPtr<indexedOctree<treeDataBPatch> > bFTreePtr_;
+        autoPtr<indexedOctree<treeDataBPatch>> bFTreePtr_;
 
         //- The bounds of all background meshes on all processors
         treeBoundBoxList allBackgroundMeshBounds_;
@@ -275,7 +275,7 @@ public:
         //  launched from, it is assumed that the point is on that processor.
         //  The index data member of the pointIndexHit is replaced with the
         //  processor index.
-        List<List<pointIndexHit> > intersectsProcessors
+        List<List<pointIndexHit>> intersectsProcessors
         (
             const List<point>& starts,
             const List<point>& ends,

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,13 +28,13 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Triangulation, class Type>
-Foam::tmp<Foam::Field<Type> > Foam::smoothAlignmentSolver::filterFarPoints
+Foam::tmp<Foam::Field<Type>> Foam::smoothAlignmentSolver::filterFarPoints
 (
     const Triangulation& mesh,
     const Field<Type>& field
 )
 {
-    tmp<Field<Type> > tNewField(new Field<Type>(field.size()));
+    tmp<Field<Type>> tNewField(new Field<Type>(field.size()));
     Field<Type>& newField = tNewField();
 
     label added = 0;
@@ -92,7 +92,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildReferredMap
 
     indices.transfer(dynIndices);
 
-    List<Map<label> > compactMap;
+    List<Map<label>> compactMap;
     return autoPtr<mapDistribute>
     (
         new mapDistribute
@@ -156,7 +156,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildMap
         pointPoints[vit->index()].transfer(indices);
     }
 
-    List<Map<label> > compactMap;
+    List<Map<label>> compactMap;
     return autoPtr<mapDistribute>
     (
         new mapDistribute

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ class smoothAlignmentSolver
     // Private Member Functions
 
         template<class Triangulation, class Type>
-        tmp<Field<Type> > filterFarPoints
+        tmp<Field<Type>> filterFarPoints
         (
             const Triangulation& mesh,
             const Field<Type>& field

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,7 +107,7 @@ public:
     typedef Delaunay::Facet            Facet;
     typedef Delaunay::Point            Point;
 
-    typedef List<DynamicList<Pair<labelPair> > > labelPairPairDynListList;
+    typedef List<DynamicList<Pair<labelPair>>> labelPairPairDynListList;
 
     typedef Tuple2<pointIndexHit, label>         pointIndexHitAndFeature;
     typedef List<pointIndexHitAndFeature>        pointIndexHitAndFeatureList;
@@ -170,13 +170,13 @@ private:
         featurePointConformer ftPtConformer_;
 
         //- Search tree for edge point locations
-        mutable autoPtr<dynamicIndexedOctree<dynamicTreeDataPoint> >
+        mutable autoPtr<dynamicIndexedOctree<dynamicTreeDataPoint>>
             edgeLocationTreePtr_;
 
         mutable DynamicList<Foam::point> existingEdgeLocations_;
 
         //- Search tree for surface point locations
-        mutable autoPtr<dynamicIndexedOctree<dynamicTreeDataPoint> >
+        mutable autoPtr<dynamicIndexedOctree<dynamicTreeDataPoint>>
             surfacePtLocationTreePtr_;
 
         mutable DynamicList<Foam::point> existingSurfacePtLocations_;
@@ -710,7 +710,7 @@ private:
         (
             labelList& owner,
             labelList& neighbour,
-            const HashSet<labelPair, labelPair::Hash<> >& deferredCollapseFaces
+            const HashSet<labelPair, labelPair::Hash<>>& deferredCollapseFaces
         ) const;
 
         //- Check whether the cell sizes are fine enough. Creates a polyMesh.
@@ -783,9 +783,9 @@ private:
         //  on both processors
         void sortProcPatches
         (
-            List<DynamicList<face> >& patchFaces,
+            List<DynamicList<face>>& patchFaces,
-            List<DynamicList<label> >& patchOwners,
+            List<DynamicList<label>>& patchOwners,
-            List<DynamicList<label> >& patchPointPairSlaves,
+            List<DynamicList<label>>& patchPointPairSlaves,
             labelPairPairDynListList& patchSortingIndices
         ) const;
 
@@ -797,9 +797,9 @@ private:
             labelList& owner,
             PtrList<dictionary>& patchDicts,
             PackedBoolList& boundaryFacesToRemove,
-            const List<DynamicList<face> >& patchFaces,
+            const List<DynamicList<face>>& patchFaces,
-            const List<DynamicList<label> >& patchOwners,
+            const List<DynamicList<label>>& patchOwners,
-            const List<DynamicList<bool> >& indirectPatchFace
+            const List<DynamicList<bool>>& indirectPatchFace
         ) const;
 
         //- Remove points that are no longer used by any faces

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -160,9 +160,9 @@ void Foam::conformalVoronoiMesh::calcTetMesh
 
     label nPatches = patchNames.size();
 
-    List<DynamicList<face> > patchFaces(nPatches, DynamicList<face>(0));
+    List<DynamicList<face>> patchFaces(nPatches, DynamicList<face>(0));
 
-    List<DynamicList<label> > patchOwners(nPatches, DynamicList<label>(0));
+    List<DynamicList<label>> patchOwners(nPatches, DynamicList<label>(0));
 
     faces.setSize(number_of_finite_facets());
 
@@ -278,7 +278,7 @@ void Foam::conformalVoronoiMesh::calcTetMesh
     sortFaces(faces, owner, neighbour);
 
 //    PackedBoolList boundaryFacesToRemove;
-//    List<DynamicList<bool> > indirectPatchFace;
+//    List<DynamicList<bool>> indirectPatchFace;
 //
 //    addPatches
 //    (
@@ -673,7 +673,7 @@ void Foam::conformalVoronoiMesh::deferredCollapseFaceSet
 (
     labelList& owner,
     labelList& neighbour,
-    const HashSet<labelPair, labelPair::Hash<> >& deferredCollapseFaces
+    const HashSet<labelPair, labelPair::Hash<>>& deferredCollapseFaces
 ) const
 {
     DynamicList<label> faceLabels;
@@ -1750,12 +1750,12 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
         }
     }
 
-    List<DynamicList<face> > patchFaces(nPatches, DynamicList<face>(0));
+    List<DynamicList<face>> patchFaces(nPatches, DynamicList<face>(0));
-    List<DynamicList<label> > patchOwners(nPatches, DynamicList<label>(0));
+    List<DynamicList<label>> patchOwners(nPatches, DynamicList<label>(0));
     // Per patch face the index of the slave node of the point pair
-    List<DynamicList<label> > patchPPSlaves(nPatches, DynamicList<label>(0));
+    List<DynamicList<label>> patchPPSlaves(nPatches, DynamicList<label>(0));
 
-    List<DynamicList<bool> > indirectPatchFace(nPatches, DynamicList<bool>(0));
+    List<DynamicList<bool>> indirectPatchFace(nPatches, DynamicList<bool>(0));
 
 
     faces.setSize(number_of_finite_edges());
@@ -2134,7 +2134,7 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
                             // Use this processor's vertex index as the master
                             // for sorting
 
-                            DynamicList<Pair<labelPair> >& sortingIndex =
+                            DynamicList<Pair<labelPair>>& sortingIndex =
                                 procPatchSortingIndex[patchIndex];
 
                             if (vB->internalOrBoundaryPoint() && vB->referred())
@@ -2165,7 +2165,7 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
                             // Use the other processor's vertex index as the
                             // master for sorting
 
-                            DynamicList<Pair<labelPair> >& sortingIndex =
+                            DynamicList<Pair<labelPair>>& sortingIndex =
                                 procPatchSortingIndex[patchIndex];
 
                             if (vA->internalOrBoundaryPoint() && vA->referred())
@@ -2450,9 +2450,9 @@ void Foam::conformalVoronoiMesh::sortFaces
 
 void Foam::conformalVoronoiMesh::sortProcPatches
 (
-    List<DynamicList<face> >& patchFaces,
+    List<DynamicList<face>>& patchFaces,
-    List<DynamicList<label> >& patchOwners,
+    List<DynamicList<label>>& patchOwners,
-    List<DynamicList<label> >& patchPointPairSlaves,
+    List<DynamicList<label>>& patchPointPairSlaves,
     labelPairPairDynListList& patchSortingIndices
 ) const
 {
@@ -2466,7 +2466,7 @@ void Foam::conformalVoronoiMesh::sortProcPatches
         faceList& faces = patchFaces[patchI];
         labelList& owner = patchOwners[patchI];
         DynamicList<label>& slaves = patchPointPairSlaves[patchI];
-        DynamicList<Pair<labelPair> >& sortingIndices
+        DynamicList<Pair<labelPair>>& sortingIndices
             = patchSortingIndices[patchI];
 
         if (!sortingIndices.empty())
@@ -2511,9 +2511,9 @@ void Foam::conformalVoronoiMesh::addPatches
     labelList& owner,
     PtrList<dictionary>& patchDicts,
     PackedBoolList& boundaryFacesToRemove,
-    const List<DynamicList<face> >& patchFaces,
+    const List<DynamicList<face>>& patchFaces,
-    const List<DynamicList<label> >& patchOwners,
+    const List<DynamicList<label>>& patchOwners,
-    const List<DynamicList<bool> >& indirectPatchFace
+    const List<DynamicList<bool>>& indirectPatchFace
 ) const
 {
     label nBoundaryFaces = 0;

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -2066,7 +2066,7 @@ void Foam::conformalVoronoiMesh::addSurfaceAndEdgeHits
             keepSurfacePoint = false;
         }
 
-        List<List<pointIndexHit> > edHitsByFeature;
+        List<List<pointIndexHit>> edHitsByFeature;
 
         labelList featuresHit;
 
@@ -2295,7 +2295,7 @@ void Foam::conformalVoronoiMesh::reinsertSurfaceConformation()
         }
     }
 
-    inplaceSubset<PackedBoolList, List<Vb> >
+    inplaceSubset<PackedBoolList, List<Vb>>
     (
         selectedElems,
         surfaceConformationVertices_

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,12 +118,12 @@ void Foam::featurePointConformer::addMasterAndSlavePoints
 (
     const DynamicList<Foam::point>& masterPoints,
     const DynamicList<Foam::indexedVertexEnum::vertexType>& masterPointsTypes,
-    const Map<DynamicList<autoPtr<plane> > >& masterPointReflections,
+    const Map<DynamicList<autoPtr<plane>>>& masterPointReflections,
     DynamicList<Vb>& pts,
     const label ptI
 ) const
 {
-    typedef DynamicList<autoPtr<plane> >        planeDynList;
+    typedef DynamicList<autoPtr<plane>>        planeDynList;
     typedef Foam::indexedVertexEnum::vertexType vertexType;
 
     forAll(masterPoints, pI)
@@ -199,7 +199,7 @@ void Foam::featurePointConformer::createMasterAndSlavePoints
     DynamicList<Vb>& pts
 ) const
 {
-    typedef DynamicList<autoPtr<plane> >          planeDynList;
+    typedef DynamicList<autoPtr<plane>>          planeDynList;
     typedef indexedVertexEnum::vertexType         vertexType;
     typedef extendedFeatureEdgeMesh::edgeStatus   edgeStatus;
 

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,7 @@ class featurePointConformer
         (
             const DynamicList<point>& masterPoints,
             const DynamicList<indexedVertexEnum::vertexType>& masterPointsTypes,
-            const Map<DynamicList<autoPtr<plane> > >& masterPointReflections,
+            const Map<DynamicList<autoPtr<plane>>>& masterPointReflections,
             DynamicList<Vb>& pts,
             const label ptI
         ) const;

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ template<class Gt, class Cb>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<CGAL::indexedCell<Gt, Cb> >& p
+    const InfoProxy<CGAL::indexedCell<Gt, Cb>>& p
 )
 {
     const CGAL::indexedCell<Gt, Cb>& iv = p.t_;

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ class Ostream;
 template<class Gt, class Cb> Ostream& operator<<
 (
     Ostream&,
-    const Foam::InfoProxy<CGAL::indexedCell<Gt, Cb> >&
+    const Foam::InfoProxy<CGAL::indexedCell<Gt, Cb>>&
 );
 }
 
@@ -243,7 +243,7 @@ public:
 
         //- Return info proxy.
         //  Used to print indexedCell information to a stream
-        Foam::InfoProxy<indexedCell<Gt, Cb> > info() const
+        Foam::InfoProxy<indexedCell<Gt, Cb>> info() const
         {
             return *this;
         }
@@ -251,7 +251,7 @@ public:
         friend Foam::Ostream& Foam::operator<< <Gt, Cb>
         (
             Foam::Ostream&,
-            const Foam::InfoProxy<indexedCell<Gt, Cb> >&
+            const Foam::InfoProxy<indexedCell<Gt, Cb>>&
         );
 
 };

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -155,7 +155,7 @@ template<class Gt, class Vb>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<CGAL::indexedVertex<Gt, Vb> >& p
+    const InfoProxy<CGAL::indexedVertex<Gt, Vb>>& p
 )
 {
     const CGAL::indexedVertex<Gt, Vb>& iv = p.t_;

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ class Istream;
 template<class Gt, class Vb> Ostream& operator<<
 (
     Ostream&,
-    const Foam::InfoProxy<CGAL::indexedVertex<Gt, Vb> >&
+    const Foam::InfoProxy<CGAL::indexedVertex<Gt, Vb>>&
 );
 
 template<class Gt, class Vb> Ostream& operator<<
@@ -98,7 +98,7 @@ namespace CGAL
                        Class indexedVertex Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class Gt, class Vb = CGAL::Triangulation_vertex_base_3<Gt> >
+template<class Gt, class Vb = CGAL::Triangulation_vertex_base_3<Gt>>
 class indexedVertex
 :
     public Foam::indexedVertexEnum,
@@ -294,7 +294,7 @@ public:
 
         //- Return info proxy.
         //  Used to print indexedVertex information to a stream
-        Foam::InfoProxy<indexedVertex<Gt, Vb> > info() const
+        Foam::InfoProxy<indexedVertex<Gt, Vb>> info() const
         {
             return *this;
         }
@@ -302,7 +302,7 @@ public:
         friend Foam::Ostream& Foam::operator<< <Gt, Vb>
         (
             Foam::Ostream&,
-            const Foam::InfoProxy<indexedVertex<Gt, Vb> >&
+            const Foam::InfoProxy<indexedVertex<Gt, Vb>>&
         );
 
         friend Foam::Ostream& Foam::operator<< <Gt, Vb>

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,7 +87,7 @@ namespace Foam
 
     //- Specialisation for indexedVertex.
     template<>
-    inline pointFromPoint topoint<CGAL::indexedVertex<K> >
+    inline pointFromPoint topoint<CGAL::indexedVertex<K>>
     (
         const CGAL::indexedVertex<K>& P
     )