diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
index e09c1bbd14080664322c3840bccf33bbcb2039d5..ebc92684a440794e4ab6b90d0ea0365d9d2a558a 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
+++ b/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,
diff --git a/applications/solvers/combustion/PDRFoam/bEqn.H b/applications/solvers/combustion/PDRFoam/bEqn.H
index 8ad1161871305276d7a68e40a04fdc9d44e12ada..e9f1a732799171edcd1a9b1b5e42afd46620a833 100644
--- a/applications/solvers/combustion/PDRFoam/bEqn.H
+++ b/applications/solvers/combustion/PDRFoam/bEqn.H
@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (
diff --git a/applications/solvers/combustion/XiFoam/ftEqn.H b/applications/solvers/combustion/XiFoam/ftEqn.H
index 87bfaa97909a1c4fcfeed52c655c972fbbf9c139..c0f7dcad9c796f13158ee72b901d5a645144d507 100644
--- a/applications/solvers/combustion/XiFoam/ftEqn.H
+++ b/applications/solvers/combustion/XiFoam/ftEqn.H
@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (
diff --git a/applications/solvers/combustion/chemFoam/createSingleCellMesh.H b/applications/solvers/combustion/chemFoam/createSingleCellMesh.H
index e5e7de6496f97f675f3d71a0b55fa9fbeb5a2ff1..9b9d0f376b00b9ac809de1dbdec3bd19c95486e7 100644
--- a/applications/solvers/combustion/chemFoam/createSingleCellMesh.H
+++ b/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()
diff --git a/applications/solvers/combustion/fireFoam/YEEqn.H b/applications/solvers/combustion/fireFoam/YEEqn.H
index da485e730506a4aa64eeae7a314741d2d3f110d4..cee98e242919aa728d105d4b4efbff673c08ffde 100644
--- a/applications/solvers/combustion/fireFoam/YEEqn.H
+++ b/applications/solvers/combustion/fireFoam/YEEqn.H
@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (
diff --git a/applications/solvers/combustion/reactingFoam/YEqn.H b/applications/solvers/combustion/reactingFoam/YEqn.H
index c8d34cf1d591f446c29b3f5b5e49d41e13514ccf..8cb5664d5a96c4763fa14ee1cb133e06bce81158 100644
--- a/applications/solvers/combustion/reactingFoam/YEqn.H
+++ b/applications/solvers/combustion/reactingFoam/YEqn.H
@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
index 18155d5bca6c9a315e4cf64eda58ec97d5de5572..d65d3943f9b546e9e895d8d2574ace549c11205c 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
+++ b/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());
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H
index d27b722a93613131885ebc588dd9f6e22a78f023..8c98fb5f83df8fa6c9eebfb551cd5f92f921224a 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H
+++ b/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
diff --git a/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H b/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H
index 7f4b6cd7b8e5d61b9b8686e880f2637c95d6a1eb..7d361ac9f84d8305524c8de91d2c23d13f765953 100644
--- a/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H
+++ b/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
         (
diff --git a/applications/solvers/lagrangian/DPMFoam/createFields.H b/applications/solvers/lagrangian/DPMFoam/createFields.H
index 9e34895a73fda17317aabfce78293ab62b6ffc3b..6c08de4b8ed9fce5e3e640e09b0b9a99a97ae912 100644
--- a/applications/solvers/lagrangian/DPMFoam/createFields.H
+++ b/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
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
index a719c83cd70b3ba49dabd81e9335024f9015dffb..671e316c5425ad9c7346eb8fb7aff8f432ff684b 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H
index b23f00dbf1e391d8aa7f16870e47596e2e9962f8..93dacc3ba66859c2cf49990f1ecf1dc41cb41161 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H
@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H
index fbcc0a0f65786df1b03adcd87af5c84802de3dcf..25bdc12cdf8f2f8dc6657aba1f4bebf8df53c866 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H
@@ -1,4 +1,4 @@
-tmp<fv::convectionScheme<scalar> > mvConvection
+tmp<fv::convectionScheme<scalar>> mvConvection
 (
     fv::convectionScheme<scalar>::New
     (
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H
index cd0a45f0f020295bb6341f345e109b2999465471..20d55a8d52efc44e57f604c3b26bc1f18d8b0f92 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H
+++ b/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
     (
diff --git a/applications/solvers/multiphase/interFoam/alphaEqn.H b/applications/solvers/multiphase/interFoam/alphaEqn.H
index 6a24830137688a3ed5589fba4c61dc515c09da14..055aac39669ca8993aa7683d5d12cf5c10a09639 100644
--- a/applications/solvers/multiphase/interFoam/alphaEqn.H
+++ b/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::localEulerDdtScheme<scalar> >(ddtAlpha())
+        isType<fv::EulerDdtScheme<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
     {
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H
index 172676b97fd4502b1e13ec686755934a643a9a8d..9cc90a9ebe4edd47d1c122e05def876089346c2e 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H
+++ b/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]();
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H
index b759081eeae02721ab6ce6a3d4e36263273af693..a1b9241fa548feafdb3f03a10e9a7df5d7d5a57d 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H
+++ b/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]();
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
index 4a174eb980fe3243fb6ea039e5bd2a63f313c165..497a6e3d64508b5bb67777e1c1c63ae052deb9ef 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
+++ b/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]();
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
index f7cc2eae2114348ce56b1064ca900711b36ff24a..a4663ba488753b848fe1e089ae5fb0d38ce838e4 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
+++ b/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()),
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
index 393357a7ffcaaaa5e17f80ee3c1aad52abba9701..0b1c155f456062371d15fe4b67edb82de8f81930 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
+++ b/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();
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
index 72fdb7245eb2917dbf747f122c7954c71acaf9e1..cfe6b1b0083a4cffbb9bcb674918c3d99275b3dd 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
+++ b/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())
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
index 0152b2d18ab96b28e21931cf8342cb58371cd65c..1de1263e5c118ff492a9279789de736567019b73 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
+++ b/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();
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C
index 189c7bae06bf3b0bcbac565e821ba5397665233b..3be86e0f518b15cc6754fb3e5046c30be946a3b6 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C
+++ b/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,
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
index 67eb0dd5ba986285d50c210336cb52aca9c6fda2..c3b8f86a4647d5939c355bb401f6ffce2c3171b5 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
+++ b/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();
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C
index 5575253888798e8453f2be77799434dfd4872af0..b9a5e69bf8cfe13ad3e2664d2edebf52af285ca2 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C
+++ b/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]);
 }
 
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
index 227768ac8d3f4dc34d505a2fbab34947ce8eced3..dedc97a9e9c3a3041de7398b3335b3e5bd65ccc2 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
+++ b/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;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
index 4c2c4ad3de92c1cc5b0b7c1ea5a017825c0f974f..e10e3bb68bffd96b83b051f78fdc13cf70576820 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
+++ b/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                             \
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C
index e8f16ee9aefc9b3d52ef1ded167dd6a54cf15442..0cc976c042e4b356bddf2b3563992f5871561566 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C
+++ b/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
     )
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H
index 103c8d048c3860f4440f2d2d87aef527e245fa9d..ca001df8e4826d0ed7e54cbd1fe3f82874d5a2f3 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H
+++ b/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:
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
index 36e31630a49daedc405f2057caba294528aa0a63..64d2e63ae8a7ab0dabdba2aa833f43115b5f6715 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
+++ b/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>
         (
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H
index 4be8f0b347ea5178e9317f44ce55616893052e59..c51599d58ccd29c285fb5798ab726479194fe0bd 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H
+++ b/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;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
index 3a0cbd4ba23dd7c3e2eafe8e17c519f3798cbba6..c02f04e82ebdad3fffb3ae1662d779a858f13b65 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
+++ b/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
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
index 0c908239fdb9a18f451a305c35d8f6f47584aa03..931fc2a758b8f276024c585ba70424bb3832b9ac 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
+++ b/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;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
index f50bd61f9ea540d88f3b4822eb5dbc5395f98128..c789d365b7788f2f58616de5c34174d5a7f3f75e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
+++ b/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())
     );
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
index 2f787ed004a96329fc1cd8b11fd81d517286ac85..c449e0f67dda5c7dd2992a898b37d348dbf378b0 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
+++ b/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;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H
index 862f75646eed8fc6ed53863880e802e96cb75f6f..d869907a33c4d9c48e1994dd8918862d070e3017 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H
+++ b/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;
 }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H
index 9600f6ef9b3c2394d3e7615d8648464ea36646cc..417c6cea6d25824a3a2af33da779ab8f57501525 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H
+++ b/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;
 }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
index 664add034f5433e08370b818f49b9056c338755d..cee72cb35360ae9bbc65af25a5a6d6e66e600d9f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
+++ b/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
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C
index eee3fcd3b3f948310157a878b0b4e0027d682d05..3ac0019faba4a2d924526eb2b4a6a230477397c4 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C
+++ b/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>>()
                 );
             }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
index e33bf8c4878053847d4cae31fa2f0e79d551eb82..bf6d3e0d2eed60e1393cc8682403bd0aa5877814 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
+++ b/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;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
index 2703d75ef1f6b2da04bb0d86ca4cb24368730ad1..8b4a27f2b8bf523d8d5edffcd4a650bbb3ff7592 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
+++ b/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)
     {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index e44534e3989fad53241c71ff750df0e684c0e68e..43ad0719621f836c98d1a4413704c3ffea225f5e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/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()
     )
     {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
index e18d41fb40ba2b1224f57af39b2485654c438672..d648de7bc1104f1b216018dc855d84dade1a433a 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
+++ b/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
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
index 79df9e49225a1614db57a9253bf6121698ed316c..c4ce9a7583ffe0bf3ae797f06acdacab9056a78a 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
+++ b/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()
     )
     {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
index c7e9842f37fbd15904aaa16963c13af4d27d9e99..ab5e38effee2310749b1a57b23d27ae8458a89cd 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
+++ b/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
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index 99879c41d5c578dca49f29ae17f178dd8bc2dc19..f07624c0019d4cb40b8d37efbf5b76710a6457c6 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/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()
     )
     {
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
index 9aadb83d12738a7f3fb91b54cff381d5772ab15a..91f58d34498d959d513fade27e3603c6cdc463bb 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
+++ b/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
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
index 2eba4bdab7e020c1d757d0ee64e540c2cc201a2f..47364ab10d53d144cd7e51c1368b7bbeb68cb05c 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
+++ b/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()
     )
     {
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
index 68734e5b4f792e2f80ff503a6fc2b2d819e05a6e..c148e3c40a640da761c6a937bb542b4c03d4ddf1 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
+++ b/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
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
index 090ffd1bcc20a754a6d11e1fc9f3e2beb55a4cfc..1cac6d7176b3229556a6345f811b8351c99d814f 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
+++ b/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>
         (
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H
index e6493fa1cf26d741a1218da4c7d5ab73291f72c0..c53894f45cca8621d8ea1a3839c56982175708a3 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H
+++ b/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;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H
index 3f91a8bd255057f0b7596f450e4b0bb4da82aca4..5fb0245513d3978d28622399612f2de3ba0cbddc 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H
+++ b/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:
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
index 18928c7cc7fe0fa143562b7fba1ccd97407630d1..2355c0bf746c372e794740d37262d924e2c90cc9 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
+++ b/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_;
 
 
diff --git a/applications/test/CompactListList/Test-CompactListList.C b/applications/test/CompactListList/Test-CompactListList.C
index 13a73cde7be9e2c9155b9be6990ad01ce69c694f..6d0a26676a65443fd990d5ff21a8de65d97e063f 100644
--- a/applications/test/CompactListList/Test-CompactListList.C
+++ b/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);
diff --git a/applications/test/DynamicList/Test-DynamicList.C b/applications/test/DynamicList/Test-DynamicList.C
index 63f995d9a000a8ea647cd34f833d6acfde59acc4..7b73a214c93f337aa10f5810af01ea1239dd90a1 100644
--- a/applications/test/DynamicList/Test-DynamicList.C
+++ b/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());
 
diff --git a/applications/test/HashTable2/Test-HashTable2.C b/applications/test/HashTable2/Test-HashTable2.C
index 79ff10de4c4b596c35c40e2ffd03bc58a0c92519..0fb7b3a94252952c060f7ba2ded6c58c9b836454 100644
--- a/applications/test/HashTable2/Test-HashTable2.C
+++ b/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);
diff --git a/applications/test/HashTable3/Test-HashTable3.C b/applications/test/HashTable3/Test-HashTable3.C
index 82e6ce3b9f29900c94670230a8e4f5e98604a5a3..7184d305743303f66ef177cf40de1534b0676c1d 100644
--- a/applications/test/HashTable3/Test-HashTable3.C
+++ b/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);
-    // StaticHashTable<label, label, Hash<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);
+    HashTable<label, label, Hash<label>> map(2 * nSize);
 
     Info<< "Constructed map of size: " << nSize
         << " (size " << map.size() << " capacity " << map.capacity() << ") "
diff --git a/applications/test/PackedList2/Test-PackedList2.C b/applications/test/PackedList2/Test-PackedList2.C
index 578a6103ade2f21fde59b40364b874de8648f260..2926118ff930357a82df0a95f8a8caa87fc60d83 100644
--- a/applications/test/PackedList2/Test-PackedList2.C
+++ b/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> > fullStaticHash(100000);
+    StaticHashTable<nil, label, Hash<label>> emptyStaticHash;
+    StaticHashTable<nil, label, Hash<label>> fullStaticHash(100000);
     for (label i = 0; i < n; i++)
     {
         fullStaticHash.insert(i, nil());
diff --git a/applications/test/PatchTools/Test-PatchTools.C b/applications/test/PatchTools/Test-PatchTools.C
index 21d5e2761796435eef403cc7283637b8e3a380ae..78072879003634ba8df02b778978144935d3c411 100644
--- a/applications/test/PatchTools/Test-PatchTools.C
+++ b/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();
 //
diff --git a/applications/test/dataEntry/Test-DataEntry.C b/applications/test/dataEntry/Test-DataEntry.C
index 6223b2c6a7c1fc9a55392c51f0d0067a01a139d2..cde080161067e394605a875012f484a323922513 100644
--- a/applications/test/dataEntry/Test-DataEntry.C
+++ b/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
         (
diff --git a/applications/test/extendedStencil/Test-ExtendedStencil.C b/applications/test/extendedStencil/Test-ExtendedStencil.C
index 8c01410feca8b74781e3d0968690e0675d2b3714..e0e343eed4d479e4de2baccb7b55ab7ff2624a31 100644
--- a/applications/test/extendedStencil/Test-ExtendedStencil.C
+++ b/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,
diff --git a/applications/test/extendedStencil/Test-ExtendedStencil2.C b/applications/test/extendedStencil/Test-ExtendedStencil2.C
index df23d302833e57a2cd6a4b6d01ef16d1082b2ca8..3c0228df85bbfaeffca4450187b451158efb3afe 100644
--- a/applications/test/extendedStencil/Test-ExtendedStencil2.C
+++ b/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();
 
diff --git a/applications/test/parallel/Test-parallel.C b/applications/test/parallel/Test-parallel.C
index 5aeb0140bdc845a1aef21f678a4c8f68c9c9b559..a2072eadd9e45fa8bb31f6645e7b11ada1e898ae 100644
--- a/applications/test/parallel/Test-parallel.C
+++ b/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);
diff --git a/applications/test/regex/Test-regex.C b/applications/test/regex/Test-regex.C
index 9e74c36f2489d207a589e95b311bb2f6a6c8f12c..35fa73a2cc80defc6f115bbecd6945c7726d4ebe 100644
--- a/applications/test/regex/Test-regex.C
+++ b/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;
 
diff --git a/applications/test/thermoMixture/Test-thermoMixture.C b/applications/test/thermoMixture/Test-thermoMixture.C
index 1a2883cb0acfa6ad58145d54c1cda2b2d4b61202..2a3ab1a0c8ad497d87740e34d52d0cfe4b04273f 100644
--- a/applications/test/thermoMixture/Test-thermoMixture.C
+++ b/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;
diff --git a/applications/test/wordRe/Test-wordRe.C b/applications/test/wordRe/Test-wordRe.C
index 3c49affaae7c6a124ffe307e714295a53509a1c6..e3fae58cc579f48e6614bcad8d5fd67a244c7810 100644
--- a/applications/test/wordRe/Test-wordRe.C
+++ b/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;
 
diff --git a/applications/test/xfer/Test-xferList.C b/applications/test/xfer/Test-xferList.C
index ceddf0575df7b99e1cfeb1b11cbf269b547ca219..77231e2118dff2e8d5c1ed7d9f154cd76dc79aa2 100644
--- a/applications/test/xfer/Test-xferList.C
+++ b/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> > xB;
+    Xfer<List<label>> xA = xferMove(lstA);
+    Xfer<List<label>> xB;
 
     List<label> lstB( xA );
 
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index e6df9ed9d4c87a78be5fa4c4412a9591bcaba3db..ca1f9a4752020224b58c7fcbc2bdafa5e26346be 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-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)
     {
diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
index abd5eb45adcb8b022d45df971ab02df269196fbd..766cd6a6e5ec5d20b4fa6e0f710cb1671dd01c24 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
+++ b/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> > edgesToSplit(dict.lookup("edgesToSplit"));
-    List<Pair<point> > facesToTriangulate
+    List<Pair<point>> pointsToMove(dict.lookup("pointsToMove"));
+    List<Pair<point>> edgesToSplit(dict.lookup("edgesToSplit"));
+    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];
diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
index b3af03b509a3ac29d28e71743499827221b8c048..fee877a8bc31f3596771a1b0ffc035b7ffee214b 100644
--- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
+++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-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;
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
index deda5581f8b43a5aa8b2470d2b5f5f90dfd163d9..83ffb09f39b4ea644d6f4ff3591a5017dc223b3a 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
+++ b/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)
         {
diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
index 8e2a1749a9364b39a4b2ec809757bc65b51cbe9b..3555577fd7c529b1efb1f20afdf8dff73941f91e 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/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> > slPatchCellFaces;
+PtrList<SLList<label>> slPatchCells;
+PtrList<SLList<label>> slPatchCellFaces;
 
 // Cell types
 Map<word> cellTypes;
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
index a040ca4195c39b3eb4064380b9ed08f417765712..69b12d50807fd54d885f7624fd6ad8b34b12a4c8 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ b/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()
         );
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
index 5ed5279c9c18cfa4b710201779fc3f49ff157ab6..5de646c441850202b1b541dbacaa2545cf594ba3 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/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.
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
index 2d80394ea49d71323b5624b05c536b74c8192093..7a94b27299716fe1a781ecdc7f32a13940d78785 100644
--- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
+++ b/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)
         {
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
index a8ffe7b6b6b401f63dcceb45a6b63619d7fde74f..adbd36b6577e716f94e83813d59447c7595c8c90 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
+++ b/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);
diff --git a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
index 065e36119b428bd3212554c17a526a5982fef8e1..e00422072380f925fc0cba1c8fb2f23366e58d4f 100644
--- a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
+++ b/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)
         {
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
index 9f35fcb89b03e02eeaf49f2b012045066903f062..4f91fcd5ef7ec5f0a0bbea1c52e9156f7d72cae0 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
+++ b/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())
             {
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index 2a4de9c57b0f72b7b71b6e9a78d9a214f5f688ea..b7bcf072ad7f310ccbbae9f5492cf58601502a3d 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/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)
         {
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
index 6e050b39dd0de3dff86ac4ba123fdd45b624d67c..628c2b920bfa34ce4b9910a6ab39cd0a9c565f6d 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
+++ b/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;
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index ff0837e690c9cf982b7ec6e914ddbaf08d68ce7b..9d3bed8499cfd4aad7e86380a4136d76547d43b3 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/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,
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
index 363a60653ebb2d27a1cc7a94447bdac16ffacea8..a6916b70763a7625dc76bc9798796973baba3da2 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
+++ b/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;
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
index cde380cdd5ba9f05ced8781fb0c1bcbc3cd9344b..779b68264922094e523f8b9efc85b767cf36fd66 100644
--- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
+++ b/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>
     (
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H
index 92af158c19c17b83de8d18fdbb65baa5c91754c8..865b3108fe173cfd6e1764010c98d2c52027f232 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H
+++ b/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<label> >& patchOwners
+            const List<DynamicList<face>>& patchFaces,
+            const List<DynamicList<label>>& patchOwners
         ) const;
 
         //- Disallow default bitwise copy construct
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
index a2865609aca35562d5c99869ff30661b80f76666..3f916f9ba526ca41275a232005b212fd5da7c775 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
+++ b/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<label> >& patchOwners
+    const List<DynamicList<face>>& patchFaces,
+    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<label> > patchOwners(1, DynamicList<label>());
+    List<DynamicList<face>> patchFaces(1, DynamicList<face>());
+    List<DynamicList<label>> patchOwners(1, DynamicList<label>());
 
     vertexMap.resize(vertexCount());
     cellMap.setSize(Triangulation::number_of_finite_cells(), -1);
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
index c040300dd3af409b7aee080d8a0512efa8d0860d..2c59cf6fde171f7d67bebb0de364e08deab52072 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
+++ b/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
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
index 01d69a23769e5e461c60c5c8afd262b6faf6bf12..a21e6cecfcca662e34b6a0c07c53dfe32c6d7c11 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/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;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
index 63bb4fba0e0049df68f7b79c29cdac4924222b94..60701acbb8403ac10e26fedaf2a990cb522afedb 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
+++ b/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,
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
index 97fb37191acb72080fef35f452e9cdd97be29f75..456f6be9c5fa40a1650ead429a06fff10ecd5f60 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
+++ b/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
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H
index c3b0341a4ba1ed623a48ccecee0d13c9b0333312..19cc6ea665c6282ee8754d1ad6b3959a32567499 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H
+++ b/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
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index f6d44489b78de107ea77849ebd8774edbaedd3b7..818bf6a8c2f46aa8fd5285343da6fa935b9934e8 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/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<label> >& patchOwners,
-            List<DynamicList<label> >& patchPointPairSlaves,
+            List<DynamicList<face>>& patchFaces,
+            List<DynamicList<label>>& patchOwners,
+            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<label> >& patchOwners,
-            const List<DynamicList<bool> >& indirectPatchFace
+            const List<DynamicList<face>>& patchFaces,
+            const List<DynamicList<label>>& patchOwners,
+            const List<DynamicList<bool>>& indirectPatchFace
         ) const;
 
         //- Remove points that are no longer used by any faces
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index 2e351cf81af000fe0d2ab508e880b4bc4cd9d8cc..22554a57df2cefbf82e292ab7b63c2c280f1dc4c 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/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<label> > patchOwners(nPatches, DynamicList<label>(0));
+    List<DynamicList<face>> patchFaces(nPatches, DynamicList<face>(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<label> >& patchOwners,
-    List<DynamicList<label> >& patchPointPairSlaves,
+    List<DynamicList<face>>& patchFaces,
+    List<DynamicList<label>>& patchOwners,
+    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<label> >& patchOwners,
-    const List<DynamicList<bool> >& indirectPatchFace
+    const List<DynamicList<face>>& patchFaces,
+    const List<DynamicList<label>>& patchOwners,
+    const List<DynamicList<bool>>& indirectPatchFace
 ) const
 {
     label nBoundaryFaces = 0;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index fdc4ef4354878bc5f726da6851fe1b26081ec709..638ae6a51b876558b79a8d369e803a0319cb0c0e 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/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_
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
index 99a35e1957a58046ab6802bb4f6151453db85ec2..0e07acfebd18f258500ebefe2fb5476659a8e9c5 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
+++ b/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;
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H
index 5c5a69afea8098d8b47f716a64ba8159acf30412..21cdc53e312ecea6cfc1c5e8ee93060ee885f641 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H
+++ b/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;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.C
index 8274132e5c5dd33c021ca28399d4cd9d3b43d084..601bba3f8e8cc91dd9c05732220bd7f89542d1ab 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.C
+++ b/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_;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
index a2eeb21c99135da690d8b19734a365cacd2ecbc6..f3b964b3f307e7efbba1ab41e615792f5e0ab60b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
+++ b/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>>&
         );
 
 };
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C
index ad130e538149ca4845634e03c04c3d26cfe79681..13a137f694db1cc2c4dd281e370cd58c7223aaae 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C
+++ b/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_;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
index e4b012e66817ce296877e4f09fd8c0d295e57b06..32ed1d2447321ed3f2b590699bbc39623df1146b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
+++ b/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>
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H
index fe799a31a31afab52d85b4a5d9f114aa1903d27c..509a8f7a7f6edca3dbd20feaa3df9464fa305ebe 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H
+++ b/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
     )
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
index 464dd646ba330ca5109555d175a1dfc09ff79650..f79c96654d4145fa595ce5953aea338e50a34056 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.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
@@ -327,9 +327,9 @@ Foam::conformationSurfaces::conformationSurfaces
     regionOffset_.setSize(surfI, 0);
 
     PtrList<dictionary> globalPatchInfo(surfI);
-    List<Map<autoPtr<dictionary> > > regionPatchInfo(surfI);
+    List<Map<autoPtr<dictionary>>> regionPatchInfo(surfI);
     List<sideVolumeType> globalVolumeTypes(surfI);
-    List<Map<sideVolumeType> > regionVolumeTypes(surfI);
+    List<Map<sideVolumeType>> regionVolumeTypes(surfI);
 
     HashSet<word> unmatchedKeys(surfacesDict.toc());
 
@@ -514,8 +514,8 @@ Foam::conformationSurfaces::conformationSurfaces
                 regionVolumeTypes[surfI][iter.key()];
         }
 
-        const Map<autoPtr<dictionary> >& localInfo = regionPatchInfo[surfI];
-        forAllConstIter(Map<autoPtr<dictionary> >, localInfo, iter)
+        const Map<autoPtr<dictionary>>& localInfo = regionPatchInfo[surfI];
+        forAllConstIter(Map<autoPtr<dictionary>>, localInfo, iter)
         {
             label globalRegionI = regionOffset_[surfI] + iter.key();
 
@@ -659,7 +659,7 @@ Foam::Field<bool> Foam::conformationSurfaces::wellInOutSide
     const bool testForInside
 ) const
 {
-    List<List<volumeType> > surfaceVolumeTests
+    List<List<volumeType>> surfaceVolumeTests
     (
         surfaces_.size(),
         List<volumeType>
@@ -896,7 +896,7 @@ void Foam::conformationSurfaces::findSurfaceAllIntersections
 ) const
 {
     labelListList hitSurfaces;
-    List<List<pointIndexHit> > hitInfo;
+    List<List<pointIndexHit>> hitInfo;
 
     searchableSurfacesQueries::findAllIntersections
     (
@@ -1173,7 +1173,7 @@ void Foam::conformationSurfaces::findAllNearestEdges
 (
     const point& sample,
     const scalar searchRadiusSqr,
-    List<List<pointIndexHit> >& edgeHitsByFeature,
+    List<List<pointIndexHit>>& edgeHitsByFeature,
     List<label>& featuresHit
 ) const
 {
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
index 1d41a40d1d5914843b97ca08530303302e81fdad..09c351bd0aef1d89fa4e010c39070b3f7e5b4503 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.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
@@ -335,7 +335,7 @@ public:
             (
                 const point& sample,
                 const scalar searchRadiusSqr,
-                List<List<pointIndexHit> >& edgeHitsByFeature,
+                List<List<pointIndexHit>>& edgeHitsByFeature,
                 List<label>& featuresHit
             ) const;
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
index 6e68f1c80e616956753d45207e4ec87fb6b4b369..b8e53630020ecff5fc06754e7ce8610d9b64d813 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.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
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
         (
             100.0,      // max size ratio
             1e-9,       // intersection tolerance
-            autoPtr<writer<scalar> >(new vtkSetWriter<scalar>()),
+            autoPtr<writer<scalar>>(new vtkSetWriter<scalar>()),
             0.01,       // min triangle quality
             true
         );
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C
index 515dc5e032a17838ac83a5bc8ae7e8ffd9192573..bffad658bbc7aa5868c430cb7563b6dc80fdab90 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.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
@@ -229,7 +229,7 @@ public:
             //    start[i] = points[edges[i][0]];
             //    end[i] = points[edges[i][1]];
             //}
-            //Foam::List<Foam::List<pointIndexHit> > hitInfo;
+            //Foam::List<Foam::List<pointIndexHit>> hitInfo;
             //labelListList hitSurfaces;
             //searchableSurfacesQueries::findAllIntersections
             //(
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H
index 571273d1fdfc669b1be85dd7f42a4eaf9f6dbf38..07dc30ea4290bd1f49dede90cdac2931acf87bc9 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.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
@@ -45,7 +45,7 @@ namespace CGAL
                        Class indexedFace Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class Gt, class Fb=CGAL::Triangulation_face_base_2<Gt> >
+template<class Gt, class Fb=CGAL::Triangulation_face_base_2<Gt>>
 class indexedFace
 :
     public Fb
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H
index 83013847157f6ba24e5be7f684b6e2e6daad5372..3c100372df9b44f115e87086103bc33973b41bb5 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.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 @@ bool outsideTriangle
                        Class indexedVertex Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class Gt, class Vb=CGAL::Triangulation_vertex_base_2<Gt> >
+template<class Gt, class Vb=CGAL::Triangulation_vertex_base_2<Gt>>
 class indexedVertex
 :
     public Vb
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
index 9220ca7bedf0e536115d674a86ad43e98fb5b7ad..91da90bf770d2470e72d193cc03b850fcfaffc82 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.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
@@ -52,7 +52,7 @@ void Foam::shortEdgeFilter2D::addRegion
 
 void Foam::shortEdgeFilter2D::assignBoundaryPointRegions
 (
-    List<DynamicList<label> >& boundaryPointRegions
+    List<DynamicList<label>>& boundaryPointRegions
 ) const
 {
     forAllConstIter(EdgeMap<label>, mapEdgesRegion_, iter)
@@ -72,7 +72,7 @@ void Foam::shortEdgeFilter2D::assignBoundaryPointRegions
 void Foam::shortEdgeFilter2D::updateEdgeRegionMap
 (
     const MeshedSurface<face>& surfMesh,
-    const List<DynamicList<label> >& boundaryPtRegions,
+    const List<DynamicList<label>>& boundaryPtRegions,
     const labelList& surfPtToBoundaryPt,
     EdgeMap<label>& mapEdgesRegion,
     labelList& patchSizes
@@ -250,7 +250,7 @@ Foam::shortEdgeFilter2D::filter()
 
     // Check if the point is a boundary point. Flag if it is so that
     // it will not be deleted.
-    List<DynamicList<label> > boundaryPointRegions
+    List<DynamicList<label>> boundaryPointRegions
     (
         points.size(),
         DynamicList<label>()
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.H
index 433b22f95dcbc48084f2940a056a07e726866ae9..66f055a377ea8fb6672b22c8e546235558a2fd0b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.H
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.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
@@ -78,13 +78,13 @@ class shortEdgeFilter2D
 
         void assignBoundaryPointRegions
         (
-            List<DynamicList<label> >& boundaryPointRegions
+            List<DynamicList<label>>& boundaryPointRegions
         ) const;
 
         void updateEdgeRegionMap
         (
             const MeshedSurface<face>& surfMesh,
-            const List<DynamicList<label> >& boundaryPtRegions,
+            const List<DynamicList<label>>& boundaryPtRegions,
             const labelList& surfPtToBoundaryPt,
             EdgeMap<label>& mapEdgesRegion,
             labelList& patchSizes
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 9c3281136905c81047e1adb94822d59d597ad5c1..edd87561fd9b9a87305436c2d7a857603c8da5e9 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.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
@@ -106,11 +106,11 @@ autoPtr<refinementSurfaces> createRefinementSurfaces
     labelList globalMaxLevel(surfI, 0);
     labelList globalLevelIncr(surfI, 0);
     PtrList<dictionary> globalPatchInfo(surfI);
-    List<Map<label> > regionMinLevel(surfI);
-    List<Map<label> > regionMaxLevel(surfI);
-    List<Map<label> > regionLevelIncr(surfI);
-    List<Map<scalar> > regionAngle(surfI);
-    List<Map<autoPtr<dictionary> > > regionPatchInfo(surfI);
+    List<Map<label>> regionMinLevel(surfI);
+    List<Map<label>> regionMaxLevel(surfI);
+    List<Map<label>> regionLevelIncr(surfI);
+    List<Map<scalar>> regionAngle(surfI);
+    List<Map<autoPtr<dictionary>>> regionPatchInfo(surfI);
 
     HashSet<word> unmatchedKeys(surfacesDict.toc());
 
@@ -300,8 +300,8 @@ autoPtr<refinementSurfaces> createRefinementSurfaces
               + regionLevelIncr[surfI][iter.key()];
         }
 
-        const Map<autoPtr<dictionary> >& localInfo = regionPatchInfo[surfI];
-        forAllConstIter(Map<autoPtr<dictionary> >, localInfo, iter)
+        const Map<autoPtr<dictionary>>& localInfo = regionPatchInfo[surfI];
+        forAllConstIter(Map<autoPtr<dictionary>>, localInfo, iter)
         {
             label globalRegionI = regionOffset[surfI] + iter.key();
             patchInfo.set(globalRegionI, iter()().clone());
@@ -684,7 +684,7 @@ int main(int argc, char *argv[])
 //                    runTime,
 //                    IOobject::NO_READ
 //                ),
-//                xferMove<Field<vector> >(bb.points()()),
+//                xferMove<Field<vector>>(bb.points()()),
 //                faces.xfer(),
 //                owner.xfer(),
 //                neighbour.xfer()
@@ -1045,7 +1045,7 @@ int main(int argc, char *argv[])
         (
             100.0,      // max size ratio
             1e-9,       // intersection tolerance
-            autoPtr<writer<scalar> >(new vtkSetWriter<scalar>()),
+            autoPtr<writer<scalar>>(new vtkSetWriter<scalar>()),
             0.01,       // min triangle quality
             true
         );
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index da3c2ac7c837084444e8ef34fd8693593d09b8ae..9494874c89598682b363e97fe5f1260a13e6fb68 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.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
@@ -267,7 +267,7 @@ void addToInterface
     const label zoneID,
     const label ownRegion,
     const label neiRegion,
-    EdgeMap<Map<label> >& regionsToSize
+    EdgeMap<Map<label>>& regionsToSize
 )
 {
     edge interface
@@ -276,7 +276,7 @@ void addToInterface
         max(ownRegion, neiRegion)
     );
 
-    EdgeMap<Map<label> >::iterator iter = regionsToSize.find
+    EdgeMap<Map<label>>::iterator iter = regionsToSize.find
     (
         interface
     );
@@ -316,14 +316,14 @@ void getInterfaceSizes
     const wordList& regionNames,
 
     edgeList& interfaces,
-    List<Pair<word> >& interfaceNames,
+    List<Pair<word>>& interfaceNames,
     labelList& interfaceSizes,
     labelList& faceToInterface
 )
 {
     // From region-region to faceZone (or -1) to number of faces.
 
-    EdgeMap<Map<label> > regionsToSize;
+    EdgeMap<Map<label>> regionsToSize;
 
 
     // Internal faces
@@ -394,11 +394,11 @@ void getInterfaceSizes
             {
                 IPstream fromSlave(Pstream::blocking, slave);
 
-                EdgeMap<Map<label> > slaveSizes(fromSlave);
+                EdgeMap<Map<label>> slaveSizes(fromSlave);
 
-                forAllConstIter(EdgeMap<Map<label> >, slaveSizes, slaveIter)
+                forAllConstIter(EdgeMap<Map<label>>, slaveSizes, slaveIter)
                 {
-                    EdgeMap<Map<label> >::iterator masterIter =
+                    EdgeMap<Map<label>>::iterator masterIter =
                         regionsToSize.find(slaveIter.key());
 
                     if (masterIter != regionsToSize.end())
@@ -452,7 +452,7 @@ void getInterfaceSizes
     // Now we have the global sizes of all inter-regions.
     // Invert this on master and distribute.
     label nInterfaces = 0;
-    forAllConstIter(EdgeMap<Map<label> >, regionsToSize, iter)
+    forAllConstIter(EdgeMap<Map<label>>, regionsToSize, iter)
     {
         const Map<label>& info = iter();
         nInterfaces += info.size();
@@ -461,10 +461,10 @@ void getInterfaceSizes
     interfaces.setSize(nInterfaces);
     interfaceNames.setSize(nInterfaces);
     interfaceSizes.setSize(nInterfaces);
-    EdgeMap<Map<label> > regionsToInterface(nInterfaces);
+    EdgeMap<Map<label>> regionsToInterface(nInterfaces);
 
     nInterfaces = 0;
-    forAllConstIter(EdgeMap<Map<label> >, regionsToSize, iter)
+    forAllConstIter(EdgeMap<Map<label>>, regionsToSize, iter)
     {
         const edge& e = iter.key();
         const word& name0 = regionNames[e[0]];
@@ -1052,7 +1052,7 @@ labelList addRegionPatches
     fvMesh& mesh,
     const wordList& regionNames,
     const edgeList& interfaces,
-    const List<Pair<word> >& interfaceNames
+    const List<Pair<word>>& interfaceNames
 )
 {
     Info<< nl << "Adding patches" << nl << endl;
@@ -1785,7 +1785,7 @@ int main(int argc, char *argv[])
     // - the name
     // - the (global) size
     edgeList interfaces;
-    List<Pair<word> > interfaceNames;
+    List<Pair<word>> interfaceNames;
     labelList interfaceSizes;
     // per face the interface
     labelList faceToInterface;
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
index 180c736b92d50c84b94bcc1b8ef9baa933292746..784e260a94493413cfb29df31e7a92d60d46e817 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
+++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.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
@@ -52,7 +52,7 @@ void subsetVolFields
 (
     const fvMeshSubset& subsetter,
     const wordList& fieldNames,
-    PtrList<GeometricField<Type, fvPatchField, volMesh> >& subFields
+    PtrList<GeometricField<Type, fvPatchField, volMesh>>& subFields
 )
 {
     const fvMesh& baseMesh = subsetter.baseMesh();
@@ -86,7 +86,7 @@ void subsetSurfaceFields
 (
     const fvMeshSubset& subsetter,
     const wordList& fieldNames,
-    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >& subFields
+    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>& subFields
 )
 {
     const fvMesh& baseMesh = subsetter.baseMesh();
@@ -121,7 +121,7 @@ void subsetPointFields
     const fvMeshSubset& subsetter,
     const pointMesh& pMesh,
     const wordList& fieldNames,
-    PtrList<GeometricField<Type, pointPatchField, pointMesh> >& subFields
+    PtrList<GeometricField<Type, pointPatchField, pointMesh>>& subFields
 )
 {
     const fvMesh& baseMesh = subsetter.baseMesh();
diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C
index 15ef8f484800818decc76c27c4aa4e921154fd78..c27ee167f51ed88c374056ce0596a6ebef74aa6e 100644
--- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C
+++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,7 +125,7 @@ void Foam::helpTypes::helpBoundary::fixedValueFieldConditions
 
             fvPatch fvp(pp, mesh.boundary());
 
-            tmp<fvPatchField<Type> > pf
+            tmp<fvPatchField<Type>> pf
             (
                 fvPatchField<Type>::New
                 (
diff --git a/applications/utilities/miscellaneous/patchSummary/patchSummary.C b/applications/utilities/miscellaneous/patchSummary/patchSummary.C
index c5951b386526f0e27bc7c8423cebee5d061d8f9e..0a3621ff8351dd91dea5b8cc0e4367b108fe2ca1 100644
--- a/applications/utilities/miscellaneous/patchSummary/patchSummary.C
+++ b/applications/utilities/miscellaneous/patchSummary/patchSummary.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
@@ -152,9 +152,9 @@ int main(int argc, char *argv[])
             // patches.
 
             // Per 'group', the map from fieldname to patchfield type
-            DynamicList<HashTable<word> > fieldToTypes(bm.size());
+            DynamicList<HashTable<word>> fieldToTypes(bm.size());
             // Per 'group' the patches
-            DynamicList<DynamicList<label> > groupToPatches(bm.size());
+            DynamicList<DynamicList<label>> groupToPatches(bm.size());
             forAll(bm, patchI)
             {
                 HashTable<word> fieldToType;
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index 901890c59d71d69a55132f82efcddb16aaa84bc2..6f973fb661ac1b01869ee37e95c7088ef7d0f71e 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -460,16 +460,16 @@ int main(int argc, char *argv[])
 
             // Construct the dimensioned fields
             // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            PtrList<DimensionedField<scalar, volMesh> > dimScalarFields;
+            PtrList<DimensionedField<scalar, volMesh>> dimScalarFields;
             readFields(mesh, objects, dimScalarFields);
-            PtrList<DimensionedField<vector, volMesh> > dimVectorFields;
+            PtrList<DimensionedField<vector, volMesh>> dimVectorFields;
             readFields(mesh, objects, dimVectorFields);
-            PtrList<DimensionedField<sphericalTensor, volMesh> >
+            PtrList<DimensionedField<sphericalTensor, volMesh>>
                 dimSphericalTensorFields;
             readFields(mesh, objects, dimSphericalTensorFields);
-            PtrList<DimensionedField<symmTensor, volMesh> > dimSymmTensorFields;
+            PtrList<DimensionedField<symmTensor, volMesh>> dimSymmTensorFields;
             readFields(mesh, objects, dimSymmTensorFields);
-            PtrList<DimensionedField<tensor, volMesh> > dimTensorFields;
+            PtrList<DimensionedField<tensor, volMesh>> dimTensorFields;
             readFields(mesh, objects, dimTensorFields);
 
 
@@ -512,64 +512,64 @@ int main(int argc, char *argv[])
             );
 
             // Particles
-            PtrList<Cloud<indexedParticle> > lagrangianPositions
+            PtrList<Cloud<indexedParticle>> lagrangianPositions
             (
                 cloudDirs.size()
             );
             // Particles per cell
-            PtrList<List<SLList<indexedParticle*>*> > cellParticles
+            PtrList<List<SLList<indexedParticle*>*>> cellParticles
             (
                 cloudDirs.size()
             );
 
-            PtrList<PtrList<labelIOField> > lagrangianLabelFields
+            PtrList<PtrList<labelIOField>> lagrangianLabelFields
             (
                 cloudDirs.size()
             );
-            PtrList<PtrList<labelFieldCompactIOField> >
+            PtrList<PtrList<labelFieldCompactIOField>>
             lagrangianLabelFieldFields
             (
                 cloudDirs.size()
             );
-            PtrList<PtrList<scalarIOField> > lagrangianScalarFields
+            PtrList<PtrList<scalarIOField>> lagrangianScalarFields
             (
                 cloudDirs.size()
             );
-            PtrList<PtrList<scalarFieldCompactIOField> >
+            PtrList<PtrList<scalarFieldCompactIOField>>
             lagrangianScalarFieldFields
             (
                 cloudDirs.size()
             );
-            PtrList<PtrList<vectorIOField> > lagrangianVectorFields
+            PtrList<PtrList<vectorIOField>> lagrangianVectorFields
             (
                 cloudDirs.size()
             );
-            PtrList<PtrList<vectorFieldCompactIOField> >
+            PtrList<PtrList<vectorFieldCompactIOField>>
             lagrangianVectorFieldFields
             (
                 cloudDirs.size()
             );
-            PtrList<PtrList<sphericalTensorIOField> >
+            PtrList<PtrList<sphericalTensorIOField>>
             lagrangianSphericalTensorFields
             (
                 cloudDirs.size()
             );
-            PtrList<PtrList<sphericalTensorFieldCompactIOField> >
+            PtrList<PtrList<sphericalTensorFieldCompactIOField>>
                 lagrangianSphericalTensorFieldFields(cloudDirs.size());
-            PtrList<PtrList<symmTensorIOField> > lagrangianSymmTensorFields
+            PtrList<PtrList<symmTensorIOField>> lagrangianSymmTensorFields
             (
                 cloudDirs.size()
             );
-            PtrList<PtrList<symmTensorFieldCompactIOField> >
+            PtrList<PtrList<symmTensorFieldCompactIOField>>
             lagrangianSymmTensorFieldFields
             (
                 cloudDirs.size()
             );
-            PtrList<PtrList<tensorIOField> > lagrangianTensorFields
+            PtrList<PtrList<tensorIOField>> lagrangianTensorFields
             (
                 cloudDirs.size()
             );
-            PtrList<PtrList<tensorFieldCompactIOField> >
+            PtrList<PtrList<tensorFieldCompactIOField>>
             lagrangianTensorFieldFields
             (
                 cloudDirs.size()
diff --git a/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposer.H
index ad04f4689ecb9b4c468489a1fbb3645b7e59279e..ee4fc1d77714b3243cf88888a5793d61194f8d91 100644
--- a/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposer.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
@@ -100,7 +100,7 @@ public:
 
         //- Decompose field
         template<class Type>
-        tmp<DimensionedField<Type, volMesh> > decomposeField
+        tmp<DimensionedField<Type, volMesh>> decomposeField
         (
             const DimensionedField<Type, volMesh>& field
         ) const;
diff --git a/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposerDecomposeFields.C b/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposerDecomposeFields.C
index 701f91780d77acf7cc12512f1d69a868798191a8..dcdebc31d81fdd4da7f838c4c14e61c57982a052 100644
--- a/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposerDecomposeFields.C
+++ b/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposerDecomposeFields.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
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::DimensionedField<Type, Foam::volMesh> >
+Foam::tmp<Foam::DimensionedField<Type, Foam::volMesh>>
 Foam::dimFieldDecomposer::decomposeField
 (
     const DimensionedField<Type, volMesh>& field
@@ -38,7 +38,7 @@ Foam::dimFieldDecomposer::decomposeField
     Field<Type> mappedField(field, cellAddressing_);
 
     // Create the field for the processor
-    return tmp<DimensionedField<Type, volMesh> >
+    return tmp<DimensionedField<Type, volMesh>>
     (
         new DimensionedField<Type, volMesh>
         (
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
index 7d863693983488887ec07ee24c9d5750b65adba1..2293ff0044d21517e45608da0ccff9cf31699dc4 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.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
@@ -599,7 +599,7 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
             // Go through all the zoned points and find out if they
             // belong to a zone.  If so, add it to the zone as
             // necessary
-            List<DynamicList<label> > zonePoints(pz.size());
+            List<DynamicList<label>> zonePoints(pz.size());
 
             // Estimate size
             forAll(zonePoints, zoneI)
@@ -665,8 +665,8 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
             // Go through all the zoned face and find out if they
             // belong to a zone.  If so, add it to the zone as
             // necessary
-            List<DynamicList<label> > zoneFaces(fz.size());
-            List<DynamicList<bool> > zoneFaceFlips(fz.size());
+            List<DynamicList<label>> zoneFaces(fz.size());
+            List<DynamicList<bool>> zoneFaceFlips(fz.size());
 
             // Estimate size
             forAll(zoneFaces, zoneI)
@@ -759,7 +759,7 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
             // Go through all the zoned cells and find out if they
             // belong to a zone.  If so, add it to the zone as
             // necessary
-            List<DynamicList<label> > zoneCells(cz.size());
+            List<DynamicList<label>> zoneCells(cz.size());
 
             // Estimate size
             forAll(zoneCells, zoneI)
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
index 21bc8e61690461cd25f81ede6bad0f35faf41645..1935c6fa67056c93a87e24e1bf62c3e38031c5ad 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ class domainDecomposition
         // indices will be incremented by 1 and the decremented as
         // necessary to avoid the problem of face number zero having no
         // sign.
-        List<DynamicList<label> > procFaceAddressing_;
+        List<DynamicList<label>> procFaceAddressing_;
 
         //- Labels of cells for each processor
         labelListList procCellAddressing_;
@@ -137,8 +137,8 @@ class domainDecomposition
             const label ownerProc,
             const label nbrProc,
 
-            List<Map<label> >&,
-            List<DynamicList<DynamicList<label> > >&
+            List<Map<label>>&,
+            List<DynamicList<DynamicList<label>>>&
         ) const;
 
         //- Generate sub patch info for processor cyclics
@@ -146,8 +146,8 @@ class domainDecomposition
         void processInterCyclics
         (
             const polyBoundaryMesh& patches,
-            List<DynamicList<DynamicList<label> > >& interPatchFaces,
-            List<Map<label> >& procNbrToInterPatch,
+            List<DynamicList<DynamicList<label>>>& interPatchFaces,
+            List<Map<label>>& procNbrToInterPatch,
             List<labelListList>& subPatchIDs,
             List<labelListList>& subPatchStarts,
             bool owner,
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
index f5a767225c3e986989a2b84f21748b7eaf0294bf..efcfc82ebd8372855d7a550ff3e1cc3f25faebdd 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,8 +51,8 @@ void Foam::domainDecomposition::addInterProcFace
     const label ownerProc,
     const label nbrProc,
 
-    List<Map<label> >& nbrToInterPatch,
-    List<DynamicList<DynamicList<label> > >& interPatchFaces
+    List<Map<label>>& nbrToInterPatch,
+    List<DynamicList<DynamicList<label>>>& interPatchFaces
 ) const
 {
     Map<label>::iterator patchIter = nbrToInterPatch[ownerProc].find(nbrProc);
@@ -209,10 +209,10 @@ void Foam::domainDecomposition::decomposeMesh()
 
     // Per processor, from neighbour processor to the inter-processor patch
     // that communicates with that neighbour
-    List<Map<label> > procNbrToInterPatch(nProcs_);
+    List<Map<label>> procNbrToInterPatch(nProcs_);
 
     // Per processor the faces per inter-processor patch
-    List<DynamicList<DynamicList<label> > > interPatchFaces(nProcs_);
+    List<DynamicList<DynamicList<label>>> interPatchFaces(nProcs_);
 
     // Processor boundaries from internal faces
     forAll(neighbour, facei)
@@ -336,7 +336,7 @@ void Foam::domainDecomposition::decomposeMesh()
 
         sortedOrder(nbrs, order);
 
-        DynamicList<DynamicList<label> >& curInterPatchFaces =
+        DynamicList<DynamicList<label>>& curInterPatchFaces =
             interPatchFaces[procI];
 
         forAll(nbrs, i)
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.C
index c08be4f7fae721a9fe455fc26286f7b1cc71a9f8..5122d628d7a77265443e5a2e67f1f46893b11148 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,8 +31,8 @@ template <class BinaryOp>
 void Foam::domainDecomposition::processInterCyclics
 (
     const polyBoundaryMesh& patches,
-    List<DynamicList<DynamicList<label> > >& interPatchFaces,
-    List<Map<label> >& procNbrToInterPatch,
+    List<DynamicList<DynamicList<label>>>& interPatchFaces,
+    List<Map<label>>& procNbrToInterPatch,
     List<labelListList>& subPatchIDs,
     List<labelListList>& subPatchStarts,
     bool owner,
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
index 361c930ad24e9a75d77767d3642d3e3f731c1cb3..274e3a51a33a7eaf9d9ff19e478b6f2bb6f77e6c 100644
--- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
+++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.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
@@ -97,7 +97,7 @@ Foam::lagrangianFieldDecomposer::lagrangianFieldDecomposer
 
     particleIndices_.setSize(pi);
 
-    IOPosition<Cloud<passiveParticle> >(positions_).write();
+    IOPosition<Cloud<passiveParticle>>(positions_).write();
 }
 
 
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H
index 023ca93fb06c22d695cd142c7fa2b0e21038b93b..6e0280398d69f1b63efd6167292fae30ea00bdf0 100644
--- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.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
@@ -100,8 +100,8 @@ public:
         (
             const label cloudI,
             const IOobjectList& lagrangianObjects,
-            PtrList<PtrList<IOField<Type> > >& lagrangianFields
-//            PtrList<IOField<Type> >& lagrangianFields
+            PtrList<PtrList<IOField<Type>>>& lagrangianFields
+//            PtrList<IOField<Type>>& lagrangianFields
         );
 
         template<class Type>
@@ -111,22 +111,22 @@ public:
             const IOobjectList& lagrangianObjects,
             PtrList
             <
-                PtrList<CompactIOField<Field<Type>, Type> >
+                PtrList<CompactIOField<Field<Type>, Type>>
             >& lagrangianFields
-//            PtrList<CompactIOField<Field<Type>, Type > >& lagrangianFields
+//            PtrList<CompactIOField<Field<Type>, Type >>& lagrangianFields
         );
 
 
         //- Decompose volume field
         template<class Type>
-        tmp<IOField<Type> > decomposeField
+        tmp<IOField<Type>> decomposeField
         (
             const word& cloudName,
             const IOField<Type>& field
         ) const;
 
         template<class Type>
-        tmp<CompactIOField<Field<Type>, Type> > decomposeFieldField
+        tmp<CompactIOField<Field<Type>, Type>> decomposeFieldField
         (
             const word& cloudName,
             const CompactIOField<Field<Type>, Type>& field
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposerDecomposeFields.C b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposerDecomposeFields.C
index 0b1cbcec13423920af13fdb53b894fd6d35cddbe..1b5caf8e6fdfba210573279ac8bfebfa28e62a26 100644
--- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposerDecomposeFields.C
+++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposerDecomposeFields.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
@@ -33,7 +33,7 @@ void Foam::lagrangianFieldDecomposer::readFields
 (
     const label cloudI,
     const IOobjectList& lagrangianObjects,
-    PtrList<PtrList<IOField<Type> > >& lagrangianFields
+    PtrList<PtrList<IOField<Type>>>& lagrangianFields
 )
 {
     // Search list of objects for lagrangian fields
@@ -45,7 +45,7 @@ void Foam::lagrangianFieldDecomposer::readFields
     lagrangianFields.set
     (
         cloudI,
-        new PtrList<IOField<Type> >
+        new PtrList<IOField<Type>>
         (
             lagrangianTypeObjects.size()
         )
@@ -68,13 +68,13 @@ void Foam::lagrangianFieldDecomposer::readFieldFields
 (
     const label cloudI,
     const IOobjectList& lagrangianObjects,
-    PtrList<PtrList<CompactIOField<Field<Type>, Type> > >& lagrangianFields
+    PtrList<PtrList<CompactIOField<Field<Type>, Type>>>& lagrangianFields
 )
 {
     // Search list of objects for lagrangian fields
     IOobjectList lagrangianTypeObjectsA
     (
-        lagrangianObjects.lookupClass(IOField<Field<Type> >::typeName)
+        lagrangianObjects.lookupClass(IOField<Field<Type>>::typeName)
     );
 
     IOobjectList lagrangianTypeObjectsB
@@ -89,7 +89,7 @@ void Foam::lagrangianFieldDecomposer::readFieldFields
     lagrangianFields.set
     (
         cloudI,
-        new PtrList<CompactIOField<Field<Type>, Type> >
+        new PtrList<CompactIOField<Field<Type>, Type>>
         (
             lagrangianTypeObjectsA.size() + lagrangianTypeObjectsB.size()
         )
@@ -118,7 +118,7 @@ void Foam::lagrangianFieldDecomposer::readFieldFields
 
 
 template<class Type>
-Foam::tmp<Foam::IOField<Type> >
+Foam::tmp<Foam::IOField<Type>>
 Foam::lagrangianFieldDecomposer::decomposeField
 (
     const word& cloudName,
@@ -129,7 +129,7 @@ Foam::lagrangianFieldDecomposer::decomposeField
     Field<Type> procField(field, particleIndices_);
 
     // Create the field for the processor
-    return tmp<IOField<Type> >
+    return tmp<IOField<Type>>
     (
         new IOField<Type>
         (
@@ -150,7 +150,7 @@ Foam::lagrangianFieldDecomposer::decomposeField
 
 
 template<class Type>
-Foam::tmp<Foam::CompactIOField<Foam::Field<Type>, Type> >
+Foam::tmp<Foam::CompactIOField<Foam::Field<Type>, Type>>
 Foam::lagrangianFieldDecomposer::decomposeFieldField
 (
     const word& cloudName,
@@ -158,10 +158,10 @@ Foam::lagrangianFieldDecomposer::decomposeFieldField
 ) const
 {
     // Create and map the internal field values
-    Field<Field<Type> > procField(field, particleIndices_);
+    Field<Field<Type>> procField(field, particleIndices_);
 
     // Create the field for the processor
-    return tmp<CompactIOField<Field<Type>, Type> >
+    return tmp<CompactIOField<Field<Type>, Type>>
     (
         new CompactIOField<Field<Type>, Type>
         (
diff --git a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
index cf9e4badf8fcfdde96a27926855232622a8e115b..d912ca8d9fe65a456f4b89b104053a9d464f581c 100644
--- a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.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
@@ -154,7 +154,7 @@ public:
 
         //- Decompose point field
         template<class Type>
-        tmp<GeometricField<Type, pointPatchField, pointMesh> >
+        tmp<GeometricField<Type, pointPatchField, pointMesh>>
         decomposeField
         (
             const GeometricField<Type, pointPatchField, pointMesh>&
diff --git a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposerDecomposeFields.C b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposerDecomposeFields.C
index 6992180b11d05ef6d41a52143cc9dfac25217cd9..52f1576331c25800fabbb65bb1715048701e2d32 100644
--- a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposerDecomposeFields.C
+++ b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposerDecomposeFields.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
@@ -29,7 +29,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh>>
 Foam::pointFieldDecomposer::decomposeField
 (
     const GeometricField<Type, pointPatchField, pointMesh>& field
@@ -39,7 +39,7 @@ Foam::pointFieldDecomposer::decomposeField
     Field<Type> internalField(field.internalField(), pointAddressing_);
 
     // Create a list of pointers for the patchFields
-    PtrList<pointPatchField<Type> > patchFields(boundaryAddressing_.size());
+    PtrList<pointPatchField<Type>> patchFields(boundaryAddressing_.size());
 
     // Create and map the patch field values
     forAll(boundaryAddressing_, patchi)
@@ -73,7 +73,7 @@ Foam::pointFieldDecomposer::decomposeField
     }
 
     // Create the field for the processor
-    return tmp<GeometricField<Type, pointPatchField, pointMesh> >
+    return tmp<GeometricField<Type, pointPatchField, pointMesh>>
     (
         new GeometricField<Type, pointPatchField, pointMesh>
         (
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
index ae90704fd3524a6b4a51df1ef99c2326c04f2c90..e6a38a6cf6ed8fa24a5673bfa71453a8e2d1e7b0 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.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
@@ -40,7 +40,7 @@ using namespace Foam;
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvPatchField, volMesh> >
+tmp<GeometricField<Type, fvPatchField, volMesh>>
 volField
 (
     const fvMeshSubset& meshSubsetter,
@@ -49,7 +49,7 @@ volField
 {
     if (meshSubsetter.hasSubMesh())
     {
-        tmp<GeometricField<Type, fvPatchField, volMesh> > tfld
+        tmp<GeometricField<Type, fvPatchField, volMesh>> tfld
         (
             meshSubsetter.interpolate(vf)
         );
@@ -725,7 +725,7 @@ void ensightField
 {
     if (nodeValues)
     {
-        tmp<GeometricField<Type, pointPatchField, pointMesh> > pfld
+        tmp<GeometricField<Type, pointPatchField, pointMesh>> pfld
         (
             volPointInterpolation::New(vf.mesh()).interpolate(vf)
         );
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H
index b3469e3572bd62bbb35adc5bfd8ccb3d943aee86..ad5b11f93e5c3235117837fe4562064661955c07 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.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
@@ -41,7 +41,7 @@ SourceFiles
 
 //- Wrapper to get hold of the field or the subsetted field
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 volField
 (
     const Foam::fvMeshSubset&,
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index 1e2df860393e80a2d5cdfcdd400421f9f406c8b2..1cd3cbe37d0ad6032ab79871991cf8aafb7fb7c3 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -328,7 +328,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    HashTable<HashTable<word> > allCloudFields;
+    HashTable<HashTable<word>> allCloudFields;
     forAllConstIter(wordHashSet, allCloudNames, cloudIter)
     {
         // Add the name of the cloud(s) to the case file header
@@ -348,7 +348,7 @@ int main(int argc, char *argv[])
         allCloudFields.insert(cloudIter.key(), HashTable<word>());
 
         // Identify the new cloud in the hash table
-        HashTable<HashTable<word> >::iterator newCloudIter =
+        HashTable<HashTable<word>>::iterator newCloudIter =
             allCloudFields.find(cloudIter.key());
 
         // Loop over all times to build list of fields and field types
@@ -550,7 +550,7 @@ int main(int argc, char *argv[])
         // Cloud field data output
         // ~~~~~~~~~~~~~~~~~~~~~~~
 
-        forAllConstIter(HashTable<HashTable<word> >, allCloudFields, cloudIter)
+        forAllConstIter(HashTable<HashTable<word>>, allCloudFields, cloudIter)
         {
             const word& cloudName = cloudIter.key();
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputCase.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputCase.H
index 3ccdbbe91b27f0f1bbd21c6b533d33eaaefe8d8b..0d221590790e6ef2dab658669ab9bd0ed819ba1e 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputCase.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputCase.H
@@ -36,7 +36,7 @@ else
 
 // add information for clouds
 // multiple clouds currently require the same time index
-forAllConstIter(HashTable<HashTable<word> >, cloudFields, cloudIter)
+forAllConstIter(HashTable<HashTable<word>>, cloudFields, cloudIter)
 {
     const word& cloudName = cloudIter.key();
 
@@ -91,7 +91,7 @@ forAllConstIter(HashTable<word>, volumeFields, fieldIter)
 
 
 label cloudNo = 0;
-forAllConstIter(HashTable<HashTable<word> >, cloudFields, cloudIter)
+forAllConstIter(HashTable<HashTable<word>>, cloudFields, cloudIter)
 {
     const word& cloudName = cloudIter.key();
 
@@ -175,7 +175,7 @@ if (fieldTimesUsed.size())
 
 // TODO: allow similar/different time-steps for each cloud
 cloudNo = 0;
-forAllConstIter(HashTable<DynamicList<label> >, cloudTimesUsed, cloudIter)
+forAllConstIter(HashTable<DynamicList<label>>, cloudTimesUsed, cloudIter)
 {
     // const word& cloudName = cloudIter.key();
     const DynamicList<label>& timesUsed = cloudIter();
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H
index 0231f2e4dd42d357686d155c98233def36eaf008..077490f1ecdaaa2116db06ced0bf4823aa0e4ec8 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H
@@ -48,7 +48,7 @@ if (timeDirs.size())
         cloudFields.insert(cloudName, HashTable<word>());
 
         // Identify the new cloud within the hash table
-        HashTable<HashTable<word> >::iterator cloudIter =
+        HashTable<HashTable<word>>::iterator cloudIter =
             cloudFields.find(cloudName);
 
         IOobjectList objs
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
index 8e948b1692c9cb6d6ceb3854cf003f54fb04e344..f2d0286bce2e97f91b3e839115931b7f48f0ded3 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.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
@@ -220,10 +220,10 @@ int main(int argc, char *argv[])
     DynamicList<label> fieldTimesUsed;
 
     // Track the time indices used by each cloud
-    HashTable<DynamicList<label> > cloudTimesUsed;
+    HashTable<DynamicList<label>> cloudTimesUsed;
 
     // Create a new DynamicList for each cloud
-    forAllConstIter(HashTable<HashTable<word> >, cloudFields, cloudIter)
+    forAllConstIter(HashTable<HashTable<word>>, cloudFields, cloudIter)
     {
         cloudTimesUsed.insert(cloudIter.key(), DynamicList<label>());
     }
@@ -356,7 +356,7 @@ int main(int argc, char *argv[])
         Info<< " )" << endl;
 
         // check for clouds
-        forAllConstIter(HashTable<HashTable<word> >, cloudFields, cloudIter)
+        forAllConstIter(HashTable<HashTable<word>>, cloudFields, cloudIter)
         {
             const word& cloudName = cloudIter.key();
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H
index 60836e9a24abf1166cae69d426ab8d013f65fc53..1bd38ec8921100e242505e3496dedb933326deda 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.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
@@ -120,7 +120,7 @@ public:
 
         //- Get either fvPatchField or patchInternalField
         template<class Type>
-        tmp<Field<Type> > getPatchField
+        tmp<Field<Type>> getPatchField
         (
             const bool nearCellValue,
             const GeometricField<Type, fvPatchField, volMesh>& vfld,
@@ -130,7 +130,7 @@ public:
         //- Get mixed field: fvsPatchField for boundary faces and
         //  internalField for internal faces.
         template<class Type>
-        tmp<Field<Type> > getFaceField
+        tmp<Field<Type>> getFaceField
         (
             const GeometricField<Type, fvsPatchField, surfaceMesh>&,
             const labelList& faceLabels
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C
index 16416593cb49246aa7d6399f836deccef6f7e832..c2ca8ac4a86c710d8f50646cdd05544470ca132b 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.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
@@ -65,7 +65,7 @@ void Foam::tecplotWriter::writeField(const Field<Type>& fld) const
 
 
 template<class Type>
-Foam::tmp<Field<Type> > Foam::tecplotWriter::getPatchField
+Foam::tmp<Field<Type>> Foam::tecplotWriter::getPatchField
 (
     const bool nearCellValue,
     const GeometricField<Type, fvPatchField, volMesh>& vfld,
@@ -84,7 +84,7 @@ Foam::tmp<Field<Type> > Foam::tecplotWriter::getPatchField
 
 
 template<class Type>
-Foam::tmp<Field<Type> > Foam::tecplotWriter::getFaceField
+Foam::tmp<Field<Type>> Foam::tecplotWriter::getFaceField
 (
     const GeometricField<Type, fvsPatchField, surfaceMesh>& sfld,
     const labelList& faceLabels
@@ -92,7 +92,7 @@ Foam::tmp<Field<Type> > Foam::tecplotWriter::getFaceField
 {
     const polyBoundaryMesh& patches = sfld.mesh().boundaryMesh();
 
-    tmp<Field<Type> > tfld(new Field<Type>(faceLabels.size()));
+    tmp<Field<Type>> tfld(new Field<Type>(faceLabels.size()));
     Field<Type>& fld = tfld();
 
     forAll(faceLabels, i)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H
index 9c456f843c7920d70d92d02aebe6027bbdac94c3..4da03b6d73b37b2b0d1b6ea4f2e3d5a633da773d 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.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
@@ -91,7 +91,7 @@ public:
         template<class Type, template<class> class PatchField, class GeoMesh>
         void write
         (
-            const PtrList<GeometricField<Type, PatchField, GeoMesh> >&
+            const PtrList<GeometricField<Type, PatchField, GeoMesh>>&
         );
 
         //- Interpolate and write volFields
@@ -99,7 +99,7 @@ public:
         void write
         (
             const volPointInterpolation&,
-            const PtrList<GeometricField<Type, fvPatchField, volMesh> >&
+            const PtrList<GeometricField<Type, fvPatchField, volMesh>>&
         );
 };
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C
index 853caca75bad51e58b8c369efc7454e40f33c45f..cdc7ad97201629a34440c79bcd798e338dfee453 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.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
@@ -31,7 +31,7 @@ License
 template<class Type, template<class> class PatchField, class GeoMesh>
 void Foam::internalWriter::write
 (
-    const PtrList<GeometricField<Type, PatchField, GeoMesh> >& flds
+    const PtrList<GeometricField<Type, PatchField, GeoMesh>>& flds
 )
 {
     forAll(flds, i)
@@ -45,7 +45,7 @@ template<class Type>
 void Foam::internalWriter::write
 (
     const volPointInterpolation& pInterp,
-    const PtrList<GeometricField<Type, fvPatchField, volMesh> >& flds
+    const PtrList<GeometricField<Type, fvPatchField, volMesh>>& flds
 )
 {
     forAll(flds, i)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.H
index 730f68098e316ab48aea67f786e157705638a326..f0880c99031d7d22e6a610cdae965a6efd9b8b3e 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.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
@@ -114,14 +114,14 @@ public:
         template<class Type>
         void write
         (
-            const PtrList<GeometricField<Type, fvPatchField, volMesh> >&
+            const PtrList<GeometricField<Type, fvPatchField, volMesh>>&
         );
 
         //- Write pointFields
         template<class Type>
         void write
         (
-            const PtrList<GeometricField<Type, pointPatchField, pointMesh> >&
+            const PtrList<GeometricField<Type, pointPatchField, pointMesh>>&
         );
 
         //- Interpolate and write volFields
@@ -129,7 +129,7 @@ public:
         void write
         (
             const PrimitivePatchInterpolation<primitivePatch>&,
-            const PtrList<GeometricField<Type, fvPatchField, volMesh> >&
+            const PtrList<GeometricField<Type, fvPatchField, volMesh>>&
         );
 };
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriterTemplates.C
index 25e228ebe065f510f54c610638cf80548f8313f5..f6ea96d7b8bfe279efc6451e5e5e8986e6740df4 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriterTemplates.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
@@ -31,7 +31,7 @@ License
 template<class Type>
 void Foam::patchWriter::write
 (
-    const PtrList<GeometricField<Type, fvPatchField, volMesh> >& flds
+    const PtrList<GeometricField<Type, fvPatchField, volMesh>>& flds
 )
 {
     forAll(flds, fieldI)
@@ -66,7 +66,7 @@ void Foam::patchWriter::write
 template<class Type>
 void Foam::patchWriter::write
 (
-    const PtrList<GeometricField<Type, pointPatchField, pointMesh> >& flds
+    const PtrList<GeometricField<Type, pointPatchField, pointMesh>>& flds
 )
 {
     forAll(flds, fieldI)
@@ -96,7 +96,7 @@ template<class Type>
 void Foam::patchWriter::write
 (
     const PrimitivePatchInterpolation<primitivePatch>& pInter,
-    const PtrList<GeometricField<Type, fvPatchField, volMesh> >& flds
+    const PtrList<GeometricField<Type, fvPatchField, volMesh>>& flds
 )
 {
     forAll(flds, fieldI)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriter.H
index 0a5936cfa1aa3b5246e9359962a5d091a59596fe..2520badad0926a62c7a02fb85a1b9170ef01087a 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriter.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
@@ -90,7 +90,7 @@ public:
 
         //- Extract face data
         template<class Type>
-        tmp<Field<Type> > getFaceField
+        tmp<Field<Type>> getFaceField
         (
             const GeometricField<Type, fvsPatchField, surfaceMesh>&
         ) const;
@@ -99,7 +99,7 @@ public:
         template<class Type>
         void write
         (
-            const PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >&
+            const PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>&
         );
 };
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriterTemplates.C
index 3ae7b08be26cb3671fba616b9c258490260f0358..86ccae28675618609e9e5ebaf9fe21b9e30b32ad 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriterTemplates.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
@@ -29,14 +29,14 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Field<Type> > Foam::surfaceMeshWriter::getFaceField
+Foam::tmp<Field<Type>> Foam::surfaceMeshWriter::getFaceField
 (
     const GeometricField<Type, fvsPatchField, surfaceMesh>& sfld
 ) const
 {
     const polyBoundaryMesh& patches = sfld.mesh().boundaryMesh();
 
-    tmp<Field<Type> > tfld(new Field<Type>(pp_.size()));
+    tmp<Field<Type>> tfld(new Field<Type>(pp_.size()));
     Field<Type>& fld = tfld();
 
     forAll(pp_.addressing(), i)
@@ -63,7 +63,7 @@ Foam::tmp<Field<Type> > Foam::surfaceMeshWriter::getFaceField
 template<class Type>
 void Foam::surfaceMeshWriter::write
 (
-    const PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >& sflds
+    const PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>& sflds
 )
 {
     forAll(sflds, fieldI)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H
index 11f18b3d764cab397493cb5e5a18e4a6514f1529..41b21b3bdf15b5be4ab80e02a957641972f8c62b 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.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
@@ -146,7 +146,7 @@ public:
     (
         std::ostream&,
         const bool binary,
-        const PtrList<GeometricField<Type, PatchField, GeoMesh> >&,
+        const PtrList<GeometricField<Type, PatchField, GeoMesh>>&,
         const vtkMesh&
     );
 
@@ -157,7 +157,7 @@ public:
         std::ostream&,
         const bool binary,
         const volPointInterpolation&,
-        const PtrList<GeometricField<Type, fvPatchField, volMesh> >&,
+        const PtrList<GeometricField<Type, fvPatchField, volMesh>>&,
         const vtkMesh&
     );
 };
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C
index 5fe5d076dd03668b9be15251598d1ba84dae236e..b88b9b20f8c159ac8e669a236aea9d07edca647a 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.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
@@ -161,7 +161,7 @@ void Foam::writeFuns::write
 (
     std::ostream& os,
     const bool binary,
-    const PtrList<GeometricField<Type, PatchField, GeoMesh> >& flds,
+    const PtrList<GeometricField<Type, PatchField, GeoMesh>>& flds,
     const vtkMesh& vMesh
 )
 {
@@ -178,7 +178,7 @@ void Foam::writeFuns::write
     std::ostream& os,
     const bool binary,
     const volPointInterpolation& pInterp,
-    const PtrList<GeometricField<Type, fvPatchField, volMesh> >& flds,
+    const PtrList<GeometricField<Type, fvPatchField, volMesh>>& flds,
     const vtkMesh& vMesh
 )
 {
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
index 054582768f6b3a5e25b2a3a24921166f29a35094..f30956dddbb03e36ec8cdbb0c4f7dba1e4874766 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -659,7 +659,7 @@ void Foam::vtkPV3Foam::renderPatchNames(vtkRenderer* renderer, const bool show)
         labelList nZones(pbMesh.size(), 0);
 
         // Per global zone number the average face centre position
-        List<DynamicList<point> > zoneCentre(pbMesh.size());
+        List<DynamicList<point>> zoneCentre(pbMesh.size());
 
 
         // Loop through all patches to determine zones, and centre of each zone
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
index e21bd33fc9536eab4ee7e9e2677bf6fcfb18439b..ab6dc05c831eff0c486708622036c9c1dbc60c4c 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.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
@@ -497,7 +497,7 @@ class vtkPV3Foam
             void convertVolFields
             (
                 const fvMesh&,
-                const PtrList<PrimitivePatchInterpolation<primitivePatch> >&,
+                const PtrList<PrimitivePatchInterpolation<primitivePatch>>&,
                 const IOobjectList&,
                 const bool interpFields,
                 vtkMultiBlockDataSet* output
@@ -508,7 +508,7 @@ class vtkPV3Foam
             void convertVolFieldBlock
             (
                 const GeometricField<Type, fvPatchField, volMesh>&,
-                autoPtr<GeometricField<Type, pointPatchField, pointMesh> >&,
+                autoPtr<GeometricField<Type, pointPatchField, pointMesh>>&,
                 vtkMultiBlockDataSet* output,
                 const arrayRange&,
                 const List<polyDecomp>& decompLst
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFields.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFields.C
index 6d0e98dd4072d635fa652e216e4c0a697d987079..0c0fa41c739dedc1fb93ec5ade71510bb2c4b1c5 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFields.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,7 @@ void Foam::vtkPV3Foam::convertVolFields
     }
 
 
-    PtrList<PrimitivePatchInterpolation<primitivePatch> >
+    PtrList<PrimitivePatchInterpolation<primitivePatch>>
         ppInterpList(mesh.boundaryMesh().size());
 
     forAll(ppInterpList, i)
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
index 8235b13d0a8faec2fe6ded068a38d32cb02e7506..64638239881fb49013fc0442a638f1fc4a7ce1ff 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.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
@@ -325,7 +325,7 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
             // but avoids crashes when there is no vtkPolyhedron support
 
             // establish unique node ids used
-            HashSet<vtkIdType, Hash<label> > hashUniqId(2*256);
+            HashSet<vtkIdType, Hash<label>> hashUniqId(2*256);
 
             forAll(cFaces, cFaceI)
             {
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
index 842a301ed7234da76e7ccb67f8b0c33bba4450e0..1028086056d853f4dc3c821e23adb615f639ec8b 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.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
@@ -678,33 +678,33 @@ void Foam::vtkPV3Foam::updateInfoLagrangianFields()
         lagrangianPrefix/cloudName
     );
 
-    addToSelection<IOField<label> >
+    addToSelection<IOField<label>>
     (
         fieldSelection,
         objects
     );
-    addToSelection<IOField<scalar> >
+    addToSelection<IOField<scalar>>
     (
         fieldSelection,
         objects
     );
-    addToSelection<IOField<vector> >
+    addToSelection<IOField<vector>>
     (
         fieldSelection,
         objects
     );
-    addToSelection<IOField<sphericalTensor> >
+    addToSelection<IOField<sphericalTensor>>
     (
         fieldSelection,
 
         objects
     );
-    addToSelection<IOField<symmTensor> >
+    addToSelection<IOField<symmTensor>>
     (
         fieldSelection,
         objects
     );
-    addToSelection<IOField<tensor> >
+    addToSelection<IOField<tensor>>
     (
         fieldSelection,
         objects
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfoFields.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfoFields.H
index 3ef9124979c528a001ce17ae11401548484d6810..02cf345d4acb774f5b4f47582d711dc02b21b935 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfoFields.H
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfoFields.H
@@ -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
@@ -73,27 +73,27 @@ void Foam::vtkPV3Foam::updateInfoFields
     IOobjectList objects(dbPtr_(), dbPtr_().timeName(), regionPrefix);
 
     //- Add volume fields to GUI
-    addToSelection<GeometricField<scalar, patchType, meshType> >
+    addToSelection<GeometricField<scalar, patchType, meshType>>
     (
         select,
         objects
     );
-    addToSelection<GeometricField<vector, patchType, meshType> >
+    addToSelection<GeometricField<vector, patchType, meshType>>
     (
         select,
         objects
     );
-    addToSelection<GeometricField<sphericalTensor, patchType, meshType> >
+    addToSelection<GeometricField<sphericalTensor, patchType, meshType>>
     (
         select,
         objects
     );
-    addToSelection<GeometricField<symmTensor, patchType, meshType> >
+    addToSelection<GeometricField<symmTensor, patchType, meshType>>
     (
         select,
         objects
     );
-    addToSelection<GeometricField<tensor, patchType, meshType> >
+    addToSelection<GeometricField<tensor, patchType, meshType>>
     (
         select,
         objects
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H
index 57e6931c12173c505ac657ab6203b66c8caadd96..9e11686f205ca1971810774676f441fd2fb9b2fa 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H
@@ -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
@@ -46,7 +46,7 @@ template<class Type>
 void Foam::vtkPV3Foam::convertVolFields
 (
     const fvMesh& mesh,
-    const PtrList<PrimitivePatchInterpolation<primitivePatch> >& ppInterpList,
+    const PtrList<PrimitivePatchInterpolation<primitivePatch>>& ppInterpList,
     const IOobjectList& objects,
     const bool interpFields,
     vtkMultiBlockDataSet* output
@@ -74,7 +74,7 @@ void Foam::vtkPV3Foam::convertVolFields
         );
 
         // Interpolated field (demand driven)
-        autoPtr<GeometricField<Type, pointPatchField, pointMesh> > ptfPtr;
+        autoPtr<GeometricField<Type, pointPatchField, pointMesh>> ptfPtr;
         if (interpFields)
         {
             if (debug)
@@ -144,7 +144,7 @@ void Foam::vtkPV3Foam::convertVolFields
 
             if
             (
-                isType<emptyFvPatchField<Type> >(ptf)
+                isType<emptyFvPatchField<Type>>(ptf)
              ||
                 (
                     reader_->GetExtrapolatePatches()
@@ -154,7 +154,7 @@ void Foam::vtkPV3Foam::convertVolFields
             {
                 fvPatch p(ptf.patch().patch(), tf.mesh().boundary());
 
-                tmp<Field<Type> > tpptf
+                tmp<Field<Type>> tpptf
                 (
                     fvPatchField<Type>(p, tf).patchInternalField()
                 );
@@ -284,7 +284,7 @@ template<class Type>
 void Foam::vtkPV3Foam::convertVolFieldBlock
 (
     const GeometricField<Type, fvPatchField, volMesh>& tf,
-    autoPtr<GeometricField<Type, pointPatchField, pointMesh> >& ptfPtr,
+    autoPtr<GeometricField<Type, pointPatchField, pointMesh>>& ptfPtr,
     vtkMultiBlockDataSet* output,
     const arrayRange& range,
     const List<polyDecomp>& decompLst
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.C b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.C
index 960883af3414ed943bc0e57bd8338ccd7b30ad67..cf7170a738a3d5c2e1b78f0af812a13c95219724 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.C
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.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
@@ -663,7 +663,7 @@ void Foam::vtkPV4Foam::renderPatchNames
         labelList nZones(pbMesh.size(), 0);
 
         // Per global zone number the average face centre position
-        List<DynamicList<point> > zoneCentre(pbMesh.size());
+        List<DynamicList<point>> zoneCentre(pbMesh.size());
 
 
         // Loop through all patches to determine zones, and centre of each zone
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H
index 0bd35573e1d9a0b14caf09034c4d618742366f41..b177df59f6889a725c04c15caeff5f95e5a315b2 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.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
@@ -497,7 +497,7 @@ class vtkPV4Foam
             void convertVolFields
             (
                 const fvMesh&,
-                const PtrList<PrimitivePatchInterpolation<primitivePatch> >&,
+                const PtrList<PrimitivePatchInterpolation<primitivePatch>>&,
                 const IOobjectList&,
                 const bool interpFields,
                 vtkMultiBlockDataSet* output
@@ -508,7 +508,7 @@ class vtkPV4Foam
             void convertVolFieldBlock
             (
                 const GeometricField<Type, fvPatchField, volMesh>&,
-                autoPtr<GeometricField<Type, pointPatchField, pointMesh> >&,
+                autoPtr<GeometricField<Type, pointPatchField, pointMesh>>&,
                 vtkMultiBlockDataSet* output,
                 const arrayRange&,
                 const List<polyDecomp>& decompLst
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.C b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.C
index 127f49d30614c8b62fa288b40c5a1cc78c3b2cbe..949627089c37a187a3028508f5bdce82588dbc51 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.C
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.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
@@ -104,7 +104,7 @@ void Foam::vtkPV4Foam::convertVolFields
     }
 
 
-    PtrList<PrimitivePatchInterpolation<primitivePatch> >
+    PtrList<PrimitivePatchInterpolation<primitivePatch>>
         ppInterpList(mesh.boundaryMesh().size());
 
     forAll(ppInterpList, i)
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshVolume.C b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshVolume.C
index 70a7c04a1a6d74c1bd4cc92a8447d090621a8b99..9756316e817455750aa8d7a2d45a644bd5b4695d 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshVolume.C
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshVolume.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
@@ -325,7 +325,7 @@ vtkUnstructuredGrid* Foam::vtkPV4Foam::volumeVTKMesh
             // but avoids crashes when there is no vtkPolyhedron support
 
             // establish unique node ids used
-            HashSet<vtkIdType, Hash<label> > hashUniqId(2*256);
+            HashSet<vtkIdType, Hash<label>> hashUniqId(2*256);
 
             forAll(cFaces, cFaceI)
             {
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.C
index 9598d5de4aed02ed2f61e23b1c682ff1840cc4c5..653d481d14809b91cb512c454e4f98625294c9cc 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.C
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.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
@@ -678,33 +678,33 @@ void Foam::vtkPV4Foam::updateInfoLagrangianFields()
         lagrangianPrefix/cloudName
     );
 
-    addToSelection<IOField<label> >
+    addToSelection<IOField<label>>
     (
         fieldSelection,
         objects
     );
-    addToSelection<IOField<scalar> >
+    addToSelection<IOField<scalar>>
     (
         fieldSelection,
         objects
     );
-    addToSelection<IOField<vector> >
+    addToSelection<IOField<vector>>
     (
         fieldSelection,
         objects
     );
-    addToSelection<IOField<sphericalTensor> >
+    addToSelection<IOField<sphericalTensor>>
     (
         fieldSelection,
 
         objects
     );
-    addToSelection<IOField<symmTensor> >
+    addToSelection<IOField<symmTensor>>
     (
         fieldSelection,
         objects
     );
-    addToSelection<IOField<tensor> >
+    addToSelection<IOField<tensor>>
     (
         fieldSelection,
         objects
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H
index b191e1c52bc5e969e87ea260f3ab3f1c69e649eb..0c659fffdd93a72c2a861b9eb24e4ac3447b110e 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.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
@@ -73,27 +73,27 @@ void Foam::vtkPV4Foam::updateInfoFields
     IOobjectList objects(dbPtr_(), dbPtr_().timeName(), regionPrefix);
 
     //- Add volume fields to GUI
-    addToSelection<GeometricField<scalar, patchType, meshType> >
+    addToSelection<GeometricField<scalar, patchType, meshType>>
     (
         select,
         objects
     );
-    addToSelection<GeometricField<vector, patchType, meshType> >
+    addToSelection<GeometricField<vector, patchType, meshType>>
     (
         select,
         objects
     );
-    addToSelection<GeometricField<sphericalTensor, patchType, meshType> >
+    addToSelection<GeometricField<sphericalTensor, patchType, meshType>>
     (
         select,
         objects
     );
-    addToSelection<GeometricField<symmTensor, patchType, meshType> >
+    addToSelection<GeometricField<symmTensor, patchType, meshType>>
     (
         select,
         objects
     );
-    addToSelection<GeometricField<tensor, patchType, meshType> >
+    addToSelection<GeometricField<tensor, patchType, meshType>>
     (
         select,
         objects
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H
index f4757a613732a9c38d14f46c9b18b21bfa28c6ab..9c836ef3973946d0301c2e670a6315fe914505c8 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.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
@@ -46,7 +46,7 @@ template<class Type>
 void Foam::vtkPV4Foam::convertVolFields
 (
     const fvMesh& mesh,
-    const PtrList<PrimitivePatchInterpolation<primitivePatch> >& ppInterpList,
+    const PtrList<PrimitivePatchInterpolation<primitivePatch>>& ppInterpList,
     const IOobjectList& objects,
     const bool interpFields,
     vtkMultiBlockDataSet* output
@@ -74,7 +74,7 @@ void Foam::vtkPV4Foam::convertVolFields
         );
 
         // Interpolated field (demand driven)
-        autoPtr<GeometricField<Type, pointPatchField, pointMesh> > ptfPtr;
+        autoPtr<GeometricField<Type, pointPatchField, pointMesh>> ptfPtr;
         if (interpFields)
         {
             if (debug)
@@ -144,7 +144,7 @@ void Foam::vtkPV4Foam::convertVolFields
 
             if
             (
-                isType<emptyFvPatchField<Type> >(ptf)
+                isType<emptyFvPatchField<Type>>(ptf)
              ||
                 (
                     reader_->GetExtrapolatePatches()
@@ -154,7 +154,7 @@ void Foam::vtkPV4Foam::convertVolFields
             {
                 fvPatch p(ptf.patch().patch(), tf.mesh().boundary());
 
-                tmp<Field<Type> > tpptf
+                tmp<Field<Type>> tpptf
                 (
                     fvPatchField<Type>(p, tf).patchInternalField()
                 );
@@ -284,7 +284,7 @@ template<class Type>
 void Foam::vtkPV4Foam::convertVolFieldBlock
 (
     const GeometricField<Type, fvPatchField, volMesh>& tf,
-    autoPtr<GeometricField<Type, pointPatchField, pointMesh> >& ptfPtr,
+    autoPtr<GeometricField<Type, pointPatchField, pointMesh>>& ptfPtr,
     vtkMultiBlockDataSet* output,
     const arrayRange& range,
     const List<polyDecomp>& decompLst
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
index 4988fc969f871553df55c3e3f5c36ab1ba092845..590306a3ea718e0ab4339e1e0667492d5a0fda93 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.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
@@ -125,7 +125,7 @@ int main(int argc, char *argv[])
     label nTracks = nParticle/sampleFrequency;
 
     // storage for all particle tracks
-    List<DynamicList<vector> > allTracks(nTracks);
+    List<DynamicList<vector>> allTracks(nTracks);
 
     Info<< "\nGenerating " << nTracks << " particle tracks for cloud "
         << cloudName << nl << endl;
@@ -211,7 +211,7 @@ int main(int argc, char *argv[])
             tracks[trackI].transfer(allTracks[trackI]);
         }
 
-        autoPtr<writer<scalar> > scalarFormatterPtr = writer<scalar>::New
+        autoPtr<writer<scalar>> scalarFormatterPtr = writer<scalar>::New
         (
             setFormat
         );
@@ -242,7 +242,7 @@ int main(int argc, char *argv[])
             true,           // writeTracks
             tracks,
             wordList(0),
-            List<List<scalarField> >(0),
+            List<List<scalarField>>(0),
             vtkTracks
         );
     }
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
index 4d2ab943acab92eacfedb38d57d1bb1c0e472c28..cc34e016912e0d9e0494401d5f664e7b80b94014 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.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
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
     fileName vtkPath(runTime.path()/"VTK");
     mkDir(vtkPath);
 
-    typedef HashTable<label, labelPair, labelPair::Hash<> > trackTableType;
+    typedef HashTable<label, labelPair, labelPair::Hash<>> trackTableType;
 
     forAll(timeDirs, timeI)
     {
@@ -202,8 +202,8 @@ int main(int argc, char *argv[])
             }
 
             // particle "age" property used to sort the tracks
-            List<SortableList<scalar> > agePerTrack(nTracks);
-            List<List<label> > particleMap(nTracks);
+            List<SortableList<scalar>> agePerTrack(nTracks);
+            List<List<label>> particleMap(nTracks);
 
             forAll(trackLengths, i)
             {
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C
index edf43c9a293a2e7a74791b16b00f798cd65011ec..8499dc509f176b50813dafbd9076da8d355545ce 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.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
@@ -42,7 +42,7 @@ bool fieldOk(const IOobjectList& cloudObjs, const word& name)
 
 
 template<class Type>
-tmp<Field<Type> > readParticleField
+tmp<Field<Type>> readParticleField
 (
     const word& name,
     const IOobjectList cloudObjs
@@ -54,7 +54,7 @@ tmp<Field<Type> > readParticleField
     if (obj != NULL)
     {
         IOField<Type> newField(*obj);
-        return tmp<Field<Type> >(new Field<Type>(newField.xfer()));
+        return tmp<Field<Type>>(new Field<Type>(newField.xfer()));
     }
 
     FatalErrorInFunction
@@ -68,7 +68,7 @@ tmp<Field<Type> > readParticleField
 template<class Type>
 void readFields
 (
-    PtrList<List<Type> >& values,
+    PtrList<List<Type>>& values,
     const List<word>& fieldNames,
     const IOobjectList& cloudObjs
 )
@@ -109,8 +109,8 @@ template<class Type>
 void writeVTKFields
 (
     OFstream& os,
-    const PtrList<List<Type> >& values,
-    const List<List<label> >& addr,
+    const PtrList<List<Type>>& values,
+    const List<List<label>>& addr,
     const List<word>& fieldNames
 )
 {
@@ -150,7 +150,7 @@ template<class Type>
 void processFields
 (
     OFstream& os,
-    const List<List<label> >& addr,
+    const List<List<label>>& addr,
     const List<word>& userFieldNames,
     const IOobjectList& cloudObjs
 )
@@ -170,7 +170,7 @@ void processFields
         }
         fieldNames.shrink();
 
-        PtrList<List<Type> > values(fieldNames.size());
+        PtrList<List<Type>> values(fieldNames.size());
         readFields<Type>(values, fieldNames, cloudObjs);
 
         writeVTKFields<Type>
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.H b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.H
index f3b5d48d2d2437c657534478cb5cf923bb0708fd..46c6ba91b385bf92e462a5ae5ee66a6061fc60e6 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.H
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.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
@@ -42,7 +42,7 @@ namespace Foam
     bool fieldOk(const IOobjectList& cloudObjs, const word& name);
 
     template<class Type>
-    tmp<Field<Type> > readParticleField
+    tmp<Field<Type>> readParticleField
     (
         const word& name,
         const IOobjectList cloudObjs
@@ -51,7 +51,7 @@ namespace Foam
     template<class Type>
     void readFields
     (
-        PtrList<List<Type> >& values,
+        PtrList<List<Type>>& values,
         const List<word>& fields,
         const IOobjectList& cloudObjs
     );
@@ -63,15 +63,15 @@ namespace Foam
     void writeVTKFields
     (
         OFstream& os,
-        const PtrList<List<Type> >& values,
-        const List<SortableList<scalar> >& agePerTrack,
+        const PtrList<List<Type>>& values,
+        const List<SortableList<scalar>>& agePerTrack,
         const List<word>& fieldNames
     );
 
     void processFields
     (
         OFstream& os,
-        const List<SortableList<scalar> >& agePerTrack,
+        const List<SortableList<scalar>>& agePerTrack,
         const List<word>& userFieldNames,
         const IOobjectList& cloudObjs
     );
diff --git a/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/dsmcFieldsCalc.C b/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/dsmcFieldsCalc.C
index b9c321b87a8b265c34b8c6f0264e0fcb9560a437..6059ebf5aa5f185b6777409bbce50d9e06f157e3 100644
--- a/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/dsmcFieldsCalc.C
+++ b/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/dsmcFieldsCalc.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
@@ -45,7 +45,7 @@ namespace Foam
     bool addFieldsToList
     (
         const fvMesh& mesh,
-        PtrList<GeometricField<Type, fvPatchField, volMesh> >& list,
+        PtrList<GeometricField<Type, fvPatchField, volMesh>>& list,
         const wordList& fieldNames
     )
     {
diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C
index c5d842237e157e1208c779215e883fd05129df00..3a62b622ef170f312f198dcb2bf130779a34b7d2 100644
--- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C
+++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,13 +57,13 @@ void processField
 
         forAll(bf, patchI)
         {
-            if (isA<externalCoupledMixedFvPatchField<Type> >(bf[patchI]))
+            if (isA<externalCoupledMixedFvPatchField<Type>>(bf[patchI]))
             {
                 Info<< "Generating external coupled geometry for field "
                     << fieldName << endl;
 
                 const externalCoupledMixedFvPatchField<Type>& pf =
-                    refCast<const externalCoupledMixedFvPatchField<Type> >
+                    refCast<const externalCoupledMixedFvPatchField<Type>>
                     (
                         bf[patchI]
                     );
diff --git a/applications/utilities/preProcessing/mapFields/MapLagrangianFields.H b/applications/utilities/preProcessing/mapFields/MapLagrangianFields.H
index 9244091d2e22cc5babf4a762d7c555655560370c..605f43090ae33a3273201c0bc264b63ff6d219ab 100644
--- a/applications/utilities/preProcessing/mapFields/MapLagrangianFields.H
+++ b/applications/utilities/preProcessing/mapFields/MapLagrangianFields.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
@@ -96,7 +96,7 @@ void MapLagrangianFields
 
     {
         IOobjectList fieldFields =
-            objects.lookupClass(IOField<Field<Type> >::typeName);
+            objects.lookupClass(IOField<Field<Type>>::typeName);
 
         forAllIter(IOobjectList, fieldFields, fieldIter)
         {
@@ -104,7 +104,7 @@ void MapLagrangianFields
                 << fieldIter()->name() << endl;
 
             // Read field (does not need mesh)
-            IOField<Field<Type> > fieldSource(*fieldIter());
+            IOField<Field<Type>> fieldSource(*fieldIter());
 
             // Map - use CompactIOField to automatically write in
             // compact form for binary format.
diff --git a/applications/utilities/preProcessing/mapFieldsPar/MapLagrangianFields.H b/applications/utilities/preProcessing/mapFieldsPar/MapLagrangianFields.H
index e0455221456ce198a574607ca734a93335ce4b0e..6b668fdd38e07971fb1aa4d83d51fe68bd50983f 100644
--- a/applications/utilities/preProcessing/mapFieldsPar/MapLagrangianFields.H
+++ b/applications/utilities/preProcessing/mapFieldsPar/MapLagrangianFields.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
@@ -95,7 +95,7 @@ void MapLagrangianFields
 
     {
         IOobjectList fieldFields =
-            objects.lookupClass(IOField<Field<Type> >::typeName);
+            objects.lookupClass(IOField<Field<Type>>::typeName);
 
         forAllIter(IOobjectList, fieldFields, fieldIter)
         {
@@ -104,7 +104,7 @@ void MapLagrangianFields
             Info<< "    mapping lagrangian fieldField " << fieldName << endl;
 
             // Read field (does not need mesh)
-            IOField<Field<Type> > fieldSource(*fieldIter());
+            IOField<Field<Type>> fieldSource(*fieldIter());
 
             // Map - use CompactIOField to automatically write in
             // compact form for binary format.
diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
index e01be739e1cbb2b54c19cecea7e9ab5f4933c85f..ed00d1a6cf33deb59aeff113a76b69b092c1dd9e 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
+++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
@@ -515,7 +515,7 @@ int main(int argc, char *argv[])
     // - construct distribute map
     // - renumber rayEndFace into compact addressing
 
-    List<Map<label> > compactMap(Pstream::nProcs());
+    List<Map<label>> compactMap(Pstream::nProcs());
 
     mapDistribute map(globalNumbering, rayEndFace, compactMap);
 
@@ -586,8 +586,8 @@ int main(int argc, char *argv[])
 
     pointField compactCoarseCf(map.constructSize(), pTraits<vector>::zero);
     pointField compactCoarseSf(map.constructSize(), pTraits<vector>::zero);
-    List<List<point> > compactFineSf(map.constructSize());
-    List<List<point> > compactFineCf(map.constructSize());
+    List<List<point>> compactFineSf(map.constructSize());
+    List<List<point>> compactFineCf(map.constructSize());
 
     DynamicList<label> compactPatchId(map.constructSize());
 
diff --git a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C
index 73d87c004bbe5a454ed29235bc029d17571920fe..7857569be374ebfbc911c11675cf83554f4e7cdc 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.C
+++ b/applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/general/general.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
@@ -144,7 +144,7 @@ Foam::tabulatedWallFunctions::general::general
     log10YPlus_(coeffDict_.lookup("log10YPlus")),
     log10UPlus_(coeffDict_.lookup("log10UPlus"))
 {
-    List<Tuple2<scalar, scalar> > inputTable = coeffDict_.lookup("inputTable");
+    List<Tuple2<scalar, scalar>> inputTable = coeffDict_.lookup("inputTable");
     if (inputTable.size() < 2)
     {
         FatalErrorInFunction
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index ea697d173367d9fed862dd5a35f0a82c9fcb106d..b539946bc630536db0a91baeab96ee6e2960e5f8 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.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
@@ -509,8 +509,8 @@ int main(int argc, char *argv[])
     (
         2*nFeatEds
     );
-    List<DynamicList<label> > edgeNormals(nFeatEds);
-    List<DynamicList<label> > normalDirections(nFeatEds);
+    List<DynamicList<label>> edgeNormals(nFeatEds);
+    List<DynamicList<label>> normalDirections(nFeatEds);
 
     forAllConstIter(labelPairLookup, inter.facePairToEdge(), iter)
     {
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index a763c90c29d5888f615ebf9c61c5e87842fb4b3d..542c9ba4afac9c4816fb6fa6ebc2e32a8bc770d8 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.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
@@ -1438,7 +1438,7 @@ int main(int argc, char *argv[])
             pointField end(searchSurf.faceCentres() + span*normals);
             const pointField& faceCentres = searchSurf.faceCentres();
 
-            List<List<pointIndexHit> > allHitInfo;
+            List<List<pointIndexHit>> allHitInfo;
 
             // Find all intersections (in order)
             searchSurf.findLineAll(start, end, allHitInfo);
diff --git a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
index 4c5a91d1080644a388f4b46445eb252f8723b0b0..b7c5ca03b2a3125727cda5f68b37781269df7d23 100644
--- a/applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
+++ b/applications/utilities/surface/surfaceHookUp/surfaceHookUp.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
@@ -151,7 +151,7 @@ void greenRefine
 void createBoundaryEdgeTrees
 (
     const PtrList<triSurfaceMesh>& surfs,
-    PtrList<indexedOctree<treeDataEdge> >& bEdgeTrees,
+    PtrList<indexedOctree<treeDataEdge>>& bEdgeTrees,
     labelListList& treeBoundaryEdges
 )
 {
@@ -325,11 +325,11 @@ int main(int argc, char *argv[])
         Info<< decrIndent;
     }
 
-    PtrList<indexedOctree<treeDataEdge> > bEdgeTrees(surfs.size());
+    PtrList<indexedOctree<treeDataEdge>> bEdgeTrees(surfs.size());
     labelListList treeBoundaryEdges(surfs.size());
 
-    List<DynamicList<labelledTri> > newFaces(surfs.size());
-    List<DynamicList<point> > newPoints(surfs.size());
+    List<DynamicList<labelledTri>> newFaces(surfs.size());
+    List<DynamicList<point>> newPoints(surfs.size());
     List<PackedBoolList> visitedFace(surfs.size());
 
     PtrList<triSurfaceMesh> newSurfaces(surfs.size());
diff --git a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
index 03195b46647e0dd2abb0a9a618d4dbab320ee71a..3d829e89030c61d2cdf499cae0881e3b401c436e 100644
--- a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
+++ b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.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 @@ using namespace Foam;
 void writeProcStats
 (
     const triSurface& s,
-    const List<List<treeBoundBox> >& meshBb
+    const List<List<treeBoundBox>>& meshBb
 )
 {
     // Determine surface bounding boxes, faces, points
@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
     Random rndGen(653213);
 
     // Determine mesh bounding boxes:
-    List<List<treeBoundBox> > meshBb(Pstream::nProcs());
+    List<List<treeBoundBox>> meshBb(Pstream::nProcs());
     {
         meshBb[Pstream::myProcNo()] = List<treeBoundBox>
         (
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
index 51aaab6669bdfbf54af50649173bffb25970131d..2e41a7870e38a0a561c8b03ea9bd9a3a0ba75614 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
+++ b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.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 @@ Description
 
 using namespace Foam;
 
-typedef species::thermo<janafThermo<perfectGas<specie> >, absoluteEnthalpy>
+typedef species::thermo<janafThermo<perfectGas<specie>>, absoluteEnthalpy>
     thermo;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
index 7af84242b9c3f5490c9187baa8d7eb5ec956dd28..478c2ae9f587d43db20f8ceadbb1c76a56b74233 100644
--- a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
+++ b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.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
@@ -46,7 +46,7 @@ Description
 
 using namespace Foam;
 
-typedef species::thermo<janafThermo<perfectGas<specie> >, absoluteEnthalpy>
+typedef species::thermo<janafThermo<perfectGas<specie>>, absoluteEnthalpy>
     thermo;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
index 4642bde45f519387963b1cb27ec3228533dc2148..cd1c35f07e502ade95928538b25a91b6e00a0261 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
+++ b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.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 @@ Description
 
 using namespace Foam;
 
-typedef species::thermo<janafThermo<perfectGas<specie> >, absoluteEnthalpy>
+typedef species::thermo<janafThermo<perfectGas<specie>>, absoluteEnthalpy>
     thermo;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
index 358bb7ab0fc7fed0dd0cb4c43565791802908775..c755532d65781541df32bcf0db10ae3e778a3a4b 100644
--- a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
+++ b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.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 @@ Description
 
 using namespace Foam;
 
-typedef species::thermo<janafThermo<perfectGas<specie> >, absoluteEnthalpy>
+typedef species::thermo<janafThermo<perfectGas<specie>>, absoluteEnthalpy>
     thermo;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/bin/foamNewBC b/bin/foamNewBC
index 12b894eda00e9768b44d5da0e03fea05dc21b81d..61e093d7a37007a35407d07b289ecd5aa9cfd380 100755
--- a/bin/foamNewBC
+++ b/bin/foamNewBC
@@ -3,7 +3,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
@@ -164,7 +164,7 @@ do
         -e "s#TWO#${TWO}#g" \
         -e "s#THREE#${THREE}#g" \
         -e "s#FOUR#${FOUR}#g" \
-        -e 's/>>/> >/g' \
+        -e 's/>>/>>/g' \
         ${DIR}/${F} > ${NAME}/${NEWFILE}
 
     case $BASE in
diff --git a/doc/codingStyleGuide.org b/doc/codingStyleGuide.org
index 29eb59145c66b79c1737c25cf60d3e94afd2202d..4a6a679d551f11c74cf99e396f99a157f0e624c0 100644
--- a/doc/codingStyleGuide.org
+++ b/doc/codingStyleGuide.org
@@ -256,7 +256,7 @@
     they are macros, they will fail if the iterated object contains
     any commas /e.g./ following will FAIL!:
     #+BEGIN_SRC C++
-    forAllIter(HashTable<labelPair, edge, Hash<edge> >, foo, iter)
+    forAllIter(HashTable<labelPair, edge, Hash<edge>>, foo, iter)
     #+END_SRC
     These convenience macros are also generally avoided in other
     container classes and OpenFOAM primitive classes.
diff --git a/etc/codeTemplates/BC/BC.H b/etc/codeTemplates/BC/BC.H
index 553a6c918353633c53d97b2187f911b56ee87b90..14bbcb76cf0bd0fdfc8423e842718798b9a19737 100644
--- a/etc/codeTemplates/BC/BC.H
+++ b/etc/codeTemplates/BC/BC.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
@@ -110,7 +110,7 @@ class CONSTRUCT
         FIELD fieldData_;
 
         //- Type specified as a function of time for time-varying BCs
-        autoPtr<DataEntry<TYPE> > timeVsData_;
+        autoPtr<DataEntry<TYPE>> timeVsData_;
 
         //- Word entry, e.g. pName_ for name of the pressure field on database
         word wordData_;
diff --git a/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H
index 0b90345029e54cc56b0553eb7cb5ffbcfa834e28..bbb46269ff592451c4ddcdc624b4f42d041aa36a 100644
--- a/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H
+++ b/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H
@@ -93,9 +93,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<${TemplateType}> > clone() const
+        virtual autoPtr<pointPatchField<${TemplateType}>> clone() const
         {
-            return autoPtr<pointPatchField<${TemplateType}> >
+            return autoPtr<pointPatchField<${TemplateType}>>
             (
                 new ${typeName}FixedValuePointPatch${FieldType}(*this)
             );
@@ -109,12 +109,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<${TemplateType}> > clone
+        virtual autoPtr<pointPatchField<${TemplateType}>> clone
         (
             const DimensionedField<${TemplateType}, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<${TemplateType}> >
+            return autoPtr<pointPatchField<${TemplateType}>>
             (
                 new ${typeName}FixedValuePointPatch${FieldType}(*this, iF)
             );
diff --git a/etc/codeTemplates/template/_TemplateTemplate.C b/etc/codeTemplates/template/_TemplateTemplate.C
index 41469f7b13d8772e8e2d8bb8d6090ac1ad0b5a01..5603c4959e2d2e822432fe39e8fa19cb8861404b 100644
--- a/etc/codeTemplates/template/_TemplateTemplate.C
+++ b/etc/codeTemplates/template/_TemplateTemplate.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
@@ -66,10 +66,10 @@ Foam::CLASSNAME<TemplateArgument>::CLASSNAME
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
 template<TemplateClassArgument>
-Foam::autoPtr<Foam::CLASSNAME<TemplateArgument> >
+Foam::autoPtr<Foam::CLASSNAME<TemplateArgument>>
 Foam::CLASSNAME<TemplateArgument>::New()
 {
-    return autoPtr<CLASSNAME<TemplateArgument> >
+    return autoPtr<CLASSNAME<TemplateArgument>>
     (
         new CLASSNAME<TemplateArgument>
     );
diff --git a/etc/codeTemplates/template/_TemplateTemplate.H b/etc/codeTemplates/template/_TemplateTemplate.H
index 8db7a0fc991a6a4f0b895a28790bf219915bec12..e070d3d6fb9d448ed7144279b79b52f85ff540be 100644
--- a/etc/codeTemplates/template/_TemplateTemplate.H
+++ b/etc/codeTemplates/template/_TemplateTemplate.H
@@ -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
@@ -108,7 +108,7 @@ public:
     // Selectors
 
         //- Select null constructed
-        static autoPtr<CLASSNAME<TemplateArgument> > New();
+        static autoPtr<CLASSNAME<TemplateArgument>> New();
 
 
     //- Destructor
diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
index 922a62415f320e5e3b6402aea3763a8df6a5f3bb..c38bdfa81460e34272015938303cd5672159e954 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.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
@@ -148,7 +148,7 @@ bool Foam::dynamicIndexedOctree<Type>::overlaps
 template<class Type>
 void Foam::dynamicIndexedOctree<Type>::divide
 (
-    const autoPtr<DynamicList<label> >& indices,
+    const autoPtr<DynamicList<label>>& indices,
     const treeBoundBox& bb,
     contentListList& result
 ) const
@@ -157,7 +157,7 @@ void Foam::dynamicIndexedOctree<Type>::divide
     {
         result.append
         (
-            autoPtr<DynamicList<label> >
+            autoPtr<DynamicList<label>>
             (
                 new DynamicList<label>(indices().size()/8)
             )
@@ -197,7 +197,7 @@ Foam::dynamicIndexedOctree<Type>::divide
     const label octantToBeDivided
 )
 {
-    const autoPtr<DynamicList<label> >& indices = contents_[contentI];
+    const autoPtr<DynamicList<label>>& indices = contents_[contentI];
 
     node nod;
 
@@ -226,7 +226,7 @@ Foam::dynamicIndexedOctree<Type>::divide
 
     for (direction octant = 0; octant < dividedIndices.size(); octant++)
     {
-        autoPtr<DynamicList<label> >& subIndices = dividedIndices[octant];
+        autoPtr<DynamicList<label>>& subIndices = dividedIndices[octant];
 
         if (subIndices().size())
         {
@@ -245,7 +245,7 @@ Foam::dynamicIndexedOctree<Type>::divide
 
                 contents_.append
                 (
-                    autoPtr<DynamicList<label> >
+                    autoPtr<DynamicList<label>>
                     (
                         new DynamicList<label>()
                     )
@@ -2677,7 +2677,7 @@ bool Foam::dynamicIndexedOctree<Type>::insert(label startIndex, label endIndex)
     {
         contents_.append
         (
-            autoPtr<DynamicList<label> >
+            autoPtr<DynamicList<label>>
             (
                 new DynamicList<label>(1)
             )
@@ -2771,7 +2771,7 @@ bool Foam::dynamicIndexedOctree<Type>::insertIndex
 
                 contents_.append
                 (
-                    autoPtr<DynamicList<label> >(new DynamicList<label>(1))
+                    autoPtr<DynamicList<label>>(new DynamicList<label>(1))
                 );
 
                 contents_[sz]().append(index);
diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
index 3c1d969c46f2eeff85be614a75b1687f8256c1ee..e80b526461da53ce41bc0963ae64684b86b97d64 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.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
@@ -50,7 +50,7 @@ SourceFiles
 namespace Foam
 {
 
-typedef DynamicList<autoPtr<DynamicList<label > > > contentListList;
+typedef DynamicList<autoPtr<DynamicList<label >>> contentListList;
 
 // Forward declaration of classes
 template<class Type> class dynamicIndexedOctree;
@@ -181,7 +181,7 @@ private:
             //  according to where they are in relation to mid.
             void divide
             (
-                const autoPtr<DynamicList<label> >& indices,
+                const autoPtr<DynamicList<label>>& indices,
                 const treeBoundBox& bb,
                 contentListList& result
             ) const;
@@ -435,9 +435,9 @@ public:
         );
 
         //- Clone
-        autoPtr<dynamicIndexedOctree<Type> > clone() const
+        autoPtr<dynamicIndexedOctree<Type>> clone() const
         {
-            return autoPtr<dynamicIndexedOctree<Type> >
+            return autoPtr<dynamicIndexedOctree<Type>>
             (
                 new dynamicIndexedOctree<Type>(*this)
             );
diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
index 9706ffc52fc7f63740127baad6b6df5b0e95c06a..3e2968117a7dac73640d7956664c94137cd28a22 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.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
@@ -127,7 +127,7 @@ void Foam::indexedOctree<Type>::divide
     labelListList& result
 ) const
 {
-    List<DynamicList<label> > subIndices(8);
+    List<DynamicList<label>> subIndices(8);
     for (direction octant = 0; octant < subIndices.size(); octant++)
     {
         subIndices[octant].setCapacity(indices.size()/8);
diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
index e111d4f4af725b66a146c52f565c6d858d5fd5b0..d1debf7f9f7617f12dacdf60857c6ba2db7fd800 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.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
@@ -434,9 +434,9 @@ public:
         indexedOctree(const Type& shapes, Istream& is);
 
         //- Clone
-        autoPtr<indexedOctree<Type> > clone() const
+        autoPtr<indexedOctree<Type>> clone() const
         {
-            return autoPtr<indexedOctree<Type> >
+            return autoPtr<indexedOctree<Type>>
             (
                 new indexedOctree<Type>(*this)
             );
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
index ffe4e8a76664a04fa975cf89a2c6ce6dfe6a7b49..513efd8c9bf35cf9e10cf6ff068dc948a2b8f19e 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
@@ -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
@@ -92,13 +92,13 @@ public:
         {}
 
         //- Construct by transferring the parameter contents
-        HashSet(const Xfer<HashSet<Key, Hash> >& hs)
+        HashSet(const Xfer<HashSet<Key, Hash>>& hs)
         :
             HashTable<nil, Key, Hash>(hs)
         {}
 
         //- Construct by transferring the parameter contents
-        HashSet(const Xfer<HashTable<nil, Key, Hash> >& hs)
+        HashSet(const Xfer<HashTable<nil, Key, Hash>>& hs)
         :
             HashTable<nil, Key, Hash>(hs)
         {}
@@ -208,7 +208,7 @@ HashSet<Key,Hash> operator^
 typedef HashSet<> wordHashSet;
 
 //- A HashSet with label keys.
-typedef HashSet<label, Hash<label> > labelHashSet;
+typedef HashSet<label, Hash<label>> labelHashSet;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
index 2ebab1e3a9da50d52c5e5a2c25def350400fd4e1..7e36d1eb6e5b1e8a293cedb7e8d1219751037dc9 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.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
@@ -78,7 +78,7 @@ Foam::HashTable<T, Key, Hash>::HashTable(const HashTable<T, Key, Hash>& ht)
 template<class T, class Key, class Hash>
 Foam::HashTable<T, Key, Hash>::HashTable
 (
-    const Xfer<HashTable<T, Key, Hash> >& ht
+    const Xfer<HashTable<T, Key, Hash>>& ht
 )
 :
     HashTableCore(),
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index 0b3218c40b6ae5fb2feb3f18da113b2f4621dc50..b24990f5c1318375237c7d39d94256654c3bbecc 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.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
@@ -205,7 +205,7 @@ public:
         HashTable(const HashTable<T, Key, Hash>&);
 
         //- Construct by transferring the parameter contents
-        HashTable(const Xfer<HashTable<T, Key, Hash> >&);
+        HashTable(const Xfer<HashTable<T, Key, Hash>>&);
 
 
     //- Destructor
@@ -290,7 +290,7 @@ public:
             void transfer(HashTable<T, Key, Hash>&);
 
             //- Transfer contents to the Xfer container
-            inline Xfer<HashTable<T, Key, Hash> > xfer();
+            inline Xfer<HashTable<T, Key, Hash>> xfer();
 
 
     // Member Operators
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
index 9839015f02ae77eafba2045b7610d2f4bdba4639..b3e3406da55f80362542f08e0da4ebfd38a6bef8 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.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
@@ -98,7 +98,7 @@ inline bool Foam::HashTable<T, Key, Hash>::set
 
 
 template<class T, class Key, class Hash>
-inline Foam::Xfer<Foam::HashTable<T, Key, Hash> >
+inline Foam::Xfer<Foam::HashTable<T, Key, Hash>>
 Foam::HashTable<T, Key, Hash>::xfer()
 {
     return xferMove(*this);
diff --git a/src/OpenFOAM/containers/HashTables/Map/Map.H b/src/OpenFOAM/containers/HashTables/Map/Map.H
index 61da5981fd623b9ce1dec4b31807afe49ca378c6..f9d6082eada09469bb9e24d6c42b8169742229f6 100644
--- a/src/OpenFOAM/containers/HashTables/Map/Map.H
+++ b/src/OpenFOAM/containers/HashTables/Map/Map.H
@@ -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
@@ -49,14 +49,14 @@ namespace Foam
 template<class T>
 class Map
 :
-    public HashTable<T, label, Hash<label> >
+    public HashTable<T, label, Hash<label>>
 {
 
 public:
 
-    typedef typename HashTable<T, label, Hash<label> >::iterator iterator;
+    typedef typename HashTable<T, label, Hash<label>>::iterator iterator;
 
-    typedef typename HashTable<T, label, Hash<label> >::const_iterator
+    typedef typename HashTable<T, label, Hash<label>>::const_iterator
         const_iterator;
 
     // Constructors
@@ -64,31 +64,31 @@ public:
         //- Construct given initial size
         Map(const label size = 128)
         :
-            HashTable<T, label, Hash<label> >(size)
+            HashTable<T, label, Hash<label>>(size)
         {}
 
         //- Construct from Istream
         Map(Istream& is)
         :
-            HashTable<T, label, Hash<label> >(is)
+            HashTable<T, label, Hash<label>>(is)
         {}
 
         //- Construct as copy
         Map(const Map<T>& map)
         :
-            HashTable<T, label, Hash<label> >(map)
+            HashTable<T, label, Hash<label>>(map)
         {}
 
         //- Construct by transferring the parameter contents
-        Map(const Xfer<Map<T> >& map)
+        Map(const Xfer<Map<T>>& map)
         :
-            HashTable<T, label, Hash<label> >(map)
+            HashTable<T, label, Hash<label>>(map)
         {}
 
         //- Construct by transferring the parameter contents
-        Map(const Xfer<HashTable<T, label, Hash<label> > >& map)
+        Map(const Xfer<HashTable<T, label, Hash<label>>>& map)
         :
-            HashTable<T, label, Hash<label> >(map)
+            HashTable<T, label, Hash<label>>(map)
         {}
 
 };
diff --git a/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H b/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H
index c225048b01564fb8cf106148bea172e1c318997e..89054f95a11f02e5e60179653069f72d9f375773 100644
--- a/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H
+++ b/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H
@@ -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
@@ -49,7 +49,7 @@ namespace Foam
 template<class T>
 class PtrMap
 :
-    public HashPtrTable<T, label, Hash<label> >
+    public HashPtrTable<T, label, Hash<label>>
 {
 
 public:
@@ -59,19 +59,19 @@ public:
         //- Construct given initial map size
         PtrMap(const label size = 128)
         :
-            HashPtrTable<T, label, Hash<label> >(size)
+            HashPtrTable<T, label, Hash<label>>(size)
         {}
 
         //- Construct from Istream
         PtrMap(Istream& is)
         :
-            HashPtrTable<T, label, Hash<label> >(is)
+            HashPtrTable<T, label, Hash<label>>(is)
         {}
 
         //- Construct as copy
         PtrMap(const PtrMap<T>& map)
         :
-            HashPtrTable<T, label, Hash<label> >(map)
+            HashPtrTable<T, label, Hash<label>>(map)
         {}
 };
 
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
index 2b1dacbc39cd99cd5bf9e8759a1a4927920a6f77..f4fe74840f8a945bfd2110fdee422aa369687075 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.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
@@ -97,7 +97,7 @@ Foam::StaticHashTable<T, Key, Hash>::StaticHashTable
 template<class T, class Key, class Hash>
 Foam::StaticHashTable<T, Key, Hash>::StaticHashTable
 (
-    const Xfer<StaticHashTable<T, Key, Hash> >& ht
+    const Xfer<StaticHashTable<T, Key, Hash>>& ht
 )
 :
     StaticHashTableCore(),
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
index d3372ed0e1901eefb58690d0cb2ef72b7228ed93..d10ae72bb41e0ee685b67d919d8ef0fc175ffa73 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.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
@@ -111,10 +111,10 @@ class StaticHashTable
     // Private data type for table entries
 
         //- The lookup keys, ordered per hash value
-        List<List<Key> > keys_;
+        List<List<Key>> keys_;
 
         //- For each key the corresponding object.
-        List<List<T> > objects_;
+        List<List<T>> objects_;
 
         //- The current number of elements in table
         label nElmts_;
@@ -178,7 +178,7 @@ public:
         StaticHashTable(const StaticHashTable<T, Key, Hash>&);
 
         //- Construct by transferring the parameter contents
-        StaticHashTable(const Xfer<StaticHashTable<T, Key, Hash> >&);
+        StaticHashTable(const Xfer<StaticHashTable<T, Key, Hash>>&);
 
 
     //- Destructor
@@ -246,7 +246,7 @@ public:
             void transfer(StaticHashTable<T, Key, Hash>&);
 
             //- Transfer contents to the Xfer container
-            inline Xfer<StaticHashTable<T, Key, Hash> > xfer();
+            inline Xfer<StaticHashTable<T, Key, Hash>> xfer();
 
 
     // Member Operators
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
index 49f84be2b480bcd42424fbefe4424577ee896830..50030eae9482f1147074b1a8c262c8209edac9f8 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.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
@@ -78,7 +78,7 @@ inline bool Foam::StaticHashTable<T, Key, Hash>::set
 
 
 template<class T, class Key, class Hash>
-inline Foam::Xfer<Foam::StaticHashTable<T, Key, Hash> >
+inline Foam::Xfer<Foam::StaticHashTable<T, Key, Hash>>
 Foam::StaticHashTable<T, Key, Hash>::xfer()
 {
     return xferMove(*this);
diff --git a/src/OpenFOAM/containers/Identifiers/Keyed/Keyed.H b/src/OpenFOAM/containers/Identifiers/Keyed/Keyed.H
index 70cb858119aa6f4eb5d9b7f44011b960855f645f..df695531de15a6405cb36920fada8ea49efc1ef6 100644
--- a/src/OpenFOAM/containers/Identifiers/Keyed/Keyed.H
+++ b/src/OpenFOAM/containers/Identifiers/Keyed/Keyed.H
@@ -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
@@ -69,14 +69,14 @@ public:
     // Static Members
 
         //- Add labels to a list of values
-        inline static List<Keyed<T> > createList
+        inline static List<Keyed<T>> createList
         (
             const List<T>&,
             const label key=0
         );
 
         //- Add labels to a list of values
-        inline static List<Keyed<T> > createList
+        inline static List<Keyed<T>> createList
         (
             const List<T>&,
             const labelUList& keys
diff --git a/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H b/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
index ed5edf6c8f9f8a859262890499ff23f6b2f0149b..d07aeb0f6af080661f00b9af7a180f72096287f6 100644
--- a/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
+++ b/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.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
@@ -75,10 +75,10 @@ inline Foam::label& Foam::Keyed<T>::key()
 
 
 template<class T>
-inline Foam::List<Foam::Keyed<T> >
+inline Foam::List<Foam::Keyed<T>>
 Foam::Keyed<T>::createList(const List<T>& lst, const label key)
 {
-    List<Keyed<T> > newList(lst.size());
+    List<Keyed<T>> newList(lst.size());
 
     forAll(lst, elemI)
     {
@@ -89,7 +89,7 @@ Foam::Keyed<T>::createList(const List<T>& lst, const label key)
 
 
 template<class T>
-inline Foam::List<Foam::Keyed<T> >
+inline Foam::List<Foam::Keyed<T>>
 Foam::Keyed<T>::createList(const List<T>& lst, const labelUList& keys)
 {
     if (lst.size() != keys.size())
@@ -101,7 +101,7 @@ Foam::Keyed<T>::createList(const List<T>& lst, const labelUList& keys)
             << abort(FatalError);
     }
 
-    List<Keyed<T> > newList(lst.size());
+    List<Keyed<T>> newList(lst.size());
 
     forAll(lst, elemI)
     {
diff --git a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
index 667a0f40cbfab01179fab006956f12b94ffc1f19..e436c1f0dc9c7e334313c7dbd355140f7f9b357a 100644
--- a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
+++ b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
@@ -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
@@ -73,7 +73,7 @@ public:
         (
             const UList<T>& posList,
             const UList<T>& negList,
-            const Xfer<List<label> >&
+            const Xfer<List<label>>&
         );
 
 
@@ -101,7 +101,7 @@ public:
 
             //- Reset addressing
             inline void resetAddressing(const labelUList&);
-            inline void resetAddressing(const Xfer<List<label> >&);
+            inline void resetAddressing(const Xfer<List<label>>&);
 
 
         // Member Operators
diff --git a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
index dcf70d41a5a3e1421eacebcf749d6f85165c2ceb..1f1dd4de5b3df3555f17cedef0f99d933f66c291 100644
--- a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
+++ b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.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
@@ -44,7 +44,7 @@ inline Foam::BiIndirectList<T>::BiIndirectList
 (
     const UList<T>& posList,
     const UList<T>& negList,
-    const Xfer<List<label> >& addr
+    const Xfer<List<label>>& addr
 )
 :
     posList_(const_cast<UList<T>&>(posList)),
@@ -104,7 +104,7 @@ inline void Foam::BiIndirectList<T>::resetAddressing
 template<class T>
 inline void Foam::BiIndirectList<T>::resetAddressing
 (
-    const Xfer<List<label> >& addr
+    const Xfer<List<label>>& addr
 )
 {
     addressing_.transfer(addr());
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
index 4e18ee617614be3e049e3ed43d584208409a7b5a..164069d2fa9b03e6964c43df1685218a8d0399e4 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.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
@@ -102,7 +102,7 @@ Foam::CompactListList<T, Container>::CompactListList
 template<class T, class Container>
 Foam::CompactListList<T, Container>::CompactListList
 (
-    const Xfer<CompactListList<T, Container> >& lst
+    const Xfer<CompactListList<T, Container>>& lst
 )
 {
     transfer(lst());
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
index fe0e33da2dc8b39bc2114df5405aa393eb8bc067..5cfa0a07f295b2fac5849235a9d057167e840e95 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.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
@@ -76,7 +76,7 @@ template<class T, class Container> Ostream& operator<<
                        Class CompactListList Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class T, class Container = List<T> >
+template<class T, class Container = List<T>>
 class CompactListList
 {
     // Private data
@@ -102,7 +102,7 @@ public:
         //- Null constructor.
         inline CompactListList();
 
-        //- Construct by converting given List<List<T> >
+        //- Construct by converting given List<List<T>>
         explicit CompactListList(const List<Container>&);
 
         //- Construct given size of offset table (number of rows)
@@ -120,7 +120,7 @@ public:
         CompactListList(const labelUList& rowSizes, const T&);
 
         //- Construct by transferring the parameter contents
-        explicit CompactListList(const Xfer<CompactListList<T, Container> >&);
+        explicit CompactListList(const Xfer<CompactListList<T, Container>>&);
 
         //- Construct as copy or re-use as specified.
         CompactListList(CompactListList<T, Container>&, bool reUse);
@@ -129,7 +129,7 @@ public:
         CompactListList(Istream&);
 
         //- Clone
-        inline autoPtr<CompactListList<T, Container> > clone() const;
+        inline autoPtr<CompactListList<T, Container>> clone() const;
 
 
     // Member Functions
@@ -194,7 +194,7 @@ public:
             void transfer(CompactListList<T, Container>&);
 
             //- Transfer the contents to the Xfer container
-            inline Xfer<CompactListList<T, Container> > xfer();
+            inline Xfer<CompactListList<T, Container>> xfer();
 
         // Other
 
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
index c426fd151cca90aa03e84272a00b11eef98c3ee9..4abf8489155ec11c9682eac94bd01a79f18f4821 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.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
@@ -63,10 +63,10 @@ inline Foam::CompactListList<T, Container>::CompactListList
 
 
 template<class T, class Container>
-inline Foam::autoPtr<Foam::CompactListList<T, Container> >
+inline Foam::autoPtr<Foam::CompactListList<T, Container>>
 Foam::CompactListList<T, Container>::clone() const
 {
-    return autoPtr<CompactListList<T, Container> >
+    return autoPtr<CompactListList<T, Container>>
     (
         new CompactListList<T, Container>(*this)
     );
@@ -79,7 +79,7 @@ template<class T, class Container>
 inline const Foam::CompactListList<T, Container>&
 Foam::CompactListList<T, Container>::null()
 {
-    return NullObjectRef<CompactListList<T, Container> >();
+    return NullObjectRef<CompactListList<T, Container>>();
 }
 
 
@@ -165,7 +165,7 @@ inline Foam::label Foam::CompactListList<T, Container>::whichColumn
 
 
 template<class T, class Container>
-inline Foam::Xfer<Foam::CompactListList<T, Container> >
+inline Foam::Xfer<Foam::CompactListList<T, Container>>
 Foam::CompactListList<T, Container>::xfer()
 {
     return xferMove(*this);
diff --git a/src/OpenFOAM/containers/Lists/Distribution/Distribution.H b/src/OpenFOAM/containers/Lists/Distribution/Distribution.H
index 0faff2764c28c8c92bfeccbc428de5a8e9dc4a5d..89e9eb5cd4053b00233428eded99b6e239639a90 100644
--- a/src/OpenFOAM/containers/Lists/Distribution/Distribution.H
+++ b/src/OpenFOAM/containers/Lists/Distribution/Distribution.H
@@ -125,18 +125,18 @@ public:
 
         //- Return the normalised distribution (probability density)
         //  and bins
-        List<List<Pair<scalar>> > normalised() const;
+        List<List<Pair<scalar>>> normalised() const;
 
         //- Return the distribution of the total bin weights
-        List<List < Pair<scalar> > > raw() const;
+        List<List < Pair<scalar>>> raw() const;
 
         //- Return the cumulative normalised distribution and
         //  integration locations (at end of bins)
-        List<List<Pair<scalar>> > cumulativeNormalised() const;
+        List<List<Pair<scalar>>> cumulativeNormalised() const;
 
         //- Return the cumulative total bin weights and integration
         //  locations (at end of bins)
-        List<List<Pair<scalar>> > cumulativeRaw() const;
+        List<List<Pair<scalar>>> cumulativeRaw() const;
 
         //- Resets the Distribution by clearing the stored lists.
         //  Leaves the same number of them and the same binWidth.
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
index 0d9621c50dcc1081ca5e104fd39cc53b85ccd52a..e4a0b14253485edbcce08d2b431f43b179bd73ec 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
@@ -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
@@ -115,7 +115,7 @@ public:
         explicit inline DynamicList(const UIndirectList<T>&);
 
         //- Construct by transferring the parameter contents
-        explicit inline DynamicList(const Xfer<List<T> >&);
+        explicit inline DynamicList(const Xfer<List<T>>&);
 
         //- Construct from Istream. Size set to size of list read.
         explicit DynamicList(Istream&);
@@ -178,7 +178,7 @@ public:
             inline void transfer(DynamicList<T, SizeInc, SizeMult, SizeDiv>&);
 
             //- Transfer contents to the Xfer container as a plain List
-            inline Xfer<List<T> > xfer();
+            inline Xfer<List<T>> xfer();
 
 
         // Member Operators
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
index 80323a7b730e4ce224bdf88cbc9d8ebb8b755c3e..802cf9b17ab7d9f6ce38d83fdeabbe4271f559e4 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
@@ -85,7 +85,7 @@ inline Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::DynamicList
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 inline Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::DynamicList
 (
-    const Xfer<List<T> >& lst
+    const Xfer<List<T>>& lst
 )
 :
     List<T>(lst),
@@ -297,7 +297,7 @@ Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::transfer
 
 
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
-inline Foam::Xfer<Foam::List<T> >
+inline Foam::Xfer<Foam::List<T>>
 Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::xfer()
 {
     return xferMoveTo<List<T>>(*this);
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
index fa69e0a646e2bd7e8ff61834aa4d33d6de23df2d..ed0fbc12b2d9789f49fdb32d47b94440acfb6852 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
@@ -83,7 +83,7 @@ public:
 
     //- Hashing function class.
     //  Use Hasher directly for contiguous data. Otherwise hash incrementally.
-    template<class HashT=Hash<T> >
+    template<class HashT=Hash<T>>
     class Hash
     {
     public:
@@ -127,7 +127,7 @@ public:
         FixedList(Istream&);
 
         //- Clone
-        inline autoPtr<FixedList<T, Size> > clone() const;
+        inline autoPtr<FixedList<T, Size>> clone() const;
 
 
     // Member Functions
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
index 16f7f1b16d31c510b5bc012f64c6dced06d9146e..a6470695997dbb26020d20552637c2e9d248d429 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
@@ -95,10 +95,10 @@ inline Foam::FixedList<T, Size>::FixedList(const FixedList<T, Size>& lst)
 
 
 template<class T, unsigned Size>
-inline Foam::autoPtr<Foam::FixedList<T, Size> >
+inline Foam::autoPtr<Foam::FixedList<T, Size>>
 Foam::FixedList<T, Size>::clone() const
 {
-    return autoPtr<FixedList<T, Size> >(new FixedList<T, Size>(*this));
+    return autoPtr<FixedList<T, Size>>(new FixedList<T, Size>(*this));
 }
 
 
@@ -107,7 +107,7 @@ Foam::FixedList<T, Size>::clone() const
 template<class T, unsigned Size>
 inline const Foam::FixedList<T, Size>& Foam::FixedList<T, Size>::null()
 {
-    return NullObjectRef<FixedList<T, Size> >();
+    return NullObjectRef<FixedList<T, Size>>();
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C b/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C
index 62e801dd986edb956683e450c996f0c4135831a7..2bf821a369e8717aa9297caa0226c281df6bae20 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.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
@@ -54,7 +54,7 @@ Foam::Istream& Foam::operator>>(Foam::Istream& is, FixedList<T, Size>& L)
 
         if (firstToken.isCompound())
         {
-            L = dynamicCast<token::Compound<List<T> > >
+            L = dynamicCast<token::Compound<List<T>>>
             (
                 firstToken.transferCompoundToken(is)
             );
diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
index 4af62fc864e24ba68e235cbc246231aa8d5df2a2..1d554d7d7e972d4e5e86d998fc9abe0e20dbf3b7 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
+++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
@@ -76,7 +76,7 @@ protected:
         explicit inline IndirectListAddressing(const labelUList& addr);
 
         //- Construct by transferring addressing array
-        explicit inline IndirectListAddressing(const Xfer<List<label> >& addr);
+        explicit inline IndirectListAddressing(const Xfer<List<label>>& addr);
 
 
     // Member Functions
@@ -90,7 +90,7 @@ protected:
 
             //- Reset addressing
             inline void resetAddressing(const labelUList&);
-            inline void resetAddressing(const Xfer<List<label> >&);
+            inline void resetAddressing(const Xfer<List<label>>&);
 
 };
 
@@ -122,7 +122,7 @@ public:
         inline IndirectList(const UList<T>&, const labelUList&);
 
         //- Construct given the complete list and by transferring addressing
-        inline IndirectList(const UList<T>&, const Xfer<List<label> >&);
+        inline IndirectList(const UList<T>&, const Xfer<List<label>>&);
 
         //- Copy constructor
         inline IndirectList(const IndirectList<T>&);
diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
index b8374b02262923704aae6d806c5b738a22af9f17..068b38ed9d21da56dbdff749bbd1baa1c9f3e037 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
+++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
@@ -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
@@ -37,7 +37,7 @@ inline Foam::IndirectListAddressing::IndirectListAddressing
 
 inline Foam::IndirectListAddressing::IndirectListAddressing
 (
-    const Xfer<List<label> >& addr
+    const Xfer<List<label>>& addr
 )
 :
     addressing_(addr)
@@ -64,7 +64,7 @@ template<class T>
 inline Foam::IndirectList<T>::IndirectList
 (
     const UList<T>& completeList,
-    const Xfer<List<label> >& addr
+    const Xfer<List<label>>& addr
 )
 :
     IndirectListAddressing(addr),
@@ -126,7 +126,7 @@ inline void Foam::IndirectListAddressing::resetAddressing
 
 inline void Foam::IndirectListAddressing::resetAddressing
 (
-    const Xfer<List<label> >& addr
+    const Xfer<List<label>>& addr
 )
 {
     addressing_.transfer(addr());
diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C
index e184284d82305bdeced682bc0bdd6cbc9c923197..cd766c8ed191ea995c327671eca3017165163480 100644
--- a/src/OpenFOAM/containers/Lists/List/List.C
+++ b/src/OpenFOAM/containers/Lists/List/List.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
@@ -113,7 +113,7 @@ Foam::List<T>::List(const List<T>& a)
 
 // Construct by transferring the parameter contents
 template<class T>
-Foam::List<T>::List(const Xfer<List<T> >& lst)
+Foam::List<T>::List(const Xfer<List<T>>& lst)
 {
     transfer(lst());
 }
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index 0523b55b7503ad42dabc2eaa8d1f2971319466dd..ba1e75ad1f307d9857a308e163db4160e6370ed2 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.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
@@ -109,7 +109,7 @@ public:
         List(const List<T>&);
 
         //- Construct by transferring the parameter contents
-        List(const Xfer<List<T> >&);
+        List(const Xfer<List<T>>&);
 
         //- Construct as copy or re-use as specified.
         List(List<T>&, bool reUse);
@@ -141,7 +141,7 @@ public:
         List(Istream&);
 
         //- Clone
-        inline autoPtr<List<T> > clone() const;
+        inline autoPtr<List<T>> clone() const;
 
 
     //- Destructor
@@ -200,7 +200,7 @@ public:
             void transfer(SortableList<T>&);
 
             //- Transfer contents to the Xfer container
-            inline Xfer<List<T> > xfer();
+            inline Xfer<List<T>> xfer();
 
             //- Return subscript-checked element of UList.
             inline T& newElmt(const label);
diff --git a/src/OpenFOAM/containers/Lists/List/ListI.H b/src/OpenFOAM/containers/Lists/List/ListI.H
index f304da6e218a7dcf3512cc8ddd954f695e602ed1..1d1e9912441dab2fe7f5dae268a3977d85832447 100644
--- a/src/OpenFOAM/containers/Lists/List/ListI.H
+++ b/src/OpenFOAM/containers/Lists/List/ListI.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
@@ -31,9 +31,9 @@ inline Foam::List<T>::List()
 
 
 template<class T>
-inline Foam::autoPtr<Foam::List<T> > Foam::List<T>::clone() const
+inline Foam::autoPtr<Foam::List<T>> Foam::List<T>::clone() const
 {
-    return autoPtr<List<T> >(new List<T>(*this));
+    return autoPtr<List<T>>(new List<T>(*this));
 }
 
 
@@ -42,7 +42,7 @@ inline Foam::autoPtr<Foam::List<T> > Foam::List<T>::clone() const
 template<class T>
 inline const Foam::List<T>& Foam::List<T>::null()
 {
-    return NullObjectRef<List<T> >();
+    return NullObjectRef<List<T>>();
 }
 
 
@@ -87,7 +87,7 @@ inline Foam::label Foam::List<T>::size() const
 
 
 template<class T>
-inline Foam::Xfer<Foam::List<T> > Foam::List<T>::xfer()
+inline Foam::Xfer<Foam::List<T>> Foam::List<T>::xfer()
 {
     return xferMove(*this);
 }
diff --git a/src/OpenFOAM/containers/Lists/List/ListIO.C b/src/OpenFOAM/containers/Lists/List/ListIO.C
index 4480234cd0996705c0144b814142d02dbdb3df20..97d338470bfecb3b6fb21146cdb16752ed84b790 100644
--- a/src/OpenFOAM/containers/Lists/List/ListIO.C
+++ b/src/OpenFOAM/containers/Lists/List/ListIO.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
@@ -57,7 +57,7 @@ Foam::Istream& Foam::operator>>(Istream& is, List<T>& L)
     {
         L.transfer
         (
-            dynamicCast<token::Compound<List<T> > >
+            dynamicCast<token::Compound<List<T>>>
             (
                 firstToken.transferCompoundToken(is)
             )
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
index 4909cf9240623ee4613ef969acf59db85ca11bd0..904d6f16440e64a5985fbd76e549be205a3dd9db 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.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,7 +112,7 @@ public:
         inline PackedBoolList(const Xfer<PackedBoolList>&);
 
         //- Construct by transferring the parameter contents
-        inline PackedBoolList(const Xfer<PackedList<1> >&);
+        inline PackedBoolList(const Xfer<PackedList<1>>&);
 
         //- Construct from a list of bools
         explicit inline PackedBoolList(const Foam::UList<bool>&);
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
index 3a76fdc65cfb0f7ad74fc0076697b58ebd508dce..772ef763d3cd2de254a33f4498adf3743316245f 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
@@ -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
@@ -67,7 +67,7 @@ inline Foam::PackedBoolList::PackedBoolList(const Xfer<PackedBoolList>& lst)
 }
 
 
-inline Foam::PackedBoolList::PackedBoolList(const Xfer<PackedList<1> >& lst)
+inline Foam::PackedBoolList::PackedBoolList(const Xfer<PackedList<1>>& lst)
 :
     PackedList<1>(lst)
 {}
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
index 1766cbe028e6cc4e867d7600e15cbe47be1d2fe6..8b44cc362bf2a91febca667f20e205ba72776e32 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
@@ -226,7 +226,7 @@ public:
         inline PackedList(const PackedList<nBits>&);
 
         //- Construct by transferring the parameter contents
-        inline PackedList(const Xfer<PackedList<nBits> >&);
+        inline PackedList(const Xfer<PackedList<nBits>>&);
 
         //- Construct from a list of labels
         explicit inline PackedList(const labelUList&);
@@ -344,7 +344,7 @@ public:
             inline void transfer(PackedList<nBits>&);
 
             //- Transfer contents to the Xfer container
-            inline Xfer<PackedList<nBits> > xfer();
+            inline Xfer<PackedList<nBits>> xfer();
 
 
         // IO
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
index 01f21e37adf1e45f2796641996e692234663cf8d..e4a56f9b701213eb9381bc270d5283c067e9fad2 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.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
@@ -222,7 +222,7 @@ inline Foam::PackedList<nBits>::PackedList(const PackedList<nBits>& lst)
 
 
 template<unsigned nBits>
-inline Foam::PackedList<nBits>::PackedList(const Xfer<PackedList<nBits> >& lst)
+inline Foam::PackedList<nBits>::PackedList(const Xfer<PackedList<nBits>>& lst)
 {
     transfer(lst());
 }
@@ -257,10 +257,10 @@ inline Foam::PackedList<nBits>::PackedList(const UIndirectList<label>& lst)
 
 
 template<unsigned nBits>
-inline Foam::autoPtr<Foam::PackedList<nBits> >
+inline Foam::autoPtr<Foam::PackedList<nBits>>
 Foam::PackedList<nBits>::clone() const
 {
-    return autoPtr<PackedList<nBits> >(new PackedList<nBits>(*this));
+    return autoPtr<PackedList<nBits>>(new PackedList<nBits>(*this));
 }
 
 
@@ -954,7 +954,7 @@ inline void Foam::PackedList<nBits>::transfer(PackedList<nBits>& lst)
 
 
 template<unsigned nBits>
-inline Foam::Xfer<Foam::PackedList<nBits> > Foam::PackedList<nBits>::xfer()
+inline Foam::Xfer<Foam::PackedList<nBits>> Foam::PackedList<nBits>::xfer()
 {
     return xferMove(*this);
 }
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
index db29382769a6c8c393e724298c8bb2ea1f358f55..d526142159e2d11f03b2f99f40552c4161f86d59 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.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
@@ -70,7 +70,7 @@ Foam::PtrList<T>::PtrList(const PtrList<T>& a, const CloneArg& cloneArg)
 
 
 template<class T>
-Foam::PtrList<T>::PtrList(const Xfer<PtrList<T> >& lst)
+Foam::PtrList<T>::PtrList(const Xfer<PtrList<T>>& lst)
 {
     transfer(lst());
 }
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
index b3b2924d9f8becac800ae3607f24d50e66ca4784..80b751c22055aaf4a3c1f270e59b46c2b148e835 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.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
@@ -158,7 +158,7 @@ public:
         PtrList(const PtrList<T>&, const CloneArg&);
 
         //- Construct by transferring the parameter contents
-        PtrList(const Xfer<PtrList<T> >&);
+        PtrList(const Xfer<PtrList<T>>&);
 
         //- Construct as copy or re-use as specified.
         PtrList(PtrList<T>&, bool reUse);
@@ -224,7 +224,7 @@ public:
             void transfer(PtrList<T>&);
 
             //- Transfer contents to the Xfer container
-            inline Xfer<PtrList<T> > xfer();
+            inline Xfer<PtrList<T>> xfer();
 
             //- Is element set
             inline bool set(const label) const;
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H b/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
index c9065e8c46b4ee423265d4d2f0d07a0eaa394949..2913f19106eb2fc88681ce993a4b866ffbfa7f70 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrListI.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
@@ -142,7 +142,7 @@ inline Foam::autoPtr<T> Foam::PtrList<T>::set
 
 
 template<class T>
-inline Foam::Xfer<Foam::PtrList<T> > Foam::PtrList<T>::xfer()
+inline Foam::Xfer<Foam::PtrList<T>> Foam::PtrList<T>::xfer()
 {
     return xferMove(*this);
 }
diff --git a/src/OpenFOAM/containers/Lists/SortableList/SortableList.C b/src/OpenFOAM/containers/Lists/SortableList/SortableList.C
index d610a56a04cdf408325dcb8a8b1b805d53945563..784b1f9e1d64828e884f752143690bb1a5a3d9fa 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/SortableList.C
+++ b/src/OpenFOAM/containers/Lists/SortableList/SortableList.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
@@ -42,7 +42,7 @@ Foam::SortableList<T>::SortableList(const UList<T>& values)
 
 
 template<class T>
-Foam::SortableList<T>::SortableList(const Xfer<List<T> >& values)
+Foam::SortableList<T>::SortableList(const Xfer<List<T>>& values)
 :
     List<T>(values)
 {
@@ -122,9 +122,9 @@ void Foam::SortableList<T>::reverseSort()
 
 
 template<class T>
-Foam::Xfer<Foam::List<T> > Foam::SortableList<T>::xfer()
+Foam::Xfer<Foam::List<T>> Foam::SortableList<T>::xfer()
 {
-    return xferMoveTo<List<T> >(*this);
+    return xferMoveTo<List<T>>(*this);
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/SortableList/SortableList.H b/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
index 2d7b31a9e89ff315670d6608d23882528294d985..56fa2e20c1b0bacfe0b883bee18bdf4cc231cb83 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
+++ b/src/OpenFOAM/containers/Lists/SortableList/SortableList.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
@@ -71,7 +71,7 @@ public:
         explicit SortableList(const UList<T>&);
 
         //- Construct from transferred List, sorting immediately.
-        explicit SortableList(const Xfer<List<T> >&);
+        explicit SortableList(const Xfer<List<T>>&);
 
         //- Construct given size. Sort later on.
         //  The indices remain empty until the list is sorted
@@ -113,7 +113,7 @@ public:
         void reverseSort();
 
         //- Transfer contents to the Xfer container as a plain List
-        inline Xfer<List<T> > xfer();
+        inline Xfer<List<T>> xfer();
 
 
     // Member Operators
diff --git a/src/OpenFOAM/containers/Lists/SubList/SubListI.H b/src/OpenFOAM/containers/Lists/SubList/SubListI.H
index ce8b19e59273d3a42fe9026b1694a99fbe6a0b3a..a0b9f32807330f3b40568ca7cb2ce57f957a888f 100644
--- a/src/OpenFOAM/containers/Lists/SubList/SubListI.H
+++ b/src/OpenFOAM/containers/Lists/SubList/SubListI.H
@@ -74,7 +74,7 @@ inline Foam::SubList<T>::SubList
 template<class T>
 inline const Foam::SubList<T>& Foam::SubList<T>::null()
 {
-    return NullObjectRef<SubList<T> >();
+    return NullObjectRef<SubList<T>>();
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/UList/UListI.H b/src/OpenFOAM/containers/Lists/UList/UListI.H
index aaf526d636c76a2044fc3219c42d9e87667e48ba..523abb2d29d004878614f828f38fe467a6a81753 100644
--- a/src/OpenFOAM/containers/Lists/UList/UListI.H
+++ b/src/OpenFOAM/containers/Lists/UList/UListI.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
@@ -50,7 +50,7 @@ inline Foam::UList<T>::UList(T* __restrict__ v, label size)
 template<class T>
 inline const Foam::UList<T>& Foam::UList<T>::null()
 {
-    return NullObjectRef<UList<T> >();
+    return NullObjectRef<UList<T>>();
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/UList/UListIO.C b/src/OpenFOAM/containers/Lists/UList/UListIO.C
index bb888a7fd276d4fd65e1d7068e51310ba42c8953..e31b5dd2bcc1933483b32dde4428a58b8d1c4ab7 100644
--- a/src/OpenFOAM/containers/Lists/UList/UListIO.C
+++ b/src/OpenFOAM/containers/Lists/UList/UListIO.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
@@ -152,7 +152,7 @@ Foam::Istream& Foam::operator>>(Istream& is, UList<T>& L)
         List<T> elems;
         elems.transfer
         (
-            dynamicCast<token::Compound<List<T> > >
+            dynamicCast<token::Compound<List<T>>>
             (
                 firstToken.transferCompoundToken(is)
             )
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
index 139877c409e903b97c1e5c8323c932983621140d..3a6a7c2d9630d39b4ff2a86c26e3f93cc7904a31 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.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::UPtrList<T>::UPtrList(const label s)
 
 
 template<class T>
-Foam::UPtrList<T>::UPtrList(const Xfer<UPtrList<T> >& lst)
+Foam::UPtrList<T>::UPtrList(const Xfer<UPtrList<T>>& lst)
 {
     transfer(lst());
 }
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
index cdf32f630ae7b78210a4fa54398801843f8e49b2..02aee9f141f659e0741bc0cdd39b965a658b9846 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
@@ -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
@@ -110,7 +110,7 @@ public:
         explicit UPtrList(const label);
 
         //- Construct by transferring the parameter contents
-        UPtrList(const Xfer<UPtrList<T> >&);
+        UPtrList(const Xfer<UPtrList<T>>&);
 
         //- Construct as copy or re-use as specified.
         UPtrList(UPtrList<T>&, bool reUse);
@@ -159,7 +159,7 @@ public:
             void transfer(UPtrList<T>&);
 
             //- Transfer contents to the Xfer container
-            inline Xfer<UPtrList<T> > xfer();
+            inline Xfer<UPtrList<T>> xfer();
 
             //- Is element set
             inline bool set(const label) const;
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.H b/src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.H
index 2f69d169299a818876f516d105b270351e0c63b9..7162cd5c3d7cf0fb084658bc49eb4f23483a3260 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.H
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.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
@@ -93,7 +93,7 @@ inline T* Foam::UPtrList<T>::set(const label i, T* ptr)
 
 
 template<class T>
-inline Foam::Xfer<Foam::UPtrList<T> > Foam::UPtrList<T>::xfer()
+inline Foam::Xfer<Foam::UPtrList<T>> Foam::UPtrList<T>::xfer()
 {
     return xferMove(*this);
 }
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C
index 9cdaf8de8891a597061a8c2eb38f42c219fbc151..c5e369b1cf2446dea1953117fa350d5aa6ed67f7 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C
+++ b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.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
@@ -127,7 +127,7 @@ template<class T, class BaseType>
 Foam::CompactIOField<T, BaseType>::CompactIOField
 (
     const IOobject& io,
-    const Xfer<Field<T> >& list
+    const Xfer<Field<T>>& list
 )
 :
     regIOobject(io)
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H
index 31edac7970051368473c1e3e634e902f40ebef4e..f7bdf4b48ce701a655ad29518d0ef22c3544e83a 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H
+++ b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H
@@ -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
@@ -95,7 +95,7 @@ public:
         CompactIOField(const IOobject&, const Field<T>&);
 
         //- Construct by transferring the Field contents
-        CompactIOField(const IOobject&, const Xfer<Field<T> >&);
+        CompactIOField(const IOobject&, const Xfer<Field<T>>&);
 
 
     // Destructor
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
index 5d7756dd42f8e74bb3723de10684568685faf053..b742b293b1a97f1352d72a421bd72a7b2cc79d0a 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C
+++ b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.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
@@ -127,7 +127,7 @@ template<class T, class BaseType>
 Foam::CompactIOList<T, BaseType>::CompactIOList
 (
     const IOobject& io,
-    const Xfer<List<T> >& list
+    const Xfer<List<T>>& list
 )
 :
     regIOobject(io)
diff --git a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
index dc06092c59758ed0a941f9cf8c6ee19a69d8eda7..7c8628ef1c74f9ac6677d9471d9b9a9fb0f689cb 100644
--- a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
+++ b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H
@@ -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
@@ -97,7 +97,7 @@ public:
         CompactIOList(const IOobject&, const List<T>&);
 
         //- Construct by transferring the List contents
-        CompactIOList(const IOobject&, const Xfer<List<T> >&);
+        CompactIOList(const IOobject&, const Xfer<List<T>>&);
 
 
     // Destructor
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.C b/src/OpenFOAM/db/IOobjects/IOField/IOField.C
index 9d47700da8f0dabf46e79283d1a4c877b6f4c939..5002c32f2a0e260834051b60309ef834883360bf 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.C
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.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
@@ -126,7 +126,7 @@ Foam::IOField<Type>::IOField(const IOobject& io, const Field<Type>& f)
 
 
 template<class Type>
-Foam::IOField<Type>::IOField(const IOobject& io, const Xfer<Field<Type> >& f)
+Foam::IOField<Type>::IOField(const IOobject& io, const Xfer<Field<Type>>& f)
 :
     regIOobject(io)
 {
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.H b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
index 5c18b4e4ffc3823abe620d2fb299114b8c36c8b3..29768ee62ddd5d7110fc64c02c43f7c4e90150ef 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.H
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
@@ -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 @@ public:
         IOField(const IOobject&, const Field<Type>&);
 
         //- Construct by transferring the Field contents
-        IOField(const IOobject&, const Xfer<Field<Type> >&);
+        IOField(const IOobject&, const Xfer<Field<Type>>&);
 
 
     //- Destructor
diff --git a/src/OpenFOAM/db/IOobjects/IOList/IOList.C b/src/OpenFOAM/db/IOobjects/IOList/IOList.C
index 1bd99eff9a9d1aa9a41be81b4c78042d16d9e47b..3fd35a5d0bdfad9e232fe84670955b986c8bf4b6 100644
--- a/src/OpenFOAM/db/IOobjects/IOList/IOList.C
+++ b/src/OpenFOAM/db/IOobjects/IOList/IOList.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
@@ -124,7 +124,7 @@ Foam::IOList<T>::IOList(const IOobject& io, const List<T>& list)
 
 
 template<class T>
-Foam::IOList<T>::IOList(const IOobject& io, const Xfer<List<T> >& list)
+Foam::IOList<T>::IOList(const IOobject& io, const Xfer<List<T>>& list)
 :
     regIOobject(io)
 {
diff --git a/src/OpenFOAM/db/IOobjects/IOList/IOList.H b/src/OpenFOAM/db/IOobjects/IOList/IOList.H
index ef3f5c341fe0a804186345cc9cfb05d25efb1e17..8a54d99aac207cf9772fc581e909e015cbd7e258 100644
--- a/src/OpenFOAM/db/IOobjects/IOList/IOList.H
+++ b/src/OpenFOAM/db/IOobjects/IOList/IOList.H
@@ -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
@@ -72,7 +72,7 @@ public:
         IOList(const IOobject&, const List<T>&);
 
         //- Construct by transferring the List contents
-        IOList(const IOobject&, const Xfer<List<T> >&);
+        IOList(const IOobject&, const Xfer<List<T>>&);
 
 
     //- Destructor
diff --git a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C
index f2921af31a96c07b82927cd7165a89c98e680609..4701df55488cddcbb94f8ef9f2d7856860db773e 100644
--- a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.C
+++ b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.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
@@ -95,7 +95,7 @@ Foam::IOMap<T>::IOMap(const IOobject& io, const Map<T>& map)
 
 
 template<class T>
-Foam::IOMap<T>::IOMap(const IOobject& io, const Xfer<Map<T> >& map)
+Foam::IOMap<T>::IOMap(const IOobject& io, const Xfer<Map<T>>& map)
 :
     regIOobject(io)
 {
diff --git a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
index 71d254bd6b15ee05d6704b88caffaeb51bd5b8b6..5d9cae6b5f47def787df2526987d22b6b1e77e9d 100644
--- a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
+++ b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
@@ -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
@@ -72,7 +72,7 @@ public:
         IOMap(const IOobject&, const Map<T>&);
 
         //- Construct by transferring the Map contents
-        IOMap(const IOobject&, const Xfer<Map<T> >&);
+        IOMap(const IOobject&, const Xfer<Map<T>>&);
 
 
     //- Destructor
diff --git a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
index a002e62b2b66d38bbc5d6212d1ada3c6fce563c9..1c806bfab12eb58bb57b6e3203aa1c74d68086ce 100644
--- a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C
+++ b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.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::IOPtrList<T>::IOPtrList(const IOobject& io, const PtrList<T>& list)
 
 
 template<class T>
-Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const Xfer<PtrList<T> >& list)
+Foam::IOPtrList<T>::IOPtrList(const IOobject& io, const Xfer<PtrList<T>>& list)
 :
     regIOobject(io)
 {
diff --git a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
index 5267f38a2084c7a1fd045837806d848f068a449f..cef88c4608be52905ed53348de8cdad414d30b40 100644
--- a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
+++ b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
@@ -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
@@ -76,7 +76,7 @@ public:
         IOPtrList(const IOobject&, const PtrList<T>&);
 
         //- Construct by transferring the PtrList contents
-        IOPtrList(const IOobject&, const Xfer<PtrList<T> >&);
+        IOPtrList(const IOobject&, const Xfer<PtrList<T>>&);
 
 
     //- Destructor
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
index 718366cd5bebac8cf52645a16116413c428a4025..5da9dd218bb0da8044ff28983b4bf35b62db142d 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.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
@@ -102,10 +102,10 @@ class PstreamBuffers
         const IOstream::versionNumber version_;
 
         //- Send buffer
-        List<DynamicList<char> > sendBuf_;
+        List<DynamicList<char>> sendBuf_;
 
         //- Receive buffer
-        List<DynamicList<char> > recvBuf_;
+        List<DynamicList<char>> recvBuf_;
 
         //- Read position in recvBuf_
         labelList recvBufPos_;
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index 7249823d02e947b5a7c6736ffdfaef59af434f4f..6a332a1f4edd8db7a3ea96e269a752c8d13462af 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.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 @@ Foam::List<Foam::UPstream::commsStruct> Foam::UPstream::calcLinearComm
 void Foam::UPstream::collectReceives
 (
     const label procID,
-    const List<DynamicList<label> >& receives,
+    const List<DynamicList<label>>& receives,
     DynamicList<label>& allReceives
 )
 {
@@ -170,7 +170,7 @@ Foam::List<Foam::UPstream::commsStruct> Foam::UPstream::calcTreeComm
         nLevels++;
     }
 
-    List<DynamicList<label> > receives(nProcs);
+    List<DynamicList<label>> receives(nProcs);
     labelList sends(nProcs, -1);
 
     // Info<< "Using " << nLevels << " communication levels" << endl;
@@ -201,7 +201,7 @@ Foam::List<Foam::UPstream::commsStruct> Foam::UPstream::calcTreeComm
 
     // For all processors find the processors it receives data from
     // (and the processors they receive data from etc.)
-    List<DynamicList<label> > allReceives(nProcs);
+    List<DynamicList<label>> allReceives(nProcs);
     for (label procID = 0; procID < nProcs; procID++)
     {
         collectReceives(procID, receives, allReceives[procID]);
@@ -388,7 +388,7 @@ Foam::LIFOStack<Foam::label> Foam::UPstream::freeComms_;
 Foam::DynamicList<int> Foam::UPstream::myProcNo_(10);
 
 // List of process IDs
-Foam::DynamicList<Foam::List<int> > Foam::UPstream::procIDs_(10);
+Foam::DynamicList<Foam::List<int>> Foam::UPstream::procIDs_(10);
 
 // Parent communicator
 Foam::DynamicList<Foam::label> Foam::UPstream::parentCommunicator_(10);
@@ -397,11 +397,11 @@ Foam::DynamicList<Foam::label> Foam::UPstream::parentCommunicator_(10);
 int Foam::UPstream::msgType_(1);
 
 // Linear communication schedule
-Foam::DynamicList<Foam::List<Foam::UPstream::commsStruct> >
+Foam::DynamicList<Foam::List<Foam::UPstream::commsStruct>>
 Foam::UPstream::linearCommunication_(10);
 
 // Multi level communication schedule
-Foam::DynamicList<Foam::List<Foam::UPstream::commsStruct> >
+Foam::DynamicList<Foam::List<Foam::UPstream::commsStruct>>
 Foam::UPstream::treeCommunication_(10);
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index 09706b704d20bec76c0c722c0915c097cefa3943..615f9a6fb5c0f10a08fed14c27db080091a0bc25 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -188,11 +188,11 @@ private:
 
         static LIFOStack<label> freeComms_;
         static DynamicList<int> myProcNo_;
-        static DynamicList<List<int> > procIDs_;
+        static DynamicList<List<int>> procIDs_;
         static DynamicList<label> parentCommunicator_;
 
-        static DynamicList<List<commsStruct> > linearCommunication_;
-        static DynamicList<List<commsStruct> > treeCommunication_;
+        static DynamicList<List<commsStruct>> linearCommunication_;
+        static DynamicList<List<commsStruct>> treeCommunication_;
 
 
     // Private Member Functions
@@ -211,7 +211,7 @@ private:
         static void collectReceives
         (
             const label procID,
-            const List<DynamicList<label> >& receives,
+            const List<DynamicList<label>>& receives,
             DynamicList<label>& allReceives
         );
 
diff --git a/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H b/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
index 55c04d0d94d719609ec4113c89e27073f3ba7dc9..9a179e2d078f079f1fa687c83da395c07c3bda26 100644
--- a/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
+++ b/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
@@ -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
@@ -88,7 +88,7 @@ public:
         ITstream
         (
             const string& name,
-            const Xfer<List<token> >& tokens,
+            const Xfer<List<token>>& tokens,
             streamFormat format=ASCII,
             versionNumber version=currentVersion
         )
diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index 3b5775b9553310e8e71c57d92285a01e8de08ac0..7b7eeee54c057505b3bd7bbbac5bc493e6dfe4f4 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.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
@@ -444,7 +444,7 @@ Ostream& operator<<(Ostream& os, const InfoProxy<token>& ip);
     defineTemplateTypeNameAndDebugWithName(token::Compound<Type>, #Type, 0);
 
 #define addCompoundToRunTimeSelectionTable(Type, Name)                        \
-    token::compound::addIstreamConstructorToTable<token::Compound<Type> >     \
+    token::compound::addIstreamConstructorToTable<token::Compound<Type>>     \
         add##Name##IstreamConstructorToTable_;
 
 
diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index 0221242a832e0e6a66f24f2b6f78fff9be240c0f..a85406d53f70cfaf7371b6cfdf8555948cd265c6 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.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,7 +51,7 @@ bool Foam::dictionary::findInPatterns
     const bool patternMatch,
     const word& Keyword,
     DLList<entry*>::const_iterator& wcLink,
-    DLList<autoPtr<regExp> >::const_iterator& reLink
+    DLList<autoPtr<regExp>>::const_iterator& reLink
 ) const
 {
     if (patternEntries_.size())
@@ -82,7 +82,7 @@ bool Foam::dictionary::findInPatterns
     const bool patternMatch,
     const word& Keyword,
     DLList<entry*>::iterator& wcLink,
-    DLList<autoPtr<regExp> >::iterator& reLink
+    DLList<autoPtr<regExp>>::iterator& reLink
 )
 {
     if (patternEntries_.size())
@@ -319,7 +319,7 @@ bool Foam::dictionary::found
         {
             DLList<entry*>::const_iterator wcLink =
                 patternEntries_.begin();
-            DLList<autoPtr<regExp> >::const_iterator reLink =
+            DLList<autoPtr<regExp>>::const_iterator reLink =
                 patternRegexps_.begin();
 
             // Find in patterns using regular expressions only
@@ -356,7 +356,7 @@ const Foam::entry* Foam::dictionary::lookupEntryPtr
         {
             DLList<entry*>::const_iterator wcLink =
                 patternEntries_.begin();
-            DLList<autoPtr<regExp> >::const_iterator reLink =
+            DLList<autoPtr<regExp>>::const_iterator reLink =
                 patternRegexps_.begin();
 
             // Find in patterns using regular expressions only
@@ -395,7 +395,7 @@ Foam::entry* Foam::dictionary::lookupEntryPtr
         {
             DLList<entry*>::iterator wcLink =
                 patternEntries_.begin();
-            DLList<autoPtr<regExp> >::iterator reLink =
+            DLList<autoPtr<regExp>>::iterator reLink =
                 patternRegexps_.begin();
 
             // Find in patterns using regular expressions only
@@ -889,7 +889,7 @@ bool Foam::dictionary::remove(const word& Keyword)
         // Delete from patterns first
         DLList<entry*>::iterator wcLink =
             patternEntries_.begin();
-        DLList<autoPtr<regExp> >::iterator reLink =
+        DLList<autoPtr<regExp>>::iterator reLink =
             patternRegexps_.begin();
 
         // Find in pattern using exact match only
@@ -957,7 +957,7 @@ bool Foam::dictionary::changeKeyword
                 // Delete from patterns first
                 DLList<entry*>::iterator wcLink =
                     patternEntries_.begin();
-                DLList<autoPtr<regExp> >::iterator reLink =
+                DLList<autoPtr<regExp>>::iterator reLink =
                     patternRegexps_.begin();
 
                 // Find in patterns using exact match only
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index bbba527971e059c3456a4e491b09cfdb8e6ed226..040e829fb4ee6bad63e06c896019c899784fc57f 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.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
@@ -156,7 +156,7 @@ class dictionary
         DLList<entry*> patternEntries_;
 
         //- Patterns as precompiled regular expressions
-        DLList<autoPtr<regExp> > patternRegexps_;
+        DLList<autoPtr<regExp>> patternRegexps_;
 
 
    // Private Member Functions
@@ -167,7 +167,7 @@ class dictionary
             const bool patternMatch,
             const word& Keyword,
             DLList<entry*>::const_iterator& wcLink,
-            DLList<autoPtr<regExp> >::const_iterator& reLink
+            DLList<autoPtr<regExp>>::const_iterator& reLink
         ) const;
 
         //- Search patterns table for exact match or regular expression match
@@ -176,7 +176,7 @@ class dictionary
             const bool patternMatch,
             const word& Keyword,
             DLList<entry*>::iterator& wcLink,
-            DLList<autoPtr<regExp> >::iterator& reLink
+            DLList<autoPtr<regExp>>::iterator& reLink
         );
 
 
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
index 5e4d15eb0899700c9eb1bdfd6a74617fc55b192e..9bc12364b43cb9844d33ab8ed6fbeeb7d2f12404 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.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
@@ -136,7 +136,7 @@ Foam::primitiveEntry::primitiveEntry
 Foam::primitiveEntry::primitiveEntry
 (
     const keyType& key,
-    const Xfer<List<token> >& tokens
+    const Xfer<List<token>>& tokens
 )
 :
     entry(key),
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
index 2930e5f1213acf768656af3991bc9808ecfc5cba..35314c46e0fc2776c42b69737ba635e99c14a916 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.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
@@ -113,7 +113,7 @@ public:
         primitiveEntry(const keyType&, const UList<token>&);
 
         //- Construct from keyword and by transferring a list of tokens
-        primitiveEntry(const keyType&, const Xfer<List<token> >&);
+        primitiveEntry(const keyType&, const Xfer<List<token>>&);
 
         //- Construct from keyword and a T
         template<class T>
diff --git a/src/OpenFOAM/db/runTimeSelection/memberFunctions/addToMemberFunctionSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/memberFunctions/addToMemberFunctionSelectionTable.H
index e2c1eab272fe9140dbece9fee58a19a583580202..a8ddcb9145362d58da508cd48f8d4eb510c1a7ed 100644
--- a/src/OpenFOAM/db/runTimeSelection/memberFunctions/addToMemberFunctionSelectionTable.H
+++ b/src/OpenFOAM/db/runTimeSelection/memberFunctions/addToMemberFunctionSelectionTable.H
@@ -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
@@ -65,7 +65,7 @@ Description
                                                                               \
     /* Add the thisType memberFunction to the table */                        \
     baseType::add##memberFunction##argNames##                                 \
-    MemberFunctionToTable<thisType<Targ> >                                    \
+    MemberFunctionToTable<thisType<Targ>>                                    \
     add##thisType##Targ##memberFunction##argNames##MemberFunctionTo##         \
     baseType##Table_
 
@@ -77,7 +77,7 @@ Description
                                                                               \
     /* Add the thisType memberFunction to the table, find by lookup name */   \
     baseType::add##memberFunction##argNames##                                 \
-    MemberFunctionToTable<thisType<Targ> >                                    \
+    MemberFunctionToTable<thisType<Targ>>                                    \
     add_##lookup##_##thisType##Targ##memberFunction##argNames##               \
     MemberFunctionTo##baseType##Table_(#lookup)
 
@@ -87,7 +87,7 @@ Description
                                                                               \
     /* Add the thisType memberFunction to the table */                        \
     baseType<Targ>::add##memberFunction##argNames##                           \
-    MemberFunctionToTable<thisType<Targ> >                                    \
+    MemberFunctionToTable<thisType<Targ>>                                    \
     add##thisType##Targ##memberFunction##argNames##MemberFunctionTo##         \
     baseType##Targ##Table_
 
@@ -97,7 +97,7 @@ Description
                                                                               \
     /* Add the thisType memberFunction to the table, find by lookup name */   \
     baseType<Targ>::add##memberFunction##argNames##                           \
-    MemberFunctionToTable<thisType<Targ> >                                    \
+    MemberFunctionToTable<thisType<Targ>>                                    \
     add_##lookup##_##thisType##Targ##memberFunction##argNames##               \
     MemberFunctionTo##baseType##Targ##Table_(#lookup)
 
@@ -112,7 +112,7 @@ Description
                                                                               \
     /* Add the thisType memberFunction to the table */                        \
     baseType<Targ>::add##memberFunction##argNames##                           \
-    MemberFunctionToTable<thisType<Targ> >                                    \
+    MemberFunctionToTable<thisType<Targ>>                                    \
     add##thisType##Targ##memberFunction##argNames##MemberFunctionTo##         \
     baseType##Targ##Table_
 
@@ -124,7 +124,7 @@ Description
                                                                               \
     /* Add the thisType memberFunction to the table, find by lookup name */   \
     baseType<Targ>::add##memberFunction##argNames##                           \
-    MemberFunctionToTable<thisType<Targ> >                                    \
+    MemberFunctionToTable<thisType<Targ>>                                    \
     add_##lookup##_##thisType##Targ##memberFunction##argNames##               \
     MemberFunctionTo##baseType##Targ##Table_(#lookup)
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
index 3c3abf215d9e173db025090add8f85082c2cca13..cd49f12880c04eb5a6f0390797c7664ddfc58a9f 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.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
@@ -144,7 +144,7 @@ DimensionedField<Type, GeoMesh>::DimensionedField
 template<class Type, class GeoMesh>
 DimensionedField<Type, GeoMesh>::DimensionedField
 (
-    const Xfer<DimensionedField<Type, GeoMesh> >& df
+    const Xfer<DimensionedField<Type, GeoMesh>>& df
 )
 :
     regIOobject(df(), true),
@@ -158,7 +158,7 @@ DimensionedField<Type, GeoMesh>::DimensionedField
 template<class Type, class GeoMesh>
 DimensionedField<Type, GeoMesh>::DimensionedField
 (
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf
 )
 :
     regIOobject(tdf(), tdf.isTmp()),
@@ -237,7 +237,7 @@ template<class Type, class GeoMesh>
 DimensionedField<Type, GeoMesh>::DimensionedField
 (
     const word& newName,
-    const Xfer<DimensionedField<Type, GeoMesh> >& df
+    const Xfer<DimensionedField<Type, GeoMesh>>& df
 )
 :
     regIOobject(newName, df, true),
@@ -252,7 +252,7 @@ template<class Type, class GeoMesh>
 DimensionedField<Type, GeoMesh>::DimensionedField
 (
     const word& newName,
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf
 )
 :
     regIOobject(newName, tdf(), true),
@@ -270,10 +270,10 @@ DimensionedField<Type, GeoMesh>::DimensionedField
 
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<Type, GeoMesh> >
+tmp<DimensionedField<Type, GeoMesh>>
 DimensionedField<Type, GeoMesh>::clone() const
 {
-    return tmp<DimensionedField<Type, GeoMesh> >
+    return tmp<DimensionedField<Type, GeoMesh>>
     (
         new DimensionedField<Type, GeoMesh>(*this)
     );
@@ -300,7 +300,7 @@ DimensionedField<Type, GeoMesh>::component
     const direction d
 ) const
 {
-    tmp<DimensionedField<cmptType, GeoMesh> > result
+    tmp<DimensionedField<cmptType, GeoMesh>> result
     (
         new DimensionedField<cmptType, GeoMesh>
         (
@@ -350,10 +350,10 @@ void DimensionedField<Type, GeoMesh>::replace
 
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<Type, GeoMesh> >
+tmp<DimensionedField<Type, GeoMesh>>
 DimensionedField<Type, GeoMesh>::T() const
 {
-    tmp<DimensionedField<Type, GeoMesh> > result
+    tmp<DimensionedField<Type, GeoMesh>> result
     (
         new DimensionedField<Type, GeoMesh>
         (
@@ -409,7 +409,7 @@ dimensioned<Type> DimensionedField<Type, GeoMesh>::weightedAverage
 template<class Type, class GeoMesh>
 dimensioned<Type> DimensionedField<Type, GeoMesh>::weightedAverage
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >& tweightField
+    const tmp<DimensionedField<scalar, GeoMesh>>& tweightField
 ) const
 {
     dimensioned<Type> wa = weightedAverage(tweightField());
@@ -444,7 +444,7 @@ void DimensionedField<Type, GeoMesh>::operator=
 template<class Type, class GeoMesh>
 void DimensionedField<Type, GeoMesh>::operator=
 (
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf
 )
 {
     const DimensionedField<Type, GeoMesh>& df = tdf();
@@ -493,7 +493,7 @@ void DimensionedField<Type, GeoMesh>::operator op                             \
 template<class Type, class GeoMesh>                                           \
 void DimensionedField<Type, GeoMesh>::operator op                             \
 (                                                                             \
-    const tmp<DimensionedField<TYPE, GeoMesh> >& tdf                          \
+    const tmp<DimensionedField<TYPE, GeoMesh>>& tdf                          \
 )                                                                             \
 {                                                                             \
     operator op(tdf());                                                       \
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
index b3beb9577c09d6f6ef5868dbf197b99150eab3e7..81817fdeba48ea0a3bcc4b007a777d7f582200ec 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.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
@@ -60,7 +60,7 @@ template<class Type, class GeoMesh> Ostream& operator<<
 template<class Type, class GeoMesh> Ostream& operator<<
 (
     Ostream&,
-    const tmp<DimensionedField<Type, GeoMesh> >&
+    const tmp<DimensionedField<Type, GeoMesh>>&
 );
 
 
@@ -165,14 +165,14 @@ public:
         //- Construct by transferring the DimensionedField
         DimensionedField
         (
-            const Xfer<DimensionedField<Type, GeoMesh> >&
+            const Xfer<DimensionedField<Type, GeoMesh>>&
         );
 
         //- Construct as copy of tmp<DimensionedField> deleting argument
         #ifndef NoConstructFromTmp
         DimensionedField
         (
-            const tmp<DimensionedField<Type, GeoMesh> >&
+            const tmp<DimensionedField<Type, GeoMesh>>&
         );
         #endif
 
@@ -210,7 +210,7 @@ public:
         DimensionedField
         (
             const word& newName,
-            const Xfer<DimensionedField<Type, GeoMesh> >&
+            const Xfer<DimensionedField<Type, GeoMesh>>&
         );
 
         //- Construct as copy resetting name
@@ -218,12 +218,12 @@ public:
         DimensionedField
         (
             const word& newName,
-            const tmp<DimensionedField<Type, GeoMesh> >&
+            const tmp<DimensionedField<Type, GeoMesh>>&
         );
         #endif
 
         //- Clone
-        tmp<DimensionedField<Type, GeoMesh> > clone() const;
+        tmp<DimensionedField<Type, GeoMesh>> clone() const;
 
 
     //- Destructor
@@ -252,7 +252,7 @@ public:
         inline Field<Type>& field();
 
         //- Return a component field of the field
-        tmp<DimensionedField<cmptType, GeoMesh> > component
+        tmp<DimensionedField<cmptType, GeoMesh>> component
         (
             const direction
         ) const;
@@ -268,11 +268,11 @@ public:
         void replace
         (
             const direction,
-            const tmp<DimensionedField<cmptType, GeoMesh> >&
+            const tmp<DimensionedField<cmptType, GeoMesh>>&
         );
 
         //- Return the field transpose (only defined for second rank tensors)
-        tmp<DimensionedField<Type, GeoMesh> > T() const;
+        tmp<DimensionedField<Type, GeoMesh>> T() const;
 
         //- Calculate and return arithmetic average
         dimensioned<Type> average() const;
@@ -286,7 +286,7 @@ public:
         //- Calculate and return weighted average
         dimensioned<Type> weightedAverage
         (
-            const tmp<DimensionedField<scalar, GeoMesh> >&
+            const tmp<DimensionedField<scalar, GeoMesh>>&
         ) const;
 
 
@@ -300,20 +300,20 @@ public:
     // Member Operators
 
         void operator=(const DimensionedField<Type, GeoMesh>&);
-        void operator=(const tmp<DimensionedField<Type, GeoMesh> >&);
+        void operator=(const tmp<DimensionedField<Type, GeoMesh>>&);
         void operator=(const dimensioned<Type>&);
 
         void operator+=(const DimensionedField<Type, GeoMesh>&);
-        void operator+=(const tmp<DimensionedField<Type, GeoMesh> >&);
+        void operator+=(const tmp<DimensionedField<Type, GeoMesh>>&);
 
         void operator-=(const DimensionedField<Type, GeoMesh>&);
-        void operator-=(const tmp<DimensionedField<Type, GeoMesh> >&);
+        void operator-=(const tmp<DimensionedField<Type, GeoMesh>>&);
 
         void operator*=(const DimensionedField<scalar, GeoMesh>&);
-        void operator*=(const tmp<DimensionedField<scalar, GeoMesh> >&);
+        void operator*=(const tmp<DimensionedField<scalar, GeoMesh>>&);
 
         void operator/=(const DimensionedField<scalar, GeoMesh>&);
-        void operator/=(const tmp<DimensionedField<scalar, GeoMesh> >&);
+        void operator/=(const tmp<DimensionedField<scalar, GeoMesh>>&);
 
         void operator+=(const dimensioned<Type>&);
         void operator-=(const dimensioned<Type>&);
@@ -333,7 +333,7 @@ public:
         friend Ostream& operator<< <Type, GeoMesh>
         (
             Ostream&,
-            const tmp<DimensionedField<Type, GeoMesh> >&
+            const tmp<DimensionedField<Type, GeoMesh>>&
         );
 };
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
index 66f6c7bee1e0fbc843c0e6dcce1c3bebe9d92f82..cc070b715c6bce9b620febf7dc8456b3b90b4baf 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.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
@@ -36,7 +36,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * Global functions  * * * * * * * * * * * * * //
 
 template<class Type, class GeoMesh, int r>
-tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh> >
+tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh>>
 pow
 (
     const DimensionedField<Type, GeoMesh>& df,
@@ -45,7 +45,7 @@ pow
 {
     typedef typename powProduct<Type, r>::type powProductType;
 
-    tmp<DimensionedField<powProductType, GeoMesh> > tPow
+    tmp<DimensionedField<powProductType, GeoMesh>> tPow
     (
         new DimensionedField<powProductType, GeoMesh>
         (
@@ -67,10 +67,10 @@ pow
 
 
 template<class Type, class GeoMesh, int r>
-tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh> >
+tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh>>
 pow
 (
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf,
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf,
     typename powProduct<Type, r>::type
 )
 {
@@ -78,7 +78,7 @@ pow
 
     const DimensionedField<Type, GeoMesh>& df = tdf();
 
-    tmp<DimensionedField<powProductType, GeoMesh> > tPow =
+    tmp<DimensionedField<powProductType, GeoMesh>> tPow =
         reuseTmpDimensionedField<powProductType, Type, GeoMesh>::New
         (
             tdf,
@@ -94,12 +94,12 @@ pow
 }
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<typename outerProduct<Type, Type>::type, GeoMesh> >
+tmp<DimensionedField<typename outerProduct<Type, Type>::type, GeoMesh>>
 sqr(const DimensionedField<Type, GeoMesh>& df)
 {
     typedef typename outerProduct<Type, Type>::type outerProductType;
 
-    tmp<DimensionedField<outerProductType, GeoMesh> > tSqr
+    tmp<DimensionedField<outerProductType, GeoMesh>> tSqr
     (
         new DimensionedField<outerProductType, GeoMesh>
         (
@@ -120,14 +120,14 @@ sqr(const DimensionedField<Type, GeoMesh>& df)
 }
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<typename outerProduct<Type, Type>::type, GeoMesh> >
-sqr(const tmp<DimensionedField<Type, GeoMesh> >& tdf)
+tmp<DimensionedField<typename outerProduct<Type, Type>::type, GeoMesh>>
+sqr(const tmp<DimensionedField<Type, GeoMesh>>& tdf)
 {
     typedef typename outerProduct<Type, Type>::type outerProductType;
 
     const DimensionedField<Type, GeoMesh>& df = tdf();
 
-    tmp<DimensionedField<outerProductType, GeoMesh> > tSqr =
+    tmp<DimensionedField<outerProductType, GeoMesh>> tSqr =
         reuseTmpDimensionedField<outerProductType, Type, GeoMesh>::New
         (
             tdf,
@@ -144,12 +144,12 @@ sqr(const tmp<DimensionedField<Type, GeoMesh> >& tdf)
 
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > magSqr
+tmp<DimensionedField<scalar, GeoMesh>> magSqr
 (
     const DimensionedField<Type, GeoMesh>& df
 )
 {
-    tmp<DimensionedField<scalar, GeoMesh> > tMagSqr
+    tmp<DimensionedField<scalar, GeoMesh>> tMagSqr
     (
         new DimensionedField<scalar, GeoMesh>
         (
@@ -170,14 +170,14 @@ tmp<DimensionedField<scalar, GeoMesh> > magSqr
 }
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > magSqr
+tmp<DimensionedField<scalar, GeoMesh>> magSqr
 (
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf
 )
 {
     const DimensionedField<Type, GeoMesh>& df = tdf();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tMagSqr =
+    tmp<DimensionedField<scalar, GeoMesh>> tMagSqr =
         reuseTmpDimensionedField<scalar, Type, GeoMesh>::New
         (
             tdf,
@@ -194,12 +194,12 @@ tmp<DimensionedField<scalar, GeoMesh> > magSqr
 
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > mag
+tmp<DimensionedField<scalar, GeoMesh>> mag
 (
     const DimensionedField<Type, GeoMesh>& df
 )
 {
-    tmp<DimensionedField<scalar, GeoMesh> > tMag
+    tmp<DimensionedField<scalar, GeoMesh>> tMag
     (
         new DimensionedField<scalar, GeoMesh>
         (
@@ -220,14 +220,14 @@ tmp<DimensionedField<scalar, GeoMesh> > mag
 }
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > mag
+tmp<DimensionedField<scalar, GeoMesh>> mag
 (
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf
 )
 {
     const DimensionedField<Type, GeoMesh>& df = tdf();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tMag =
+    tmp<DimensionedField<scalar, GeoMesh>> tMag =
         reuseTmpDimensionedField<scalar, Type, GeoMesh>::New
         (
             tdf,
@@ -253,7 +253,7 @@ cmptAv(const DimensionedField<Type, GeoMesh>& df)
 {
     typedef typename DimensionedField<Type, GeoMesh>::cmptType cmptType;
 
-    tmp<DimensionedField<cmptType, GeoMesh> > CmptAv
+    tmp<DimensionedField<cmptType, GeoMesh>> CmptAv
     (
         new DimensionedField<scalar, GeoMesh>
         (
@@ -279,14 +279,14 @@ tmp
     DimensionedField
         <typename DimensionedField<Type, GeoMesh>::cmptType, GeoMesh>
 >
-cmptAv(const tmp<DimensionedField<Type, GeoMesh> >& tdf)
+cmptAv(const tmp<DimensionedField<Type, GeoMesh>>& tdf)
 {
     typedef typename DimensionedField<Type, GeoMesh>::cmptType
         cmptType;
 
     const DimensionedField<Type, GeoMesh>& df = tdf();
 
-    tmp<DimensionedField<cmptType, GeoMesh> > CmptAv =
+    tmp<DimensionedField<cmptType, GeoMesh>> CmptAv =
         reuseTmpDimensionedField<cmptType, Type, GeoMesh>::New
         (
             tdf,
@@ -320,7 +320,7 @@ dimensioned<returnType> func                                                  \
 template<class Type, class GeoMesh>                                           \
 dimensioned<returnType> func                                                  \
 (                                                                             \
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf1                         \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                         \
 )                                                                             \
 {                                                                             \
     dimensioned<returnType> res = func(tdf1());                               \
@@ -367,7 +367,7 @@ BINARY_TYPE_OPERATOR_FS(Type, Type, scalar, /, '|', divide)
 #define PRODUCT_OPERATOR(product, op, opFunc)                                 \
                                                                               \
 template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh> >         \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
 operator op                                                                   \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
@@ -375,7 +375,7 @@ operator op                                                                   \
 )                                                                             \
 {                                                                             \
     typedef typename product<Type1, Type2>::type productType;                 \
-    tmp<DimensionedField<productType, GeoMesh> > tRes                         \
+    tmp<DimensionedField<productType, GeoMesh>> tRes                         \
     (                                                                         \
         new DimensionedField<productType, GeoMesh>                            \
         (                                                                     \
@@ -396,18 +396,18 @@ operator op                                                                   \
 }                                                                             \
                                                                               \
 template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh> >         \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
 operator op                                                                   \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 )                                                                             \
 {                                                                             \
     typedef typename product<Type1, Type2>::type productType;                 \
                                                                               \
     const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
                                                                               \
-    tmp<DimensionedField<productType, GeoMesh> > tRes =                       \
+    tmp<DimensionedField<productType, GeoMesh>> tRes =                       \
         reuseTmpDimensionedField<productType, Type2, GeoMesh>::New            \
         (                                                                     \
             tdf2,                                                             \
@@ -423,10 +423,10 @@ operator op                                                                   \
 }                                                                             \
                                                                               \
 template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh> >         \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
 operator op                                                                   \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 )                                                                             \
 {                                                                             \
@@ -434,7 +434,7 @@ operator op                                                                   \
                                                                               \
     const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
                                                                               \
-    tmp<DimensionedField<productType, GeoMesh> > tRes =                       \
+    tmp<DimensionedField<productType, GeoMesh>> tRes =                       \
         reuseTmpDimensionedField<productType, Type1, GeoMesh>::New            \
         (                                                                     \
             tdf1,                                                             \
@@ -450,11 +450,11 @@ operator op                                                                   \
 }                                                                             \
                                                                               \
 template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh> >         \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
 operator op                                                                   \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 )                                                                             \
 {                                                                             \
     typedef typename product<Type1, Type2>::type productType;                 \
@@ -462,7 +462,7 @@ operator op                                                                   \
     const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
     const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
                                                                               \
-    tmp<DimensionedField<productType, GeoMesh> > tRes =                       \
+    tmp<DimensionedField<productType, GeoMesh>> tRes =                       \
         reuseTmpTmpDimensionedField                                           \
         <productType, Type1, Type1, Type2, GeoMesh>::New                      \
         (                                                                     \
@@ -481,7 +481,7 @@ operator op                                                                   \
 }                                                                             \
                                                                               \
 template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const DimensionedField<Type, GeoMesh>& df1,                               \
@@ -490,7 +490,7 @@ operator op                                                                   \
 {                                                                             \
     typedef typename product<Type, Form>::type productType;                   \
                                                                               \
-    tmp<DimensionedField<productType, GeoMesh> > tRes                         \
+    tmp<DimensionedField<productType, GeoMesh>> tRes                         \
     (                                                                         \
         new DimensionedField<productType, GeoMesh>                            \
         (                                                                     \
@@ -511,7 +511,7 @@ operator op                                                                   \
 }                                                                             \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const DimensionedField<Type, GeoMesh>& df1,                               \
@@ -523,10 +523,10 @@ operator op                                                                   \
                                                                               \
                                                                               \
 template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf1,                        \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1,                        \
     const dimensioned<Form>& dvs                                              \
 )                                                                             \
 {                                                                             \
@@ -534,7 +534,7 @@ operator op                                                                   \
                                                                               \
     const DimensionedField<Type, GeoMesh>& df1 = tdf1();                      \
                                                                               \
-    tmp<DimensionedField<productType, GeoMesh> > tRes =                       \
+    tmp<DimensionedField<productType, GeoMesh>> tRes =                       \
         reuseTmpDimensionedField<productType, Type, GeoMesh>::New             \
         (                                                                     \
             tdf1,                                                             \
@@ -550,10 +550,10 @@ operator op                                                                   \
 }                                                                             \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf1,                        \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1,                        \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
 )                                                                             \
 {                                                                             \
@@ -562,7 +562,7 @@ operator op                                                                   \
                                                                               \
                                                                               \
 template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const dimensioned<Form>& dvs,                                             \
@@ -570,7 +570,7 @@ operator op                                                                   \
 )                                                                             \
 {                                                                             \
     typedef typename product<Form, Type>::type productType;                   \
-    tmp<DimensionedField<productType, GeoMesh> > tRes                         \
+    tmp<DimensionedField<productType, GeoMesh>> tRes                         \
     (                                                                         \
         new DimensionedField<productType, GeoMesh>                            \
         (                                                                     \
@@ -591,7 +591,7 @@ operator op                                                                   \
 }                                                                             \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
@@ -602,18 +602,18 @@ operator op                                                                   \
 }                                                                             \
                                                                               \
 template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const dimensioned<Form>& dvs,                                             \
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf1                         \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                         \
 )                                                                             \
 {                                                                             \
     typedef typename product<Form, Type>::type productType;                   \
                                                                               \
     const DimensionedField<Type, GeoMesh>& df1 = tdf1();                      \
                                                                               \
-    tmp<DimensionedField<productType, GeoMesh> > tRes =                       \
+    tmp<DimensionedField<productType, GeoMesh>> tRes =                       \
         reuseTmpDimensionedField<productType, Type, GeoMesh>::New             \
         (                                                                     \
             tdf1,                                                             \
@@ -629,11 +629,11 @@ operator op                                                                   \
 }                                                                             \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf1                         \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                         \
 )                                                                             \
 {                                                                             \
     return dimensioned<Form>(static_cast<const Form&>(vs)) op tdf1;           \
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
index df4efeb8ea991f5533b0440ec3d55e8270467215..09deae37e9c8cf9a182f4a4774fb7185ffc95be3 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctions.H
@@ -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
@@ -36,7 +36,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * Global functions  * * * * * * * * * * * * * //
 
 template<class Type, class GeoMesh, int r>
-tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh> >
+tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh>>
 pow
 (
     const DimensionedField<Type, GeoMesh>& df,
@@ -44,43 +44,43 @@ pow
 );
 
 template<class Type, class GeoMesh, int r>
-tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh> >
+tmp<DimensionedField<typename powProduct<Type, r>::type, GeoMesh>>
 pow
 (
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf,
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf,
     typename powProduct<Type, r>::type
 );
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<typename outerProduct<Type, Type>::type, GeoMesh> >
+tmp<DimensionedField<typename outerProduct<Type, Type>::type, GeoMesh>>
 sqr(const DimensionedField<Type, GeoMesh>& df);
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<typename outerProduct<Type, Type>::type, GeoMesh> >
-sqr(const tmp<DimensionedField<Type, GeoMesh> >& tdf);
+tmp<DimensionedField<typename outerProduct<Type, Type>::type, GeoMesh>>
+sqr(const tmp<DimensionedField<Type, GeoMesh>>& tdf);
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > magSqr
+tmp<DimensionedField<scalar, GeoMesh>> magSqr
 (
     const DimensionedField<Type, GeoMesh>& df
 );
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > magSqr
+tmp<DimensionedField<scalar, GeoMesh>> magSqr
 (
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf
 );
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > mag
+tmp<DimensionedField<scalar, GeoMesh>> mag
 (
     const DimensionedField<Type, GeoMesh>& df
 );
 
 template<class Type, class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > mag
+tmp<DimensionedField<scalar, GeoMesh>> mag
 (
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf
 );
 
 template<class Type, class GeoMesh>
@@ -97,7 +97,7 @@ tmp
     DimensionedField
         <typename DimensionedField<Type, GeoMesh>::cmptType, GeoMesh>
 >
-cmptAv(const tmp<DimensionedField<Type, GeoMesh> >& tdf);
+cmptAv(const tmp<DimensionedField<Type, GeoMesh>>& tdf);
 
 
 #define UNARY_REDUCTION_FUNCTION(returnType, func, dfunc)                     \
@@ -110,7 +110,7 @@ dimensioned<returnType> func                                                  \
 template<class Type, class GeoMesh>                                           \
 dimensioned<returnType> func                                                  \
 (                                                                             \
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf1                         \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                         \
 );
 
 UNARY_REDUCTION_FUNCTION(Type, max, gMax)
@@ -152,7 +152,7 @@ BINARY_TYPE_OPERATOR_FS(Type, Type, scalar, /, '|', divide)
 #define PRODUCT_OPERATOR(product, op, opFunc)                                 \
                                                                               \
 template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh> >         \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
 operator op                                                                   \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
@@ -160,31 +160,31 @@ operator op                                                                   \
 );                                                                            \
                                                                               \
 template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh> >         \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
 operator op                                                                   \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 );                                                                            \
                                                                               \
 template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh> >         \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
 operator op                                                                   \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 );                                                                            \
                                                                               \
 template<class Type1, class Type2, class GeoMesh>                             \
-tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh> >         \
+tmp<DimensionedField<typename product<Type1, Type2>::type, GeoMesh>>         \
 operator op                                                                   \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 );                                                                            \
                                                                               \
 template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const DimensionedField<Type, GeoMesh>& df1,                               \
@@ -192,7 +192,7 @@ operator op                                                                   \
 );                                                                            \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const DimensionedField<Type, GeoMesh>& df1,                               \
@@ -200,23 +200,23 @@ operator op                                                                   \
 );                                                                            \
                                                                               \
 template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Type, Form>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf1,                        \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1,                        \
     const dimensioned<Form>& dvs                                              \
 );                                                                            \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf1,                        \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1,                        \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
 );                                                                            \
                                                                               \
 template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const dimensioned<Form>& dvs,                                             \
@@ -224,7 +224,7 @@ operator op                                                                   \
 );                                                                            \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
@@ -232,19 +232,19 @@ operator op                                                                   \
 );                                                                            \
                                                                               \
 template<class Form, class Type, class GeoMesh>                               \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const dimensioned<Form>& dvs,                                             \
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf1                         \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                         \
 );                                                                            \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type, class GeoMesh>        \
-tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh> >           \
+tmp<DimensionedField<typename product<Form, Type>::type, GeoMesh>>           \
 operator op                                                                   \
 (                                                                             \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf1                         \
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf1                         \
 );
 
 PRODUCT_OPERATOR(typeOfSum, +, add)
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
index 85310c12fc1a8d33f4f4bda002ee18a05d2b82bb..bd33ca2c607807dc96b25259ac3fa5a621f72d4b 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.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
@@ -30,12 +30,12 @@ License
 #define UNARY_FUNCTION(ReturnType, Type1, Func, Dfunc)                        \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1                               \
 )                                                                             \
 {                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         new DimensionedField<ReturnType, GeoMesh>                             \
         (                                                                     \
@@ -56,14 +56,14 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1                        \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1                        \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New             \
         (                                                                     \
@@ -86,12 +86,12 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 #define UNARY_OPERATOR(ReturnType, Type1, Op, OpFunc, Dfunc)                  \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1                               \
 )                                                                             \
 {                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         new DimensionedField<ReturnType, GeoMesh>                             \
         (                                                                     \
@@ -112,14 +112,14 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1                        \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1                        \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New             \
         (                                                                     \
@@ -142,13 +142,13 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 #define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                       \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 )                                                                             \
 {                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         new DimensionedField<ReturnType, GeoMesh>                             \
         (                                                                     \
@@ -169,15 +169,15 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New             \
         (                                                                     \
@@ -195,15 +195,15 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New             \
         (                                                                     \
@@ -221,16 +221,16 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
     const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpTmpDimensionedField                                           \
             <ReturnType, Type1, Type1, Type2, GeoMesh>::New                   \
@@ -256,13 +256,13 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 #define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 )                                                                             \
 {                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         new DimensionedField<ReturnType, GeoMesh>                             \
         (                                                                     \
@@ -283,7 +283,7 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const Type1& t1,                                                          \
     const DimensionedField<Type2, GeoMesh>& df2                               \
@@ -294,15 +294,15 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
                                                                               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New             \
         (                                                                     \
@@ -320,10 +320,10 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const Type1& t1,                                                          \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 )                                                                             \
 {                                                                             \
     return Func(dimensioned<Type2>(t1), tdf2);                                \
@@ -333,13 +333,13 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 #define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const dimensioned<Type2>& dt2                                             \
 )                                                                             \
 {                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         new DimensionedField<ReturnType, GeoMesh>                             \
         (                                                                     \
@@ -360,7 +360,7 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const Type2& t2                                                           \
@@ -371,15 +371,15 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
                                                                               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const dimensioned<Type2>& dt2                                             \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New             \
         (                                                                     \
@@ -397,9 +397,9 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const Type2& t2                                                           \
 )                                                                             \
 {                                                                             \
@@ -417,13 +417,13 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 #define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)         \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 )                                                                             \
 {                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         new DimensionedField<ReturnType, GeoMesh>                             \
         (                                                                     \
@@ -444,15 +444,15 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New             \
         (                                                                     \
@@ -470,15 +470,15 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New             \
         (                                                                     \
@@ -496,16 +496,16 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
     const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpTmpDimensionedField                                           \
             <ReturnType, Type1, Type1, Type2, GeoMesh>::New                   \
@@ -531,13 +531,13 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 #define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 )                                                                             \
 {                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         new DimensionedField<ReturnType, GeoMesh>                             \
         (                                                                     \
@@ -558,7 +558,7 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const Type1& t1,                                                          \
     const DimensionedField<Type2, GeoMesh>& df2                               \
@@ -569,15 +569,15 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
                                                                               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type2, GeoMesh>& df2 = tdf2();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpDimensionedField<ReturnType, Type2, GeoMesh>::New             \
         (                                                                     \
@@ -595,10 +595,10 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const Type1& t1,                                                          \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 )                                                                             \
 {                                                                             \
     return dimensioned<Type1>(t1) Op tdf2;                                    \
@@ -608,13 +608,13 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 #define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const dimensioned<Type2>& dt2                                             \
 )                                                                             \
 {                                                                             \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         new DimensionedField<ReturnType, GeoMesh>                             \
         (                                                                     \
@@ -635,7 +635,7 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const Type2& t2                                                           \
@@ -646,15 +646,15 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
                                                                               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const dimensioned<Type2>& dt2                                             \
 )                                                                             \
 {                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1 = tdf1();                     \
                                                                               \
-    tmp<DimensionedField<ReturnType, GeoMesh> > tRes                          \
+    tmp<DimensionedField<ReturnType, GeoMesh>> tRes                          \
     (                                                                         \
         reuseTmpDimensionedField<ReturnType, Type1, GeoMesh>::New             \
         (                                                                     \
@@ -672,9 +672,9 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const Type2& t2                                                           \
 )                                                                             \
 {                                                                             \
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H
index 66b2ada8fe4672a3eff2ab5050fe7ed5c6f46aa6..1ed114443c66fc2087973731934dcd44c8ae5980 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H
@@ -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
@@ -28,15 +28,15 @@ License
 #define UNARY_FUNCTION(ReturnType, Type1, Func, Dfunc)                        \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df                                \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1                        \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1                        \
 );
 
 
@@ -45,15 +45,15 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 #define UNARY_OPERATOR(ReturnType, Type1, Op, opFunc, Dfunc)                  \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1                               \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1                        \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1                        \
 );
 
 
@@ -62,31 +62,31 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 #define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                       \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 );
 
 
@@ -95,61 +95,61 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 #define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const Type1& t1,                                                          \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const Type1& t1,                                                          \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 );
 
 
 #define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const dimensioned<Type2>& dt2                                             \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const Type2& t2                                                           \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const dimensioned<Type2>& dt2                                             \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
+tmp<DimensionedField<ReturnType, GeoMesh>> Func                              \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf2,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf2,                       \
     const Type2& t2                                                           \
 );
 
@@ -164,31 +164,31 @@ tmp<DimensionedField<ReturnType, GeoMesh> > Func                              \
 #define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)         \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 );
 
 
@@ -197,61 +197,61 @@ tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
 #define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const Type1& t1,                                                          \
     const DimensionedField<Type2, GeoMesh>& df2                               \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const Type1& t1,                                                          \
-    const tmp<DimensionedField<Type2, GeoMesh> >& tdf2                        \
+    const tmp<DimensionedField<Type2, GeoMesh>>& tdf2                        \
 );
 
 
 #define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const dimensioned<Type2>& dt2                                             \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
     const DimensionedField<Type1, GeoMesh>& df1,                              \
     const Type2& t2                                                           \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const dimensioned<Type2>& dt2                                             \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<DimensionedField<ReturnType, GeoMesh> > operator Op                       \
+tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                       \
 (                                                                             \
-    const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,                       \
+    const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,                       \
     const Type2& t2                                                           \
 );
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldI.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldI.H
index f2aa000604bd14e22239a649849774bb570db4ae..64cfd315895bc29de04ac1b18ceb88dc4e2b8fd3 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldI.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ template<class Type, class GeoMesh>
 inline const Foam::DimensionedField<Type, GeoMesh>&
 Foam::DimensionedField<Type, GeoMesh>::null()
 {
-    return NullObjectRef<DimensionedField<Type, GeoMesh> >();
+    return NullObjectRef<DimensionedField<Type, GeoMesh>>();
 }
 
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
index be049a4be8a05656d97b6ba99cbe738f17b8734d..0a7b21514763053631f5916b54bf151e57d64fa7 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.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
@@ -131,7 +131,7 @@ template<class Type, class GeoMesh>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const tmp<DimensionedField<Type, GeoMesh> >& tdf
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf
 )
 {
     tdf().writeData(os);
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
index 806745808f2451c37115f2edb2edb32cf9cb9497..2df208e96e2ee43e84c5033b118d3cc9dcabaeb5 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
@@ -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
@@ -38,16 +38,16 @@ class reuseTmpDimensionedField
 {
 public:
 
-    static tmp<DimensionedField<TypeR, GeoMesh> > New
+    static tmp<DimensionedField<TypeR, GeoMesh>> New
     (
-        const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,
+        const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,
         const word& name,
         const dimensionSet& dimensions
     )
     {
         const DimensionedField<Type1, GeoMesh>& df1 = tdf1();
 
-        return tmp<DimensionedField<TypeR, GeoMesh> >
+        return tmp<DimensionedField<TypeR, GeoMesh>>
         (
             new DimensionedField<TypeR, GeoMesh>
             (
@@ -63,7 +63,7 @@ public:
         );
     }
 
-    static void clear(const tmp<DimensionedField<Type1, GeoMesh> >& tdf1)
+    static void clear(const tmp<DimensionedField<Type1, GeoMesh>>& tdf1)
     {
         tdf1.clear();
     }
@@ -75,9 +75,9 @@ class reuseTmpDimensionedField<TypeR, TypeR, GeoMesh>
 {
 public:
 
-    static tmp<DimensionedField<TypeR, GeoMesh> > New
+    static tmp<DimensionedField<TypeR, GeoMesh>> New
     (
-        const tmp<DimensionedField<TypeR, GeoMesh> >& tdf1,
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1,
         const word& name,
         const dimensionSet& dimensions
     )
@@ -93,7 +93,7 @@ public:
         }
         else
         {
-            return tmp<DimensionedField<TypeR, GeoMesh> >
+            return tmp<DimensionedField<TypeR, GeoMesh>>
             (
                 new DimensionedField<TypeR, GeoMesh>
                 (
@@ -110,7 +110,7 @@ public:
         }
     }
 
-    static void clear(const tmp<DimensionedField<TypeR, GeoMesh> >& tdf1)
+    static void clear(const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1)
     {
         if (tdf1.isTmp())
         {
@@ -125,17 +125,17 @@ class reuseTmpTmpDimensionedField
 {
 public:
 
-    static tmp<DimensionedField<TypeR, GeoMesh> > New
+    static tmp<DimensionedField<TypeR, GeoMesh>> New
     (
-        const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,
-        const tmp<DimensionedField<Type2, GeoMesh> >& tdf2,
+        const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,
+        const tmp<DimensionedField<Type2, GeoMesh>>& tdf2,
         const word& name,
         const dimensionSet& dimensions
     )
     {
         const DimensionedField<Type1, GeoMesh>& df1 = tdf1();
 
-        return tmp<DimensionedField<TypeR, GeoMesh> >
+        return tmp<DimensionedField<TypeR, GeoMesh>>
         (
             new DimensionedField<TypeR, GeoMesh>
             (
@@ -153,8 +153,8 @@ public:
 
     static void clear
     (
-        const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,
-        const tmp<DimensionedField<Type2, GeoMesh> >& tdf2
+        const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,
+        const tmp<DimensionedField<Type2, GeoMesh>>& tdf2
     )
     {
         tdf1.clear();
@@ -168,10 +168,10 @@ class reuseTmpTmpDimensionedField<TypeR, Type1, Type12, TypeR, GeoMesh>
 {
 public:
 
-    static tmp<DimensionedField<TypeR, GeoMesh> > New
+    static tmp<DimensionedField<TypeR, GeoMesh>> New
     (
-        const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,
-        const tmp<DimensionedField<TypeR, GeoMesh> >& tdf2,
+        const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf2,
         const word& name,
         const dimensionSet& dimensions
     )
@@ -188,7 +188,7 @@ public:
         }
         else
         {
-            return tmp<DimensionedField<TypeR, GeoMesh> >
+            return tmp<DimensionedField<TypeR, GeoMesh>>
             (
                 new DimensionedField<TypeR, GeoMesh>
                 (
@@ -207,8 +207,8 @@ public:
 
     static void clear
     (
-        const tmp<DimensionedField<Type1, GeoMesh> >& tdf1,
-        const tmp<DimensionedField<TypeR, GeoMesh> >& tdf2
+        const tmp<DimensionedField<Type1, GeoMesh>>& tdf1,
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf2
     )
     {
         tdf1.clear();
@@ -225,10 +225,10 @@ class reuseTmpTmpDimensionedField<TypeR, TypeR, TypeR, Type2, GeoMesh>
 {
 public:
 
-    static tmp<DimensionedField<TypeR, GeoMesh> > New
+    static tmp<DimensionedField<TypeR, GeoMesh>> New
     (
-        const tmp<DimensionedField<TypeR, GeoMesh> >& tdf1,
-        const tmp<DimensionedField<Type2, GeoMesh> >& tdf2,
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1,
+        const tmp<DimensionedField<Type2, GeoMesh>>& tdf2,
         const word& name,
         const dimensionSet& dimensions
     )
@@ -244,7 +244,7 @@ public:
         }
         else
         {
-            return tmp<DimensionedField<TypeR, GeoMesh> >
+            return tmp<DimensionedField<TypeR, GeoMesh>>
             (
                 new DimensionedField<TypeR, GeoMesh>
                 (
@@ -263,8 +263,8 @@ public:
 
     static void clear
     (
-        const tmp<DimensionedField<TypeR, GeoMesh> >& tdf1,
-        const tmp<DimensionedField<Type2, GeoMesh> >& tdf2
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1,
+        const tmp<DimensionedField<Type2, GeoMesh>>& tdf2
     )
     {
         if (tdf1.isTmp())
@@ -281,10 +281,10 @@ class reuseTmpTmpDimensionedField<TypeR, TypeR, TypeR, TypeR, GeoMesh>
 {
 public:
 
-    static tmp<DimensionedField<TypeR, GeoMesh> > New
+    static tmp<DimensionedField<TypeR, GeoMesh>> New
     (
-        const tmp<DimensionedField<TypeR, GeoMesh> >& tdf1,
-        const tmp<DimensionedField<TypeR, GeoMesh> >& tdf2,
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1,
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf2,
         const word& name,
         const dimensionSet& dimensions
     )
@@ -308,7 +308,7 @@ public:
         }
         else
         {
-            return tmp<DimensionedField<TypeR, GeoMesh> >
+            return tmp<DimensionedField<TypeR, GeoMesh>>
             (
                 new DimensionedField<TypeR, GeoMesh>
                 (
@@ -327,8 +327,8 @@ public:
 
     static void clear
     (
-        const tmp<DimensionedField<TypeR, GeoMesh> >& tdf1,
-        const tmp<DimensionedField<TypeR, GeoMesh> >& tdf2
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf1,
+        const tmp<DimensionedField<TypeR, GeoMesh>>& tdf2
     )
     {
         if (tdf1.isTmp())
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedField.H
index e4f69802b8f2b84fec25f429824b45e6d6902e81..e0e4282fb4f0757a7eafda10c4532d9968c2c118 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedField.H
@@ -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
@@ -103,13 +103,13 @@ public:
         static inline const SubDimensionedField<Type, GeoMesh>& null();
 
         //- Return a component field of the field
-        inline tmp<DimensionedField<cmptType, GeoMesh> > component
+        inline tmp<DimensionedField<cmptType, GeoMesh>> component
         (
             const direction
         ) const;
 
         //- Return the field transpose (only defined for second rank tensors)
-        tmp<DimensionedField<Type, GeoMesh> > T() const;
+        tmp<DimensionedField<Type, GeoMesh>> T() const;
 
 
     // Member operators
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H
index ecddcc04ba5b9e54c925c10abe3594e702f7eb2b..215a52542192b7bee0f78948776c35c48217b5e6 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ template<class Type, class GeoMesh>
 inline const Foam::SubDimensionedField<Type, GeoMesh>&
 Foam::SubDimensionedField<Type, GeoMesh>::null()
 {
-    return NullObjectRef<SubDimensionedField<Type, GeoMesh> >();
+    return NullObjectRef<SubDimensionedField<Type, GeoMesh>>();
 }
 
 
@@ -97,7 +97,7 @@ Foam::SubDimensionedField<Type, GeoMesh>::component
 
 
 template<class Type, class GeoMesh>
-inline Foam::tmp<Foam::DimensionedField<Type, GeoMesh> >
+inline Foam::tmp<Foam::DimensionedField<Type, GeoMesh>>
 Foam::SubDimensionedField<Type, GeoMesh>::T() const
 {
     return
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
index 8d1429f5005985532c76ef31d530fb2d0914539c..5426d79c533f6ca279a20ab5b96a70401200aeb9 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.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
@@ -36,13 +36,13 @@ namespace Foam
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > stabilise
+tmp<DimensionedField<scalar, GeoMesh>> stabilise
 (
     const DimensionedField<scalar, GeoMesh>& dsf,
     const dimensioned<scalar>& ds
 )
 {
-    tmp<DimensionedField<scalar, GeoMesh> > tRes
+    tmp<DimensionedField<scalar, GeoMesh>> tRes
     (
         new DimensionedField<scalar, GeoMesh>
         (
@@ -64,15 +64,15 @@ tmp<DimensionedField<scalar, GeoMesh> > stabilise
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > stabilise
+tmp<DimensionedField<scalar, GeoMesh>> stabilise
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf,
     const dimensioned<scalar>& ds
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf = tdsf();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tRes =
+    tmp<DimensionedField<scalar, GeoMesh>> tRes =
         reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
         (
             tdsf,
@@ -101,13 +101,13 @@ BINARY_TYPE_OPERATOR_SF(scalar, scalar, scalar, /, '|', divide)
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
     const DimensionedField<scalar, GeoMesh>& dsf1,
     const DimensionedField<scalar, GeoMesh>& dsf2
 )
 {
-    tmp<DimensionedField<scalar, GeoMesh> > tPow
+    tmp<DimensionedField<scalar, GeoMesh>> tPow
     (
         new DimensionedField<scalar, GeoMesh>
         (
@@ -133,15 +133,15 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf1,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf1,
     const DimensionedField<scalar, GeoMesh>& dsf2
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf1 = tdsf1();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tPow =
+    tmp<DimensionedField<scalar, GeoMesh>> tPow =
         reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
         (
             tdsf1,
@@ -162,15 +162,15 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
     const DimensionedField<scalar, GeoMesh>& dsf1,
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf2
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf2
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf2 = tdsf2();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tPow =
+    tmp<DimensionedField<scalar, GeoMesh>> tPow =
         reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
         (
             tdsf2,
@@ -190,16 +190,16 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf1,
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf2
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf1,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf2
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf1 = tdsf1();
     const DimensionedField<scalar, GeoMesh>& dsf2 = tdsf2();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tPow =
+    tmp<DimensionedField<scalar, GeoMesh>> tPow =
         reuseTmpTmpDimensionedField<scalar, scalar, scalar, scalar, GeoMesh>::
         New
         (
@@ -226,13 +226,13 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
     const DimensionedField<scalar, GeoMesh>& dsf,
     const dimensionedScalar& ds
 )
 {
-    tmp<DimensionedField<scalar, GeoMesh> > tPow
+    tmp<DimensionedField<scalar, GeoMesh>> tPow
     (
         new DimensionedField<scalar, GeoMesh>
         (
@@ -253,15 +253,15 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf,
     const dimensionedScalar& ds
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf = tdsf();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tPow =
+    tmp<DimensionedField<scalar, GeoMesh>> tPow =
         reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
         (
             tdsf,
@@ -277,7 +277,7 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
     const DimensionedField<scalar, GeoMesh>& dsf,
     const scalar& s
@@ -287,9 +287,9 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf,
     const scalar& s
 )
 {
@@ -298,13 +298,13 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
     const dimensionedScalar& ds,
     const DimensionedField<scalar, GeoMesh>& dsf
 )
 {
-    tmp<DimensionedField<scalar, GeoMesh> > tPow
+    tmp<DimensionedField<scalar, GeoMesh>> tPow
     (
         new DimensionedField<scalar, GeoMesh>
         (
@@ -326,15 +326,15 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
     const dimensionedScalar& ds,
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf = tdsf();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tPow =
+    tmp<DimensionedField<scalar, GeoMesh>> tPow =
         reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
         (
             tdsf,
@@ -350,7 +350,7 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
     const scalar& s,
     const DimensionedField<scalar, GeoMesh>& dsf
@@ -360,10 +360,10 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > pow
+tmp<DimensionedField<scalar, GeoMesh>> pow
 (
     const scalar& s,
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf
 )
 {
     return pow(dimensionedScalar(s), tdsf);
@@ -373,13 +373,13 @@ tmp<DimensionedField<scalar, GeoMesh> > pow
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
     const DimensionedField<scalar, GeoMesh>& dsf1,
     const DimensionedField<scalar, GeoMesh>& dsf2
 )
 {
-    tmp<DimensionedField<scalar, GeoMesh> > tAtan2
+    tmp<DimensionedField<scalar, GeoMesh>> tAtan2
     (
         new DimensionedField<scalar, GeoMesh>
         (
@@ -401,15 +401,15 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf1,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf1,
     const DimensionedField<scalar, GeoMesh>& dsf2
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf1 = tdsf1();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tAtan2 =
+    tmp<DimensionedField<scalar, GeoMesh>> tAtan2 =
         reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
         (
             tdsf1,
@@ -426,15 +426,15 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
     const DimensionedField<scalar, GeoMesh>& dsf1,
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf2
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf2
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf2 = tdsf2();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tAtan2 =
+    tmp<DimensionedField<scalar, GeoMesh>> tAtan2 =
         reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
         (
             tdsf2,
@@ -450,16 +450,16 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf1,
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf2
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf1,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf2
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf1 = tdsf1();
     const DimensionedField<scalar, GeoMesh>& dsf2 = tdsf2();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tAtan2 =
+    tmp<DimensionedField<scalar, GeoMesh>> tAtan2 =
         reuseTmpTmpDimensionedField<scalar, scalar, scalar, scalar, GeoMesh>::
         New
         (
@@ -482,13 +482,13 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
     const DimensionedField<scalar, GeoMesh>& dsf,
     const dimensionedScalar& ds
 )
 {
-    tmp<DimensionedField<scalar, GeoMesh> > tAtan2
+    tmp<DimensionedField<scalar, GeoMesh>> tAtan2
     (
         new DimensionedField<scalar, GeoMesh>
         (
@@ -509,15 +509,15 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf,
     const dimensionedScalar& ds
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf = tdsf();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tAtan2 =
+    tmp<DimensionedField<scalar, GeoMesh>> tAtan2 =
         reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
         (
             tdsf,
@@ -533,7 +533,7 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
     const DimensionedField<scalar, GeoMesh>& dsf,
     const scalar& s
@@ -543,9 +543,9 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf,
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf,
     const scalar& s
 )
 {
@@ -554,13 +554,13 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
     const dimensionedScalar& ds,
     const DimensionedField<scalar, GeoMesh>& dsf
 )
 {
-    tmp<DimensionedField<scalar, GeoMesh> > tAtan2
+    tmp<DimensionedField<scalar, GeoMesh>> tAtan2
     (
         new DimensionedField<scalar, GeoMesh>
         (
@@ -582,15 +582,15 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
     const dimensionedScalar& ds,
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf
 )
 {
     const DimensionedField<scalar, GeoMesh>& dsf = tdsf();
 
-    tmp<DimensionedField<scalar, GeoMesh> > tAtan2 =
+    tmp<DimensionedField<scalar, GeoMesh>> tAtan2 =
         reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New
         (
             tdsf,
@@ -606,7 +606,7 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
     const scalar& s,
     const DimensionedField<scalar, GeoMesh>& dsf
@@ -616,10 +616,10 @@ tmp<DimensionedField<scalar, GeoMesh> > atan2
 }
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > atan2
+tmp<DimensionedField<scalar, GeoMesh>> atan2
 (
     const scalar& s,
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf
 )
 {
     return atan2(dimensionedScalar(s), tdsf);
@@ -670,7 +670,7 @@ UNARY_FUNCTION(scalar, scalar, y1, trans)
 #define BesselFunc(func)                                                    \
                                                                             \
 template<class GeoMesh>                                                     \
-tmp<DimensionedField<scalar, GeoMesh> > func                                \
+tmp<DimensionedField<scalar, GeoMesh>> func                                \
 (                                                                           \
     const int n,                                                            \
     const DimensionedField<scalar, GeoMesh>& dsf                            \
@@ -683,7 +683,7 @@ tmp<DimensionedField<scalar, GeoMesh> > func                                \
             << abort(FatalError);                                           \
     }                                                                       \
                                                                             \
-    tmp<DimensionedField<scalar, GeoMesh> > tFunc                           \
+    tmp<DimensionedField<scalar, GeoMesh>> tFunc                           \
     (                                                                       \
         new DimensionedField<scalar, GeoMesh>                               \
         (                                                                   \
@@ -704,10 +704,10 @@ tmp<DimensionedField<scalar, GeoMesh> > func                                \
 }                                                                           \
                                                                             \
 template<class GeoMesh>                                                     \
-tmp<DimensionedField<scalar, GeoMesh> > func                                \
+tmp<DimensionedField<scalar, GeoMesh>> func                                \
 (                                                                           \
     const int n,                                                            \
-    const tmp<DimensionedField<scalar, GeoMesh> >& tdsf                     \
+    const tmp<DimensionedField<scalar, GeoMesh>>& tdsf                     \
 )                                                                           \
 {                                                                           \
     const DimensionedField<scalar, GeoMesh>& dsf = tdsf();                  \
@@ -719,7 +719,7 @@ tmp<DimensionedField<scalar, GeoMesh> > func                                \
             << abort(FatalError);                                           \
     }                                                                       \
                                                                             \
-    tmp<DimensionedField<scalar, GeoMesh> > tFunc                           \
+    tmp<DimensionedField<scalar, GeoMesh>> tFunc                           \
     (                                                                       \
         reuseTmpDimensionedField<scalar, scalar, GeoMesh>::New              \
         (                                                                   \
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H
index 1734c9dde065d606d1da83cad21cf2cace54d7d2..11202231761eca111f436e519868caa396bca894 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.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
@@ -49,16 +49,16 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > stabilise
+tmp<DimensionedField<scalar, GeoMesh>> stabilise
 (
     const DimensionedField<scalar, GeoMesh>&,
     const dimensioned<scalar>&
 );
 
 template<class GeoMesh>
-tmp<DimensionedField<scalar, GeoMesh> > stabilise
+tmp<DimensionedField<scalar, GeoMesh>> stabilise
 (
-    const tmp<DimensionedField<scalar, GeoMesh> >&,
+    const tmp<DimensionedField<scalar, GeoMesh>>&,
     const dimensioned<scalar>&
 );
 
@@ -124,17 +124,17 @@ UNARY_FUNCTION(scalar, scalar, y1, trans)
 #define BesselFunc(func)                                                       \
                                                                                \
 template<class GeoMesh>                                                        \
-tmp<DimensionedField<scalar, GeoMesh> > func                                   \
+tmp<DimensionedField<scalar, GeoMesh>> func                                   \
 (                                                                              \
     const int n,                                                               \
     const DimensionedField<scalar, GeoMesh>&                                   \
 );                                                                             \
                                                                                \
 template<class GeoMesh>                                                        \
-tmp<DimensionedField<scalar, GeoMesh> > func                                   \
+tmp<DimensionedField<scalar, GeoMesh>> func                                   \
 (                                                                              \
     const int n,                                                               \
-    const tmp<DimensionedField<scalar, GeoMesh> >&                             \
+    const tmp<DimensionedField<scalar, GeoMesh>>&                             \
 );
 
 BesselFunc(jn)
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
index 6042b204488e5f5ddf3e10ba287907b333c5688c..c15243f392e9a775d3979ae619e9a3d89d5cc9a9 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.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
@@ -107,14 +107,14 @@ void checkFields
 template<template<class> class Field, class Type>
 FieldField<Field, Type>::FieldField()
 :
-    PtrList<Field<Type> >()
+    PtrList<Field<Type>>()
 {}
 
 
 template<template<class> class Field, class Type>
 FieldField<Field, Type>::FieldField(const label size)
 :
-    PtrList<Field<Type> >(size)
+    PtrList<Field<Type>>(size)
 {}
 
 
@@ -125,7 +125,7 @@ FieldField<Field, Type>::FieldField
     const FieldField<Field, Type>& ff
 )
 :
-    PtrList<Field<Type> >(ff.size())
+    PtrList<Field<Type>>(ff.size())
 {
     forAll(*this, i)
     {
@@ -138,7 +138,7 @@ template<template<class> class Field, class Type>
 FieldField<Field, Type>::FieldField(const FieldField<Field, Type>& f)
 :
     refCount(),
-    PtrList<Field<Type> >(f)
+    PtrList<Field<Type>>(f)
 {}
 
 
@@ -146,23 +146,23 @@ template<template<class> class Field, class Type>
 FieldField<Field, Type>::FieldField(FieldField<Field, Type>& f, bool reUse)
 :
     refCount(),
-    PtrList<Field<Type> >(f, reUse)
+    PtrList<Field<Type>>(f, reUse)
 {}
 
 
 template<template<class> class Field, class Type>
-FieldField<Field, Type>::FieldField(const PtrList<Field<Type> >& tl)
+FieldField<Field, Type>::FieldField(const PtrList<Field<Type>>& tl)
 :
-    PtrList<Field<Type> >(tl)
+    PtrList<Field<Type>>(tl)
 {}
 
 
 // Construct as copy of tmp<FieldField>
 #ifndef NoConstructFromTmp
 template<template<class> class Field, class Type>
-FieldField<Field, Type>::FieldField(const tmp<FieldField<Field, Type> >& tf)
+FieldField<Field, Type>::FieldField(const tmp<FieldField<Field, Type>>& tf)
 :
-    PtrList<Field<Type> >
+    PtrList<Field<Type>>
     (
         const_cast<FieldField<Field, Type>&>(tf()),
         tf.isTmp()
@@ -176,20 +176,20 @@ FieldField<Field, Type>::FieldField(const tmp<FieldField<Field, Type> >& tf)
 template<template<class> class Field, class Type>
 FieldField<Field, Type>::FieldField(Istream& is)
 :
-    PtrList<Field<Type> >(is)
+    PtrList<Field<Type>>(is)
 {}
 
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > FieldField<Field, Type>::clone() const
+tmp<FieldField<Field, Type>> FieldField<Field, Type>::clone() const
 {
-    return tmp<FieldField<Field, Type> >(new FieldField<Field, Type>(*this));
+    return tmp<FieldField<Field, Type>>(new FieldField<Field, Type>(*this));
 }
 
 
 template<template<class> class Field, class Type>
 template<class Type2>
-tmp<FieldField<Field, Type> > FieldField<Field, Type>::NewCalculatedType
+tmp<FieldField<Field, Type>> FieldField<Field, Type>::NewCalculatedType
 (
     const FieldField<Field, Type2>& ff
 )
@@ -204,7 +204,7 @@ tmp<FieldField<Field, Type> > FieldField<Field, Type>::NewCalculatedType
         nffPtr->set(i, Field<Type>::NewCalculatedType(ff[i]).ptr());
     }
 
-    return tmp<FieldField<Field, Type> >(nffPtr);
+    return tmp<FieldField<Field, Type>>(nffPtr);
 }
 
 
@@ -221,13 +221,13 @@ void FieldField<Field, Type>::negate()
 
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> >
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>>
 FieldField<Field, Type>::component
 (
     const direction d
 ) const
 {
-    tmp<FieldField<Field, cmptType> > Component
+    tmp<FieldField<Field, cmptType>> Component
     (
         FieldField<Field, typename FieldField<Field, Type>::cmptType>::
             NewCalculatedType(*this)
@@ -268,9 +268,9 @@ void FieldField<Field, Type>::replace
 
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > FieldField<Field, Type>::T() const
+tmp<FieldField<Field, Type>> FieldField<Field, Type>::T() const
 {
-    tmp<FieldField<Field, Type> > transpose
+    tmp<FieldField<Field, Type>> transpose
     (
         FieldField<Field, Type>::NewCalculatedType(*this)
     );
@@ -311,7 +311,7 @@ void FieldField<Field, Type>::operator=(const tmp<FieldField>& tf)
 
     // This is dodgy stuff, don't try this at home.
     FieldField* fieldPtr = tf.ptr();
-    PtrList<Field<Type> >::transfer(*fieldPtr);
+    PtrList<Field<Type>>::transfer(*fieldPtr);
     delete fieldPtr;
 }
 
@@ -340,7 +340,7 @@ void FieldField<Field, Type>::operator op(const FieldField<Field, TYPE>& f)   \
 template<template<class> class Field, class Type>                             \
 void FieldField<Field, Type>::operator op                                     \
 (                                                                             \
-    const tmp<FieldField<Field, TYPE> >& tf                                   \
+    const tmp<FieldField<Field, TYPE>>& tf                                   \
 )                                                                             \
 {                                                                             \
     operator op(tf());                                                        \
@@ -369,13 +369,13 @@ COMPUTED_ASSIGNMENT(scalar, /=)
 template<template<class> class Field, class Type>
 Ostream& operator<<(Ostream& os, const FieldField<Field, Type>& f)
 {
-    os << static_cast<const PtrList<Field<Type> >&>(f);
+    os << static_cast<const PtrList<Field<Type>>&>(f);
     return os;
 }
 
 
 template<template<class> class Field, class Type>
-Ostream& operator<<(Ostream& os, const tmp<FieldField<Field, Type> >& tf)
+Ostream& operator<<(Ostream& os, const tmp<FieldField<Field, Type>>& tf)
 {
     os << tf();
     tf.clear();
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
index 94f89dbf6a38a987cc7e0a5b51f97594ec9e7778..3c1134e2072062adc9122a72a425133d143e0f6a 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.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
@@ -62,7 +62,7 @@ template<template<class> class Field, class Type>
 Ostream& operator<<
 (
     Ostream&,
-    const tmp<FieldField<Field, Type> >&
+    const tmp<FieldField<Field, Type>>&
 );
 
 
@@ -74,7 +74,7 @@ template<template<class> class Field, class Type>
 class FieldField
 :
     public refCount,
-    public PtrList<Field<Type> >
+    public PtrList<Field<Type>>
 {
 
 public:
@@ -105,23 +105,23 @@ public:
         FieldField(FieldField<Field, Type>&, bool reUse);
 
         //- Construct as copy of a PtrList<Field, Type>
-        FieldField(const PtrList<Field<Type> >&);
+        FieldField(const PtrList<Field<Type>>&);
 
         //- Construct as copy of tmp<FieldField>
         #ifndef NoConstructFromTmp
-        FieldField(const tmp<FieldField<Field, Type> >&);
+        FieldField(const tmp<FieldField<Field, Type>>&);
         #endif
 
         //- Construct from Istream
         FieldField(Istream&);
 
         //- Clone
-        tmp<FieldField<Field, Type> > clone() const;
+        tmp<FieldField<Field, Type>> clone() const;
 
         //- Return a pointer to a new calculatedFvPatchFieldField created on
         //  freestore without setting patchField values
         template<class Type2>
-        static tmp<FieldField<Field, Type> > NewCalculatedType
+        static tmp<FieldField<Field, Type>> NewCalculatedType
         (
             const FieldField<Field, Type2>& ff
         );
@@ -133,7 +133,7 @@ public:
         void negate();
 
         //- Return a component field of the field
-        tmp<FieldField<Field, cmptType> > component(const direction) const;
+        tmp<FieldField<Field, cmptType>> component(const direction) const;
 
         //- Replace a component field of the field
         void replace(const direction, const FieldField<Field, cmptType>&);
@@ -142,26 +142,26 @@ public:
         void replace(const direction, const cmptType&);
 
         //- Return the field transpose (only defined for second rank tensors)
-        tmp<FieldField<Field, Type> > T() const;
+        tmp<FieldField<Field, Type>> T() const;
 
 
     // Member operators
 
         void operator=(const FieldField<Field, Type>&);
-        void operator=(const tmp<FieldField<Field, Type> >&);
+        void operator=(const tmp<FieldField<Field, Type>>&);
         void operator=(const Type&);
 
         void operator+=(const FieldField<Field, Type>&);
-        void operator+=(const tmp<FieldField<Field, Type> >&);
+        void operator+=(const tmp<FieldField<Field, Type>>&);
 
         void operator-=(const FieldField<Field, Type>&);
-        void operator-=(const tmp<FieldField<Field, Type> >&);
+        void operator-=(const tmp<FieldField<Field, Type>>&);
 
         void operator*=(const FieldField<Field, scalar>&);
-        void operator*=(const tmp<FieldField<Field, scalar> >&);
+        void operator*=(const tmp<FieldField<Field, scalar>>&);
 
         void operator/=(const FieldField<Field, scalar>&);
-        void operator/=(const tmp<FieldField<Field, scalar> >&);
+        void operator/=(const tmp<FieldField<Field, scalar>>&);
 
         void operator+=(const Type&);
         void operator-=(const Type&);
@@ -181,7 +181,7 @@ public:
         friend Ostream& operator<< <Field, Type>
         (
             Ostream&,
-            const tmp<FieldField<Field, Type> >&
+            const tmp<FieldField<Field, Type>>&
         );
 };
 
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
index 1c6a990f3586af0cece839111a2b454f438000e3..3c5b726de6992c3a78f3948854bfcbe35047a2fd 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.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
@@ -75,14 +75,14 @@ void pow
 }
 
 template<template<class> class Field, class Type, int r>
-tmp<FieldField<Field, typename powProduct<Type, r>::type> >
+tmp<FieldField<Field, typename powProduct<Type, r>::type>>
 pow
 (
     const FieldField<Field, Type>& f, typename powProduct<Type, r>::type
 )
 {
     typedef typename powProduct<Type, r>::type powProductType;
-    tmp<FieldField<Field, powProductType> > tRes
+    tmp<FieldField<Field, powProductType>> tRes
     (
         FieldField<Field, powProductType>::NewCalculatedType(f)
     );
@@ -91,14 +91,14 @@ pow
 }
 
 template<template<class> class Field, class Type, int r>
-tmp<FieldField<Field, typename powProduct<Type, r>::type> >
+tmp<FieldField<Field, typename powProduct<Type, r>::type>>
 pow
 (
-    const tmp<FieldField<Field, Type> >& tf, typename powProduct<Type, r>::type
+    const tmp<FieldField<Field, Type>>& tf, typename powProduct<Type, r>::type
 )
 {
     typedef typename powProduct<Type, r>::type powProductType;
-    tmp<FieldField<Field, powProductType> > tRes
+    tmp<FieldField<Field, powProductType>> tRes
     (
         reuseTmpFieldField<Field, powProductType, Type>::New(tf)
     );
@@ -122,11 +122,11 @@ void sqr
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename outerProduct<Type, Type>::type> >
+tmp<FieldField<Field, typename outerProduct<Type, Type>::type>>
 sqr(const FieldField<Field, Type>& f)
 {
     typedef typename outerProduct<Type, Type>::type outerProductType;
-    tmp<FieldField<Field, outerProductType> > tRes
+    tmp<FieldField<Field, outerProductType>> tRes
     (
         FieldField<Field, outerProductType>::NewCalculatedType(f)
     );
@@ -135,11 +135,11 @@ sqr(const FieldField<Field, Type>& f)
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename outerProduct<Type, Type>::type> >
-sqr(const tmp<FieldField<Field, Type> >& tf)
+tmp<FieldField<Field, typename outerProduct<Type, Type>::type>>
+sqr(const tmp<FieldField<Field, Type>>& tf)
 {
     typedef typename outerProduct<Type, Type>::type outerProductType;
-    tmp<FieldField<Field, outerProductType> > tRes
+    tmp<FieldField<Field, outerProductType>> tRes
     (
         reuseTmpFieldField<Field, outerProductType, Type>::New(tf)
     );
@@ -159,9 +159,9 @@ void magSqr(FieldField<Field, scalar>& sf, const FieldField<Field, Type>& f)
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, scalar> > magSqr(const FieldField<Field, Type>& f)
+tmp<FieldField<Field, scalar>> magSqr(const FieldField<Field, Type>& f)
 {
-    tmp<FieldField<Field, scalar> > tRes
+    tmp<FieldField<Field, scalar>> tRes
     (
         FieldField<Field, scalar>::NewCalculatedType(f)
     );
@@ -171,9 +171,9 @@ tmp<FieldField<Field, scalar> > magSqr(const FieldField<Field, Type>& f)
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, scalar> > magSqr(const tmp<FieldField<Field, Type> >& tf)
+tmp<FieldField<Field, scalar>> magSqr(const tmp<FieldField<Field, Type>>& tf)
 {
-    tmp<FieldField<Field, scalar> > tRes
+    tmp<FieldField<Field, scalar>> tRes
     (
         reuseTmpFieldField<Field, scalar, Type>::New(tf)
     );
@@ -194,9 +194,9 @@ void mag(FieldField<Field, scalar>& sf, const FieldField<Field, Type>& f)
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, scalar> > mag(const FieldField<Field, Type>& f)
+tmp<FieldField<Field, scalar>> mag(const FieldField<Field, Type>& f)
 {
-    tmp<FieldField<Field, scalar> > tRes
+    tmp<FieldField<Field, scalar>> tRes
     (
         FieldField<Field, scalar>::NewCalculatedType(f)
     );
@@ -206,9 +206,9 @@ tmp<FieldField<Field, scalar> > mag(const FieldField<Field, Type>& f)
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, scalar> > mag(const tmp<FieldField<Field, Type> >& tf)
+tmp<FieldField<Field, scalar>> mag(const tmp<FieldField<Field, Type>>& tf)
 {
-    tmp<FieldField<Field, scalar> > tRes
+    tmp<FieldField<Field, scalar>> tRes
     (
         reuseTmpFieldField<Field, scalar, Type>::New(tf)
     );
@@ -233,13 +233,13 @@ void cmptMax
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptMax
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMax
 (
     const FieldField<Field, Type>& f
 )
 {
     typedef typename FieldField<Field, Type>::cmptType cmptType;
-    tmp<FieldField<Field, cmptType> > tRes
+    tmp<FieldField<Field, cmptType>> tRes
     (
         FieldField<Field, cmptType>::NewCalculatedType(f)
     );
@@ -248,13 +248,13 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptMax
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptMax
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMax
 (
-    const tmp<FieldField<Field, Type> >& tf
+    const tmp<FieldField<Field, Type>>& tf
 )
 {
     typedef typename FieldField<Field, Type>::cmptType cmptType;
-    tmp<FieldField<Field, cmptType> > tRes
+    tmp<FieldField<Field, cmptType>> tRes
     (
         reuseTmpFieldField<Field, cmptType, Type>::New(tf)
     );
@@ -278,13 +278,13 @@ void cmptMin
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptMin
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMin
 (
     const FieldField<Field, Type>& f
 )
 {
     typedef typename FieldField<Field, Type>::cmptType cmptType;
-    tmp<FieldField<Field, cmptType> > tRes
+    tmp<FieldField<Field, cmptType>> tRes
     (
         FieldField<Field, cmptType>::NewCalculatedType(f)
     );
@@ -293,13 +293,13 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptMin
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptMin
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMin
 (
-    const tmp<FieldField<Field, Type> >& tf
+    const tmp<FieldField<Field, Type>>& tf
 )
 {
     typedef typename FieldField<Field, Type>::cmptType cmptType;
-    tmp<FieldField<Field, cmptType> > tRes
+    tmp<FieldField<Field, cmptType>> tRes
     (
         reuseTmpFieldField<Field, cmptType, Type>::New(tf)
     );
@@ -323,13 +323,13 @@ void cmptAv
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptAv
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptAv
 (
     const FieldField<Field, Type>& f
 )
 {
     typedef typename FieldField<Field, Type>::cmptType cmptType;
-    tmp<FieldField<Field, cmptType> > tRes
+    tmp<FieldField<Field, cmptType>> tRes
     (
         FieldField<Field, cmptType>::NewCalculatedType(f)
     );
@@ -338,13 +338,13 @@ tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptAv
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptAv
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptAv
 (
-    const tmp<FieldField<Field, Type> >& tf
+    const tmp<FieldField<Field, Type>>& tf
 )
 {
     typedef typename FieldField<Field, Type>::cmptType cmptType;
-    tmp<FieldField<Field, cmptType> > tRes
+    tmp<FieldField<Field, cmptType>> tRes
     (
         reuseTmpFieldField<Field, cmptType, Type>::New(tf)
     );
@@ -368,12 +368,12 @@ void cmptMag
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > cmptMag
+tmp<FieldField<Field, Type>> cmptMag
 (
     const FieldField<Field, Type>& f
 )
 {
-    tmp<FieldField<Field, Type> > tRes
+    tmp<FieldField<Field, Type>> tRes
     (
         FieldField<Field, Type>::NewCalculatedType(f)
     );
@@ -382,12 +382,12 @@ tmp<FieldField<Field, Type> > cmptMag
 }
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > cmptMag
+tmp<FieldField<Field, Type>> cmptMag
 (
-    const tmp<FieldField<Field, Type> >& tf
+    const tmp<FieldField<Field, Type>>& tf
 )
 {
-    tmp<FieldField<Field, Type> > tRes
+    tmp<FieldField<Field, Type>> tRes
     (
         reuseTmpFieldField<Field, Type, Type>::New(tf)
     );
@@ -400,7 +400,7 @@ tmp<FieldField<Field, Type> > cmptMag
 #define TMP_UNARY_FUNCTION(returnType, func)                                  \
                                                                               \
 template<template<class> class Field, class Type>                             \
-returnType func(const tmp<FieldField<Field, Type> >& tf1)                     \
+returnType func(const tmp<FieldField<Field, Type>>& tf1)                     \
 {                                                                             \
     returnType res = func(tf1());                                             \
     tf1.clear();                                                              \
@@ -655,7 +655,7 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type> >                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field1, Type1>& f1,                                       \
@@ -663,7 +663,7 @@ operator op                                                                    \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type1, Type2>::type productType;                  \
-    tmp<FieldField<Field1, productType> > tRes                                 \
+    tmp<FieldField<Field1, productType>> tRes                                 \
     (                                                                          \
         FieldField<Field1, productType>::NewCalculatedType(f1)                 \
     );                                                                         \
@@ -672,15 +672,15 @@ operator op                                                                    \
 }                                                                              \
                                                                                \
 template<template<class> class Field, class Type1, class Type2>                \
-tmp<FieldField<Field, typename product<Type1, Type2>::type> >                  \
+tmp<FieldField<Field, typename product<Type1, Type2>::type>>                  \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field, Type1>& f1,                                        \
-    const tmp<FieldField<Field, Type2> >& tf2                                  \
+    const tmp<FieldField<Field, Type2>>& tf2                                  \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type1, Type2>::type productType;                  \
-    tmp<FieldField<Field, productType> > tRes                                  \
+    tmp<FieldField<Field, productType>> tRes                                  \
     (                                                                          \
         reuseTmpFieldField<Field, productType, Type2>::New(tf2)                \
     );                                                                         \
@@ -696,15 +696,15 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field, typename product<Type1, Type2>::type> >                  \
+tmp<FieldField<Field, typename product<Type1, Type2>::type>>                  \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field1, Type1>& f1,                                       \
-    const tmp<FieldField<Field2, Type2> >& tf2                                 \
+    const tmp<FieldField<Field2, Type2>>& tf2                                 \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type1, Type2>::type productType;                  \
-    tmp<FieldField<Field1, productType> > tRes                                 \
+    tmp<FieldField<Field1, productType>> tRes                                 \
     (                                                                          \
         FieldField<Field1, productType>::NewCalculatedType(f1)                 \
     );                                                                         \
@@ -720,15 +720,15 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type> >                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
 operator op                                                                    \
 (                                                                              \
-    const tmp<FieldField<Field1, Type1> >& tf1,                                \
+    const tmp<FieldField<Field1, Type1>>& tf1,                                \
     const FieldField<Field2, Type2>& f2                                        \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type1, Type2>::type productType;                  \
-    tmp<FieldField<Field1, productType> > tRes                                 \
+    tmp<FieldField<Field1, productType>> tRes                                 \
     (                                                                          \
         reuseTmpFieldField<Field1, productType, Type1>::New(tf1)               \
     );                                                                         \
@@ -744,15 +744,15 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type> >                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
 operator op                                                                    \
 (                                                                              \
-    const tmp<FieldField<Field1, Type1> >& tf1,                                \
-    const tmp<FieldField<Field2, Type2> >& tf2                                 \
+    const tmp<FieldField<Field1, Type1>>& tf1,                                \
+    const tmp<FieldField<Field2, Type2>>& tf2                                 \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type1, Type2>::type productType;                  \
-    tmp<FieldField<Field1, productType> > tRes                                 \
+    tmp<FieldField<Field1, productType>> tRes                                 \
     (                                                                          \
         reuseTmpTmpFieldField<Field1, productType, Type1, Type1, Type2>::New   \
         (tf1, tf2)                                                             \
@@ -780,7 +780,7 @@ void opFunc                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Type, class Form, class Cmpt, int nCmpt>   \
-tmp<FieldField<Field, typename product<Type, Form>::type> >                    \
+tmp<FieldField<Field, typename product<Type, Form>::type>>                    \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field, Type>& f1,                                         \
@@ -788,7 +788,7 @@ operator op                                                                    \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type, Form>::type productType;                    \
-    tmp<FieldField<Field, productType> > tRes                                  \
+    tmp<FieldField<Field, productType>> tRes                                  \
     (                                                                          \
         FieldField<Field, productType>::NewCalculatedType(f1)                  \
     );                                                                         \
@@ -798,15 +798,15 @@ operator op                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Type, class Form, class Cmpt, int nCmpt>   \
-tmp<FieldField<Field, typename product<Type, Form>::type> >                    \
+tmp<FieldField<Field, typename product<Type, Form>::type>>                    \
 operator op                                                                    \
 (                                                                              \
-    const tmp<FieldField<Field, Type> >& tf1,                                  \
+    const tmp<FieldField<Field, Type>>& tf1,                                  \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
 )                                                                              \
 {                                                                              \
     typedef typename product<Type, Form>::type productType;                    \
-    tmp<FieldField<Field, productType> > tRes                                  \
+    tmp<FieldField<Field, productType>> tRes                                  \
     (                                                                          \
         reuseTmpFieldField<Field, productType, Type>::New(tf1)                 \
     );                                                                         \
@@ -832,7 +832,7 @@ void opFunc                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Form, class Cmpt, int nCmpt, class Type>   \
-tmp<FieldField<Field, typename product<Form, Type>::type> >                    \
+tmp<FieldField<Field, typename product<Form, Type>::type>>                    \
 operator op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
@@ -840,7 +840,7 @@ operator op                                                                    \
 )                                                                              \
 {                                                                              \
     typedef typename product<Form, Type>::type productType;                    \
-    tmp<FieldField<Field, productType> > tRes                                  \
+    tmp<FieldField<Field, productType>> tRes                                  \
     (                                                                          \
         FieldField<Field, productType>::NewCalculatedType(f1)                  \
     );                                                                         \
@@ -850,15 +850,15 @@ operator op                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Form, class Cmpt, int nCmpt, class Type>   \
-tmp<FieldField<Field, typename product<Form, Type>::type> >                    \
+tmp<FieldField<Field, typename product<Form, Type>::type>>                    \
 operator op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
-    const tmp<FieldField<Field, Type> >& tf1                                   \
+    const tmp<FieldField<Field, Type>>& tf1                                   \
 )                                                                              \
 {                                                                              \
     typedef typename product<Form, Type>::type productType;                    \
-    tmp<FieldField<Field, productType> > tRes                                  \
+    tmp<FieldField<Field, productType>> tRes                                  \
     (                                                                          \
         reuseTmpFieldField<Field, productType, Type>::New(tf1)                 \
     );                                                                         \
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
index 97dccf45106b34b2d32676aa9eb1326849337d3e..5860c6e4edc4f01f84cabce6fe67d94cccec9df4 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.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
@@ -55,7 +55,7 @@ void pow
 );
 
 template<template<class> class Field, class Type, int r>
-tmp<FieldField<Field, typename powProduct<Type, r>::type> >
+tmp<FieldField<Field, typename powProduct<Type, r>::type>>
 pow
 (
     const FieldField<Field, Type>& f, typename powProduct<Type, r>::type
@@ -63,10 +63,10 @@ pow
 );
 
 template<template<class> class Field, class Type, int r>
-tmp<FieldField<Field, typename powProduct<Type, r>::type> >
+tmp<FieldField<Field, typename powProduct<Type, r>::type>>
 pow
 (
-    const tmp<FieldField<Field, Type> >& tf, typename powProduct<Type, r>::type
+    const tmp<FieldField<Field, Type>>& tf, typename powProduct<Type, r>::type
         = pTraits<typename powProduct<Type, r>::type>::zero
 );
 
@@ -79,30 +79,30 @@ void sqr
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename outerProduct<Type, Type>::type> >
+tmp<FieldField<Field, typename outerProduct<Type, Type>::type>>
 sqr(const FieldField<Field, Type>& f);
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename outerProduct<Type, Type>::type> >
-sqr(const tmp<FieldField<Field, Type> >& tf);
+tmp<FieldField<Field, typename outerProduct<Type, Type>::type>>
+sqr(const tmp<FieldField<Field, Type>>& tf);
 
 template<template<class> class Field, class Type>
 void magSqr(FieldField<Field, scalar>& sf, const FieldField<Field, Type>& f);
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, scalar> > magSqr(const FieldField<Field, Type>& f);
+tmp<FieldField<Field, scalar>> magSqr(const FieldField<Field, Type>& f);
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, scalar> > magSqr(const tmp<FieldField<Field, Type> >& tf);
+tmp<FieldField<Field, scalar>> magSqr(const tmp<FieldField<Field, Type>>& tf);
 
 template<template<class> class Field, class Type>
 void mag(FieldField<Field, scalar>& sf, const FieldField<Field, Type>& f);
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, scalar> > mag(const FieldField<Field, Type>& f);
+tmp<FieldField<Field, scalar>> mag(const FieldField<Field, Type>& f);
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, scalar> > mag(const tmp<FieldField<Field, Type> >& tf);
+tmp<FieldField<Field, scalar>> mag(const tmp<FieldField<Field, Type>>& tf);
 
 
 template<template<class> class Field, class Type>
@@ -113,15 +113,15 @@ void cmptMax
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptMax
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMax
 (
     const FieldField<Field, Type>& f
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptMax
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMax
 (
-    const tmp<FieldField<Field, Type> >& tf
+    const tmp<FieldField<Field, Type>>& tf
 );
 
 
@@ -133,15 +133,15 @@ void cmptMin
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptMin
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMin
 (
     const FieldField<Field, Type>& f
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptMin
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptMin
 (
-    const tmp<FieldField<Field, Type> >& tf
+    const tmp<FieldField<Field, Type>>& tf
 );
 
 
@@ -153,15 +153,15 @@ void cmptAv
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptAv
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptAv
 (
     const FieldField<Field, Type>& f
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType> > cmptAv
+tmp<FieldField<Field, typename FieldField<Field, Type>::cmptType>> cmptAv
 (
-    const tmp<FieldField<Field, Type> >& tf
+    const tmp<FieldField<Field, Type>>& tf
 );
 
 
@@ -173,22 +173,22 @@ void cmptMag
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > cmptMag
+tmp<FieldField<Field, Type>> cmptMag
 (
     const FieldField<Field, Type>& f
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > cmptMag
+tmp<FieldField<Field, Type>> cmptMag
 (
-    const tmp<FieldField<Field, Type> >& tf
+    const tmp<FieldField<Field, Type>>& tf
 );
 
 
 #define TMP_UNARY_FUNCTION(returnType, func)                                  \
                                                                               \
 template<template<class> class Field, class Type>                             \
-returnType func(const tmp<FieldField<Field, Type> >& tf1);
+returnType func(const tmp<FieldField<Field, Type>>& tf1);
 
 template<template<class> class Field, class Type>
 Type max(const FieldField<Field, Type>& f);
@@ -288,7 +288,7 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type> >                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field1, Type1>& f1,                                       \
@@ -296,11 +296,11 @@ operator op                                                                    \
 );                                                                             \
                                                                                \
 template<template<class> class Field, class Type1, class Type2>                \
-tmp<FieldField<Field, typename product<Type1, Type2>::type> >                  \
+tmp<FieldField<Field, typename product<Type1, Type2>::type>>                  \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field, Type1>& f1,                                        \
-    const tmp<FieldField<Field, Type2> >& tf2                                  \
+    const tmp<FieldField<Field, Type2>>& tf2                                  \
 );                                                                             \
                                                                                \
 template                                                                       \
@@ -310,11 +310,11 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type> >                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field1, Type1>& f1,                                       \
-    const tmp<FieldField<Field2, Type2> >& tf2                                 \
+    const tmp<FieldField<Field2, Type2>>& tf2                                 \
 );                                                                             \
                                                                                \
 template                                                                       \
@@ -324,10 +324,10 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type> >                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
 operator op                                                                    \
 (                                                                              \
-    const tmp<FieldField<Field1, Type1> >& tf1,                                \
+    const tmp<FieldField<Field1, Type1>>& tf1,                                \
     const FieldField<Field2, Type2>& f2                                        \
 );                                                                             \
                                                                                \
@@ -338,11 +338,11 @@ template                                                                       \
     class Type1,                                                               \
     class Type2                                                                \
 >                                                                              \
-tmp<FieldField<Field1, typename product<Type1, Type2>::type> >                 \
+tmp<FieldField<Field1, typename product<Type1, Type2>::type>>                 \
 operator op                                                                    \
 (                                                                              \
-    const tmp<FieldField<Field1, Type1> >& tf1,                                \
-    const tmp<FieldField<Field2, Type2> >& tf2                                 \
+    const tmp<FieldField<Field1, Type1>>& tf1,                                \
+    const tmp<FieldField<Field2, Type2>>& tf2                                 \
 );                                                                             \
                                                                                \
 template                                                                       \
@@ -356,7 +356,7 @@ void opFunc                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Type, class Form, class Cmpt, int nCmpt>   \
-tmp<FieldField<Field, typename product<Type, Form>::type> >                    \
+tmp<FieldField<Field, typename product<Type, Form>::type>>                    \
 operator op                                                                    \
 (                                                                              \
     const FieldField<Field, Type>& f1,                                         \
@@ -365,10 +365,10 @@ operator op                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Type, class Form, class Cmpt, int nCmpt>   \
-tmp<FieldField<Field, typename product<Type, Form>::type> >                    \
+tmp<FieldField<Field, typename product<Type, Form>::type>>                    \
 operator op                                                                    \
 (                                                                              \
-    const tmp<FieldField<Field, Type> >& tf1,                                  \
+    const tmp<FieldField<Field, Type>>& tf1,                                  \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                     \
 );                                                                             \
                                                                                \
@@ -383,7 +383,7 @@ void opFunc                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Form, class Cmpt, int nCmpt, class Type>   \
-tmp<FieldField<Field, typename product<Form, Type>::type> >                    \
+tmp<FieldField<Field, typename product<Form, Type>::type>>                    \
 operator op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
@@ -392,11 +392,11 @@ operator op                                                                    \
                                                                                \
 template                                                                       \
 <template<class> class Field, class Form, class Cmpt, int nCmpt, class Type>   \
-tmp<FieldField<Field, typename product<Form, Type>::type> >                    \
+tmp<FieldField<Field, typename product<Form, Type>::type>>                    \
 operator op                                                                    \
 (                                                                              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                    \
-    const tmp<FieldField<Field, Type> >& tf1                                   \
+    const tmp<FieldField<Field, Type>>& tf1                                   \
 );
 
 PRODUCT_OPERATOR(typeOfSum, +, add)
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
index 880d52ea5b73d2f425ae678c43a4d94ee122529d..e30973377010ed28c86bacb3f74639cb5b7f0e2f 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.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
@@ -44,12 +44,12 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
     const FieldField<Field, Type>& f                                          \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         FieldField<Field, ReturnType>::NewCalculatedType(f)                   \
     );                                                                        \
@@ -58,12 +58,12 @@ tmp<FieldField<Field, ReturnType> > Func                                      \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
-    const tmp<FieldField<Field, Type> >& tf                                   \
+    const tmp<FieldField<Field, Type>>& tf                                   \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpFieldField<Field, Type, Type>::New(tf)                        \
     );                                                                        \
@@ -91,12 +91,12 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const FieldField<Field, Type>& f                                          \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         FieldField<Field, Type>::NewCalculatedType(f)                         \
     );                                                                        \
@@ -105,12 +105,12 @@ tmp<FieldField<Field, ReturnType> > operator Op                               \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
-    const tmp<FieldField<Field, Type> >& tf                                   \
+    const tmp<FieldField<Field, Type>>& tf                                   \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpFieldField<Field, Type, Type>::New(tf)                        \
     );                                                                        \
@@ -139,13 +139,13 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
     const FieldField<Field, Type2>& f2                                        \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         FieldField<Field, Type1>::NewCalculatedType(f1)                       \
     );                                                                        \
@@ -154,13 +154,13 @@ tmp<FieldField<Field, ReturnType> > Func                                      \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                \
     );                                                                        \
@@ -170,13 +170,13 @@ tmp<FieldField<Field, ReturnType> > Func                                      \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
     const FieldField<Field, Type2>& f2                                        \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                \
     );                                                                        \
@@ -186,13 +186,13 @@ tmp<FieldField<Field, ReturnType> > Func                                      \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::       \
             New(tf1, tf2)                                                     \
@@ -223,13 +223,13 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
     const Type2& s                                                            \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         FieldField<Field, Type1>::NewCalculatedType(f1)                       \
     );                                                                        \
@@ -238,13 +238,13 @@ tmp<FieldField<Field, ReturnType> > Func                                      \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
     const Type2& s                                                            \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                \
     );                                                                        \
@@ -271,13 +271,13 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
     const Type1& s,                                                           \
     const FieldField<Field, Type2>& f2                                        \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         FieldField<Field, Type2>::NewCalculatedType(f2)                       \
     );                                                                        \
@@ -286,13 +286,13 @@ tmp<FieldField<Field, ReturnType> > Func                                      \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
     const Type1& s,                                                           \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                \
     );                                                                        \
@@ -326,13 +326,13 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
     const FieldField<Field, Type2>& f2                                        \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         FieldField<Field, ReturnType>::NewCalculatedType(f1)                  \
     );                                                                        \
@@ -341,13 +341,13 @@ tmp<FieldField<Field, ReturnType> > operator Op                               \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                \
     );                                                                        \
@@ -357,13 +357,13 @@ tmp<FieldField<Field, ReturnType> > operator Op                               \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
     const FieldField<Field, Type2>& f2                                        \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                \
     );                                                                        \
@@ -373,13 +373,13 @@ tmp<FieldField<Field, ReturnType> > operator Op                               \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpTmpFieldField<Field, ReturnType, Type1, Type1, Type2>::       \
             New(tf1, tf2)                                                     \
@@ -410,13 +410,13 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const Type1& s,                                                           \
     const FieldField<Field, Type2>& f2                                        \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         FieldField<Field, Type2>::NewCalculatedType(f2)                       \
     );                                                                        \
@@ -425,13 +425,13 @@ tmp<FieldField<Field, ReturnType> > operator Op                               \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const Type1& s,                                                           \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpFieldField<Field, ReturnType, Type2>::New(tf2)                \
     );                                                                        \
@@ -458,13 +458,13 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
     const Type2& s                                                            \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         FieldField<Field, Type1>::NewCalculatedType(f1)                       \
     );                                                                        \
@@ -473,13 +473,13 @@ tmp<FieldField<Field, ReturnType> > operator Op                               \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
     const Type2& s                                                            \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, ReturnType> > tRes                                  \
+    tmp<FieldField<Field, ReturnType>> tRes                                  \
     (                                                                         \
         reuseTmpFieldField<Field, ReturnType, Type1>::New(tf1)                \
     );                                                                        \
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.H
index aafc1fa7203b7658e399ab2fb0a298ff2d2661ef..6cc3ad76abc52bcfe78ba183d6cefd2047c4d6b4 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctionsM.H
@@ -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
@@ -40,15 +40,15 @@ void Func                                                                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
     const FieldField<Field, Type1>& f                                         \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > Func                                      \
+tmp<FieldField<Field, ReturnType>> Func                                      \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf                                  \
+    const tmp<FieldField<Field, Type1>>& tf                                  \
 );
 
 
@@ -64,15 +64,15 @@ void OpFunc                                                                   \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const FieldField<Field, Type1>& f                                         \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf                                  \
+    const tmp<FieldField<Field, Type1>>& tf                                  \
 );
 
 
@@ -89,31 +89,31 @@ void func                                                                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > func                                      \
+tmp<FieldField<Field, ReturnType>> func                                      \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
     const FieldField<Field, Type2>& f2                                        \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > func                                      \
+tmp<FieldField<Field, ReturnType>> func                                      \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > func                                      \
+tmp<FieldField<Field, ReturnType>> func                                      \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
     const FieldField<Field, Type2>& f2                                        \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > func                                      \
+tmp<FieldField<Field, ReturnType>> func                                      \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 );
 
 
@@ -130,17 +130,17 @@ void func                                                                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > func                                      \
+tmp<FieldField<Field, ReturnType>> func                                      \
 (                                                                             \
     const Type1& s1,                                                          \
     const FieldField<Field, Type1>& f2                                        \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > func                                      \
+tmp<FieldField<Field, ReturnType>> func                                      \
 (                                                                             \
     const Type1& s1,                                                          \
-    const tmp<FieldField<Field, Type1> >& tf2                                 \
+    const tmp<FieldField<Field, Type1>>& tf2                                 \
 );
 
 
@@ -155,16 +155,16 @@ void func                                                                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > func                                      \
+tmp<FieldField<Field, ReturnType>> func                                      \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
     const Type2& s                                                            \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > func                                      \
+tmp<FieldField<Field, ReturnType>> func                                      \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
     const Type2& s                                                            \
 );
 
@@ -187,31 +187,31 @@ void OpFunc                                                                   \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
     const FieldField<Field, Type2>& f2                                        \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
     const FieldField<Field, Type2>& f2                                        \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 );
 
 
@@ -228,17 +228,17 @@ void OpFunc                                                                   \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const Type1& s1,                                                          \
     const FieldField<Field, Type2>& f2                                        \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const Type1& s1,                                                          \
-    const tmp<FieldField<Field, Type2> >& tf2                                 \
+    const tmp<FieldField<Field, Type2>>& tf2                                 \
 );
 
 
@@ -253,16 +253,16 @@ void OpFunc                                                                   \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
     const FieldField<Field, Type1>& f1,                                       \
     const Type2& s2                                                           \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<FieldField<Field, ReturnType> > operator Op                               \
+tmp<FieldField<Field, ReturnType>> operator Op                               \
 (                                                                             \
-    const tmp<FieldField<Field, Type1> >& tf1,                                \
+    const tmp<FieldField<Field, Type1>>& tf1,                                \
     const Type2& s2                                                           \
 );
 
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
index 525a6d38b1be5c6c7ab5da74f92dc8955f635a8d..b941bee749a33f3f8403ad9d2569d1f35187d160 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldReuseFunctions.H
@@ -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
@@ -38,18 +38,18 @@ class reuseTmpFieldField
 {
 public:
 
-    static tmp<FieldField<Field, TypeR> > New
+    static tmp<FieldField<Field, TypeR>> New
     (
-        const tmp<FieldField<Field, Type1> >& tf1
+        const tmp<FieldField<Field, Type1>>& tf1
     )
     {
-        return tmp<FieldField<Field, TypeR> >
+        return tmp<FieldField<Field, TypeR>>
         (
             FieldField<Field, TypeR>::NewCalculatedType(tf1())
         );
     }
 
-    static void clear(const tmp<FieldField<Field, Type1> >& tf1)
+    static void clear(const tmp<FieldField<Field, Type1>>& tf1)
     {
         tf1.clear();
     }
@@ -61,9 +61,9 @@ class reuseTmpFieldField<Field, TypeR, TypeR>
 {
 public:
 
-    static tmp<FieldField<Field, TypeR> > New
+    static tmp<FieldField<Field, TypeR>> New
     (
-        const tmp<FieldField<Field, TypeR> >& tf1
+        const tmp<FieldField<Field, TypeR>>& tf1
     )
     {
         if (tf1.isTmp())
@@ -72,14 +72,14 @@ public:
         }
         else
         {
-            return tmp<FieldField<Field, TypeR> >
+            return tmp<FieldField<Field, TypeR>>
             (
                 FieldField<Field, TypeR>::NewCalculatedType(tf1())
             );
         }
     }
 
-    static void clear(const tmp<FieldField<Field, TypeR> >& tf1)
+    static void clear(const tmp<FieldField<Field, TypeR>>& tf1)
     {
         if (tf1.isTmp())
         {
@@ -101,13 +101,13 @@ class reuseTmpTmpFieldField
 {
 public:
 
-    static tmp<FieldField<Field, TypeR> > New
+    static tmp<FieldField<Field, TypeR>> New
     (
-        const tmp<FieldField<Field, Type1> >& tf1,
-        const tmp<FieldField<Field, Type2> >& tf2
+        const tmp<FieldField<Field, Type1>>& tf1,
+        const tmp<FieldField<Field, Type2>>& tf2
     )
     {
-        return tmp<FieldField<Field, TypeR> >
+        return tmp<FieldField<Field, TypeR>>
         (
             FieldField<Field, TypeR>::NewCalculatedType(tf1())
         );
@@ -115,8 +115,8 @@ public:
 
     static void clear
     (
-        const tmp<FieldField<Field, Type1> >& tf1,
-        const tmp<FieldField<Field, Type2> >& tf2
+        const tmp<FieldField<Field, Type1>>& tf1,
+        const tmp<FieldField<Field, Type2>>& tf2
     )
     {
         tf1.clear();
@@ -130,10 +130,10 @@ class reuseTmpTmpFieldField<Field, TypeR, Type1, Type12, TypeR>
 {
 public:
 
-    static tmp<FieldField<Field, TypeR> > New
+    static tmp<FieldField<Field, TypeR>> New
     (
-        const tmp<FieldField<Field, Type1> >& tf1,
-        const tmp<FieldField<Field, TypeR> >& tf2
+        const tmp<FieldField<Field, Type1>>& tf1,
+        const tmp<FieldField<Field, TypeR>>& tf2
     )
     {
         if (tf2.isTmp())
@@ -142,7 +142,7 @@ public:
         }
         else
         {
-            return tmp<FieldField<Field, TypeR> >
+            return tmp<FieldField<Field, TypeR>>
             (
                 FieldField<Field, TypeR>::NewCalculatedType(tf1())
             );
@@ -151,8 +151,8 @@ public:
 
     static void clear
     (
-        const tmp<FieldField<Field, Type1> >& tf1,
-        const tmp<FieldField<Field, TypeR> >& tf2
+        const tmp<FieldField<Field, Type1>>& tf1,
+        const tmp<FieldField<Field, TypeR>>& tf2
     )
     {
         tf1.clear();
@@ -169,10 +169,10 @@ class reuseTmpTmpFieldField<Field, TypeR, TypeR, TypeR, Type2>
 {
 public:
 
-    static tmp<FieldField<Field, TypeR> > New
+    static tmp<FieldField<Field, TypeR>> New
     (
-        const tmp<FieldField<Field, TypeR> >& tf1,
-        const tmp<FieldField<Field, Type2> >& tf2
+        const tmp<FieldField<Field, TypeR>>& tf1,
+        const tmp<FieldField<Field, Type2>>& tf2
     )
     {
         if (tf1.isTmp())
@@ -181,7 +181,7 @@ public:
         }
         else
         {
-            return tmp<FieldField<Field, TypeR> >
+            return tmp<FieldField<Field, TypeR>>
             (
                 FieldField<Field, TypeR>::NewCalculatedType(tf1())
             );
@@ -190,8 +190,8 @@ public:
 
     static void clear
     (
-        const tmp<FieldField<Field, TypeR> >& tf1,
-        const tmp<FieldField<Field, Type2> >& tf2
+        const tmp<FieldField<Field, TypeR>>& tf1,
+        const tmp<FieldField<Field, Type2>>& tf2
     )
     {
         if (tf1.isTmp())
@@ -208,10 +208,10 @@ class reuseTmpTmpFieldField<Field, TypeR, TypeR, TypeR, TypeR>
 {
 public:
 
-    static tmp<FieldField<Field, TypeR> > New
+    static tmp<FieldField<Field, TypeR>> New
     (
-        const tmp<FieldField<Field, TypeR> >& tf1,
-        const tmp<FieldField<Field, TypeR> >& tf2
+        const tmp<FieldField<Field, TypeR>>& tf1,
+        const tmp<FieldField<Field, TypeR>>& tf2
     )
     {
         if (tf1.isTmp())
@@ -224,7 +224,7 @@ public:
         }
         else
         {
-            return tmp<FieldField<Field, TypeR> >
+            return tmp<FieldField<Field, TypeR>>
             (
                 FieldField<Field, TypeR>::NewCalculatedType(tf1())
             );
@@ -233,8 +233,8 @@ public:
 
     static void clear
     (
-        const tmp<FieldField<Field, TypeR> >& tf1,
-        const tmp<FieldField<Field, TypeR> >& tf2
+        const tmp<FieldField<Field, TypeR>>& tf1,
+        const tmp<FieldField<Field, TypeR>>& tf2
     )
     {
         if (tf1.isTmp())
diff --git a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C
index 4f4ddcb429dd487710a8508b74ce9b95a202180d..43e52ab90f6b31d7eb2695362b7c0354fc7a7352 100644
--- a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.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
@@ -53,13 +53,13 @@ void stabilise
 }
 
 template<template<class> class Field>
-tmp<FieldField<Field, scalar> > stabilise
+tmp<FieldField<Field, scalar>> stabilise
 (
     const FieldField<Field, scalar>& f1,
     const scalar s
 )
 {
-    tmp<FieldField<Field, scalar> > tf
+    tmp<FieldField<Field, scalar>> tf
     (
         FieldField<Field, scalar>::NewCalculatedType(f1)
     );
@@ -68,13 +68,13 @@ tmp<FieldField<Field, scalar> > stabilise
 }
 
 template<template<class> class Field>
-tmp<FieldField<Field, scalar> > stabilise
+tmp<FieldField<Field, scalar>> stabilise
 (
-    const tmp<FieldField<Field, scalar> >& tf1,
+    const tmp<FieldField<Field, scalar>>& tf1,
     const scalar s
 )
 {
-    tmp<FieldField<Field, scalar> > tf(tf1.ptr());
+    tmp<FieldField<Field, scalar>> tf(tf1.ptr());
     stabilise(tf(), tf(), s);
     return tf;
 }
@@ -152,13 +152,13 @@ void func                                                                     \
 }                                                                             \
                                                                               \
 template<template<class> class Field>                                         \
-tmp<FieldField<Field, scalar> > func                                          \
+tmp<FieldField<Field, scalar>> func                                          \
 (                                                                             \
     const int n,                                                              \
     const FieldField<Field, scalar>& sf                                       \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, scalar> > tRes                                      \
+    tmp<FieldField<Field, scalar>> tRes                                      \
     (                                                                         \
         FieldField<Field, scalar>::NewCalculatedType(sf)                      \
     );                                                                        \
@@ -167,13 +167,13 @@ tmp<FieldField<Field, scalar> > func                                          \
 }                                                                             \
                                                                               \
 template<template<class> class Field>                                         \
-tmp<FieldField<Field, scalar> > func                                          \
+tmp<FieldField<Field, scalar>> func                                          \
 (                                                                             \
     const int n,                                                              \
-    const tmp<FieldField<Field, scalar> >& tsf                                \
+    const tmp<FieldField<Field, scalar>>& tsf                                \
 )                                                                             \
 {                                                                             \
-    tmp<FieldField<Field, scalar> > tRes                                      \
+    tmp<FieldField<Field, scalar>> tRes                                      \
     (                                                                         \
         reuseTmpFieldField<Field, scalar, scalar>::New(tsf)                   \
     );                                                                        \
diff --git a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H
index 0af7ac39d43058c090d5a055e99941a513e5d9d1..3a214a3ee422330795d6a3d9fbb63cc0351729aa 100644
--- a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.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
@@ -58,7 +58,7 @@ void stabilise
 
 
 template<template<class> class Field>
-tmp<FieldField<Field, scalar> > stabilise
+tmp<FieldField<Field, scalar>> stabilise
 (
     const FieldField<Field, scalar>&,
     const scalar s
@@ -66,9 +66,9 @@ tmp<FieldField<Field, scalar> > stabilise
 
 
 template<template<class> class Field>
-tmp<FieldField<Field, scalar> > stabilise
+tmp<FieldField<Field, scalar>> stabilise
 (
-    const tmp<FieldField<Field, scalar> >&,
+    const tmp<FieldField<Field, scalar>>&,
     const scalar s
 );
 
@@ -136,7 +136,7 @@ void func                                                                     \
     const FieldField<Field, scalar>& sf                                       \
 );                                                                            \
 tmp<scalarField> func(const int n, const FieldField<Field, scalar>&);         \
-tmp<scalarField> func(const int n, const tmp<FieldField<Field, scalar> >&);
+tmp<scalarField> func(const int n, const tmp<FieldField<Field, scalar>>&);
 
 BesselFunc(jn)
 BesselFunc(yn)
diff --git a/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.C b/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.C
index 7fdb90afec86407d1eccf3d44473aae7df9907ee..a1069a53fc0d20b178c3c0a904f08fef3e53d3ca 100644
--- a/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.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
@@ -51,13 +51,13 @@ void transform
 
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
     const FieldField<Field, tensor>& trf,
     const FieldField<Field, Type>& tf
 )
 {
-    tmp<FieldField<Field, Type> > tranf
+    tmp<FieldField<Field, Type>> tranf
     (
         FieldField<Field, Type>::NewCalculatedType(tf)
     );
@@ -67,26 +67,26 @@ tmp<FieldField<Field, Type> > transform
 
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
     const FieldField<Field, tensor>& trf,
-    const tmp<FieldField<Field, Type> >& ttf
+    const tmp<FieldField<Field, Type>>& ttf
 )
 {
-    tmp<FieldField<Field, Type> > tranf(ttf.ptr());
+    tmp<FieldField<Field, Type>> tranf(ttf.ptr());
     transform(tranf(), trf, tranf());
     return tranf;
 }
 
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
-    const tmp<FieldField<Field, tensor> >& ttrf,
+    const tmp<FieldField<Field, tensor>>& ttrf,
     const FieldField<Field, Type>& tf
 )
 {
-    tmp<FieldField<Field, Type> > tranf
+    tmp<FieldField<Field, Type>> tranf
     (
         FieldField<Field, Type>::NewCalculatedType(tf)
     );
@@ -97,13 +97,13 @@ tmp<FieldField<Field, Type> > transform
 
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
-    const tmp<FieldField<Field, tensor> >& ttrf,
-    const tmp<FieldField<Field, Type> >& ttf
+    const tmp<FieldField<Field, tensor>>& ttrf,
+    const tmp<FieldField<Field, Type>>& ttf
 )
 {
-    tmp<FieldField<Field, Type> > tranf(ttf.ptr());
+    tmp<FieldField<Field, Type>> tranf(ttf.ptr());
     transform(tranf(), ttrf(), tranf());
     ttrf.clear();
     return tranf;
@@ -126,13 +126,13 @@ void transform
 
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
     const tensor& t,
     const FieldField<Field, Type>& tf
 )
 {
-    tmp<FieldField<Field, Type> > tranf
+    tmp<FieldField<Field, Type>> tranf
     (
         FieldField<Field, Type>::NewCalculatedType(tf)
     );
@@ -142,13 +142,13 @@ tmp<FieldField<Field, Type> > transform
 
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
     const tensor& t,
-    const tmp<FieldField<Field, Type> >& ttf
+    const tmp<FieldField<Field, Type>>& ttf
 )
 {
-    tmp<FieldField<Field, Type> > tranf(ttf.ptr());
+    tmp<FieldField<Field, Type>> tranf(ttf.ptr());
     transform(tranf(), t, tranf());
     return tranf;
 }
diff --git a/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.H b/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.H
index 3e11c098678f82ee865f4af2d520d7dd7e29b3f6..2b313ac9955dbace6d56721a99b74889deb92e0a 100644
--- a/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.H
@@ -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,31 +55,31 @@ void transform
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
     const FieldField<Field, tensor>&,
     const FieldField<Field, Type>&
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
     const FieldField<Field, tensor>&,
-    const tmp<FieldField<Field, Type> >&
+    const tmp<FieldField<Field, Type>>&
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
-    const tmp<FieldField<Field, tensor> >&,
+    const tmp<FieldField<Field, tensor>>&,
     const FieldField<Field, Type>&
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
-    const tmp<FieldField<Field, tensor> >&,
-    const tmp<FieldField<Field, Type> >&
+    const tmp<FieldField<Field, tensor>>&,
+    const tmp<FieldField<Field, Type>>&
 );
 
 
@@ -92,17 +92,17 @@ void transform
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
     const tensor&,
     const FieldField<Field, Type>&
 );
 
 template<template<class> class Field, class Type>
-tmp<FieldField<Field, Type> > transform
+tmp<FieldField<Field, Type>> transform
 (
     const tensor&,
-    const tmp<FieldField<Field, Type> >&
+    const tmp<FieldField<Field, Type>>&
 );
 
 
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.C b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.C
index 5696467d975cfdb9705af10d9145c63aa794ed1f..1626319fc0f94d502991996f65efe2220bf9dde9 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.C
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.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
@@ -36,10 +36,10 @@ Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::DynamicField(Istream& is)
 
 
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
-Foam::tmp<Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv> >
+Foam::tmp<Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>>
 Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::clone() const
 {
-    return tmp<DynamicField<T, SizeInc, SizeMult, SizeDiv> >
+    return tmp<DynamicField<T, SizeInc, SizeMult, SizeDiv>>
     (
         new DynamicField<T, SizeInc, SizeMult, SizeDiv>(*this)
     );
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
index 9df294a08fe355524cc05f15943be54613432639..06165cbb4135e1a7731c8f3a1ab34ed966dec07b 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
@@ -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
@@ -109,7 +109,7 @@ public:
         explicit inline DynamicField(const UList<T>&);
 
         //- Construct by transferring the parameter contents
-        explicit inline DynamicField(const Xfer<List<T> >&);
+        explicit inline DynamicField(const Xfer<List<T>>&);
 
         //- Construct by 1 to 1 mapping from the given field
         inline DynamicField
@@ -139,14 +139,14 @@ public:
         //- Construct by transferring the Field contents
         inline DynamicField
         (
-            const Xfer<DynamicField<T, SizeInc, SizeMult, SizeDiv> >&
+            const Xfer<DynamicField<T, SizeInc, SizeMult, SizeDiv>>&
         );
 
         //- Construct from Istream. Size set to size of list read.
         explicit DynamicField(Istream&);
 
         //- Clone
-        tmp<DynamicField<T, SizeInc, SizeMult, SizeDiv> > clone() const;
+        tmp<DynamicField<T, SizeInc, SizeMult, SizeDiv>> clone() const;
 
 
     // Member Functions
@@ -200,7 +200,7 @@ public:
             inline DynamicField<T, SizeInc, SizeMult, SizeDiv>& shrink();
 
             //- Transfer contents to the Xfer container as a plain List
-            inline Xfer<List<T> > xfer();
+            inline Xfer<List<T>> xfer();
 
 
         // Member Operators
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
index 72c49353a7da1cf27115b7f0b8aeea3a7d2e158a..8db855af5353f7f695d2599a4a76e049dd0a0394 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
@@ -61,7 +61,7 @@ inline Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::DynamicField
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 inline Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::DynamicField
 (
-    const Xfer<List<T> >& lst
+    const Xfer<List<T>>& lst
 )
 :
     Field<T>(lst),
@@ -121,7 +121,7 @@ inline Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::DynamicField
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 inline Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::DynamicField
 (
-    const Xfer<DynamicField<T, SizeInc, SizeMult, SizeDiv> >& lst
+    const Xfer<DynamicField<T, SizeInc, SizeMult, SizeDiv>>& lst
 )
 :
     Field<T>(lst),
@@ -308,7 +308,7 @@ Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::shrink()
 
 
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
-inline Foam::Xfer<Foam::List<T> >
+inline Foam::Xfer<Foam::List<T>>
 Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::xfer()
 {
     return xferMoveTo<List<T>>(*this);
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index f629bc4187ea9329cdf7a781ace8f0d9a722e27e..5d66bdb349b8674d980f4d783498e66e4d55ea7d 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.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
@@ -73,7 +73,7 @@ Foam::Field<Type>::Field
 template<class Type>
 Foam::Field<Type>::Field
 (
-    const tmp<Field<Type> >& tmapF,
+    const tmp<Field<Type>>& tmapF,
     const labelUList& mapAddressing
 )
 :
@@ -100,7 +100,7 @@ Foam::Field<Type>::Field
 template<class Type>
 Foam::Field<Type>::Field
 (
-    const tmp<Field<Type> >& tmapF,
+    const tmp<Field<Type>>& tmapF,
     const labelListList& mapAddressing,
     const scalarListList& mapWeights
 )
@@ -155,7 +155,7 @@ Foam::Field<Type>::Field
 template<class Type>
 Foam::Field<Type>::Field
 (
-    const tmp<Field<Type> >& tmapF,
+    const tmp<Field<Type>>& tmapF,
     const FieldMapper& mapper
 )
 :
@@ -168,7 +168,7 @@ Foam::Field<Type>::Field
 template<class Type>
 Foam::Field<Type>::Field
 (
-    const tmp<Field<Type> >& tmapF,
+    const tmp<Field<Type>>& tmapF,
     const FieldMapper& mapper,
     const Type& defaultValue
 )
@@ -182,7 +182,7 @@ Foam::Field<Type>::Field
 template<class Type>
 Foam::Field<Type>::Field
 (
-    const tmp<Field<Type> >& tmapF,
+    const tmp<Field<Type>>& tmapF,
     const FieldMapper& mapper,
     const UList<Type>& defaultValues
 )
@@ -209,14 +209,14 @@ Foam::Field<Type>::Field(Field<Type>& f, bool reUse)
 
 
 template<class Type>
-Foam::Field<Type>::Field(const Xfer<List<Type> >& f)
+Foam::Field<Type>::Field(const Xfer<List<Type>>& f)
 :
     List<Type>(f)
 {}
 
 
 template<class Type>
-Foam::Field<Type>::Field(const Xfer<Field<Type> >& f)
+Foam::Field<Type>::Field(const Xfer<Field<Type>>& f)
 :
     List<Type>(f)
 {}
@@ -232,7 +232,7 @@ Foam::Field<Type>::Field(const UList<Type>& list)
 // Construct as copy of tmp<Field>
 #ifndef NoConstructFromTmp
 template<class Type>
-Foam::Field<Type>::Field(const tmp<Field<Type> >& tf)
+Foam::Field<Type>::Field(const tmp<Field<Type>>& tf)
 :
     List<Type>(const_cast<Field<Type>&>(tf()), tf.isTmp())
 {
@@ -324,9 +324,9 @@ Foam::Field<Type>::Field
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::Field<Type>::clone() const
+Foam::tmp<Foam::Field<Type>> Foam::Field<Type>::clone() const
 {
-    return tmp<Field<Type> >(new Field<Type>(*this));
+    return tmp<Field<Type>>(new Field<Type>(*this));
 }
 
 
@@ -364,7 +364,7 @@ void Foam::Field<Type>::map
 template<class Type>
 void Foam::Field<Type>::map
 (
-    const tmp<Field<Type> >& tmapF,
+    const tmp<Field<Type>>& tmapF,
     const labelUList& mapAddressing
 )
 {
@@ -413,7 +413,7 @@ void Foam::Field<Type>::map
 template<class Type>
 void Foam::Field<Type>::map
 (
-    const tmp<Field<Type> >& tmapF,
+    const tmp<Field<Type>>& tmapF,
     const labelListList& mapAddressing,
     const scalarListList& mapWeights
 )
@@ -449,7 +449,7 @@ void Foam::Field<Type>::map
 template<class Type>
 void Foam::Field<Type>::map
 (
-    const tmp<Field<Type> >& tmapF,
+    const tmp<Field<Type>>& tmapF,
     const FieldMapper& mapper
 )
 {
@@ -508,7 +508,7 @@ void Foam::Field<Type>::rmap
 template<class Type>
 void Foam::Field<Type>::rmap
 (
-    const tmp<Field<Type> >& tmapF,
+    const tmp<Field<Type>>& tmapF,
     const labelUList& mapAddressing
 )
 {
@@ -539,7 +539,7 @@ void Foam::Field<Type>::rmap
 template<class Type>
 void Foam::Field<Type>::rmap
 (
-    const tmp<Field<Type> >& tmapF,
+    const tmp<Field<Type>>& tmapF,
     const labelUList& mapAddressing,
     const UList<scalar>& mapWeights
 )
@@ -557,13 +557,13 @@ void Foam::Field<Type>::negate()
 
 
 template<class Type>
-Foam::tmp<Foam::Field<typename Foam::Field<Type>::cmptType> >
+Foam::tmp<Foam::Field<typename Foam::Field<Type>::cmptType>>
 Foam::Field<Type>::component
 (
     const direction d
 ) const
 {
-    tmp<Field<cmptType> > Component(new Field<cmptType>(this->size()));
+    tmp<Field<cmptType>> Component(new Field<cmptType>(this->size()));
     ::Foam::component(Component(), *this, d);
     return Component;
 }
@@ -585,7 +585,7 @@ template<class Type>
 void Foam::Field<Type>::replace
 (
     const direction d,
-    const tmp<Field<cmptType> >& tsf
+    const tmp<Field<cmptType>>& tsf
 )
 {
     replace(d, tsf());
@@ -606,9 +606,9 @@ void Foam::Field<Type>::replace
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::Field<Type>::T() const
+Foam::tmp<Foam::Field<Type>> Foam::Field<Type>::T() const
 {
-    tmp<Field<Type> > transpose(new Field<Type>(this->size()));
+    tmp<Field<Type>> transpose(new Field<Type>(this->size()));
     ::Foam::T(transpose(), *this);
     return transpose;
 }
@@ -721,7 +721,7 @@ void Foam::Field<Type>::operator op(const UList<TYPE>& f)                     \
 }                                                                             \
                                                                               \
 template<class Type>                                                          \
-void Foam::Field<Type>::operator op(const tmp<Field<TYPE> >& tf)              \
+void Foam::Field<Type>::operator op(const tmp<Field<TYPE>>& tf)              \
 {                                                                             \
     operator op(tf());                                                        \
     tf.clear();                                                               \
@@ -752,7 +752,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const Field<Type>& f)
 
 
 template<class Type>
-Foam::Ostream& Foam::operator<<(Ostream& os, const tmp<Field<Type> >& tf)
+Foam::Ostream& Foam::operator<<(Ostream& os, const tmp<Field<Type>>& tf)
 {
     os  << tf();
     tf.clear();
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index f9c340f9bc6a2ce5d9f6e538574ba0c22027969c..678dd3c77212628a80a4d395bd6c163df11fe551 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.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
@@ -65,7 +65,7 @@ template<class Type>
 Ostream& operator<<(Ostream&, const Field<Type>&);
 
 template<class Type>
-Ostream& operator<<(Ostream&, const tmp<Field<Type> >&);
+Ostream& operator<<(Ostream&, const tmp<Field<Type>>&);
 
 class FieldMapper;
 class dictionary;
@@ -100,7 +100,7 @@ public:
         //- Return a null field
         inline static const Field<Type>& null()
         {
-            return NullObjectRef<Field<Type> >();
+            return NullObjectRef<Field<Type>>();
         }
 
 
@@ -121,7 +121,7 @@ public:
         explicit Field(const UList<Type>&);
 
         //- Construct by transferring the List contents
-        explicit Field(const Xfer<List<Type> >&);
+        explicit Field(const Xfer<List<Type>>&);
 
         //- Construct by 1 to 1 mapping from the given field
         Field
@@ -133,7 +133,7 @@ public:
         //- Construct by 1 to 1 mapping from the given tmp field
         Field
         (
-            const tmp<Field<Type> >& tmapF,
+            const tmp<Field<Type>>& tmapF,
             const labelUList& mapAddressing
         );
 
@@ -148,7 +148,7 @@ public:
         //- Construct by interpolative mapping from the given tmp field
         Field
         (
-            const tmp<Field<Type> >& tmapF,
+            const tmp<Field<Type>>& tmapF,
             const labelListList& mapAddressing,
             const scalarListList& weights
         );
@@ -179,7 +179,7 @@ public:
         //- Construct by mapping from the given tmp field
         Field
         (
-            const tmp<Field<Type> >& tmapF,
+            const tmp<Field<Type>>& tmapF,
             const FieldMapper& map
         );
 
@@ -187,7 +187,7 @@ public:
         //  value for unmapped items
         Field
         (
-            const tmp<Field<Type> >& tmapF,
+            const tmp<Field<Type>>& tmapF,
             const FieldMapper& map,
             const Type& defaultValue
         );
@@ -196,7 +196,7 @@ public:
         //  for unmapped items
         Field
         (
-            const tmp<Field<Type> >& tmapF,
+            const tmp<Field<Type>>& tmapF,
             const FieldMapper& map,
             const UList<Type>& defaultValues
         );
@@ -208,11 +208,11 @@ public:
         Field(Field<Type>&, bool reUse);
 
         //- Construct by transferring the Field contents
-        Field(const Xfer<Field<Type> >&);
+        Field(const Xfer<Field<Type>>&);
 
         //- Construct as copy of tmp<Field>
         #ifndef NoConstructFromTmp
-        Field(const tmp<Field<Type> >&);
+        Field(const tmp<Field<Type>>&);
         #endif
 
         //- Construct from Istream
@@ -222,14 +222,14 @@ public:
         Field(const word& keyword, const dictionary&, const label size);
 
         //- Clone
-        tmp<Field<Type> > clone() const;
+        tmp<Field<Type>> clone() const;
 
         //- Return a pointer to a new calculatedFvPatchFieldField created on
         //  freestore without setting patchField values
         template<class Type2>
-        static tmp<Field<Type> > NewCalculatedType(const Field<Type2>& f)
+        static tmp<Field<Type>> NewCalculatedType(const Field<Type2>& f)
         {
-            return tmp<Field<Type> >(new Field<Type>(f.size()));
+            return tmp<Field<Type>>(new Field<Type>(f.size()));
         }
 
 
@@ -245,7 +245,7 @@ public:
         //- 1 to 1 map from the given tmp field
         void map
         (
-            const tmp<Field<Type> >& tmapF,
+            const tmp<Field<Type>>& tmapF,
             const labelUList& mapAddressing
         );
 
@@ -260,7 +260,7 @@ public:
         //- Interpolative map from the given tmp field
         void map
         (
-            const tmp<Field<Type> >& tmapF,
+            const tmp<Field<Type>>& tmapF,
             const labelListList& mapAddressing,
             const scalarListList& weights
         );
@@ -275,7 +275,7 @@ public:
         //- Map from the given tmp field
         void map
         (
-            const tmp<Field<Type> >& tmapF,
+            const tmp<Field<Type>>& tmapF,
             const FieldMapper& map
         );
 
@@ -295,7 +295,7 @@ public:
         //- 1 to 1 reverse-map from the given tmp field
         void rmap
         (
-            const tmp<Field<Type> >& tmapF,
+            const tmp<Field<Type>>& tmapF,
             const labelUList& mapAddressing
         );
 
@@ -310,7 +310,7 @@ public:
         //- Interpolative reverse map from the given tmp field
         void rmap
         (
-            const tmp<Field<Type> >& tmapF,
+            const tmp<Field<Type>>& tmapF,
             const labelUList& mapAddressing,
             const UList<scalar>& weights
         );
@@ -319,19 +319,19 @@ public:
         void negate();
 
         //- Return a component field of the field
-        tmp<Field<cmptType> > component(const direction) const;
+        tmp<Field<cmptType>> component(const direction) const;
 
         //- Replace a component field of the field
         void replace(const direction, const UList<cmptType>&);
 
         //- Replace a component field of the field
-        void replace(const direction, const tmp<Field<cmptType> >&);
+        void replace(const direction, const tmp<Field<cmptType>>&);
 
         //- Replace a component field of the field
         void replace(const direction, const cmptType&);
 
         //- Return the field transpose (only defined for second rank tensors)
-        tmp<Field<Type> > T() const;
+        tmp<Field<Type>> T() const;
 
         //- Write the field as a dictionary entry
         void writeEntry(const word& keyword, Ostream& os) const;
@@ -342,23 +342,23 @@ public:
         void operator=(const Field<Type>&);
         void operator=(const UList<Type>&);
         void operator=(const SubField<Type>&);
-        void operator=(const tmp<Field<Type> >&);
+        void operator=(const tmp<Field<Type>>&);
         void operator=(const Type&);
 
         template<class Form, class Cmpt, int nCmpt>
         void operator=(const VectorSpace<Form,Cmpt,nCmpt>&);
 
         void operator+=(const UList<Type>&);
-        void operator+=(const tmp<Field<Type> >&);
+        void operator+=(const tmp<Field<Type>>&);
 
         void operator-=(const UList<Type>&);
-        void operator-=(const tmp<Field<Type> >&);
+        void operator-=(const tmp<Field<Type>>&);
 
         void operator*=(const UList<scalar>&);
-        void operator*=(const tmp<Field<scalar> >&);
+        void operator*=(const tmp<Field<scalar>>&);
 
         void operator/=(const UList<scalar>&);
-        void operator/=(const tmp<Field<scalar> >&);
+        void operator/=(const tmp<Field<scalar>>&);
 
         void operator+=(const Type&);
         void operator-=(const Type&);
@@ -373,7 +373,7 @@ public:
         (Ostream&, const Field<Type>&);
 
         friend Ostream& operator<< <Type>
-        (Ostream&, const tmp<Field<Type> >&);
+        (Ostream&, const tmp<Field<Type>>&);
 };
 
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
index f7bd17530874f87c7a2ca8d08c52cd719b62c6c0..e8703cd1b8fd57e11d3a5d903d81d54f773b5f88 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.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
@@ -75,7 +75,7 @@ void pow
 }
 
 template<class Type, int r>
-tmp<Field<typename powProduct<Type, r>::type> >
+tmp<Field<typename powProduct<Type, r>::type>>
 pow
 (
     const UList<Type>& f,
@@ -83,7 +83,7 @@ pow
 )
 {
     typedef typename powProduct<Type, r>::type powProductType;
-    tmp<Field<powProductType> > tRes
+    tmp<Field<powProductType>> tRes
     (
         new Field<powProductType>(f.size())
     );
@@ -92,15 +92,15 @@ pow
 }
 
 template<class Type, int r>
-tmp<Field<typename powProduct<Type, r>::type> >
+tmp<Field<typename powProduct<Type, r>::type>>
 pow
 (
-    const tmp<Field<Type> >& tf,
+    const tmp<Field<Type>>& tf,
     typename powProduct<Type, r>::type
 )
 {
     typedef typename powProduct<Type, r>::type powProductType;
-    tmp<Field<powProductType> > tRes = reuseTmp<powProductType, Type>::New(tf);
+    tmp<Field<powProductType>> tRes = reuseTmp<powProductType, Type>::New(tf);
     pow<Type, r>(tRes(), tf());
     reuseTmp<powProductType, Type>::clear(tf);
     return tRes;
@@ -119,11 +119,11 @@ void sqr
 }
 
 template<class Type>
-tmp<Field<typename outerProduct<Type, Type>::type> >
+tmp<Field<typename outerProduct<Type, Type>::type>>
 sqr(const UList<Type>& f)
 {
     typedef typename outerProduct<Type, Type>::type outerProductType;
-    tmp<Field<outerProductType> > tRes
+    tmp<Field<outerProductType>> tRes
     (
         new Field<outerProductType>(f.size())
     );
@@ -132,11 +132,11 @@ sqr(const UList<Type>& f)
 }
 
 template<class Type>
-tmp<Field<typename outerProduct<Type, Type>::type> >
-sqr(const tmp<Field<Type> >& tf)
+tmp<Field<typename outerProduct<Type, Type>::type>>
+sqr(const tmp<Field<Type>>& tf)
 {
     typedef typename outerProduct<Type, Type>::type outerProductType;
-    tmp<Field<outerProductType> > tRes =
+    tmp<Field<outerProductType>> tRes =
         reuseTmp<outerProductType, Type>::New(tf);
     sqr(tRes(), tf());
     reuseTmp<outerProductType, Type>::clear(tf);
@@ -151,17 +151,17 @@ void magSqr(Field<scalar>& res, const UList<Type>& f)
 }
 
 template<class Type>
-tmp<Field<scalar> > magSqr(const UList<Type>& f)
+tmp<Field<scalar>> magSqr(const UList<Type>& f)
 {
-    tmp<Field<scalar> > tRes(new Field<scalar>(f.size()));
+    tmp<Field<scalar>> tRes(new Field<scalar>(f.size()));
     magSqr(tRes(), f);
     return tRes;
 }
 
 template<class Type>
-tmp<Field<scalar> > magSqr(const tmp<Field<Type> >& tf)
+tmp<Field<scalar>> magSqr(const tmp<Field<Type>>& tf)
 {
-    tmp<Field<scalar> > tRes = reuseTmp<scalar, Type>::New(tf);
+    tmp<Field<scalar>> tRes = reuseTmp<scalar, Type>::New(tf);
     magSqr(tRes(), tf());
     reuseTmp<scalar, Type>::clear(tf);
     return tRes;
@@ -175,17 +175,17 @@ void mag(Field<scalar>& res, const UList<Type>& f)
 }
 
 template<class Type>
-tmp<Field<scalar> > mag(const UList<Type>& f)
+tmp<Field<scalar>> mag(const UList<Type>& f)
 {
-    tmp<Field<scalar> > tRes(new Field<scalar>(f.size()));
+    tmp<Field<scalar>> tRes(new Field<scalar>(f.size()));
     mag(tRes(), f);
     return tRes;
 }
 
 template<class Type>
-tmp<Field<scalar> > mag(const tmp<Field<Type> >& tf)
+tmp<Field<scalar>> mag(const tmp<Field<Type>>& tf)
 {
-    tmp<Field<scalar> > tRes = reuseTmp<scalar, Type>::New(tf);
+    tmp<Field<scalar>> tRes = reuseTmp<scalar, Type>::New(tf);
     mag(tRes(), tf());
     reuseTmp<scalar, Type>::clear(tf);
     return tRes;
@@ -200,19 +200,19 @@ void cmptMax(Field<typename Field<Type>::cmptType>& res, const UList<Type>& f)
 }
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> > cmptMax(const UList<Type>& f)
+tmp<Field<typename Field<Type>::cmptType>> cmptMax(const UList<Type>& f)
 {
     typedef typename Field<Type>::cmptType cmptType;
-    tmp<Field<cmptType> > tRes(new Field<cmptType>(f.size()));
+    tmp<Field<cmptType>> tRes(new Field<cmptType>(f.size()));
     cmptMax(tRes(), f);
     return tRes;
 }
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> > cmptMax(const tmp<Field<Type> >& tf)
+tmp<Field<typename Field<Type>::cmptType>> cmptMax(const tmp<Field<Type>>& tf)
 {
     typedef typename Field<Type>::cmptType cmptType;
-    tmp<Field<cmptType> > tRes = reuseTmp<cmptType, Type>::New(tf);
+    tmp<Field<cmptType>> tRes = reuseTmp<cmptType, Type>::New(tf);
     cmptMax(tRes(), tf());
     reuseTmp<cmptType, Type>::clear(tf);
     return tRes;
@@ -227,19 +227,19 @@ void cmptMin(Field<typename Field<Type>::cmptType>& res, const UList<Type>& f)
 }
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> > cmptMin(const UList<Type>& f)
+tmp<Field<typename Field<Type>::cmptType>> cmptMin(const UList<Type>& f)
 {
     typedef typename Field<Type>::cmptType cmptType;
-    tmp<Field<cmptType> > tRes(new Field<cmptType>(f.size()));
+    tmp<Field<cmptType>> tRes(new Field<cmptType>(f.size()));
     cmptMin(tRes(), f);
     return tRes;
 }
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> > cmptMin(const tmp<Field<Type> >& tf)
+tmp<Field<typename Field<Type>::cmptType>> cmptMin(const tmp<Field<Type>>& tf)
 {
     typedef typename Field<Type>::cmptType cmptType;
-    tmp<Field<cmptType> > tRes = reuseTmp<cmptType, Type>::New(tf);
+    tmp<Field<cmptType>> tRes = reuseTmp<cmptType, Type>::New(tf);
     cmptMin(tRes(), tf());
     reuseTmp<cmptType, Type>::clear(tf);
     return tRes;
@@ -254,19 +254,19 @@ void cmptAv(Field<typename Field<Type>::cmptType>& res, const UList<Type>& f)
 }
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> > cmptAv(const UList<Type>& f)
+tmp<Field<typename Field<Type>::cmptType>> cmptAv(const UList<Type>& f)
 {
     typedef typename Field<Type>::cmptType cmptType;
-    tmp<Field<cmptType> > tRes(new Field<cmptType>(f.size()));
+    tmp<Field<cmptType>> tRes(new Field<cmptType>(f.size()));
     cmptAv(tRes(), f);
     return tRes;
 }
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> > cmptAv(const tmp<Field<Type> >& tf)
+tmp<Field<typename Field<Type>::cmptType>> cmptAv(const tmp<Field<Type>>& tf)
 {
     typedef typename Field<Type>::cmptType cmptType;
-    tmp<Field<cmptType> > tRes = reuseTmp<cmptType, Type>::New(tf);
+    tmp<Field<cmptType>> tRes = reuseTmp<cmptType, Type>::New(tf);
     cmptAv(tRes(), tf());
     reuseTmp<cmptType, Type>::clear(tf);
     return tRes;
@@ -280,17 +280,17 @@ void cmptMag(Field<Type>& res, const UList<Type>& f)
 }
 
 template<class Type>
-tmp<Field<Type> > cmptMag(const UList<Type>& f)
+tmp<Field<Type>> cmptMag(const UList<Type>& f)
 {
-    tmp<Field<Type> > tRes(new Field<Type>(f.size()));
+    tmp<Field<Type>> tRes(new Field<Type>(f.size()));
     cmptMag(tRes(), f);
     return tRes;
 }
 
 template<class Type>
-tmp<Field<Type> > cmptMag(const tmp<Field<Type> >& tf)
+tmp<Field<Type>> cmptMag(const tmp<Field<Type>>& tf)
 {
-    tmp<Field<Type> > tRes = reuseTmp<Type, Type>::New(tf);
+    tmp<Field<Type>> tRes = reuseTmp<Type, Type>::New(tf);
     cmptMag(tRes(), tf());
     reuseTmp<Type, Type>::clear(tf);
     return tRes;
@@ -300,7 +300,7 @@ tmp<Field<Type> > cmptMag(const tmp<Field<Type> >& tf)
 #define TMP_UNARY_FUNCTION(ReturnType, Func)                                  \
                                                                               \
 template<class Type>                                                          \
-ReturnType Func(const tmp<Field<Type> >& tf1)                                 \
+ReturnType Func(const tmp<Field<Type>>& tf1)                                 \
 {                                                                             \
     ReturnType res = Func(tf1());                                             \
     tf1.clear();                                                              \
@@ -648,43 +648,43 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type> >                             \
+tmp<Field<typename product<Type1, Type2>::type>>                             \
 operator Op(const UList<Type1>& f1, const UList<Type2>& f2)                   \
 {                                                                             \
     typedef typename product<Type1, Type2>::type productType;                 \
-    tmp<Field<productType> > tRes(new Field<productType>(f1.size()));         \
+    tmp<Field<productType>> tRes(new Field<productType>(f1.size()));         \
     OpFunc(tRes(), f1, f2);                                                   \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type> >                             \
-operator Op(const UList<Type1>& f1, const tmp<Field<Type2> >& tf2)            \
+tmp<Field<typename product<Type1, Type2>::type>>                             \
+operator Op(const UList<Type1>& f1, const tmp<Field<Type2>>& tf2)            \
 {                                                                             \
     typedef typename product<Type1, Type2>::type productType;                 \
-    tmp<Field<productType> > tRes = reuseTmp<productType, Type2>::New(tf2);   \
+    tmp<Field<productType>> tRes = reuseTmp<productType, Type2>::New(tf2);   \
     OpFunc(tRes(), f1, tf2());                                                \
     reuseTmp<productType, Type2>::clear(tf2);                                 \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type> >                             \
-operator Op(const tmp<Field<Type1> >& tf1, const UList<Type2>& f2)            \
+tmp<Field<typename product<Type1, Type2>::type>>                             \
+operator Op(const tmp<Field<Type1>>& tf1, const UList<Type2>& f2)            \
 {                                                                             \
     typedef typename product<Type1, Type2>::type productType;                 \
-    tmp<Field<productType> > tRes = reuseTmp<productType, Type1>::New(tf1);   \
+    tmp<Field<productType>> tRes = reuseTmp<productType, Type1>::New(tf1);   \
     OpFunc(tRes(), tf1(), f2);                                                \
     reuseTmp<productType, Type1>::clear(tf1);                                 \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type> >                             \
-operator Op(const tmp<Field<Type1> >& tf1, const tmp<Field<Type2> >& tf2)     \
+tmp<Field<typename product<Type1, Type2>::type>>                             \
+operator Op(const tmp<Field<Type1>>& tf1, const tmp<Field<Type2>>& tf2)     \
 {                                                                             \
     typedef typename product<Type1, Type2>::type productType;                 \
-    tmp<Field<productType> > tRes =                                           \
+    tmp<Field<productType>> tRes =                                           \
         reuseTmpTmp<productType, Type1, Type1, Type2>::New(tf1, tf2);         \
     OpFunc(tRes(), tf1(), tf2());                                             \
     reuseTmpTmp<productType, Type1, Type1, Type2>::clear(tf1, tf2);           \
@@ -705,25 +705,25 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 template<class Type, class Form, class Cmpt, int nCmpt>                       \
-tmp<Field<typename product<Type, Form>::type> >                               \
+tmp<Field<typename product<Type, Form>::type>>                               \
 operator Op(const UList<Type>& f1, const VectorSpace<Form,Cmpt,nCmpt>& vs)    \
 {                                                                             \
     typedef typename product<Type, Form>::type productType;                   \
-    tmp<Field<productType> > tRes(new Field<productType>(f1.size()));         \
+    tmp<Field<productType>> tRes(new Field<productType>(f1.size()));         \
     OpFunc(tRes(), f1, static_cast<const Form&>(vs));                         \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 template<class Type, class Form, class Cmpt, int nCmpt>                       \
-tmp<Field<typename product<Type, Form>::type> >                               \
+tmp<Field<typename product<Type, Form>::type>>                               \
 operator Op                                                                   \
 (                                                                             \
-    const tmp<Field<Type> >& tf1,                                             \
+    const tmp<Field<Type>>& tf1,                                             \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
 )                                                                             \
 {                                                                             \
     typedef typename product<Type, Form>::type productType;                   \
-    tmp<Field<productType> > tRes = reuseTmp<productType, Type>::New(tf1);    \
+    tmp<Field<productType>> tRes = reuseTmp<productType, Type>::New(tf1);    \
     OpFunc(tRes(), tf1(), static_cast<const Form&>(vs));                      \
     reuseTmp<productType, Type>::clear(tf1);                                  \
     return tRes;                                                              \
@@ -743,24 +743,24 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type>                       \
-tmp<Field<typename product<Form, Type>::type> >                               \
+tmp<Field<typename product<Form, Type>::type>>                               \
 operator Op(const VectorSpace<Form,Cmpt,nCmpt>& vs, const UList<Type>& f1)    \
 {                                                                             \
     typedef typename product<Form, Type>::type productType;                   \
-    tmp<Field<productType> > tRes(new Field<productType>(f1.size()));         \
+    tmp<Field<productType>> tRes(new Field<productType>(f1.size()));         \
     OpFunc(tRes(), static_cast<const Form&>(vs), f1);                         \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type>                       \
-tmp<Field<typename product<Form, Type>::type> >                               \
+tmp<Field<typename product<Form, Type>::type>>                               \
 operator Op                                                                   \
 (                                                                             \
-    const VectorSpace<Form,Cmpt,nCmpt>& vs, const tmp<Field<Type> >& tf1      \
+    const VectorSpace<Form,Cmpt,nCmpt>& vs, const tmp<Field<Type>>& tf1      \
 )                                                                             \
 {                                                                             \
     typedef typename product<Form, Type>::type productType;                   \
-    tmp<Field<productType> > tRes = reuseTmp<productType, Type>::New(tf1);    \
+    tmp<Field<productType>> tRes = reuseTmp<productType, Type>::New(tf1);    \
     OpFunc(tRes(), static_cast<const Form&>(vs), tf1());                      \
     reuseTmp<productType, Type>::clear(tf1);                                  \
     return tRes;                                                              \
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
index 72a148f8e37b2ab123bbdcf6d91e6c7840e3dec7..682139da60870448aeff26d73b3d086046b951a3 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,7 @@ void pow
 
 
 template<class Type, int r>
-tmp<Field<typename powProduct<Type, r>::type> >
+tmp<Field<typename powProduct<Type, r>::type>>
 pow
 (
     const UList<Type>& f,
@@ -65,10 +65,10 @@ pow
 );
 
 template<class Type, int r>
-tmp<Field<typename powProduct<Type, r>::type> >
+tmp<Field<typename powProduct<Type, r>::type>>
 pow
 (
-    const tmp<Field<Type> >& tf,
+    const tmp<Field<Type>>& tf,
     typename powProduct<Type, r>::type
       = pTraits<typename powProduct<Type, r>::type>::zero
 );
@@ -82,79 +82,79 @@ void sqr
 );
 
 template<class Type>
-tmp<Field<typename outerProduct<Type, Type>::type> >
+tmp<Field<typename outerProduct<Type, Type>::type>>
 sqr(const UList<Type>& f);
 
 template<class Type>
-tmp<Field<typename outerProduct<Type, Type>::type> >
-sqr(const tmp<Field<Type> >& tf);
+tmp<Field<typename outerProduct<Type, Type>::type>>
+sqr(const tmp<Field<Type>>& tf);
 
 
 template<class Type>
 void magSqr(Field<scalar>& res, const UList<Type>& f);
 
 template<class Type>
-tmp<Field<scalar> > magSqr(const UList<Type>& f);
+tmp<Field<scalar>> magSqr(const UList<Type>& f);
 
 template<class Type>
-tmp<Field<scalar> > magSqr(const tmp<Field<Type> >& tf);
+tmp<Field<scalar>> magSqr(const tmp<Field<Type>>& tf);
 
 
 template<class Type>
 void mag(Field<scalar>& res, const UList<Type>& f);
 
 template<class Type>
-tmp<Field<scalar> > mag(const UList<Type>& f);
+tmp<Field<scalar>> mag(const UList<Type>& f);
 
 template<class Type>
-tmp<Field<scalar> > mag(const tmp<Field<Type> >& tf);
+tmp<Field<scalar>> mag(const tmp<Field<Type>>& tf);
 
 
 template<class Type>
 void cmptMax(Field<typename Field<Type>::cmptType>& res, const UList<Type>& f);
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> > cmptMax(const UList<Type>& f);
+tmp<Field<typename Field<Type>::cmptType>> cmptMax(const UList<Type>& f);
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> >
-cmptMax(const tmp<Field<Type> >& tf);
+tmp<Field<typename Field<Type>::cmptType>>
+cmptMax(const tmp<Field<Type>>& tf);
 
 
 template<class Type>
 void cmptMin(Field<typename Field<Type>::cmptType>& res, const UList<Type>& f);
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> > cmptMin(const UList<Type>& f);
+tmp<Field<typename Field<Type>::cmptType>> cmptMin(const UList<Type>& f);
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> >
-cmptMin(const tmp<Field<Type> >& tf);
+tmp<Field<typename Field<Type>::cmptType>>
+cmptMin(const tmp<Field<Type>>& tf);
 
 
 template<class Type>
 void cmptAv(Field<typename Field<Type>::cmptType>& res, const UList<Type>& f);
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> > cmptAv(const UList<Type>& f);
+tmp<Field<typename Field<Type>::cmptType>> cmptAv(const UList<Type>& f);
 
 template<class Type>
-tmp<Field<typename Field<Type>::cmptType> > cmptAv(const tmp<Field<Type> >& tf);
+tmp<Field<typename Field<Type>::cmptType>> cmptAv(const tmp<Field<Type>>& tf);
 
 
 template<class Type>
 void cmptMag(Field<Type>& res, const UList<Type>& f);
 
 template<class Type>
-tmp<Field<Type> > cmptMag(const UList<Type>& f);
+tmp<Field<Type>> cmptMag(const UList<Type>& f);
 
 template<class Type>
-tmp<Field<Type> > cmptMag(const tmp<Field<Type> >& tf);
+tmp<Field<Type>> cmptMag(const tmp<Field<Type>>& tf);
 
 #define TMP_UNARY_FUNCTION(ReturnType, Func)                                  \
                                                                               \
 template<class Type>                                                          \
-ReturnType Func(const tmp<Field<Type> >& tf1);
+ReturnType Func(const tmp<Field<Type>>& tf1);
 
 template<class Type>
 Type max(const UList<Type>& f);
@@ -292,20 +292,20 @@ void OpFunc                                                                   \
 );                                                                            \
                                                                               \
 template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type> >                             \
+tmp<Field<typename product<Type1, Type2>::type>>                             \
 operator Op(const UList<Type1>& f1, const UList<Type2>& f2);                  \
                                                                               \
 template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type> >                             \
-operator Op(const UList<Type1>& f1, const tmp<Field<Type2> >& tf2);           \
+tmp<Field<typename product<Type1, Type2>::type>>                             \
+operator Op(const UList<Type1>& f1, const tmp<Field<Type2>>& tf2);           \
                                                                               \
 template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type> >                             \
-operator Op(const tmp<Field<Type1> >& tf1, const UList<Type2>& f2);           \
+tmp<Field<typename product<Type1, Type2>::type>>                             \
+operator Op(const tmp<Field<Type1>>& tf1, const UList<Type2>& f2);           \
                                                                               \
 template<class Type1, class Type2>                                            \
-tmp<Field<typename product<Type1, Type2>::type> >                             \
-operator Op(const tmp<Field<Type1> >& tf1, const tmp<Field<Type2> >& tf2);    \
+tmp<Field<typename product<Type1, Type2>::type>>                             \
+operator Op(const tmp<Field<Type1>>& tf1, const tmp<Field<Type2>>& tf2);    \
                                                                               \
 template<class Type, class Form, class Cmpt, int nCmpt>                       \
 void OpFunc                                                                   \
@@ -316,12 +316,12 @@ void OpFunc                                                                   \
 );                                                                            \
                                                                               \
 template<class Type, class Form, class Cmpt, int nCmpt>                       \
-tmp<Field<typename product<Type, Form>::type> >                               \
+tmp<Field<typename product<Type, Form>::type>>                               \
 operator Op(const UList<Type>& f1, const VectorSpace<Form,Cmpt,nCmpt>& vs);   \
                                                                               \
 template<class Type, class Form, class Cmpt, int nCmpt>                       \
-tmp<Field<typename product<Type, Form>::type> >                               \
-operator Op(const tmp<Field<Type> >&tf1,const VectorSpace<Form,Cmpt,nCmpt>&vs);\
+tmp<Field<typename product<Type, Form>::type>>                               \
+operator Op(const tmp<Field<Type>>&tf1,const VectorSpace<Form,Cmpt,nCmpt>&vs);\
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type>                       \
 void OpFunc                                                                   \
@@ -332,12 +332,12 @@ void OpFunc                                                                   \
 );                                                                            \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type>                       \
-tmp<Field<typename product<Form, Type>::type> >                               \
+tmp<Field<typename product<Form, Type>::type>>                               \
 operator Op(const VectorSpace<Form,Cmpt,nCmpt>& vs, const UList<Type>& f1);   \
                                                                               \
 template<class Form, class Cmpt, int nCmpt, class Type>                       \
-tmp<Field<typename product<Form, Type>::type> >                               \
-operator Op(const VectorSpace<Form,Cmpt,nCmpt>&vs,const tmp<Field<Type> >&tf1);
+tmp<Field<typename product<Form, Type>::type>>                               \
+operator Op(const VectorSpace<Form,Cmpt,nCmpt>&vs,const tmp<Field<Type>>&tf1);
 
 PRODUCT_OPERATOR(typeOfSum, +, add)
 PRODUCT_OPERATOR(typeOfSum, -, subtract)
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C
index 4227d67df3ae4b66cfc5061dbdeff140711d0892..1a2840a7865935daa3db8943bf6ba37c82af6d68 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.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
@@ -37,17 +37,17 @@ void Func(Field<ReturnType>& res, const UList<Type>& f)                       \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func(const UList<Type>& f)                            \
+tmp<Field<ReturnType>> Func(const UList<Type>& f)                            \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes(new Field<ReturnType>(f.size()));            \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f.size()));            \
     Func(tRes(), f);                                                          \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func(const tmp<Field<Type> >& tf)                     \
+tmp<Field<ReturnType>> Func(const tmp<Field<Type>>& tf)                     \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes = reuseTmp<ReturnType, Type>::New(tf);       \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type>::New(tf);       \
     Func(tRes(), tf());                                                       \
     reuseTmp<ReturnType, Type>::clear(tf);                                    \
     return tRes;                                                              \
@@ -65,17 +65,17 @@ void OpFunc(Field<ReturnType>& res, const UList<Type>& f)                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op(const UList<Type>& f)                     \
+tmp<Field<ReturnType>> operator Op(const UList<Type>& f)                     \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes(new Field<ReturnType>(f.size()));            \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f.size()));            \
     OpFunc(tRes(), f);                                                        \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op(const tmp<Field<Type> >& tf)              \
+tmp<Field<ReturnType>> operator Op(const tmp<Field<Type>>& tf)              \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes = reuseTmp<ReturnType, Type>::New(tf);       \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type>::New(tf);       \
     OpFunc(tRes(), tf());                                                     \
     reuseTmp<ReturnType, Type>::clear(tf);                                    \
     return tRes;                                                              \
@@ -101,51 +101,51 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
     const UList<Type2>& f2                                                    \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes(new Field<ReturnType>(f1.size()));           \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f1.size()));           \
     Func(tRes(), f1, f2);                                                     \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type2>>& tf2                                             \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes = reuseTmp<ReturnType, Type2>::New(tf2);     \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);     \
     Func(tRes(), f1, tf2());                                                  \
     reuseTmp<ReturnType, Type2>::clear(tf2);                                  \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
+    const tmp<Field<Type1>>& tf1,                                            \
     const UList<Type2>& f2                                                    \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes = reuseTmp<ReturnType, Type1>::New(tf1);     \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);     \
     Func(tRes(), tf1(), f2);                                                  \
     reuseTmp<ReturnType, Type1>::clear(tf1);                                  \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type1>>& tf1,                                            \
+    const tmp<Field<Type2>>& tf2                                             \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes =                                            \
+    tmp<Field<ReturnType>> tRes =                                            \
         reuseTmpTmp<ReturnType, Type1, Type1, Type2>::New(tf1, tf2);          \
     Func(tRes(), tf1(), tf2());                                               \
     reuseTmpTmp<ReturnType, Type1, Type1, Type2>::clear(tf1, tf2);            \
@@ -172,25 +172,25 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
     const Type1& s1,                                                          \
     const UList<Type2>& f2                                                    \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes(new Field<ReturnType>(f2.size()));           \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f2.size()));           \
     Func(tRes(), s1, f2);                                                     \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
     const Type1& s1,                                                          \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type2>>& tf2                                             \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes = reuseTmp<ReturnType, Type2>::New(tf2);     \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);     \
     Func(tRes(), s1, tf2());                                                  \
     reuseTmp<ReturnType, Type2>::clear(tf2);                                  \
     return tRes;                                                              \
@@ -214,25 +214,25 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
     const Type2& s2                                                           \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes(new Field<ReturnType>(f1.size()));           \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f1.size()));           \
     Func(tRes(), f1, s2);                                                     \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
+    const tmp<Field<Type1>>& tf1,                                            \
     const Type2& s2                                                           \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes = reuseTmp<ReturnType, Type1>::New(tf1);     \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);     \
     Func(tRes(), tf1(), s2);                                                  \
     reuseTmp<ReturnType, Type1>::clear(tf1);                                  \
     return tRes;                                                              \
@@ -260,51 +260,51 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
     const UList<Type2>& f2                                                    \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes(new Field<ReturnType>(f1.size()));           \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f1.size()));           \
     OpFunc(tRes(), f1, f2);                                                   \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type2>>& tf2                                             \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes = reuseTmp<ReturnType, Type2>::New(tf2);     \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);     \
     OpFunc(tRes(), f1, tf2());                                                \
     reuseTmp<ReturnType, Type2>::clear(tf2);                                  \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
+    const tmp<Field<Type1>>& tf1,                                            \
     const UList<Type2>& f2                                                    \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes = reuseTmp<ReturnType, Type1>::New(tf1);     \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);     \
     OpFunc(tRes(), tf1(), f2);                                                \
     reuseTmp<ReturnType, Type1>::clear(tf1);                                  \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type1>>& tf1,                                            \
+    const tmp<Field<Type2>>& tf2                                             \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes =                                            \
+    tmp<Field<ReturnType>> tRes =                                            \
         reuseTmpTmp<ReturnType, Type1, Type1, Type2>::New(tf1, tf2);          \
     OpFunc(tRes(), tf1(), tf2());                                             \
     reuseTmpTmp<ReturnType, Type1, Type1, Type2>::clear(tf1, tf2);            \
@@ -328,25 +328,25 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
     const Type1& s1,                                                          \
     const UList<Type2>& f2                                                    \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes(new Field<ReturnType>(f2.size()));           \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f2.size()));           \
     OpFunc(tRes(), s1, f2);                                                   \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
     const Type1& s1,                                                          \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type2>>& tf2                                             \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes = reuseTmp<ReturnType, Type2>::New(tf2);     \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type2>::New(tf2);     \
     OpFunc(tRes(), s1, tf2());                                                \
     reuseTmp<ReturnType, Type2>::clear(tf2);                                  \
     return tRes;                                                              \
@@ -367,25 +367,25 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
     const Type2& s2                                                           \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes(new Field<ReturnType>(f1.size()));           \
+    tmp<Field<ReturnType>> tRes(new Field<ReturnType>(f1.size()));           \
     OpFunc(tRes(), f1, s2);                                                   \
     return tRes;                                                              \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
+    const tmp<Field<Type1>>& tf1,                                            \
     const Type2& s2                                                           \
 )                                                                             \
 {                                                                             \
-    tmp<Field<ReturnType> > tRes = reuseTmp<ReturnType, Type1>::New(tf1);     \
+    tmp<Field<ReturnType>> tRes = reuseTmp<ReturnType, Type1>::New(tf1);     \
     OpFunc(tRes(), tf1(), s2);                                                \
     reuseTmp<ReturnType, Type1>::clear(tf1);                                  \
     return tRes;                                                              \
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.H b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.H
index 381a8d98727614e1653b1b47e2b0931fd0c93ae7..4d0993e767b71ec0c6a6d326e37b1fca15742348 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctionsM.H
@@ -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
@@ -35,9 +35,9 @@ Description
 TEMPLATE                                                                      \
 void Func(Field<ReturnType>& res, const UList<Type1>& f);                     \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func(const UList<Type1>& f);                          \
+tmp<Field<ReturnType>> Func(const UList<Type1>& f);                          \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func(const tmp<Field<Type1> >& tf);
+tmp<Field<ReturnType>> Func(const tmp<Field<Type1>>& tf);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -47,9 +47,9 @@ tmp<Field<ReturnType> > Func(const tmp<Field<Type1> >& tf);
 TEMPLATE                                                                      \
 void OpFunc(Field<ReturnType>& res, const UList<Type1>& f);                   \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op(const UList<Type1>& f);                   \
+tmp<Field<ReturnType>> operator Op(const UList<Type1>& f);                   \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op(const tmp<Field<Type1> >& tf);
+tmp<Field<ReturnType>> operator Op(const tmp<Field<Type1>>& tf);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -65,31 +65,31 @@ void Func                                                                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
     const UList<Type2>& f2                                                    \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type2>>& tf2                                             \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
+    const tmp<Field<Type1>>& tf1,                                            \
     const UList<Type2>& f2                                                    \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type1>>& tf1,                                            \
+    const tmp<Field<Type2>>& tf2                                             \
 );
 
 
@@ -106,17 +106,17 @@ void Func                                                                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
     const Type1& s1,                                                          \
     const UList<Type2>& f2                                                    \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
     const Type1& s1,                                                          \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type2>>& tf2                                             \
 );
 
 
@@ -131,16 +131,16 @@ void Func                                                                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
     const Type2& s2                                                           \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > Func                                                  \
+tmp<Field<ReturnType>> Func                                                  \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
+    const tmp<Field<Type1>>& tf1,                                            \
     const Type2& s2                                                           \
 );
 
@@ -163,31 +163,31 @@ void OpFunc                                                                   \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
     const UList<Type2>& f2                                                    \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type2>>& tf2                                             \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
+    const tmp<Field<Type1>>& tf1,                                            \
     const UList<Type2>& f2                                                    \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type1>>& tf1,                                            \
+    const tmp<Field<Type2>>& tf2                                             \
 );
 
 
@@ -204,17 +204,17 @@ void OpFunc                                                                   \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
     const Type1& s1,                                                          \
     const UList<Type2>& f2                                                    \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
     const Type1& s1,                                                          \
-    const tmp<Field<Type2> >& tf2                                             \
+    const tmp<Field<Type2>>& tf2                                             \
 );
 
 
@@ -229,16 +229,16 @@ void OpFunc                                                                   \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
     const UList<Type1>& f1,                                                   \
     const Type2& s2                                                           \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<Field<ReturnType> > operator Op                                           \
+tmp<Field<ReturnType>> operator Op                                           \
 (                                                                             \
-    const tmp<Field<Type1> >& tf1,                                            \
+    const tmp<Field<Type1>>& tf1,                                            \
     const Type2& s2                                                           \
 );
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldMapper.H b/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
index 69414c5b3e90eab00c7c70b63ce467af911863b8..b15b45b295b90d015db28bffb3e1c7ba716a423f 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldMapper.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,9 +99,9 @@ public:
     // Member Operators
 
         template<class Type>
-        tmp<Field<Type> > operator()(const Field<Type>& f) const
+        tmp<Field<Type>> operator()(const Field<Type>& f) const
         {
-            return tmp<Field<Type> >(new Field<Type>(f, *this));
+            return tmp<Field<Type>>(new Field<Type>(f, *this));
         }
 };
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H b/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
index 099994919a11e3b62146f4ac9080270f9fbc37fe..35c5a5c16dc7da3a19d09f8f38d5545324ca55b7 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldReuseFunctions.H
@@ -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
@@ -38,12 +38,12 @@ class reuseTmp
 {
 public:
 
-    static tmp<Field<TypeR> > New(const tmp<Field<Type1> >& tf1)
+    static tmp<Field<TypeR>> New(const tmp<Field<Type1>>& tf1)
     {
-        return tmp<Field<TypeR> >(new Field<TypeR>(tf1().size()));
+        return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
     }
 
-    static void clear(const tmp<Field<Type1> >& tf1)
+    static void clear(const tmp<Field<Type1>>& tf1)
     {
         tf1.clear();
     }
@@ -55,7 +55,7 @@ class reuseTmp<TypeR, TypeR>
 {
 public:
 
-    static tmp<Field<TypeR> > New(const tmp<Field<TypeR> >& tf1)
+    static tmp<Field<TypeR>> New(const tmp<Field<TypeR>>& tf1)
     {
         if (tf1.isTmp())
         {
@@ -63,11 +63,11 @@ public:
         }
         else
         {
-            return tmp<Field<TypeR> >(new Field<TypeR>(tf1().size()));
+            return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
         }
     }
 
-    static void clear(const tmp<Field<TypeR> >& tf1)
+    static void clear(const tmp<Field<TypeR>>& tf1)
     {
         if (tf1.isTmp())
         {
@@ -82,19 +82,19 @@ class reuseTmpTmp
 {
 public:
 
-    static tmp<Field<TypeR> > New
+    static tmp<Field<TypeR>> New
     (
-        const tmp<Field<Type1> >& tf1,
-        const tmp<Field<Type2> >& tf2
+        const tmp<Field<Type1>>& tf1,
+        const tmp<Field<Type2>>& tf2
     )
     {
-        return tmp<Field<TypeR> >(new Field<TypeR>(tf1().size()));
+        return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
     }
 
     static void clear
     (
-        const tmp<Field<Type1> >& tf1,
-        const tmp<Field<Type2> >& tf2
+        const tmp<Field<Type1>>& tf1,
+        const tmp<Field<Type2>>& tf2
     )
     {
         tf1.clear();
@@ -108,10 +108,10 @@ class reuseTmpTmp<TypeR, Type1, Type12, TypeR>
 {
 public:
 
-    static tmp<Field<TypeR> > New
+    static tmp<Field<TypeR>> New
     (
-        const tmp<Field<Type1> >& tf1,
-        const tmp<Field<TypeR> >& tf2
+        const tmp<Field<Type1>>& tf1,
+        const tmp<Field<TypeR>>& tf2
     )
     {
         if (tf2.isTmp())
@@ -120,14 +120,14 @@ public:
         }
         else
         {
-            return tmp<Field<TypeR> >(new Field<TypeR>(tf1().size()));
+            return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
         }
     }
 
     static void clear
     (
-        const tmp<Field<Type1> >& tf1,
-        const tmp<Field<TypeR> >& tf2
+        const tmp<Field<Type1>>& tf1,
+        const tmp<Field<TypeR>>& tf2
     )
     {
         tf1.clear();
@@ -144,10 +144,10 @@ class reuseTmpTmp<TypeR, TypeR, TypeR, Type2>
 {
 public:
 
-    static tmp<Field<TypeR> > New
+    static tmp<Field<TypeR>> New
     (
-        const tmp<Field<TypeR> >& tf1,
-        const tmp<Field<Type2> >& tf2
+        const tmp<Field<TypeR>>& tf1,
+        const tmp<Field<Type2>>& tf2
     )
     {
         if (tf1.isTmp())
@@ -156,14 +156,14 @@ public:
         }
         else
         {
-            return tmp<Field<TypeR> >(new Field<TypeR>(tf1().size()));
+            return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
         }
     }
 
     static void clear
     (
-        const tmp<Field<TypeR> >& tf1,
-        const tmp<Field<Type2> >& tf2
+        const tmp<Field<TypeR>>& tf1,
+        const tmp<Field<Type2>>& tf2
     )
     {
         if (tf1.isTmp())
@@ -180,10 +180,10 @@ class reuseTmpTmp<TypeR, TypeR, TypeR, TypeR>
 {
 public:
 
-    static tmp<Field<TypeR> > New
+    static tmp<Field<TypeR>> New
     (
-        const tmp<Field<TypeR> >& tf1,
-        const tmp<Field<TypeR> >& tf2
+        const tmp<Field<TypeR>>& tf1,
+        const tmp<Field<TypeR>>& tf2
     )
     {
         if (tf1.isTmp())
@@ -196,14 +196,14 @@ public:
         }
         else
         {
-            return tmp<Field<TypeR> >(new Field<TypeR>(tf1().size()));
+            return tmp<Field<TypeR>>(new Field<TypeR>(tf1().size()));
         }
     }
 
     static void clear
     (
-        const tmp<Field<TypeR> >& tf1,
-        const tmp<Field<TypeR> >& tf2
+        const tmp<Field<TypeR>>& tf1,
+        const tmp<Field<TypeR>>& tf2
     )
     {
         if (tf1.isTmp())
diff --git a/src/OpenFOAM/fields/Fields/Field/SubField.H b/src/OpenFOAM/fields/Fields/Field/SubField.H
index a615d40f889af2c1840bbd1e1ee75841596ce1cf..4ebacc1feb500732ce7872c600d720a9d23d6163 100644
--- a/src/OpenFOAM/fields/Fields/Field/SubField.H
+++ b/src/OpenFOAM/fields/Fields/Field/SubField.H
@@ -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
@@ -101,10 +101,10 @@ public:
         static inline const SubField<Type>& null();
 
         //- Return a component field of the field
-        inline tmp<Field<cmptType> > component(const direction) const;
+        inline tmp<Field<cmptType>> component(const direction) const;
 
         //- Return the field transpose (only defined for second rank tensors)
-        tmp<Field<Type> > T() const;
+        tmp<Field<Type>> T() const;
 
 
     // Member operators
diff --git a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
index 18d3c589c7c162c4f1546db688d1981155342f17..e5ed14146dcea89c297dc1362381a1ca26f78b7d 100644
--- a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
+++ b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
@@ -84,12 +84,12 @@ inline Foam::SubField<Type>::SubField
 template<class Type>
 inline const Foam::SubField<Type>& Foam::SubField<Type>::null()
 {
-    return NullObjectRef<SubField<Type> >();
+    return NullObjectRef<SubField<Type>>();
 }
 
 
 template<class Type>
-inline Foam::tmp<Foam::Field<typename Foam::SubField<Type>::cmptType> >
+inline Foam::tmp<Foam::Field<typename Foam::SubField<Type>::cmptType>>
 Foam::SubField<Type>::component
 (
     const direction d
@@ -100,7 +100,7 @@ Foam::SubField<Type>::component
 
 
 template<class Type>
-inline Foam::tmp<Foam::Field<Type> > Foam::SubField<Type>::T() const
+inline Foam::tmp<Foam::Field<Type>> Foam::SubField<Type>::T() const
 {
     return (reinterpret_cast<const Field<Type>&>(*this)).T();
 }
diff --git a/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorField.C b/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorField.C
index a6d186f291d071b2865577e564120fdc96c1dce3..805b47cbad1c68aafa17a2a7d61066c42fd40625 100644
--- a/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorField.C
+++ b/src/OpenFOAM/fields/Fields/sphericalTensorField/sphericalTensorField.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
@@ -46,7 +46,7 @@ BINARY_TYPE_OPERATOR(sphericalTensor, scalar, sphericalTensor, /, divide)
 
 
 template<>
-tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
+tmp<Field<sphericalTensor>> transformFieldMask<sphericalTensor>
 (
     const tensorField& tf
 )
@@ -55,12 +55,12 @@ tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
 }
 
 template<>
-tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
+tmp<Field<sphericalTensor>> transformFieldMask<sphericalTensor>
 (
     const tmp<tensorField>& ttf
 )
 {
-    tmp<Field<sphericalTensor> > ret =
+    tmp<Field<sphericalTensor>> ret =
         transformFieldMask<sphericalTensor>(ttf());
     ttf.clear();
     return ret;
@@ -68,7 +68,7 @@ tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
 
 
 template<>
-tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
+tmp<Field<sphericalTensor>> transformFieldMask<sphericalTensor>
 (
     const symmTensorField& stf
 )
@@ -77,12 +77,12 @@ tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
 }
 
 template<>
-tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
+tmp<Field<sphericalTensor>> transformFieldMask<sphericalTensor>
 (
     const tmp<symmTensorField>& tstf
 )
 {
-    tmp<Field<sphericalTensor> > ret =
+    tmp<Field<sphericalTensor>> ret =
         transformFieldMask<sphericalTensor>(tstf());
     tstf.clear();
     return ret;
diff --git a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
index 5aec204e24211c9d5c50cf27a5e4cd002f3f97d0..f99fcb5e6a75d814b8508cbfb96c8d1580ba1587 100644
--- a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
+++ b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.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 @@ tmp<symmTensorField> inv(const tmp<symmTensorField>& tf)
 
 
 template<>
-tmp<Field<symmTensor> > transformFieldMask<symmTensor>
+tmp<Field<symmTensor>> transformFieldMask<symmTensor>
 (
     const tensorField& tf
 )
@@ -131,19 +131,19 @@ tmp<Field<symmTensor> > transformFieldMask<symmTensor>
 }
 
 template<>
-tmp<Field<symmTensor> > transformFieldMask<symmTensor>
+tmp<Field<symmTensor>> transformFieldMask<symmTensor>
 (
     const tmp<tensorField>& ttf
 )
 {
-    tmp<Field<symmTensor> > ret = transformFieldMask<symmTensor>(ttf());
+    tmp<Field<symmTensor>> ret = transformFieldMask<symmTensor>(ttf());
     ttf.clear();
     return ret;
 }
 
 
 template<>
-tmp<Field<symmTensor> > transformFieldMask<symmTensor>
+tmp<Field<symmTensor>> transformFieldMask<symmTensor>
 (
     const symmTensorField& stf
 )
@@ -152,7 +152,7 @@ tmp<Field<symmTensor> > transformFieldMask<symmTensor>
 }
 
 template<>
-tmp<Field<symmTensor> > transformFieldMask<symmTensor>
+tmp<Field<symmTensor>> transformFieldMask<symmTensor>
 (
     const tmp<symmTensorField>& tstf
 )
diff --git a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C
index 47a22217b9c07fd0839b7854983fdda3215f6839..ab8f395201e7ab78c81df34fd424e913daafc9e6 100644
--- a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C
+++ b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.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
@@ -56,26 +56,26 @@ void transform
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const symmTensorField& trf,
     const Field<Type>& tf
 )
 {
-    tmp<Field<Type> > tranf(new Field<Type> (tf.size()));
+    tmp<Field<Type>> tranf(new Field<Type> (tf.size()));
     transform(tranf(), trf, tf);
     return tranf;
 }
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const symmTensorField& trf,
-    const tmp<Field<Type> >& ttf
+    const tmp<Field<Type>>& ttf
 )
 {
-    tmp<Field<Type> > tranf = reuseTmp<Type, Type>::New(ttf);
+    tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
     transform(tranf(), trf, ttf());
     reuseTmp<Type, Type>::clear(ttf);
     return tranf;
@@ -83,13 +83,13 @@ tmp<Field<Type> > transform
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const tmp<symmTensorField>& ttrf,
     const Field<Type>& tf
 )
 {
-    tmp<Field<Type> > tranf(new Field<Type> (tf.size()));
+    tmp<Field<Type>> tranf(new Field<Type> (tf.size()));
     transform(tranf(), ttrf(), tf);
     ttrf.clear();
     return tranf;
@@ -97,13 +97,13 @@ tmp<Field<Type> > transform
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const tmp<symmTensorField>& ttrf,
-    const tmp<Field<Type> >& ttf
+    const tmp<Field<Type>>& ttf
 )
 {
-    tmp<Field<Type> > tranf = reuseTmp<Type, Type>::New(ttf);
+    tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
     transform(tranf(), ttrf(), ttf());
     reuseTmp<Type, Type>::clear(ttf);
     ttrf.clear();
@@ -124,26 +124,26 @@ void transform
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const symmTensor& t,
     const Field<Type>& tf
 )
 {
-    tmp<Field<Type> > tranf(new Field<Type>(tf.size()));
+    tmp<Field<Type>> tranf(new Field<Type>(tf.size()));
     transform(tranf(), t, tf);
     return tranf;
 }
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const symmTensor& t,
-    const tmp<Field<Type> >& ttf
+    const tmp<Field<Type>>& ttf
 )
 {
-    tmp<Field<Type> > tranf = reuseTmp<Type, Type>::New(ttf);
+    tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
     transform(tranf(), t, ttf());
     reuseTmp<Type, Type>::clear(ttf);
     return tranf;
diff --git a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H
index 0ae6755f37514dc734e255b9877942b7a7293646..5e25bf0e7496ed3b08be96741adaff1a9ae7f71a 100644
--- a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H
+++ b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H
@@ -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
@@ -50,19 +50,19 @@ template<class Type>
 void transform(Field<Type>&, const symmTensorField&, const Field<Type>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const symmTensorField&, const Field<Type>&);
+tmp<Field<Type>> transform(const symmTensorField&, const Field<Type>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const symmTensorField&, const tmp<Field<Type> >&);
+tmp<Field<Type>> transform(const symmTensorField&, const tmp<Field<Type>>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const tmp<symmTensorField>&, const Field<Type>&);
+tmp<Field<Type>> transform(const tmp<symmTensorField>&, const Field<Type>&);
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const tmp<symmTensorField>&,
-    const tmp<Field<Type> >&
+    const tmp<Field<Type>>&
 );
 
 
@@ -70,46 +70,46 @@ template<class Type>
 void transform(Field<Type>&, const tensor&, const Field<Type>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const tensor&, const Field<Type>&);
+tmp<Field<Type>> transform(const tensor&, const Field<Type>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const tensor&, const tmp<Field<Type> >&);
+tmp<Field<Type>> transform(const tensor&, const tmp<Field<Type>>&);
 
 
 template<>
-tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
+tmp<Field<sphericalTensor>> transformFieldMask<sphericalTensor>
 (
     const symmTensorField&
 );
 
 template<>
-tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
+tmp<Field<sphericalTensor>> transformFieldMask<sphericalTensor>
 (
     const tmp<symmTensorField>&
 );
 
 
 template<>
-tmp<Field<symmTensor> > transformFieldMask<symmTensor>
+tmp<Field<symmTensor>> transformFieldMask<symmTensor>
 (
     const symmTensorField&
 );
 
 template<>
-tmp<Field<symmTensor> > transformFieldMask<symmTensor>
+tmp<Field<symmTensor>> transformFieldMask<symmTensor>
 (
     const tmp<symmTensorField>&
 );
 
 
 template<>
-tmp<Field<tensor> > transformFieldMask<tensor>
+tmp<Field<tensor>> transformFieldMask<tensor>
 (
     const symmTensorField&
 );
 
 template<>
-tmp<Field<tensor> > transformFieldMask<tensor>
+tmp<Field<tensor>> transformFieldMask<tensor>
 (
     const tmp<symmTensorField>&
 );
diff --git a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
index b373dbf2e7c04bdffe1eff43fc173b8d16c68cdb..91197660f6004c4f81b062f3aebb0a15fca9d8f5 100644
--- a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
+++ b/src/OpenFOAM/fields/Fields/tensorField/tensorField.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
@@ -126,7 +126,7 @@ UNARY_FUNCTION(tensor, symmTensor, eigenVectors)
 
 
 template<>
-tmp<Field<tensor> > transformFieldMask<tensor>
+tmp<Field<tensor>> transformFieldMask<tensor>
 (
     const symmTensorField& stf
 )
@@ -138,12 +138,12 @@ tmp<Field<tensor> > transformFieldMask<tensor>
 }
 
 template<>
-tmp<Field<tensor> > transformFieldMask<tensor>
+tmp<Field<tensor>> transformFieldMask<tensor>
 (
     const tmp<symmTensorField>& tstf
 )
 {
-    tmp<Field<tensor> > ret = transformFieldMask<tensor>(tstf());
+    tmp<Field<tensor>> ret = transformFieldMask<tensor>(tstf());
     tstf.clear();
     return ret;
 }
diff --git a/src/OpenFOAM/fields/Fields/transformField/transformField.H b/src/OpenFOAM/fields/Fields/transformField/transformField.H
index ec881641b7f5738309706524edbc72e61f1599a3..e5bf3917a11f7d89fc5ef129e5ebafdfafa707ce 100644
--- a/src/OpenFOAM/fields/Fields/transformField/transformField.H
+++ b/src/OpenFOAM/fields/Fields/transformField/transformField.H
@@ -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
@@ -52,56 +52,56 @@ template<class Type>
 void transform(Field<Type>&, const tensorField&, const Field<Type>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const tensorField&, const Field<Type>&);
+tmp<Field<Type>> transform(const tensorField&, const Field<Type>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const tensorField&, const tmp<Field<Type> >&);
+tmp<Field<Type>> transform(const tensorField&, const tmp<Field<Type>>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const tmp<tensorField>&, const Field<Type>&);
+tmp<Field<Type>> transform(const tmp<tensorField>&, const Field<Type>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const tmp<tensorField>&, const tmp<Field<Type> >&);
+tmp<Field<Type>> transform(const tmp<tensorField>&, const tmp<Field<Type>>&);
 
 
 template<class Type>
 void transform(Field<Type>&, const tensor&, const Field<Type>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const tensor&, const Field<Type>&);
+tmp<Field<Type>> transform(const tensor&, const Field<Type>&);
 
 template<class Type>
-tmp<Field<Type> > transform(const tensor&, const tmp<Field<Type> >&);
+tmp<Field<Type>> transform(const tensor&, const tmp<Field<Type>>&);
 
 
 template<class Type1, class Type2>
-tmp<Field<Type1> > transformFieldMask(const Field<Type2>&);
+tmp<Field<Type1>> transformFieldMask(const Field<Type2>&);
 
 template<class Type1, class Type2>
-tmp<Field<Type1> > transformFieldMask(const tmp<Field<Type2> >&);
+tmp<Field<Type1>> transformFieldMask(const tmp<Field<Type2>>&);
 
 
 template<>
-tmp<Field<symmTensor> > transformFieldMask<symmTensor>
+tmp<Field<symmTensor>> transformFieldMask<symmTensor>
 (
     const tensorField&
 );
 
 template<>
-tmp<Field<symmTensor> > transformFieldMask<symmTensor>
+tmp<Field<symmTensor>> transformFieldMask<symmTensor>
 (
     const tmp<tensorField>&
 );
 
 
 template<>
-tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
+tmp<Field<sphericalTensor>> transformFieldMask<sphericalTensor>
 (
     const tensorField&
 );
 
 template<>
-tmp<Field<sphericalTensor> > transformFieldMask<sphericalTensor>
+tmp<Field<sphericalTensor>> transformFieldMask<sphericalTensor>
 (
     const tmp<tensorField>&
 );
diff --git a/src/OpenFOAM/fields/Fields/transformField/transformFieldTemplates.C b/src/OpenFOAM/fields/Fields/transformField/transformFieldTemplates.C
index 658fdd3aef409c8d391e1c741b7c0042664b103c..792df9ce1065a6d384e1171455827a12412ff7d0 100644
--- a/src/OpenFOAM/fields/Fields/transformField/transformFieldTemplates.C
+++ b/src/OpenFOAM/fields/Fields/transformField/transformFieldTemplates.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
@@ -56,26 +56,26 @@ void transform
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const tensorField& trf,
     const Field<Type>& tf
 )
 {
-    tmp<Field<Type> > tranf(new Field<Type> (tf.size()));
+    tmp<Field<Type>> tranf(new Field<Type> (tf.size()));
     transform(tranf(), trf, tf);
     return tranf;
 }
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const tensorField& trf,
-    const tmp<Field<Type> >& ttf
+    const tmp<Field<Type>>& ttf
 )
 {
-    tmp<Field<Type> > tranf = reuseTmp<Type, Type>::New(ttf);
+    tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
     transform(tranf(), trf, ttf());
     reuseTmp<Type, Type>::clear(ttf);
     return tranf;
@@ -83,13 +83,13 @@ tmp<Field<Type> > transform
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const tmp<tensorField>& ttrf,
     const Field<Type>& tf
 )
 {
-    tmp<Field<Type> > tranf(new Field<Type> (tf.size()));
+    tmp<Field<Type>> tranf(new Field<Type> (tf.size()));
     transform(tranf(), ttrf(), tf);
     ttrf.clear();
     return tranf;
@@ -97,13 +97,13 @@ tmp<Field<Type> > transform
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const tmp<tensorField>& ttrf,
-    const tmp<Field<Type> >& ttf
+    const tmp<Field<Type>>& ttf
 )
 {
-    tmp<Field<Type> > tranf = reuseTmp<Type, Type>::New(ttf);
+    tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
     transform(tranf(), ttrf(), ttf());
     reuseTmp<Type, Type>::clear(ttf);
     ttrf.clear();
@@ -124,26 +124,26 @@ void transform
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const tensor& t,
     const Field<Type>& tf
 )
 {
-    tmp<Field<Type> > tranf(new Field<Type>(tf.size()));
+    tmp<Field<Type>> tranf(new Field<Type>(tf.size()));
     transform(tranf(), t, tf);
     return tranf;
 }
 
 
 template<class Type>
-tmp<Field<Type> > transform
+tmp<Field<Type>> transform
 (
     const tensor& t,
-    const tmp<Field<Type> >& ttf
+    const tmp<Field<Type>>& ttf
 )
 {
-    tmp<Field<Type> > tranf = reuseTmp<Type, Type>::New(ttf);
+    tmp<Field<Type>> tranf = reuseTmp<Type, Type>::New(ttf);
     transform(tranf(), t, ttf());
     reuseTmp<Type, Type>::clear(ttf);
     return tranf;
@@ -151,15 +151,15 @@ tmp<Field<Type> > transform
 
 
 template<class Type1, class Type2>
-tmp<Field<Type1> > transformFieldMask(const Field<Type2>& f)
+tmp<Field<Type1>> transformFieldMask(const Field<Type2>& f)
 {
     return f;
 }
 
 template<class Type1, class Type2>
-tmp<Field<Type1> > transformFieldMask(const tmp<Field<Type2> >& tf)
+tmp<Field<Type1>> transformFieldMask(const tmp<Field<Type2>>& tf)
 {
-    return tmp<Field<Type1> >(tf.ptr());
+    return tmp<Field<Type1>>(tf.ptr());
 }
 
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
index da522ae42640bd310000490cc204d389ce3fdfab..2cc32642156aff45765c318de6486ee1a51a0517 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.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
@@ -336,7 +336,7 @@ GeometricBoundaryField
 (
     const BoundaryMesh& bmesh,
     const DimensionedField<Type, GeoMesh>& field,
-    const PtrList<PatchField<Type> >& ptfl
+    const PtrList<PatchField<Type>>& ptfl
 )
 :
     FieldField<PatchField, Type>(bmesh.size()),
@@ -350,7 +350,7 @@ GeometricBoundaryField
                "("
                     "const BoundaryMesh&, "
                     "const DimensionedField<Type, GeoMesh>&, "
-                    "const PtrLIst<PatchField<Type> >&"
+                    "const PtrLIst<PatchField<Type>>&"
                ")"
             << endl;
     }
@@ -573,12 +573,12 @@ interfaces() const
 
     forAll(interfaces, patchi)
     {
-        if (isA<LduInterfaceField<Type> >(this->operator[](patchi)))
+        if (isA<LduInterfaceField<Type>>(this->operator[](patchi)))
         {
             interfaces.set
             (
                 patchi,
-                &refCast<const LduInterfaceField<Type> >
+                &refCast<const LduInterfaceField<Type>>
                 (
                     this->operator[](patchi)
                 )
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index fe5a34c6defaa8ed550a74798aef1d1b99d18f17..452e21499724d86b2ba15b3206a3ed0266adc719 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.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
@@ -289,7 +289,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
     const Mesh& mesh,
     const dimensionSet& ds,
     const Field<Type>& iField,
-    const PtrList<PatchField<Type> >& ptfl
+    const PtrList<PatchField<Type>>& ptfl
 )
 :
     DimensionedField<Type, GeoMesh>(io, mesh, ds, iField),
@@ -417,7 +417,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 :
     DimensionedField<Type, GeoMesh>
@@ -480,7 +480,7 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (
     const IOobject& io,
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 :
     DimensionedField<Type, GeoMesh>
@@ -544,7 +544,7 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (
     const word& newName,
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 :
     DimensionedField<Type, GeoMesh>
@@ -943,10 +943,10 @@ writeData(Ostream& os) const
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-Foam::tmp<Foam::GeometricField<Type, PatchField, GeoMesh> >
+Foam::tmp<Foam::GeometricField<Type, PatchField, GeoMesh>>
 Foam::GeometricField<Type, PatchField, GeoMesh>::T() const
 {
-    tmp<GeometricField<Type, PatchField, GeoMesh> > result
+    tmp<GeometricField<Type, PatchField, GeoMesh>> result
     (
         new GeometricField<Type, PatchField, GeoMesh>
         (
@@ -983,7 +983,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::component
     const direction d
 ) const
 {
-    tmp<GeometricField<cmptType, PatchField, GeoMesh> > Component
+    tmp<GeometricField<cmptType, PatchField, GeoMesh>> Component
     (
         new GeometricField<cmptType, PatchField, GeoMesh>
         (
@@ -1091,7 +1091,7 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::operator=
 template<class Type, template<class> class PatchField, class GeoMesh>
 void Foam::GeometricField<Type, PatchField, GeoMesh>::operator=
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 {
     if (this == &(tgf()))
@@ -1135,7 +1135,7 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::operator=
 template<class Type, template<class> class PatchField, class GeoMesh>
 void Foam::GeometricField<Type, PatchField, GeoMesh>::operator==
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 {
     const GeometricField<Type, PatchField, GeoMesh>& gf = tgf();
@@ -1179,7 +1179,7 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::operator op             \
 template<class Type, template<class> class PatchField, class GeoMesh>         \
 void Foam::GeometricField<Type, PatchField, GeoMesh>::operator op             \
 (                                                                             \
-    const tmp<GeometricField<TYPE, PatchField, GeoMesh> >& tgf                \
+    const tmp<GeometricField<TYPE, PatchField, GeoMesh>>& tgf                \
 )                                                                             \
 {                                                                             \
     operator op(tgf());                                                       \
@@ -1232,7 +1232,7 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 {
     os << tgf();
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
index 334bdc26701f0670ff0b03224523b7ba0672e283..7c47a526cb2950b5f414ccac799e7a9cf235ea62 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.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
@@ -69,7 +69,7 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 Ostream& operator<<
 (
     Ostream&,
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >&
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>&
 );
 
 
@@ -144,12 +144,12 @@ public:
 
             //- Construct from a BoundaryMesh,
             //  reference to the internal field
-            //  and a PtrList<PatchField<Type> >
+            //  and a PtrList<PatchField<Type>>
             GeometricBoundaryField
             (
                 const BoundaryMesh&,
                 const DimensionedInternalField&,
-                const PtrList<PatchField<Type> >&
+                const PtrList<PatchField<Type>>&
             );
 
             //- Construct as copy setting the reference to the internal field
@@ -330,7 +330,7 @@ public:
             const Mesh&,
             const dimensionSet&,
             const Field<Type>&,
-            const PtrList<PatchField<Type> >&
+            const PtrList<PatchField<Type>>&
         );
 
         //- Construct and read given IOobject
@@ -358,7 +358,7 @@ public:
         #ifndef NoConstructFromTmp
         GeometricField
         (
-            const tmp<GeometricField<Type, PatchField, GeoMesh> >&
+            const tmp<GeometricField<Type, PatchField, GeoMesh>>&
         );
         #endif
 
@@ -374,7 +374,7 @@ public:
         GeometricField
         (
             const IOobject&,
-            const tmp<GeometricField<Type, PatchField, GeoMesh> >&
+            const tmp<GeometricField<Type, PatchField, GeoMesh>>&
         );
         #endif
 
@@ -390,7 +390,7 @@ public:
         GeometricField
         (
             const word& newName,
-            const tmp<GeometricField<Type, PatchField, GeoMesh> >&
+            const tmp<GeometricField<Type, PatchField, GeoMesh>>&
         );
         #endif
 
@@ -471,7 +471,7 @@ public:
         bool needReference() const;
 
         //- Return a component of the field
-        tmp<GeometricField<cmptType, PatchField, GeoMesh> > component
+        tmp<GeometricField<cmptType, PatchField, GeoMesh>> component
         (
             const direction
         ) const;
@@ -480,7 +480,7 @@ public:
         bool writeData(Ostream&) const;
 
         //- Return transpose (only if it is a tensor field)
-        tmp<GeometricField<Type, PatchField, GeoMesh> > T() const;
+        tmp<GeometricField<Type, PatchField, GeoMesh>> T() const;
 
         //- Relax field (for steady-state solution).
         //  alpha = 1 : no relaxation
@@ -548,23 +548,23 @@ public:
     // Member operators
 
         void operator=(const GeometricField<Type, PatchField, GeoMesh>&);
-        void operator=(const tmp<GeometricField<Type, PatchField, GeoMesh> >&);
+        void operator=(const tmp<GeometricField<Type, PatchField, GeoMesh>>&);
         void operator=(const dimensioned<Type>&);
 
-        void operator==(const tmp<GeometricField<Type, PatchField, GeoMesh> >&);
+        void operator==(const tmp<GeometricField<Type, PatchField, GeoMesh>>&);
         void operator==(const dimensioned<Type>&);
 
         void operator+=(const GeometricField<Type, PatchField, GeoMesh>&);
-        void operator+=(const tmp<GeometricField<Type, PatchField, GeoMesh> >&);
+        void operator+=(const tmp<GeometricField<Type, PatchField, GeoMesh>>&);
 
         void operator-=(const GeometricField<Type, PatchField, GeoMesh>&);
-        void operator-=(const tmp<GeometricField<Type, PatchField, GeoMesh> >&);
+        void operator-=(const tmp<GeometricField<Type, PatchField, GeoMesh>>&);
 
         void operator*=(const GeometricField<scalar, PatchField, GeoMesh>&);
-        void operator*=(const tmp<GeometricField<scalar,PatchField,GeoMesh> >&);
+        void operator*=(const tmp<GeometricField<scalar,PatchField,GeoMesh>>&);
 
         void operator/=(const GeometricField<scalar, PatchField, GeoMesh>&);
-        void operator/=(const tmp<GeometricField<scalar,PatchField,GeoMesh> >&);
+        void operator/=(const tmp<GeometricField<scalar,PatchField,GeoMesh>>&);
 
         void operator+=(const dimensioned<Type>&);
         void operator-=(const dimensioned<Type>&);
@@ -584,7 +584,7 @@ public:
         friend Ostream& operator<< <Type, PatchField, GeoMesh>
         (
             Ostream&,
-            const tmp<GeometricField<Type, PatchField, GeoMesh> >&
+            const tmp<GeometricField<Type, PatchField, GeoMesh>>&
         );
 };
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
index bdd619e359219fb4f6b8b025c8ba1f8afc1d3f18..9dbc5cfb0d2024dc061402f8804812c80a15c033 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.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
@@ -78,7 +78,7 @@ void pow
 }
 
 template<class Type, template<class> class PatchField, class GeoMesh, int r>
-tmp<GeometricField<typename powProduct<Type, r>::type, PatchField, GeoMesh> >
+tmp<GeometricField<typename powProduct<Type, r>::type, PatchField, GeoMesh>>
 pow
 (
     const GeometricField<Type, PatchField, GeoMesh>& gf,
@@ -87,7 +87,7 @@ pow
 {
     typedef typename powProduct<Type, r>::type powProductType;
 
-    tmp<GeometricField<powProductType, PatchField, GeoMesh> > tPow
+    tmp<GeometricField<powProductType, PatchField, GeoMesh>> tPow
     (
         new GeometricField<powProductType, PatchField, GeoMesh>
         (
@@ -111,10 +111,10 @@ pow
 
 
 template<class Type, template<class> class PatchField, class GeoMesh, int r>
-tmp<GeometricField<typename powProduct<Type, r>::type, PatchField, GeoMesh> >
+tmp<GeometricField<typename powProduct<Type, r>::type, PatchField, GeoMesh>>
 pow
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf,
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf,
     typename powProduct<Type, r>::type
 )
 {
@@ -122,7 +122,7 @@ pow
 
     const GeometricField<Type, PatchField, GeoMesh>& gf = tgf();
 
-    tmp<GeometricField<powProductType, PatchField, GeoMesh> > tPow
+    tmp<GeometricField<powProductType, PatchField, GeoMesh>> tPow
     (
         new GeometricField<powProductType, PatchField, GeoMesh>
         (
@@ -173,7 +173,7 @@ sqr(const GeometricField<Type, PatchField, GeoMesh>& gf)
 {
     typedef typename outerProduct<Type, Type>::type outerProductType;
 
-    tmp<GeometricField<outerProductType, PatchField, GeoMesh> > tSqr
+    tmp<GeometricField<outerProductType, PatchField, GeoMesh>> tSqr
     (
         new GeometricField<outerProductType, PatchField, GeoMesh>
         (
@@ -205,13 +205,13 @@ tmp
         GeoMesh
     >
 >
-sqr(const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf)
+sqr(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf)
 {
     typedef typename outerProduct<Type, Type>::type outerProductType;
 
     const GeometricField<Type, PatchField, GeoMesh>& gf = tgf();
 
-    tmp<GeometricField<outerProductType, PatchField, GeoMesh> > tSqr
+    tmp<GeometricField<outerProductType, PatchField, GeoMesh>> tSqr
     (
         new GeometricField<outerProductType, PatchField, GeoMesh>
         (
@@ -248,12 +248,12 @@ void magSqr
 }
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > magSqr
+tmp<GeometricField<scalar, PatchField, GeoMesh>> magSqr
 (
     const GeometricField<Type, PatchField, GeoMesh>& gf
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tMagSqr
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tMagSqr
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -276,14 +276,14 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > magSqr
 }
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > magSqr
+tmp<GeometricField<scalar, PatchField, GeoMesh>> magSqr
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 {
     const GeometricField<Type, PatchField, GeoMesh>& gf = tgf();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tMagSqr
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tMagSqr
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -320,12 +320,12 @@ void mag
 }
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > mag
+tmp<GeometricField<scalar, PatchField, GeoMesh>> mag
 (
     const GeometricField<Type, PatchField, GeoMesh>& gf
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tMag
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tMag
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -348,14 +348,14 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > mag
 }
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > mag
+tmp<GeometricField<scalar, PatchField, GeoMesh>> mag
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 )
 {
     const GeometricField<Type, PatchField, GeoMesh>& gf = tgf();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tMag
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tMag
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -411,7 +411,7 @@ cmptAv(const GeometricField<Type, PatchField, GeoMesh>& gf)
     typedef typename GeometricField<Type, PatchField, GeoMesh>::cmptType
         cmptType;
 
-    tmp<GeometricField<cmptType, PatchField, GeoMesh> > CmptAv
+    tmp<GeometricField<cmptType, PatchField, GeoMesh>> CmptAv
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -443,14 +443,14 @@ tmp
         GeoMesh
     >
 >
-cmptAv(const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf)
+cmptAv(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf)
 {
     typedef typename GeometricField<Type, PatchField, GeoMesh>::cmptType
         cmptType;
 
     const GeometricField<Type, PatchField, GeoMesh>& gf = tgf();
 
-    tmp<GeometricField<cmptType, PatchField, GeoMesh> > CmptAv
+    tmp<GeometricField<cmptType, PatchField, GeoMesh>> CmptAv
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -494,7 +494,7 @@ dimensioned<returnType> func                                                  \
 template<class Type, template<class> class PatchField, class GeoMesh>         \
 dimensioned<returnType> func                                                  \
 (                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1               \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
 )                                                                             \
 {                                                                             \
     dimensioned<returnType> res = func(tgf1());                               \
@@ -527,7 +527,7 @@ dimensioned<returnType> func                                                  \
 template<class Type, template<class> class PatchField, class GeoMesh>         \
 dimensioned<returnType> func                                                  \
 (                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1               \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
 )                                                                             \
 {                                                                             \
     dimensioned<returnType> res = func(tgf1());                               \
@@ -598,7 +598,7 @@ operator op                                                                   \
 )                                                                             \
 {                                                                             \
     typedef typename product<Type1, Type2>::type productType;                 \
-    tmp<GeometricField<productType, PatchField, GeoMesh> > tRes               \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes               \
     (                                                                         \
         new GeometricField<productType, PatchField, GeoMesh>                  \
         (                                                                     \
@@ -629,14 +629,14 @@ tmp                                                                           \
 operator op                                                                   \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 )                                                                             \
 {                                                                             \
     typedef typename product<Type1, Type2>::type productType;                 \
                                                                               \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
                                                                               \
-    tmp<GeometricField<productType, PatchField, GeoMesh> > tRes =             \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes =             \
         reuseTmpGeometricField<productType, Type2, PatchField, GeoMesh>::New  \
         (                                                                     \
             tgf2,                                                             \
@@ -660,7 +660,7 @@ tmp                                                                           \
 >                                                                             \
 operator op                                                                   \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
 )                                                                             \
 {                                                                             \
@@ -668,7 +668,7 @@ operator op                                                                   \
                                                                               \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
                                                                               \
-    tmp<GeometricField<productType, PatchField, GeoMesh> > tRes =             \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes =             \
         reuseTmpGeometricField<productType, Type1, PatchField, GeoMesh>::New  \
         (                                                                     \
             tgf1,                                                             \
@@ -692,8 +692,8 @@ tmp                                                                           \
 >                                                                             \
 operator op                                                                   \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 )                                                                             \
 {                                                                             \
     typedef typename product<Type1, Type2>::type productType;                 \
@@ -701,7 +701,7 @@ operator op                                                                   \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
                                                                               \
-    tmp<GeometricField<productType, PatchField, GeoMesh> > tRes =             \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes =             \
         reuseTmpTmpGeometricField                                             \
         <productType, Type1, Type1, Type2, PatchField, GeoMesh>::New          \
         (                                                                     \
@@ -736,7 +736,7 @@ void opFunc                                                                   \
                                                                               \
 template                                                                      \
 <class Form, class Type, template<class> class PatchField, class GeoMesh>     \
-tmp<GeometricField<typename product<Type, Form>::type, PatchField, GeoMesh> > \
+tmp<GeometricField<typename product<Type, Form>::type, PatchField, GeoMesh>> \
 operator op                                                                   \
 (                                                                             \
     const GeometricField<Type, PatchField, GeoMesh>& gf1,                     \
@@ -745,7 +745,7 @@ operator op                                                                   \
 {                                                                             \
     typedef typename product<Type, Form>::type productType;                   \
                                                                               \
-    tmp<GeometricField<productType, PatchField, GeoMesh> > tRes               \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes               \
     (                                                                         \
         new GeometricField<productType, PatchField, GeoMesh>                  \
         (                                                                     \
@@ -775,7 +775,7 @@ template                                                                      \
     class Type, template<class> class PatchField,                             \
     class GeoMesh                                                             \
 >                                                                             \
-tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh> > \
+tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
 operator op                                                                   \
 (                                                                             \
     const GeometricField<Type, PatchField, GeoMesh>& gf1,                     \
@@ -788,10 +788,10 @@ operator op                                                                   \
                                                                               \
 template                                                                      \
 <class Form, class Type, template<class> class PatchField, class GeoMesh>     \
-tmp<GeometricField<typename product<Type, Form>::type, PatchField, GeoMesh> > \
+tmp<GeometricField<typename product<Type, Form>::type, PatchField, GeoMesh>> \
 operator op                                                                   \
 (                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1,              \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,              \
     const dimensioned<Form>& dvs                                              \
 )                                                                             \
 {                                                                             \
@@ -799,7 +799,7 @@ operator op                                                                   \
                                                                               \
     const GeometricField<Type, PatchField, GeoMesh>& gf1 = tgf1();            \
                                                                               \
-    tmp<GeometricField<productType, PatchField, GeoMesh> > tRes =             \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes =             \
         reuseTmpGeometricField<productType, Type, PatchField, GeoMesh>::New   \
         (                                                                     \
             tgf1,                                                             \
@@ -823,10 +823,10 @@ template                                                                      \
     class Type, template<class> class PatchField,                             \
     class GeoMesh                                                             \
 >                                                                             \
-tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh> > \
+tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
 operator op                                                                   \
 (                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1,              \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
 )                                                                             \
 {                                                                             \
@@ -850,7 +850,7 @@ void opFunc                                                                   \
                                                                               \
 template                                                                      \
 <class Form, class Type, template<class> class PatchField, class GeoMesh>     \
-tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh> > \
+tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
 operator op                                                                   \
 (                                                                             \
     const dimensioned<Form>& dvs,                                             \
@@ -858,7 +858,7 @@ operator op                                                                   \
 )                                                                             \
 {                                                                             \
     typedef typename product<Form, Type>::type productType;                   \
-    tmp<GeometricField<productType, PatchField, GeoMesh> > tRes               \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes               \
     (                                                                         \
         new GeometricField<productType, PatchField, GeoMesh>                  \
         (                                                                     \
@@ -888,7 +888,7 @@ template                                                                      \
     class Type, template<class> class PatchField,                             \
     class GeoMesh                                                             \
 >                                                                             \
-tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh> > \
+tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
 operator op                                                                   \
 (                                                                             \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
@@ -900,18 +900,18 @@ operator op                                                                   \
                                                                               \
 template                                                                      \
 <class Form, class Type, template<class> class PatchField, class GeoMesh>     \
-tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh> > \
+tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
 operator op                                                                   \
 (                                                                             \
     const dimensioned<Form>& dvs,                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1               \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
 )                                                                             \
 {                                                                             \
     typedef typename product<Form, Type>::type productType;                   \
                                                                               \
     const GeometricField<Type, PatchField, GeoMesh>& gf1 = tgf1();            \
                                                                               \
-    tmp<GeometricField<productType, PatchField, GeoMesh> > tRes =             \
+    tmp<GeometricField<productType, PatchField, GeoMesh>> tRes =             \
         reuseTmpGeometricField<productType, Type, PatchField, GeoMesh>::New   \
         (                                                                     \
             tgf1,                                                             \
@@ -935,11 +935,11 @@ template                                                                      \
     class Type, template<class> class PatchField,                             \
     class GeoMesh                                                             \
 >                                                                             \
-tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh> > \
+tmp<GeometricField<typename product<Form, Type>::type, PatchField, GeoMesh>> \
 operator op                                                                   \
 (                                                                             \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1               \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
 )                                                                             \
 {                                                                             \
     return dimensioned<Form>(static_cast<const Form&>(vs)) op tgf1;           \
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H
index 459bb7b7b74b954e3143db88254bea9ed684272e..6c7d7c3d9bb4ff6c1fd7170e0eff5ce23fe5884f 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.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
@@ -83,7 +83,7 @@ tmp
 >
 pow
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf,
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf,
     typename powProduct<Type, r>::type
 );
 
@@ -117,7 +117,7 @@ tmp
         GeoMesh
     >
 >
-sqr(const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf);
+sqr(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf);
 
 template<class Type, template<class> class PatchField, class GeoMesh>
 void magSqr
@@ -127,15 +127,15 @@ void magSqr
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > magSqr
+tmp<GeometricField<scalar, PatchField, GeoMesh>> magSqr
 (
     const GeometricField<Type, PatchField, GeoMesh>& gf
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > magSqr
+tmp<GeometricField<scalar, PatchField, GeoMesh>> magSqr
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
@@ -146,15 +146,15 @@ void mag
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > mag
+tmp<GeometricField<scalar, PatchField, GeoMesh>> mag
 (
     const GeometricField<Type, PatchField, GeoMesh>& gf
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > mag
+tmp<GeometricField<scalar, PatchField, GeoMesh>> mag
 (
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
@@ -191,7 +191,7 @@ tmp
         GeoMesh
     >
 >
-cmptAv(const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf);
+cmptAv(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf);
 
 
 #define UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY(returnType, func, gFunc)       \
@@ -205,7 +205,7 @@ dimensioned<returnType> func                                                  \
 template<class Type, template<class> class PatchField, class GeoMesh>         \
 dimensioned<returnType> func                                                  \
 (                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1               \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
 );
 
 UNARY_REDUCTION_FUNCTION_WITH_BOUNDARY(Type, max, gMax)
@@ -225,7 +225,7 @@ dimensioned<returnType> func                                                  \
 template<class Type, template<class> class PatchField, class GeoMesh>         \
 dimensioned<returnType> func                                                  \
 (                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1               \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
 );
 
 UNARY_REDUCTION_FUNCTION(Type, sum, gSum)
@@ -297,7 +297,7 @@ tmp                                                                           \
 operator op                                                                   \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 );                                                                            \
                                                                               \
 template                                                                      \
@@ -309,7 +309,7 @@ tmp                                                                           \
 >                                                                             \
 operator op                                                                   \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
 );                                                                            \
                                                                               \
@@ -322,8 +322,8 @@ tmp                                                                           \
 >                                                                             \
 operator op                                                                   \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 );                                                                            \
                                                                               \
 template                                                                      \
@@ -377,7 +377,7 @@ tmp                                                                           \
 >                                                                             \
 operator op                                                                   \
 (                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1,              \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,              \
     const dimensioned<Form>& dvs                                              \
 );                                                                            \
                                                                               \
@@ -396,7 +396,7 @@ tmp                                                                           \
 >                                                                             \
 operator op                                                                   \
 (                                                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1,              \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1,              \
     const VectorSpace<Form,Cmpt,nCmpt>& vs                                    \
 );                                                                            \
                                                                               \
@@ -452,7 +452,7 @@ tmp                                                                           \
 operator op                                                                   \
 (                                                                             \
     const dimensioned<Form>& dvs,                                             \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1               \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
 );                                                                            \
                                                                               \
 template                                                                      \
@@ -471,7 +471,7 @@ tmp                                                                           \
 operator op                                                                   \
 (                                                                             \
     const VectorSpace<Form,Cmpt,nCmpt>& vs,                                   \
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& tgf1               \
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf1               \
 );
 
 PRODUCT_OPERATOR(typeOfSum, +, add)
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
index 9b598d5bc3a448714cc0be2092e0a03f722a3ca9..ef97074ca4061a4c73a2fa2968b1302c4def6b46 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.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
@@ -46,12 +46,12 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1                     \
 )                                                                             \
 {                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         new GeometricField<ReturnType, PatchField, GeoMesh>                   \
         (                                                                     \
@@ -74,14 +74,14 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1              \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New   \
         (                                                                     \
@@ -116,12 +116,12 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1                     \
 )                                                                             \
 {                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         new GeometricField<ReturnType, PatchField, GeoMesh>                   \
         (                                                                     \
@@ -144,14 +144,14 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1              \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New   \
         (                                                                     \
@@ -187,13 +187,13 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
 )                                                                             \
 {                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         new GeometricField<ReturnType, PatchField, GeoMesh>                   \
         (                                                                     \
@@ -216,15 +216,15 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New   \
         (                                                                     \
@@ -243,15 +243,15 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New   \
         (                                                                     \
@@ -270,16 +270,16 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpTmpGeometricField                                             \
             <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>            \
@@ -318,13 +318,13 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
 )                                                                             \
 {                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         new GeometricField<ReturnType, PatchField, GeoMesh>                   \
         (                                                                     \
@@ -347,7 +347,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const Type1& t1,                                                          \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
@@ -358,15 +358,15 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
                                                                               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New   \
         (                                                                     \
@@ -385,10 +385,10 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const Type1& t1,                                                          \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 )                                                                             \
 {                                                                             \
     return Func(dimensioned<Type1>(t1), tgf2);                                \
@@ -410,13 +410,13 @@ void Func                                                                     \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
     const dimensioned<Type2>& dt2                                             \
 )                                                                             \
 {                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         new GeometricField<ReturnType, PatchField, GeoMesh>                   \
         (                                                                     \
@@ -439,7 +439,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
     const Type2& t2                                                           \
@@ -450,15 +450,15 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
                                                                               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
     const dimensioned<Type2>& dt2                                             \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New   \
         (                                                                     \
@@ -477,9 +477,9 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
     const Type2& t2                                                           \
 )                                                                             \
 {                                                                             \
@@ -511,13 +511,13 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
 )                                                                             \
 {                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         new GeometricField<ReturnType, PatchField, GeoMesh>                   \
         (                                                                     \
@@ -540,15 +540,15 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New   \
         (                                                                     \
@@ -567,15 +567,15 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New   \
         (                                                                     \
@@ -594,16 +594,16 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpTmpGeometricField                                             \
             <ReturnType, Type1, Type1, Type2, PatchField, GeoMesh>::New       \
@@ -642,13 +642,13 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
 )                                                                             \
 {                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         new GeometricField<ReturnType, PatchField, GeoMesh>                   \
         (                                                                     \
@@ -671,7 +671,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const Type1& t1,                                                          \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2                     \
@@ -682,15 +682,15 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
                                                                               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type2, PatchField, GeoMesh>& gf2 = tgf2();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpGeometricField<ReturnType, Type2, PatchField, GeoMesh>::New   \
         (                                                                     \
@@ -709,10 +709,10 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const Type1& t1,                                                          \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tgf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tgf2              \
 )                                                                             \
 {                                                                             \
     return dimensioned<Type1>(t1) Op tgf2;                                    \
@@ -734,13 +734,13 @@ void OpFunc                                                                   \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
     const dimensioned<Type2>& dt2                                             \
 )                                                                             \
 {                                                                             \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         new GeometricField<ReturnType, PatchField, GeoMesh>                   \
         (                                                                     \
@@ -763,7 +763,7 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1,                    \
     const Type2& t2                                                           \
@@ -774,15 +774,15 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
                                                                               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
     const dimensioned<Type2>& dt2                                             \
 )                                                                             \
 {                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();           \
                                                                               \
-    tmp<GeometricField<ReturnType, PatchField, GeoMesh> > tRes                \
+    tmp<GeometricField<ReturnType, PatchField, GeoMesh>> tRes                \
     (                                                                         \
         reuseTmpGeometricField<ReturnType, Type1, PatchField, GeoMesh>::New   \
         (                                                                     \
@@ -801,9 +801,9 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
 }                                                                             \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tgf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tgf1,             \
     const Type2& t2                                                           \
 )                                                                             \
 {                                                                             \
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.H
index 417b06ba440e5b74cf26a1edda68e0151ef89eb1..725fefb72729fbc9a44f042b81f24d459c7f197a 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.H
@@ -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
@@ -28,15 +28,15 @@ License
 #define UNARY_FUNCTION(ReturnType, Type1, Func, Dfunc)                        \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& df                      \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1              \
 );
 
 
@@ -45,15 +45,15 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 #define UNARY_OPERATOR(ReturnType, Type1, Op, opFunc, Dfunc)                  \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& df1                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1              \
 );
 
 
@@ -62,31 +62,31 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
 #define BINARY_FUNCTION(ReturnType, Type1, Type2, Func)                       \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
     const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
     const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
 );
 
 
@@ -95,61 +95,61 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 #define BINARY_TYPE_FUNCTION_SF(ReturnType, Type1, Type2, Func)               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
     const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const Type1& t1,                                                          \
     const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const Type1& t1,                                                          \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
 );
 
 
 #define BINARY_TYPE_FUNCTION_FS(ReturnType, Type1, Type2, Func)               \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
     const dimensioned<Type2>& dt2                                             \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
     const Type2& t2                                                           \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
     const dimensioned<Type2>& dt2                                             \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> Func                    \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf2,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf2,             \
     const Type2& t2                                                           \
 );
 
@@ -164,31 +164,31 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > Func                    \
 #define BINARY_OPERATOR(ReturnType, Type1, Type2, Op, OpName, OpFunc)         \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
     const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
     const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,             \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2              \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
 );
 
 
@@ -197,61 +197,61 @@ tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
 #define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
     const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const Type1& t1,                                                          \
     const GeometricField<Type2, PatchField, GeoMesh>& df2                     \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const dimensioned<Type1>& dt1,                                            \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const Type1& t1,                                                          \
-    const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2              \
+    const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2              \
 );
 
 
 #define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
     const dimensioned<Type2>& dt2                                             \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
     const GeometricField<Type1, PatchField, GeoMesh>& df1,                    \
     const Type2& t2                                                           \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
     const dimensioned<Type2>& dt2                                             \
 );                                                                            \
                                                                               \
 TEMPLATE                                                                      \
-tmp<GeometricField<ReturnType, PatchField, GeoMesh> > operator Op             \
+tmp<GeometricField<ReturnType, PatchField, GeoMesh>> operator Op             \
 (                                                                             \
-    const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,             \
+    const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,             \
     const Type2& t2                                                           \
 );
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H
index 35885d523f27c24367725ee33150e49ae700591b..aeda9e37fe49dbf856a86e74c9e2206d84011ca6 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 inline const Foam::GeometricField<Type, PatchField, GeoMesh>&
 Foam::GeometricField<Type, PatchField, GeoMesh>::null()
 {
-    return NullObjectRef<GeometricField<Type, PatchField, GeoMesh> >();
+    return NullObjectRef<GeometricField<Type, PatchField, GeoMesh>>();
 }
 
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
index 5861a2efddc46834e3f099ee84e588b14c71367e..06970c3c671d1471bee836691e82c6a7ae8102f1 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
@@ -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
@@ -44,16 +44,16 @@ class reuseTmpGeometricField
 {
 public:
 
-    static tmp<GeometricField<TypeR, PatchField, GeoMesh> > New
+    static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,
         const word& name,
         const dimensionSet& dimensions
     )
     {
         const GeometricField<Type1, PatchField, GeoMesh>& df1 = tdf1();
 
-        return tmp<GeometricField<TypeR, PatchField, GeoMesh> >
+        return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
         (
             new GeometricField<TypeR, PatchField, GeoMesh>
             (
@@ -71,7 +71,7 @@ public:
 
     static void clear
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1
     )
     {
         tdf1.clear();
@@ -84,9 +84,9 @@ class reuseTmpGeometricField<TypeR, TypeR, PatchField, GeoMesh>
 {
 public:
 
-    static tmp<GeometricField<TypeR, PatchField, GeoMesh> > New
+    static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh> >& tdf1,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf1,
         const word& name,
         const dimensionSet& dimensions
     )
@@ -102,7 +102,7 @@ public:
         }
         else
         {
-            return tmp<GeometricField<TypeR, PatchField, GeoMesh> >
+            return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
             (
                 new GeometricField<TypeR, PatchField, GeoMesh>
                 (
@@ -121,7 +121,7 @@ public:
 
     static void clear
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh> >& tdf1
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf1
     )
     {
         if (tdf1.isTmp())
@@ -145,17 +145,17 @@ class reuseTmpTmpGeometricField
 {
 public:
 
-    static tmp<GeometricField<TypeR, PatchField, GeoMesh> > New
+    static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,
-        const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2,
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,
+        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2,
         const word& name,
         const dimensionSet& dimensions
     )
     {
         const GeometricField<Type1, PatchField, GeoMesh>& df1 = tdf1();
 
-        return tmp<GeometricField<TypeR, PatchField, GeoMesh> >
+        return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
         (
             new GeometricField<TypeR, PatchField, GeoMesh>
             (
@@ -173,8 +173,8 @@ public:
 
     static void clear
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,
-        const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,
+        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2
     )
     {
         tdf1.clear();
@@ -196,10 +196,10 @@ class reuseTmpTmpGeometricField
 {
 public:
 
-    static tmp<GeometricField<TypeR, PatchField, GeoMesh> > New
+    static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh> >& tdf2,
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf2,
         const word& name,
         const dimensionSet& dimensions
     )
@@ -216,7 +216,7 @@ public:
         }
         else
         {
-            return tmp<GeometricField<TypeR, PatchField, GeoMesh> >
+            return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
             (
                 new GeometricField<TypeR, PatchField, GeoMesh>
                 (
@@ -235,8 +235,8 @@ public:
 
     static void clear
     (
-        const tmp<GeometricField<Type1, PatchField, GeoMesh> >& tdf1,
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh> >& tdf2
+        const tmp<GeometricField<Type1, PatchField, GeoMesh>>& tdf1,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf2
     )
     {
         tdf1.clear();
@@ -259,10 +259,10 @@ class reuseTmpTmpGeometricField<TypeR, TypeR, TypeR, Type2, PatchField, GeoMesh>
 {
 public:
 
-    static tmp<GeometricField<TypeR, PatchField, GeoMesh> > New
+    static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh> >& tdf1,
-        const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf1,
+        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2,
         const word& name,
         const dimensionSet& dimensions
     )
@@ -278,7 +278,7 @@ public:
         }
         else
         {
-            return tmp<GeometricField<TypeR, PatchField, GeoMesh> >
+            return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
             (
                 new GeometricField<TypeR, PatchField, GeoMesh>
                 (
@@ -297,8 +297,8 @@ public:
 
     static void clear
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh> >& tdf1,
-        const tmp<GeometricField<Type2, PatchField, GeoMesh> >& tdf2
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf1,
+        const tmp<GeometricField<Type2, PatchField, GeoMesh>>& tdf2
     )
     {
         if (tdf1.isTmp())
@@ -315,10 +315,10 @@ class reuseTmpTmpGeometricField<TypeR, TypeR, TypeR, TypeR, PatchField, GeoMesh>
 {
 public:
 
-    static tmp<GeometricField<TypeR, PatchField, GeoMesh> > New
+    static tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh> >& tdf1,
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh> >& tdf2,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf1,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf2,
         const word& name,
         const dimensionSet& dimensions
     )
@@ -342,7 +342,7 @@ public:
         }
         else
         {
-            return tmp<GeometricField<TypeR, PatchField, GeoMesh> >
+            return tmp<GeometricField<TypeR, PatchField, GeoMesh>>
             (
                 new GeometricField<TypeR, PatchField, GeoMesh>
                 (
@@ -361,8 +361,8 @@ public:
 
     static void clear
     (
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh> >& tdf1,
-        const tmp<GeometricField<TypeR, PatchField, GeoMesh> >& tdf2
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf1,
+        const tmp<GeometricField<TypeR, PatchField, GeoMesh>>& tdf2
     )
     {
         if (tdf1.isTmp())
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H
index 10150f7a64b3f363a28d23244f5f3f0be914609c..637e4314f3915a5daad22a4bf34716a18ea3a47f 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H
@@ -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
@@ -75,7 +75,7 @@ void MapGeometricFields
     HashTable<const GeometricField<Type, PatchField, GeoMesh>*> fields
     (
         mapper.thisDb().objectRegistry::template
-            lookupClass<GeometricField<Type, PatchField, GeoMesh> >()
+            lookupClass<GeometricField<Type, PatchField, GeoMesh>>()
     );
 
     // It is necessary to enforce that all old-time fields are stored
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C
index 968f5f4c0f0529d5dce4d573359b0b524c53761c..e53fdf778a6ca601aa5daae3d6385969c18aa882 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.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
@@ -29,7 +29,7 @@ License
 template<class GeoField>
 Foam::tmp<GeoField> Foam::uniformInterpolate
 (
-    const HashPtrTable<GeoField, label, Hash<label> >& fields,
+    const HashPtrTable<GeoField, label, Hash<label>>& fields,
     const labelList& indices,
     const scalarField& weights
 )
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.H
index f196f71c192e64e4bae65f268a2e57396b048d42..4cf01dcf9d7329030b0cf9f347cf52641a4e8851 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.H
@@ -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
@@ -39,7 +39,7 @@ namespace Foam
 template<class GeoField>
 tmp<GeoField> uniformInterpolate
 (
-    const HashPtrTable<GeoField, label, Hash<label> >& fields,
+    const HashPtrTable<GeoField, label, Hash<label>>& fields,
     const labelList& indices,
     const scalarField& weights
 );
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
index cb34740ca3e4c78a197a2eaa0a02c76a1b76935c..67f4486f116939aa0ab922e359fdb0523c5728c4 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.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
@@ -49,13 +49,13 @@ void stabilise
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > stabilise
+tmp<GeometricField<scalar, PatchField, GeoMesh>> stabilise
 (
     const GeometricField<scalar, PatchField, GeoMesh>& gsf,
     const dimensioned<scalar>& ds
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tRes
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tRes
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -79,15 +79,15 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > stabilise
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > stabilise
+tmp<GeometricField<scalar, PatchField, GeoMesh>> stabilise
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf,
     const dimensioned<scalar>& ds
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf = tgsf();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tRes
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tRes
     (
         reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
         (
@@ -132,13 +132,13 @@ void pow
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
     const GeometricField<scalar, PatchField, GeoMesh>& gsf1,
     const GeometricField<scalar, PatchField, GeoMesh>& gsf2
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -166,15 +166,15 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf1,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf1,
     const GeometricField<scalar, PatchField, GeoMesh>& gsf2
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf1 = tgsf1();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
     (
         reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
         (
@@ -197,15 +197,15 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
     const GeometricField<scalar, PatchField, GeoMesh>& gsf1,
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf2
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf2
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf2 = tgsf2();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
     (
         reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
         (
@@ -227,16 +227,16 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf1,
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf2
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf1,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf2
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf1 = tgsf1();
     const GeometricField<scalar, PatchField, GeoMesh>& gsf2 = tgsf2();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
     (
         reuseTmpTmpGeometricField
             <scalar, scalar, scalar, scalar, PatchField, GeoMesh>::New
@@ -276,13 +276,13 @@ void pow
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
     const GeometricField<scalar, PatchField, GeoMesh>& gsf,
     const dimensionedScalar& ds
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -305,15 +305,15 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf,
     const dimensionedScalar& ds
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf = tgsf();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
     (
         reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
         (
@@ -331,7 +331,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
     const GeometricField<scalar, PatchField, GeoMesh>& gsf,
     const scalar& s
@@ -341,9 +341,9 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf,
     const scalar& s
 )
 {
@@ -365,13 +365,13 @@ void pow
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
     const dimensionedScalar& ds,
     const GeometricField<scalar, PatchField, GeoMesh>& gsf
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -395,15 +395,15 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
     const dimensionedScalar& ds,
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf = tgsf();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tPow
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
     (
         reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
         (
@@ -421,7 +421,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
     const scalar& s,
     const GeometricField<scalar, PatchField, GeoMesh>& gsf
@@ -431,10 +431,10 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > pow
+tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
 (
     const scalar& s,
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf
 )
 {
     return pow(dimensionedScalar(s), tgsf);
@@ -457,13 +457,13 @@ void atan2
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
     const GeometricField<scalar, PatchField, GeoMesh>& gsf1,
     const GeometricField<scalar, PatchField, GeoMesh>& gsf2
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tAtan2
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -487,15 +487,15 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf1,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf1,
     const GeometricField<scalar, PatchField, GeoMesh>& gsf2
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf1 = tgsf1();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tAtan2
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
     (
         reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
         (
@@ -514,15 +514,15 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
     const GeometricField<scalar, PatchField, GeoMesh>& gsf1,
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf2
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf2
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf2 = tgsf2();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tAtan2
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
     (
         reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
         (
@@ -540,16 +540,16 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf1,
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf2
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf1,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf2
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf1 = tgsf1();
     const GeometricField<scalar, PatchField, GeoMesh>& gsf2 = tgsf2();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tAtan2
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
     (
         reuseTmpTmpGeometricField
             <scalar, scalar, scalar, scalar, PatchField, GeoMesh>::New
@@ -585,13 +585,13 @@ void atan2
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
     const GeometricField<scalar, PatchField, GeoMesh>& gsf,
     const dimensionedScalar& ds
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tAtan2
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -614,15 +614,15 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf,
     const dimensionedScalar& ds
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf = tgsf();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tAtan2
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
     (
         reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
         (
@@ -640,7 +640,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
     const GeometricField<scalar, PatchField, GeoMesh>& gsf,
     const scalar& s
@@ -650,9 +650,9 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf,
     const scalar& s
 )
 {
@@ -674,13 +674,13 @@ void atan2
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
     const dimensionedScalar& ds,
     const GeometricField<scalar, PatchField, GeoMesh>& gsf
 )
 {
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tAtan2
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
     (
         new GeometricField<scalar, PatchField, GeoMesh>
         (
@@ -704,15 +704,15 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
 
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
     const dimensionedScalar& ds,
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf
 )
 {
     const GeometricField<scalar, PatchField, GeoMesh>& gsf = tgsf();
 
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tAtan2
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
     (
         reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New
         (
@@ -730,7 +730,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
     const scalar& s,
     const GeometricField<scalar, PatchField, GeoMesh>& gsf
@@ -740,10 +740,10 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
 }
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > atan2
+tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
 (
     const scalar& s,
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf
 )
 {
     return atan2(dimensionedScalar(s), tgsf);
@@ -806,7 +806,7 @@ void func                                                                   \
 }                                                                           \
                                                                             \
 template<template<class> class PatchField, class GeoMesh>                   \
-tmp<GeometricField<scalar, PatchField, GeoMesh> > func                      \
+tmp<GeometricField<scalar, PatchField, GeoMesh>> func                      \
 (                                                                           \
     const int n,                                                            \
     const GeometricField<scalar, PatchField, GeoMesh>& gsf                  \
@@ -819,7 +819,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > func                      \
             << abort(FatalError);                                           \
     }                                                                       \
                                                                             \
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tFunc                 \
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tFunc                 \
     (                                                                       \
         new GeometricField<scalar, PatchField, GeoMesh>                     \
         (                                                                   \
@@ -842,10 +842,10 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > func                      \
 }                                                                           \
                                                                             \
 template<template<class> class PatchField, class GeoMesh>                   \
-tmp<GeometricField<scalar, PatchField, GeoMesh> > func                      \
+tmp<GeometricField<scalar, PatchField, GeoMesh>> func                      \
 (                                                                           \
     const int n,                                                            \
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >& tgsf           \
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>& tgsf           \
 )                                                                           \
 {                                                                           \
     const GeometricField<scalar, PatchField, GeoMesh>& gsf = tgsf();        \
@@ -857,7 +857,7 @@ tmp<GeometricField<scalar, PatchField, GeoMesh> > func                      \
             << abort(FatalError);                                           \
     }                                                                       \
                                                                             \
-    tmp<GeometricField<scalar, PatchField, GeoMesh> > tFunc                 \
+    tmp<GeometricField<scalar, PatchField, GeoMesh>> tFunc                 \
     (                                                                       \
         reuseTmpGeometricField<scalar, scalar, PatchField, GeoMesh>::New    \
         (                                                                   \
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H
index 78dc2e1d30e0f0124ecb7539606ef5d21c56ffa5..5090e5491d894f2556a01137db87d0867eb4230d 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.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
@@ -57,16 +57,16 @@ void stabilise
 );
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > stabilise
+tmp<GeometricField<scalar, PatchField, GeoMesh>> stabilise
 (
     const GeometricField<scalar, PatchField, GeoMesh>&,
     const dimensioned<scalar>&
 );
 
 template<template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<scalar, PatchField, GeoMesh> > stabilise
+tmp<GeometricField<scalar, PatchField, GeoMesh>> stabilise
 (
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >&,
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>&,
     const dimensioned<scalar>&
 );
 
@@ -140,17 +140,17 @@ void func                                                                      \
 );                                                                             \
                                                                                \
 template<template<class> class PatchField, class GeoMesh>                      \
-tmp<GeometricField<scalar, PatchField, GeoMesh> > func                         \
+tmp<GeometricField<scalar, PatchField, GeoMesh>> func                         \
 (                                                                              \
     const int n,                                                               \
     const GeometricField<scalar, PatchField, GeoMesh>&                         \
 );                                                                             \
                                                                                \
 template<template<class> class PatchField, class GeoMesh>                      \
-tmp<GeometricField<scalar, PatchField, GeoMesh> > func                         \
+tmp<GeometricField<scalar, PatchField, GeoMesh>> func                         \
 (                                                                              \
     const int n,                                                               \
-    const tmp<GeometricField<scalar, PatchField, GeoMesh> >&                   \
+    const tmp<GeometricField<scalar, PatchField, GeoMesh>>&                   \
 );
 
 BesselFunc(jn)
diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
index 1ea9ae6e115ebf9d28fd9a502001f450ffd4c9aa..5d7766e4f7aa26f7878ad0a409d11974e0c3244f 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,7 +35,7 @@ template
     template<class> class SlicedPatchField,
     class GeoMesh
 >
-Foam::tmp<Foam::FieldField<PatchField, Type> >
+Foam::tmp<Foam::FieldField<PatchField, Type>>
 Foam::SlicedGeometricField<Type, PatchField, SlicedPatchField, GeoMesh>::
 slicedBoundaryField
 (
@@ -45,7 +45,7 @@ slicedBoundaryField
     const bool preserveProcessorOnly
 )
 {
-    tmp<FieldField<PatchField, Type> > tbf
+    tmp<FieldField<PatchField, Type>> tbf
     (
         new FieldField<PatchField, Type>(mesh.boundary().size())
     );
@@ -113,7 +113,7 @@ template
     template<class> class SlicedPatchField,
     class GeoMesh
 >
-Foam::tmp<Foam::FieldField<PatchField, Type> >
+Foam::tmp<Foam::FieldField<PatchField, Type>>
 Foam::SlicedGeometricField<Type, PatchField, SlicedPatchField, GeoMesh>::
 slicedBoundaryField
 (
@@ -122,7 +122,7 @@ slicedBoundaryField
     const bool preserveCouples
 )
 {
-    tmp<FieldField<PatchField, Type> > tbf
+    tmp<FieldField<PatchField, Type>> tbf
     (
         new FieldField<PatchField, Type>(mesh.boundary().size())
     );
diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
index dd23712e6748586c8a919e384c628b301c6d58ba..594315715e39daa526ef15926580f00edb102693 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,7 +79,7 @@ private:
 
         //- Slice the given field and a create a PtrList of SlicedPatchField
         //  from which the boundary field is built
-        tmp<FieldField<PatchField, Type> >  slicedBoundaryField
+        tmp<FieldField<PatchField, Type>>  slicedBoundaryField
         (
             const Mesh& mesh,
             const Field<Type>& completeField,
@@ -89,7 +89,7 @@ private:
 
         //- Slice the given field and a create a PtrList of SlicedPatchField
         //  from which the boundary field is built
-        tmp<FieldField<PatchField, Type> >  slicedBoundaryField
+        tmp<FieldField<PatchField, Type>>  slicedBoundaryField
         (
             const Mesh& mesh,
             const FieldField<PatchField, Type>& bField,
@@ -108,7 +108,7 @@ private:
 
         //- Disallow standard assignment to tmp<GeometricField>,
         //  == assignment is allowed.
-        void operator=(const tmp<GeometricField<Type, PatchField, GeoMesh> >&);
+        void operator=(const tmp<GeometricField<Type, PatchField, GeoMesh>>&);
 
 
 public:
diff --git a/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.C b/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.C
index 677f7a435840649ec50c8c16e3d875c462b6762b..e3b75000b40bad59adf80e14cbf12adc02904f5c 100644
--- a/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.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
@@ -51,13 +51,13 @@ void transform
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
     const GeometricField<tensor, PatchField, GeoMesh>& trf,
     const GeometricField<Type, PatchField, GeoMesh>& tf
 )
 {
-    tmp<GeometricField<Type, PatchField, GeoMesh> > tranf
+    tmp<GeometricField<Type, PatchField, GeoMesh>> tranf
     (
         new GeometricField<Type, PatchField, GeoMesh>
         (
@@ -81,13 +81,13 @@ tmp<GeometricField<Type, PatchField, GeoMesh> > transform
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
     const GeometricField<tensor, PatchField, GeoMesh>& trf,
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& ttf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& ttf
 )
 {
-    tmp<GeometricField<Type, PatchField, GeoMesh> > tranf =
+    tmp<GeometricField<Type, PatchField, GeoMesh>> tranf =
         transform(trf, ttf());
     ttf.clear();
     return tranf;
@@ -95,13 +95,13 @@ tmp<GeometricField<Type, PatchField, GeoMesh> > transform
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
-    const tmp<GeometricField<tensor, PatchField, GeoMesh> >& ttrf,
+    const tmp<GeometricField<tensor, PatchField, GeoMesh>>& ttrf,
     const GeometricField<Type, PatchField, GeoMesh>& tf
 )
 {
-    tmp<GeometricField<Type, PatchField, GeoMesh> > tranf =
+    tmp<GeometricField<Type, PatchField, GeoMesh>> tranf =
         transform(ttrf(), tf);
     ttrf.clear();
     return tranf;
@@ -109,13 +109,13 @@ tmp<GeometricField<Type, PatchField, GeoMesh> > transform
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
-    const tmp<GeometricField<tensor, PatchField, GeoMesh> >& ttrf,
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& ttf
+    const tmp<GeometricField<tensor, PatchField, GeoMesh>>& ttrf,
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& ttf
 )
 {
-    tmp<GeometricField<Type, PatchField, GeoMesh> > tranf =
+    tmp<GeometricField<Type, PatchField, GeoMesh>> tranf =
         transform(ttrf(), ttf());
     ttf.clear();
     ttrf.clear();
@@ -137,13 +137,13 @@ void transform
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
     const dimensionedTensor& t,
     const GeometricField<Type, PatchField, GeoMesh>& tf
 )
 {
-    tmp<GeometricField<Type, PatchField, GeoMesh> > tranf
+    tmp<GeometricField<Type, PatchField, GeoMesh>> tranf
     (
         new GeometricField<vector, PatchField, GeoMesh>
         (
@@ -167,13 +167,13 @@ tmp<GeometricField<Type, PatchField, GeoMesh> > transform
 
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
     const dimensionedTensor& t,
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >& ttf
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>& ttf
 )
 {
-    tmp<GeometricField<Type, PatchField, GeoMesh> > tranf =
+    tmp<GeometricField<Type, PatchField, GeoMesh>> tranf =
         transform(t, ttf());
     ttf.clear();
     return tranf;
diff --git a/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.H b/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.H
index 5c0a582fe67919b6eb58b7f7245fba2ae13ce3d4..36307c90aa3292f65c71ef35484b071020f4a5fd 100644
--- a/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.H
@@ -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
@@ -54,31 +54,31 @@ void transform
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
     const GeometricField<tensor, PatchField, GeoMesh>&,
     const GeometricField<Type, PatchField, GeoMesh>&
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
     const GeometricField<tensor, PatchField, GeoMesh>&,
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >&
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>&
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
-    const tmp<GeometricField<tensor, PatchField, GeoMesh> >&,
+    const tmp<GeometricField<tensor, PatchField, GeoMesh>>&,
     const GeometricField<Type, PatchField, GeoMesh>&
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
-    const tmp<GeometricField<tensor, PatchField, GeoMesh> >&,
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >&
+    const tmp<GeometricField<tensor, PatchField, GeoMesh>>&,
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>&
 );
 
 
@@ -91,17 +91,17 @@ void transform
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
     const dimensionedTensor&,
     const GeometricField<Type, PatchField, GeoMesh>&
 );
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-tmp<GeometricField<Type, PatchField, GeoMesh> > transform
+tmp<GeometricField<Type, PatchField, GeoMesh>> transform
 (
     const dimensionedTensor&,
-    const tmp<GeometricField<Type, PatchField, GeoMesh> >&
+    const tmp<GeometricField<Type, PatchField, GeoMesh>>&
 );
 
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C
index 85c718e7030313259849b17962c8b605ee3ee5e5..c4e7b18a0cc3a0331aca60e12b749dda3f468f99 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.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
@@ -87,7 +87,7 @@ void Foam::basicSymmetryPointPatchField<Type>::evaluate
 {
     const vectorField& nHat = this->patch().pointNormals();
 
-    tmp<Field<Type> > tvalues =
+    tmp<Field<Type>> tvalues =
     (
         (
             this->patchInternalField()
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H
index cb006fcda9cb17744fbf52bb7e364a288547a87a..45f1945ad875730b67b646e94396ed579634f979 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H
@@ -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
@@ -82,9 +82,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new basicSymmetryPointPatchField<Type>
                 (
@@ -101,12 +101,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new basicSymmetryPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C
index 74846139eb6e4fe8bcf6cd3a34f9a64bec842827..2d48607cce315a73ebbe4479a52f53b4a723612a 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.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
@@ -85,7 +85,7 @@ Foam::calculatedPointPatchField<Type>::calculatedPointPatchField
 
 template<class Type>
 template<class Type2>
-Foam::autoPtr<Foam::pointPatchField<Type> >
+Foam::autoPtr<Foam::pointPatchField<Type>>
 Foam::pointPatchField<Type>::NewCalculatedType
 (
     const pointPatchField<Type2>& pf
@@ -96,7 +96,7 @@ Foam::pointPatchField<Type>::NewCalculatedType
 
     if (patchTypeCstrIter != pointPatchConstructorTablePtr_->end())
     {
-        return autoPtr<pointPatchField<Type> >
+        return autoPtr<pointPatchField<Type>>
         (
             patchTypeCstrIter()
             (
@@ -107,7 +107,7 @@ Foam::pointPatchField<Type>::NewCalculatedType
     }
     else
     {
-        return autoPtr<pointPatchField<Type> >
+        return autoPtr<pointPatchField<Type>>
         (
             new calculatedPointPatchField<Type>
             (
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H
index 6e9bc9ca8e7c844b825f79fe390d38c9f441bf9e..b331000367d67437007498d7bb14a9c101d7ffce 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H
@@ -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
@@ -85,9 +85,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new calculatedPointPatchField<Type>
                 (
@@ -104,10 +104,10 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> >
+        virtual autoPtr<pointPatchField<Type>>
         clone(const DimensionedField<Type, pointMesh>& iF) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new calculatedPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H
index bd52d255f57692b79197484ce7d1d540262ece66..283c8cf3b8b09e5a11328149bd44512befb4cc13 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H
@@ -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
@@ -86,7 +86,7 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const = 0;
+        virtual autoPtr<pointPatchField<Type>> clone() const = 0;
 
         //- Construct as copy setting internal field reference
         coupledPointPatchField
@@ -96,7 +96,7 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const = 0;
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
index d739bc239f463fa9866698ff83e75aa89da3504a..3b0aa4e59fdb63a014e0221e6b93117d8768c7ab 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,9 +86,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new fixedValuePointPatchField<Type>
                 (
@@ -105,12 +105,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new fixedValuePointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
index 747e3daa7f5cbad2d93d290ff3dc7d8747876841..e40a781a35a1f582064e5eda9448cdf90b2d8b15 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.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
@@ -137,7 +137,7 @@ void Foam::valuePointPatchField<Type>::rmap
 {
     Field<Type>::rmap
     (
-        refCast<const valuePointPatchField<Type> >
+        refCast<const valuePointPatchField<Type>>
         (
             ptf
         ),
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
index a98b2be40e4a14f0d05c0a66be1bc7b668f6e9a9..aedb5b5ceb576bd2156551fa1bf1b4c5f80ba2be 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
@@ -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
@@ -91,9 +91,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new valuePointPatchField<Type>
                 (
@@ -110,12 +110,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new valuePointPatchField<Type>
                 (
@@ -209,7 +209,7 @@ public:
 // which enables simple backward compatability with verions using
 // referenceLevel in GeometicField
 template<class Type>
-tmp<Field<Type> > operator+
+tmp<Field<Type>> operator+
 (
     const valuePointPatchField<Type>& vsppf,
     const Type& t
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H
index c32c776a44c6d52adc99b0f3a1c56baa9574e4f3..6f288f86abfe69f9efcf19ff232a0b75cebfa003 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H
@@ -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
@@ -85,9 +85,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new zeroGradientPointPatchField<Type>
                 (
@@ -104,12 +104,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new zeroGradientPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C
index 1ebadbb40cbe31e1e536859c76c9c87d57cd3122..ff745bf31578204fd6186f3ab82008f441706453 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.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
@@ -121,13 +121,13 @@ void Foam::cyclicPointPatchField<Type>::swapAddSeparated
 
         // Get neighbouring pointPatchField
         const GeometricField<Type, pointPatchField, pointMesh>& fld =
-            refCast<const GeometricField<Type, pointPatchField, pointMesh> >
+            refCast<const GeometricField<Type, pointPatchField, pointMesh>>
             (
                 this->dimensionedInternalField()
             );
 
         const cyclicPointPatchField<Type>& nbr =
-            refCast<const cyclicPointPatchField<Type> >
+            refCast<const cyclicPointPatchField<Type>>
             (
                 fld.boundaryField()[nbrPatch.index()]
             );
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
index 4737062fbe57f6d4279ca5789fe397fe72db0c99..981f7ee0d931b264ebadbc2097f7ed403aa7fd36 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
@@ -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
@@ -91,9 +91,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new cyclicPointPatchField<Type>
                 (
@@ -110,12 +110,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new cyclicPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C
index 0b822b1a4300a16c9512026a1750bc7310b35cb8..8bceca0831afccd49c823f931a1e09f73af78b2b 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.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
@@ -84,7 +84,7 @@ void Foam::cyclicSlipPointPatchField<Type>::evaluate(const Pstream::commsTypes)
 {
     const vectorField& nHat = this->patch().pointNormals();
 
-    tmp<Field<Type> > tvalues =
+    tmp<Field<Type>> tvalues =
     (
         (
             this->patchInternalField()
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H
index 9c37aadada24fbb6460e26d8e4f1ea751906a0b3..b33f1ed47aa046ebcc3f36fa0cb8c9e5f20daf67 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H
@@ -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
@@ -86,9 +86,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new cyclicSlipPointPatchField<Type>
                 (
@@ -105,12 +105,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new cyclicSlipPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H
index 042879c9c88ab5eaac6111522decfff772dde8a9..6f7dfda203eab341a9234b0c1fc5727bcdff436c 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H
@@ -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
@@ -86,9 +86,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new emptyPointPatchField<Type>
                 (
@@ -105,12 +105,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new emptyPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C
index 3f31c34d2e584534a1619262fd17b17950ab3840..f2d0ac7b2d4fc7e2841f1239d152cf313d6b2a41 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.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
@@ -91,7 +91,7 @@ void Foam::nonuniformTransformCyclicPointPatchField<Type>::evaluate
 {
     const vectorField& nHat = this->patch().pointNormals();
 
-    tmp<Field<Type> > tvalues =
+    tmp<Field<Type>> tvalues =
     (
         (
             this->patchInternalField()
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H
index c3f6792245b3b30f9b73971d16ff43b4d74fc971..8a3c17e453ea8816343465887340652801a99e64 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H
@@ -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
@@ -86,9 +86,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new nonuniformTransformCyclicPointPatchField<Type>
                 (
@@ -105,12 +105,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new nonuniformTransformCyclicPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
index 5dfceda2d118ee6195f58f816a4affb2ed292144..68565fa3fdf462755541a5f8e7f591300b23367e 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.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
@@ -90,9 +90,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new processorPointPatchField<Type>
                 (
@@ -109,12 +109,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new processorPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
index ee1084541f24458eb63e3b18cc7c866629ba8f78..bca065d7a700946c2cb5acf44b9694ba4c5cff94 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.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
@@ -94,9 +94,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new processorCyclicPointPatchField<Type>
                 (
@@ -113,12 +113,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new processorCyclicPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H
index aa8aac7cee332d86d38916a6892519a9bc84095d..098f484e8178bf43ab24acb536a932bf9e30f68c 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H
@@ -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
@@ -86,9 +86,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new symmetryPointPatchField<Type>
                 (
@@ -105,12 +105,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new symmetryPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C
index c402bad230bb1c94aa6037f6a12303e009dbbac4..e90c1454fdef697a0672ff98e08be0a7936cd828 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.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
@@ -108,7 +108,7 @@ void Foam::symmetryPlanePointPatchField<Type>::evaluate
 {
     vector nHat = symmetryPlanePatch_.n();
 
-    tmp<Field<Type> > tvalues =
+    tmp<Field<Type>> tvalues =
     (
         (
             this->patchInternalField()
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H
index c3774789d83324fbaa0e6e770f02066172d25596..4090b6b9f2ff80d6cfaf4dca326b7b8c438bba20 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,9 +91,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new symmetryPlanePointPatchField<Type>
                 (
@@ -110,12 +110,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new symmetryPlanePointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C
index 52e55ef0ccfff9444d94b67b4ce15f76bc3bedc7..8a5c7f2da22ac00927464ae4ceb6885688dec34a 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.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
@@ -105,7 +105,7 @@ void Foam::wedgePointPatchField<Type>::evaluate(const Pstream::commsTypes)
     // normal vector from the first point
     const vector& nHat = this->patch().pointNormals()[0];
 
-    tmp<Field<Type> > tvalues =
+    tmp<Field<Type>> tvalues =
         transform(I - nHat*nHat, this->patchInternalField());
 
     // Get internal field to insert values into
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H
index f0ddee6d9e94bb2702868ad955365af07b3676f9..27270b5fd1efd071d4ea77efc1ac9389d6b0910a 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H
@@ -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
@@ -86,9 +86,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new wedgePointPatchField<Type>
                 (
@@ -105,12 +105,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new wedgePointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
index 71212ed4d971985de39a9eec87f150a3fa6da034..bc2a08de68a9bbbb2d4bbdfd86bb146e59bd0cff 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.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
@@ -112,7 +112,7 @@ class codedFixedValuePointPatchField
 
         const word redirectType_;
 
-        mutable autoPtr<pointPatchField<Type> > redirectPatchFieldPtr_;
+        mutable autoPtr<pointPatchField<Type>> redirectPatchFieldPtr_;
 
     // Private Member Functions
 
@@ -186,9 +186,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new codedFixedValuePointPatchField<Type>(*this)
             );
@@ -202,12 +202,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new codedFixedValuePointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C
index 38975b2661eae394d95768e7c32374648c53005c..00454c22d87aad7861bceb75bd42b732aa020005 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.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
@@ -86,7 +86,7 @@ void Foam::fixedNormalSlipPointPatchField<Type>::evaluate
     const Pstream::commsTypes
 )
 {
-    tmp<Field<Type> > tvalues =
+    tmp<Field<Type>> tvalues =
         transform(I - n_*n_, this->patchInternalField());
 
     // Get internal field to insert values into
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H
index 669b66bdfa2ebe9ed0e14cf2d27b78cca6d4a25d..fa0692d96d4fae025b86c73f7cd14ccc8c5cd078 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H
@@ -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
@@ -103,9 +103,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new fixedNormalSlipPointPatchField<Type>
                 (
@@ -122,12 +122,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new fixedNormalSlipPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H
index f2b0c726ec0e6aa27c7a2fc49f6927f046ac30e6..f21b4ef1b94f6d00bb542548161f5a8ebd402675 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H
@@ -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
@@ -85,9 +85,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new slipPointPatchField<Type>
                 (
@@ -104,12 +104,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new slipPointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.H
index e1509c88ea97a010e526a042a58f173411170c01..40c18a6dc0682970c37081fddf10b9beb6515d20 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.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
@@ -100,9 +100,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new timeVaryingUniformFixedValuePointPatchField<Type>(*this)
             );
@@ -116,12 +116,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new timeVaryingUniformFixedValuePointPatchField<Type>(*this, iF)
             );
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H
index 120f1ffe169d9c12c4b2f030fd6e304e1dd7b384..0a3f45df6aee18bcf2a8a6142c90c32f2626d2b6 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,7 @@ class uniformFixedValuePointPatchField
 {
     // Private data
 
-        autoPtr<DataEntry<Type> > uniformValue_;
+        autoPtr<DataEntry<Type>> uniformValue_;
 
 
 public:
@@ -109,9 +109,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const
+        virtual autoPtr<pointPatchField<Type>> clone() const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new uniformFixedValuePointPatchField<Type>
                 (
@@ -129,12 +129,12 @@ public:
 
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type> >
+            return autoPtr<pointPatchField<Type>>
             (
                 new uniformFixedValuePointPatchField<Type>
                 (
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
index 92c62d0703438c7f3bbd3698f9701c1d8c5910d9..fdd069525d7126449823589bdeb5c9b4259d8e21 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.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
@@ -124,7 +124,7 @@ void Foam::pointPatchField<Type>::write(Ostream& os) const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::pointPatchField<Type>::patchInternalField() const
 {
     return patchInternalField(internalField());
@@ -133,7 +133,7 @@ Foam::pointPatchField<Type>::patchInternalField() const
 
 template<class Type>
 template<class Type1>
-Foam::tmp<Foam::Field<Type1> >
+Foam::tmp<Foam::Field<Type1>>
 Foam::pointPatchField<Type>::patchInternalField
 (
     const Field<Type1>& iF,
@@ -150,13 +150,13 @@ Foam::pointPatchField<Type>::patchInternalField
             << abort(FatalError);
     }
 
-    return tmp<Field<Type1> >(new Field<Type1>(iF, meshPoints));
+    return tmp<Field<Type1>>(new Field<Type1>(iF, meshPoints));
 }
 
 
 template<class Type>
 template<class Type1>
-Foam::tmp<Foam::Field<Type1> >
+Foam::tmp<Foam::Field<Type1>>
 Foam::pointPatchField<Type>::patchInternalField
 (
     const Field<Type1>& iF
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
index 88e6bfecfe652d19a5d89e1cc6501facdf2bb8f3..45b3efba95345df62e23bfe49ef494e4d74ed7bd 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.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
@@ -180,7 +180,7 @@ public:
         pointPatchField(const pointPatchField<Type>&);
 
         //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type> > clone() const = 0;
+        virtual autoPtr<pointPatchField<Type>> clone() const = 0;
 
         //- Construct as copy setting internal field reference
         pointPatchField
@@ -190,7 +190,7 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual autoPtr<pointPatchField<Type> > clone
+        virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const = 0;
@@ -201,7 +201,7 @@ public:
         //- Return a pointer to a new patchField created on freestore given
         //  patch and internal field
         //  (does not set the patch field values)
-        static autoPtr<pointPatchField<Type> > New
+        static autoPtr<pointPatchField<Type>> New
         (
             const word&,
             const pointPatch&,
@@ -212,7 +212,7 @@ public:
         //  patch and internal field
         //  (does not set the patch field values).
         //  Allows override of constraint type
-        static autoPtr<pointPatchField<Type> > New
+        static autoPtr<pointPatchField<Type>> New
         (
             const word&,
             const word& actualPatchType,
@@ -222,7 +222,7 @@ public:
 
         //- Return a pointer to a new patchField created on freestore from
         //  a given pointPatchField mapped onto a new patch
-        static autoPtr<pointPatchField<Type> > New
+        static autoPtr<pointPatchField<Type>> New
         (
             const pointPatchField<Type>&,
             const pointPatch&,
@@ -232,7 +232,7 @@ public:
 
         //- Return a pointer to a new patchField created on freestore
         //  from dictionary
-        static autoPtr<pointPatchField<Type> > New
+        static autoPtr<pointPatchField<Type>> New
         (
             const pointPatch&,
             const DimensionedField<Type, pointMesh>&,
@@ -243,7 +243,7 @@ public:
         //- Return a pointer to a new CalculatedpointPatchField created on
         //  freestore without setting patchField values
         template<class Type2>
-        static autoPtr<pointPatchField<Type> >
+        static autoPtr<pointPatchField<Type>>
         NewCalculatedType
         (
             const pointPatchField<Type2>&
@@ -318,12 +318,12 @@ public:
             }
 
             //- Return field created from appropriate internal field values
-            tmp<Field<Type> > patchInternalField() const;
+            tmp<Field<Type>> patchInternalField() const;
 
             //- Return field created from appropriate internal field values
             //  given internal field reference
             template<class Type1>
-            tmp<Field<Type1> > patchInternalField
+            tmp<Field<Type1>> patchInternalField
             (
                 const Field<Type1>& iF
             ) const;
@@ -331,7 +331,7 @@ public:
             //- Return field created from selected internal field values
             //  given internal field reference
             template<class Type1>
-            tmp<Field<Type1> > patchInternalField
+            tmp<Field<Type1>> patchInternalField
             (
                 const Field<Type1>& iF,
                 const labelList& meshPoints
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
index 25f955bbceaad05960f2570416d11101b5067f40..4a05a01acb2e66a127e4c8be2cd6ffb63baa75a5 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         |2011 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
@@ -26,7 +26,7 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
+Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
 (
     const word& patchFieldType,
     const word& actualPatchType,
@@ -56,7 +56,7 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
             << exit(FatalError);
     }
 
-    autoPtr<pointPatchField<Type> > pfPtr(cstrIter()(p, iF));
+    autoPtr<pointPatchField<Type>> pfPtr(cstrIter()(p, iF));
 
     if
     (
@@ -95,7 +95,7 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
 
 
 template<class Type>
-Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
+Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
 (
     const word& patchFieldType,
     const pointPatch& p,
@@ -107,7 +107,7 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
 
 
 template<class Type>
-Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
+Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
@@ -148,7 +148,7 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
     }
 
     // Construct (but not necesarily returned)
-    autoPtr<pointPatchField<Type> > pfPtr(cstrIter()(p, iF, dict));
+    autoPtr<pointPatchField<Type>> pfPtr(cstrIter()(p, iF, dict));
 
     if
     (
@@ -189,7 +189,7 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
 // Return a pointer to a new patch created on freestore from
 // a given pointPatchField<Type> mapped onto a new patch
 template<class Type>
-Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
+Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
 (
     const pointPatchField<Type>& ptf,
     const pointPatch& p,
diff --git a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
index cfe912888bc49be14b0c8e8348ebf4eed4beea96..d12ce331dab7f062c5188db61f2348768a12b19b 100644
--- a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.C
+++ b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.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
@@ -54,7 +54,7 @@ void Foam::interpolation2DTable<Type>::readTable()
 template<class Type>
 Foam::interpolation2DTable<Type>::interpolation2DTable()
 :
-    List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >(),
+    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(),
     boundsHandling_(interpolation2DTable::WARN),
     fileName_("fileNameIsUndefined"),
     reader_(NULL)
@@ -64,12 +64,12 @@ Foam::interpolation2DTable<Type>::interpolation2DTable()
 template<class Type>
 Foam::interpolation2DTable<Type>::interpolation2DTable
 (
-    const List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >& values,
+    const List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>& values,
     const boundsHandling bounds,
     const fileName& fName
 )
 :
-    List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >(values),
+    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(values),
     boundsHandling_(bounds),
     fileName_(fName),
     reader_(NULL)
@@ -79,7 +79,7 @@ Foam::interpolation2DTable<Type>::interpolation2DTable
 template<class Type>
 Foam::interpolation2DTable<Type>::interpolation2DTable(const fileName& fName)
 :
-    List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >(),
+    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(),
     boundsHandling_(interpolation2DTable::WARN),
     fileName_(fName),
     reader_(new openFoamTableReader<Type>(dictionary()))
@@ -91,7 +91,7 @@ Foam::interpolation2DTable<Type>::interpolation2DTable(const fileName& fName)
 template<class Type>
 Foam::interpolation2DTable<Type>::interpolation2DTable(const dictionary& dict)
 :
-    List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >(),
+    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(),
     boundsHandling_(wordToBoundsHandling(dict.lookup("outOfBounds"))),
     fileName_(dict.lookup("fileName")),
     reader_(tableReader<Type>::New(dict))
@@ -106,7 +106,7 @@ Foam::interpolation2DTable<Type>::interpolation2DTable
      const interpolation2DTable& interpTable
 )
 :
-    List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >(interpTable),
+    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>(interpTable),
     boundsHandling_(interpTable.boundsHandling_),
     fileName_(interpTable.fileName_),
     reader_(interpTable.reader_)    // note: steals reader. Used in write().
@@ -119,7 +119,7 @@ Foam::interpolation2DTable<Type>::interpolation2DTable
 template<class Type>
 Type Foam::interpolation2DTable<Type>::interpolateValue
 (
-    const List<Tuple2<scalar, Type> >& data,
+    const List<Tuple2<scalar, Type>>& data,
     const scalar lookupValue
 ) const
 {
diff --git a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H
index c34090c9852755ed28603d255d2bdea6993b3cf0..be6fb45e33b236fe29df69873101a72cab050137 100644
--- a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H
+++ b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.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
@@ -52,7 +52,7 @@ namespace Foam
 template<class Type>
 class interpolation2DTable
 :
-    public List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >
+    public List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>
 {
 public:
 
@@ -67,7 +67,7 @@ public:
         };
 
         //- Cconvenience typedef
-        typedef List<Tuple2<scalar, List<Tuple2<scalar, Type> > > > table;
+        typedef List<Tuple2<scalar, List<Tuple2<scalar, Type>>>> table;
 
 
 private:
@@ -81,7 +81,7 @@ private:
         fileName fileName_;
 
         //- The actual reader
-        autoPtr<tableReader<Type> > reader_;
+        autoPtr<tableReader<Type>> reader_;
 
 
     // Private Member Functions
@@ -92,7 +92,7 @@ private:
         //- Return interpolated value in List
         Type interpolateValue
         (
-            const List<Tuple2<scalar, Type> >& data,
+            const List<Tuple2<scalar, Type>>& data,
             const scalar
         ) const;
 
@@ -116,7 +116,7 @@ public:
         //- Construct from components
         interpolation2DTable
         (
-            const List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >& values,
+            const List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>& values,
             const boundsHandling bounds,
             const fileName& fName
         );
@@ -153,7 +153,7 @@ public:
     // Member Operators
 
         //- Return an element of constant Tuple2<scalar, Type>
-        const List<Tuple2<scalar, Type> >& operator[](const label) const;
+        const List<Tuple2<scalar, Type>>& operator[](const label) const;
 
         //- Return an interpolated value
         Type operator()(const scalar, const scalar) const;
diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
index 4fd0b074832f12240269c1aad7c1e8c8126439ab..63b7bad3220fce63218bfcb8fccf3527a62c7e73 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.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
@@ -58,7 +58,7 @@ void Foam::interpolationTable<Type>::readTable()
 template<class Type>
 Foam::interpolationTable<Type>::interpolationTable()
 :
-    List<Tuple2<scalar, Type> >(),
+    List<Tuple2<scalar, Type>>(),
     boundsHandling_(interpolationTable::WARN),
     fileName_("fileNameIsUndefined"),
     reader_(NULL)
@@ -68,12 +68,12 @@ Foam::interpolationTable<Type>::interpolationTable()
 template<class Type>
 Foam::interpolationTable<Type>::interpolationTable
 (
-    const List<Tuple2<scalar, Type> >& values,
+    const List<Tuple2<scalar, Type>>& values,
     const boundsHandling bounds,
     const fileName& fName
 )
 :
-    List<Tuple2<scalar, Type> >(values),
+    List<Tuple2<scalar, Type>>(values),
     boundsHandling_(bounds),
     fileName_(fName),
     reader_(NULL)
@@ -83,7 +83,7 @@ Foam::interpolationTable<Type>::interpolationTable
 template<class Type>
 Foam::interpolationTable<Type>::interpolationTable(const fileName& fName)
 :
-    List<Tuple2<scalar, Type> >(),
+    List<Tuple2<scalar, Type>>(),
     boundsHandling_(interpolationTable::WARN),
     fileName_(fName),
     reader_(new openFoamTableReader<Type>(dictionary()))
@@ -95,7 +95,7 @@ Foam::interpolationTable<Type>::interpolationTable(const fileName& fName)
 template<class Type>
 Foam::interpolationTable<Type>::interpolationTable(const dictionary& dict)
 :
-    List<Tuple2<scalar, Type> >(),
+    List<Tuple2<scalar, Type>>(),
     boundsHandling_(wordToBoundsHandling(dict.lookup("outOfBounds"))),
     fileName_(dict.lookup("fileName")),
     reader_(tableReader<Type>::New(dict))
@@ -110,7 +110,7 @@ Foam::interpolationTable<Type>::interpolationTable
      const interpolationTable& interpTable
 )
 :
-    List<Tuple2<scalar, Type> >(interpTable),
+    List<Tuple2<scalar, Type>>(interpTable),
     boundsHandling_(interpTable.boundsHandling_),
     fileName_(interpTable.fileName_),
     reader_(interpTable.reader_)    // note: steals reader. Used in write().
@@ -206,12 +206,12 @@ template<class Type>
 void Foam::interpolationTable<Type>::check() const
 {
     label n = this->size();
-    scalar prevValue = List<Tuple2<scalar, Type> >::operator[](0).first();
+    scalar prevValue = List<Tuple2<scalar, Type>>::operator[](0).first();
 
     for (label i=1; i<n; ++i)
     {
         const scalar currValue =
-            List<Tuple2<scalar, Type> >::operator[](i).first();
+            List<Tuple2<scalar, Type>>::operator[](i).first();
 
         // avoid duplicate values (divide-by-zero error)
         if (currValue <= prevValue)
@@ -251,8 +251,8 @@ Type Foam::interpolationTable<Type>::rateOfChange(const scalar value) const
         return 0;
     }
 
-    scalar minLimit = List<Tuple2<scalar, Type> >::operator[](0).first();
-    scalar maxLimit = List<Tuple2<scalar, Type> >::operator[](n-1).first();
+    scalar minLimit = List<Tuple2<scalar, Type>>::operator[](0).first();
+    scalar maxLimit = List<Tuple2<scalar, Type>>::operator[](n-1).first();
     scalar lookupValue = value;
 
     if (lookupValue < minLimit)
@@ -328,7 +328,7 @@ Type Foam::interpolationTable<Type>::rateOfChange(const scalar value) const
     // look for the correct range
     for (label i = 0; i < n; ++i)
     {
-        if (lookupValue >= List<Tuple2<scalar, Type> >::operator[](i).first())
+        if (lookupValue >= List<Tuple2<scalar, Type>>::operator[](i).first())
         {
             lo = hi = i;
         }
@@ -356,13 +356,13 @@ Type Foam::interpolationTable<Type>::rateOfChange(const scalar value) const
         return
         (
             (
-                List<Tuple2<scalar, Type> >::operator[](hi).second()
-              - List<Tuple2<scalar, Type> >::operator[](lo).second()
+                List<Tuple2<scalar, Type>>::operator[](hi).second()
+              - List<Tuple2<scalar, Type>>::operator[](lo).second()
             )
            /(
-               List<Tuple2<scalar, Type> >::operator[](hi).first()
+               List<Tuple2<scalar, Type>>::operator[](hi).first()
              + minLimit
-             - List<Tuple2<scalar, Type> >::operator[](lo).first()
+             - List<Tuple2<scalar, Type>>::operator[](lo).first()
             )
         );
     }
@@ -372,12 +372,12 @@ Type Foam::interpolationTable<Type>::rateOfChange(const scalar value) const
         return
         (
             (
-                List<Tuple2<scalar, Type> >::operator[](hi).second()
-              - List<Tuple2<scalar, Type> >::operator[](lo).second()
+                List<Tuple2<scalar, Type>>::operator[](hi).second()
+              - List<Tuple2<scalar, Type>>::operator[](lo).second()
             )
            /(
-                List<Tuple2<scalar, Type> >::operator[](hi).first()
-              - List<Tuple2<scalar, Type> >::operator[](lo).first()
+                List<Tuple2<scalar, Type>>::operator[](hi).first()
+              - List<Tuple2<scalar, Type>>::operator[](lo).first()
             )
         );
     }
@@ -466,7 +466,7 @@ Foam::interpolationTable<Type>::operator[](const label i) const
         }
     }
 
-    return List<Tuple2<scalar, Type> >::operator[](ii);
+    return List<Tuple2<scalar, Type>>::operator[](ii);
 }
 
 
@@ -477,11 +477,11 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
 
     if (n <= 1)
     {
-        return List<Tuple2<scalar, Type> >::operator[](0).second();
+        return List<Tuple2<scalar, Type>>::operator[](0).second();
     }
 
-    scalar minLimit = List<Tuple2<scalar, Type> >::operator[](0).first();
-    scalar maxLimit = List<Tuple2<scalar, Type> >::operator[](n-1).first();
+    scalar minLimit = List<Tuple2<scalar, Type>>::operator[](0).first();
+    scalar maxLimit = List<Tuple2<scalar, Type>>::operator[](n-1).first();
     scalar lookupValue = value;
 
     if (lookupValue < minLimit)
@@ -505,7 +505,7 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
             }
             case interpolationTable::CLAMP:
             {
-                return List<Tuple2<scalar, Type> >::operator[](0).second();
+                return List<Tuple2<scalar, Type>>::operator[](0).second();
                 break;
             }
             case interpolationTable::REPEAT:
@@ -538,7 +538,7 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
             }
             case interpolationTable::CLAMP:
             {
-                return List<Tuple2<scalar, Type> >::operator[](n-1).second();
+                return List<Tuple2<scalar, Type>>::operator[](n-1).second();
                 break;
             }
             case interpolationTable::REPEAT:
@@ -557,7 +557,7 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
     // look for the correct range
     for (label i = 0; i < n; ++i)
     {
-        if (lookupValue >= List<Tuple2<scalar, Type> >::operator[](i).first())
+        if (lookupValue >= List<Tuple2<scalar, Type>>::operator[](i).first())
         {
             lo = hi = i;
         }
@@ -571,7 +571,7 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
     if (lo == hi)
     {
         // we are at the end of the table - or there is only a single entry
-        return List<Tuple2<scalar, Type> >::operator[](hi).second();
+        return List<Tuple2<scalar, Type>>::operator[](hi).second();
     }
     else if (hi == 0)
     {
@@ -584,10 +584,10 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
 
         return
         (
-            List<Tuple2<scalar, Type> >::operator[](lo).second()
+            List<Tuple2<scalar, Type>>::operator[](lo).second()
           + (
-                List<Tuple2<scalar, Type> >::operator[](hi).second()
-              - List<Tuple2<scalar, Type> >::operator[](lo).second()
+                List<Tuple2<scalar, Type>>::operator[](hi).second()
+              - List<Tuple2<scalar, Type>>::operator[](lo).second()
             )
            *(lookupValue / minLimit)
         );
@@ -597,18 +597,18 @@ Type Foam::interpolationTable<Type>::operator()(const scalar value) const
         // normal interpolation
         return
         (
-            List<Tuple2<scalar, Type> >::operator[](lo).second()
+            List<Tuple2<scalar, Type>>::operator[](lo).second()
           + (
-                List<Tuple2<scalar, Type> >::operator[](hi).second()
-              - List<Tuple2<scalar, Type> >::operator[](lo).second()
+                List<Tuple2<scalar, Type>>::operator[](hi).second()
+              - List<Tuple2<scalar, Type>>::operator[](lo).second()
             )
            *(
                 lookupValue
-              - List<Tuple2<scalar, Type> >::operator[](lo).first()
+              - List<Tuple2<scalar, Type>>::operator[](lo).first()
             )
            /(
-                List<Tuple2<scalar, Type> >::operator[](hi).first()
-              - List<Tuple2<scalar, Type> >::operator[](lo).first()
+                List<Tuple2<scalar, Type>>::operator[](hi).first()
+              - List<Tuple2<scalar, Type>>::operator[](lo).first()
             )
         );
     }
diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
index 21523832e8676839c3e808da8f5a67ff60fef3f6..83382d343c066a5c096b3a6bcd3c2873d81f9c53 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.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 @@ namespace Foam
 template<class Type>
 class interpolationTable
 :
-    public List<Tuple2<scalar, Type> >
+    public List<Tuple2<scalar, Type>>
 {
 public:
 
@@ -104,7 +104,7 @@ private:
         fileName fileName_;
 
         //- The actual reader
-        autoPtr<tableReader<Type> > reader_;
+        autoPtr<tableReader<Type>> reader_;
 
     // Private Member Functions
 
@@ -122,7 +122,7 @@ public:
         //- Construct from components
         interpolationTable
         (
-            const List<Tuple2<scalar, Type> >& values,
+            const List<Tuple2<scalar, Type>>& values,
             const boundsHandling bounds,
             const fileName& fName
         );
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
index 8f544c0709b892b177b6f44a5f48ccb6c857b9c1..130f5b9c932ed5f32e1cac43e5a0feb5fb34a416 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.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
@@ -105,12 +105,12 @@ template<class Type>
 void Foam::csvTableReader<Type>::operator()
 (
     const fileName& fName,
-    List<Tuple2<scalar, Type> >& data
+    List<Tuple2<scalar, Type>>& data
 )
 {
     IFstream in(fName);
 
-    DynamicList<Tuple2<scalar, Type> > values;
+    DynamicList<Tuple2<scalar, Type>> values;
 
     // Skip header
     if (headerLine_)
@@ -162,7 +162,7 @@ template<class Type>
 void Foam::csvTableReader<Type>::operator()
 (
     const fileName& fName,
-    List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >& data
+    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>& data
 )
 {
     NotImplemented;
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H
index f3f067b0c4eaab426098870e4cd62e5922d3c34e..46949da45285b403f2f2f23f5dd7292321698c37 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.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
@@ -82,9 +82,9 @@ public:
         csvTableReader(const dictionary& dict);
 
         //- Construct and return a copy
-        virtual autoPtr<tableReader<Type> > clone() const
+        virtual autoPtr<tableReader<Type>> clone() const
         {
-            return autoPtr<tableReader<Type> >
+            return autoPtr<tableReader<Type>>
             (
                 new csvTableReader<Type>
                 (
@@ -101,13 +101,13 @@ public:
     // Member Functions
 
         //- Read the table
-        virtual void operator()(const fileName&, List<Tuple2<scalar, Type> >&);
+        virtual void operator()(const fileName&, List<Tuple2<scalar, Type>>&);
 
         //- Read 2D table
         virtual void operator()
         (
             const fileName&,
-            List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >&
+            List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>&
         );
 
         //- Write the remaining parameters
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.C
index aa48da7b6879f105cf25b3bfa64fe42f81d2e68f..dc5451a5028cf2615bb9cd34a64879b99d6cb9a7 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.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,7 +48,7 @@ template<class Type>
 void Foam::openFoamTableReader<Type>::operator()
 (
     const fileName& fName,
-    List<Tuple2<scalar, Type> >& data
+    List<Tuple2<scalar, Type>>& data
 )
 {
     // Read data from file
@@ -60,7 +60,7 @@ template<class Type>
 void Foam::openFoamTableReader<Type>::operator()
 (
     const fileName& fName,
-    List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >& data
+    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>& data
 )
 {
     // Read data from file
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H
index e40990cafdf146783099c95ff485649656840d0d..ee44fe6799bb14e7d60800bc4cbfbdfa4f03668e 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H
@@ -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
@@ -64,9 +64,9 @@ public:
         openFoamTableReader(const dictionary &dict);
 
         //- Construct and return a copy
-        virtual autoPtr<tableReader<Type> > clone() const
+        virtual autoPtr<tableReader<Type>> clone() const
         {
-            return autoPtr<tableReader<Type> >
+            return autoPtr<tableReader<Type>>
             (
                 new openFoamTableReader<Type>
                 (
@@ -83,13 +83,13 @@ public:
     // Member functions
 
         //- Read the table
-        virtual void operator()(const fileName&, List<Tuple2<scalar, Type> > &);
+        virtual void operator()(const fileName&, List<Tuple2<scalar, Type>> &);
 
         //- Read 2D table
         virtual void operator()
         (
             const fileName&,
-            List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >&
+            List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>&
         );
 };
 
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C
index cd27159ec6407c11449211d78a84f8cab5a3974f..3955291941e6c51053acb6acd5f27093fc0dbd15 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.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
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::autoPtr<Foam::tableReader<Type> > Foam::tableReader<Type>::New
+Foam::autoPtr<Foam::tableReader<Type>> Foam::tableReader<Type>::New
 (
     const dictionary& spec
 )
@@ -53,7 +53,7 @@ Foam::autoPtr<Foam::tableReader<Type> > Foam::tableReader<Type>::New
             << exit(FatalError);
     }
 
-    return autoPtr<tableReader<Type> >(cstrIter()(spec));
+    return autoPtr<tableReader<Type>>(cstrIter()(spec));
 }
 
 
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H
index d68ea92e7dc11b6bbd37437c77eb1787be725ccd..7540e37fa025cf3a4cf38bfa6430b6d05cb6b9a0 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H
@@ -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
@@ -81,7 +81,7 @@ public:
         tableReader(const dictionary& dict);
 
         //- Construct and return a clone
-        virtual autoPtr<tableReader<Type> > clone() const = 0;
+        virtual autoPtr<tableReader<Type>> clone() const = 0;
 
 
     // Selectors
@@ -100,14 +100,14 @@ public:
         virtual void operator()
         (
             const fileName&,
-            List<Tuple2<scalar, Type> >&
+            List<Tuple2<scalar, Type>>&
         ) = 0;
 
         //- Read the 2D table
         virtual void operator()
         (
             const fileName&,
-            List<Tuple2<scalar, List<Tuple2<scalar, Type> > > >&
+            List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>&
         ) = 0;
 
         //- Write additional information
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
index b4242b23056e7affd27b373487779efcd4f71ec6..8993cdbdb867197f80224b4b4c4aac2ac2b42419 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.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
@@ -36,7 +36,7 @@ namespace Foam
 //- Interpolate point field
 template<class FromPatch, class ToPatch>
 template<class Type>
-tmp<Field<Type> >
+tmp<Field<Type>>
 PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
 (
     const Field<Type>& pf
@@ -50,7 +50,7 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
             << abort(FatalError);
     }
 
-    tmp<Field<Type> > tresult
+    tmp<Field<Type>> tresult
     (
         new Field<Type>
         (
@@ -90,13 +90,13 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
 
 template<class FromPatch, class ToPatch>
 template<class Type>
-tmp<Field<Type> >
+tmp<Field<Type>>
 PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
 (
-    const tmp<Field<Type> >& tpf
+    const tmp<Field<Type>>& tpf
 ) const
 {
-    tmp<Field<Type> > tint = pointInterpolate<Type>(tpf());
+    tmp<Field<Type>> tint = pointInterpolate<Type>(tpf());
     tpf.clear();
     return tint;
 }
@@ -105,7 +105,7 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
 //- Interpolate face field
 template<class FromPatch, class ToPatch>
 template<class Type>
-tmp<Field<Type> >
+tmp<Field<Type>>
 PatchToPatchInterpolation<FromPatch, ToPatch>::faceInterpolate
 (
     const Field<Type>& ff
@@ -119,7 +119,7 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::faceInterpolate
             << abort(FatalError);
     }
 
-    tmp<Field<Type> > tresult
+    tmp<Field<Type>> tresult
     (
         new Field<Type>
         (
@@ -161,13 +161,13 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::faceInterpolate
 
 template<class FromPatch, class ToPatch>
 template<class Type>
-tmp<Field<Type> >
+tmp<Field<Type>>
 PatchToPatchInterpolation<FromPatch, ToPatch>::faceInterpolate
 (
-    const tmp<Field<Type> >& tff
+    const tmp<Field<Type>>& tff
 ) const
 {
-    tmp<Field<Type> > tint = faceInterpolate(tff());
+    tmp<Field<Type>> tint = faceInterpolate(tff());
     tff.clear();
     return tint;
 }
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
index b8b282fa826b3f492ba5de4aa42a34ab4342ddd6..04cea8be20958d6bbda6d76fbcd4d1ea64a4e34d 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.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
@@ -208,17 +208,17 @@ public:
 
         //- Interpolate point field
         template<class Type>
-        tmp<Field<Type> > pointInterpolate(const Field<Type>& pf) const;
+        tmp<Field<Type>> pointInterpolate(const Field<Type>& pf) const;
 
         template<class Type>
-        tmp<Field<Type> > pointInterpolate(const tmp<Field<Type> >& tpf) const;
+        tmp<Field<Type>> pointInterpolate(const tmp<Field<Type>>& tpf) const;
 
         //- Interpolate face field
         template<class Type>
-        tmp<Field<Type> > faceInterpolate(const Field<Type>& pf) const;
+        tmp<Field<Type>> faceInterpolate(const Field<Type>& pf) const;
 
         template<class Type>
-        tmp<Field<Type> > faceInterpolate(const tmp<Field<Type> >& tpf) const;
+        tmp<Field<Type>> faceInterpolate(const tmp<Field<Type>>& tpf) const;
 
 };
 
diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
index bfd3b4a6d6ddb3e49bc6f353d88aa7458e69bd58..fd77c9a677892d85101bc15a746dda5eaf780d4c 100644
--- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
+++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.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
@@ -170,7 +170,7 @@ PrimitivePatchInterpolation<Patch>::~PrimitivePatchInterpolation()
 
 template<class Patch>
 template<class Type>
-tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
+tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
 (
     const Field<Type>& ff
 ) const
@@ -184,7 +184,7 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
             << abort(FatalError);
     }
 
-    tmp<Field<Type> > tresult
+    tmp<Field<Type>> tresult
     (
         new Field<Type>
         (
@@ -214,12 +214,12 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
 
 template<class Patch>
 template<class Type>
-tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
+tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
 (
-    const tmp<Field<Type> >& tff
+    const tmp<Field<Type>>& tff
 ) const
 {
-    tmp<Field<Type> > tint = faceToPointInterpolate(tff());
+    tmp<Field<Type>> tint = faceToPointInterpolate(tff());
     tff.clear();
     return tint;
 }
@@ -227,7 +227,7 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToPointInterpolate
 
 template<class Patch>
 template<class Type>
-tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
+tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
 (
     const Field<Type>& pf
 ) const
@@ -240,7 +240,7 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
             << abort(FatalError);
     }
 
-    tmp<Field<Type> > tresult
+    tmp<Field<Type>> tresult
     (
         new Field<Type>
         (
@@ -271,12 +271,12 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
 
 template<class Patch>
 template<class Type>
-tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
+tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
 (
-    const tmp<Field<Type> >& tpf
+    const tmp<Field<Type>>& tpf
 ) const
 {
-    tmp<Field<Type> > tint = pointToFaceInterpolate(tpf());
+    tmp<Field<Type>> tint = pointToFaceInterpolate(tpf());
     tpf.clear();
     return tint;
 }
@@ -284,7 +284,7 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::pointToFaceInterpolate
 
 template<class Patch>
 template<class Type>
-tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
+tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
 (
     const Field<Type>& pf
 ) const
@@ -298,7 +298,7 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
             << abort(FatalError);
     }
 
-    tmp<Field<Type> > tresult
+    tmp<Field<Type>> tresult
     (
         new Field<Type>(patch_.nEdges(), pTraits<Type>::zero)
     );
@@ -328,12 +328,12 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
 
 template<class Patch>
 template<class Type>
-tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
+tmp<Field<Type>> PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
 (
-    const tmp<Field<Type> >& tpf
+    const tmp<Field<Type>>& tpf
 ) const
 {
-    tmp<Field<Type> > tint = faceToEdgeInterpolate(tpf());
+    tmp<Field<Type>> tint = faceToEdgeInterpolate(tpf());
     tpf.clear();
     return tint;
 }
diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
index ee61e2e42ee8603ae01eab464a20654cabc8ecf0..14f22287725eae5694b8d4dd17aed1ee9c959c5f 100644
--- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
+++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
@@ -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
@@ -107,41 +107,41 @@ public:
 
         //- Interpolate from faces to points
         template<class Type>
-        tmp<Field<Type> > faceToPointInterpolate
+        tmp<Field<Type>> faceToPointInterpolate
         (
             const Field<Type>& ff
         ) const;
 
         template<class Type>
-        tmp<Field<Type> > faceToPointInterpolate
+        tmp<Field<Type>> faceToPointInterpolate
         (
-            const tmp<Field<Type> >& tff
+            const tmp<Field<Type>>& tff
         ) const;
 
         //- Interpolate from points to faces
         template<class Type>
-        tmp<Field<Type> > pointToFaceInterpolate
+        tmp<Field<Type>> pointToFaceInterpolate
         (
             const Field<Type>& pf
         ) const;
 
         template<class Type>
-        tmp<Field<Type> > pointToFaceInterpolate
+        tmp<Field<Type>> pointToFaceInterpolate
         (
-            const tmp<Field<Type> >& tpf
+            const tmp<Field<Type>>& tpf
         ) const;
 
         //- Interpolate from faces to edges
         template<class Type>
-        tmp<Field<Type> > faceToEdgeInterpolate
+        tmp<Field<Type>> faceToEdgeInterpolate
         (
             const Field<Type>& ff
         ) const;
 
         template<class Type>
-        tmp<Field<Type> > faceToEdgeInterpolate
+        tmp<Field<Type>> faceToEdgeInterpolate
         (
-            const tmp<Field<Type> >& tff
+            const tmp<Field<Type>>& tff
         ) const;
 
         //- Do what is neccessary if the mesh has moved
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFieldPtrsList.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFieldPtrsList.H
index b669a565d90b62c5b24ba9f3127f3c9df8744724..82761182825a4943e10a49317ffb49f61f3823c6 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFieldPtrsList.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceFieldPtrsList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,13 +47,13 @@ namespace Foam
 template<class Type>
 class LduInterfaceFieldPtrsList
 :
-    public UPtrList<const LduInterfaceField<Type> >
+    public UPtrList<const LduInterfaceField<Type>>
 {
 public:
 
     LduInterfaceFieldPtrsList(label size)
     :
-        UPtrList<const LduInterfaceField<Type> >(size)
+        UPtrList<const LduInterfaceField<Type>>(size)
     {}
 };
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
index d00069911d7ef699f60ce11698f6027ecf14787b..ef4d65de81fc5b8deb56b92b9f2d561d50910939 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.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
@@ -595,10 +595,10 @@ public:
             void sumMagOffDiag(Field<LUType>& sumOff) const;
 
             //- Matrix multiplication
-            void Amul(Field<Type>&, const tmp<Field<Type> >&) const;
+            void Amul(Field<Type>&, const tmp<Field<Type>>&) const;
 
             //- Matrix transpose multiplication
-            void Tmul(Field<Type>&, const tmp<Field<Type> >&) const;
+            void Tmul(Field<Type>&, const tmp<Field<Type>>&) const;
 
 
             //- Sum the coefficients on each row of the matrix
@@ -607,7 +607,7 @@ public:
 
             void residual(Field<Type>& rA, const Field<Type>& psi) const;
 
-            tmp<Field<Type> > residual(const Field<Type>& psi) const;
+            tmp<Field<Type>> residual(const Field<Type>& psi) const;
 
 
             //- Initialise the update of interfaced interfaces
@@ -628,11 +628,11 @@ public:
             ) const;
 
 
-            tmp<Field<Type> > H(const Field<Type>&) const;
-            tmp<Field<Type> > H(const tmp<Field<Type> >&) const;
+            tmp<Field<Type>> H(const Field<Type>&) const;
+            tmp<Field<Type>> H(const tmp<Field<Type>>&) const;
 
-            tmp<Field<Type> > faceH(const Field<Type>&) const;
-            tmp<Field<Type> > faceH(const tmp<Field<Type> >&) const;
+            tmp<Field<Type>> faceH(const Field<Type>&) const;
+            tmp<Field<Type>> faceH(const tmp<Field<Type>>&) const;
 
 
     // Member operators
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
index 805b133a3b3ec5508c847996e0342443ba11a468..73a0af2c66b2edd38bff85a467d5cded20109064 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.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
@@ -63,7 +63,7 @@ template<class Type, class DType, class LUType>
 void Foam::LduMatrix<Type, DType, LUType>::Amul
 (
     Field<Type>& Apsi,
-    const tmp<Field<Type> >& tpsi
+    const tmp<Field<Type>>& tpsi
 ) const
 {
     Type* __restrict__ ApsiPtr = Apsi.begin();
@@ -117,7 +117,7 @@ template<class Type, class DType, class LUType>
 void Foam::LduMatrix<Type, DType, LUType>::Tmul
 (
     Field<Type>& Tpsi,
-    const tmp<Field<Type> >& tpsi
+    const tmp<Field<Type>>& tpsi
 ) const
 {
     Type* __restrict__ TpsiPtr = Tpsi.begin();
@@ -280,12 +280,12 @@ void Foam::LduMatrix<Type, DType, LUType>::residual
 
 
 template<class Type, class DType, class LUType>
-Foam::tmp<Foam::Field<Type> > Foam::LduMatrix<Type, DType, LUType>::residual
+Foam::tmp<Foam::Field<Type>> Foam::LduMatrix<Type, DType, LUType>::residual
 (
     const Field<Type>& psi
 ) const
 {
-    tmp<Field<Type> > trA(new Field<Type>(psi.size()));
+    tmp<Field<Type>> trA(new Field<Type>(psi.size()));
     residual(trA(), psi);
     return trA;
 }
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
index 3685bbe20d2f8c8cc83a1803dcd611787be0f5c7..1c43bebcaf2b619a9789dbdd13634a06b1a060e6 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.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
@@ -84,10 +84,10 @@ void Foam::LduMatrix<Type, DType, LUType>::sumMagOffDiag
 
 
 template<class Type, class DType, class LUType>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::LduMatrix<Type, DType, LUType>::H(const Field<Type>& psi) const
 {
-    tmp<Field<Type> > tHpsi
+    tmp<Field<Type>> tHpsi
     (
         new Field<Type>(lduAddr().size(), pTraits<Type>::zero)
     );
@@ -119,17 +119,17 @@ Foam::LduMatrix<Type, DType, LUType>::H(const Field<Type>& psi) const
 }
 
 template<class Type, class DType, class LUType>
-Foam::tmp<Foam::Field<Type> >
-Foam::LduMatrix<Type, DType, LUType>::H(const tmp<Field<Type> >& tpsi) const
+Foam::tmp<Foam::Field<Type>>
+Foam::LduMatrix<Type, DType, LUType>::H(const tmp<Field<Type>>& tpsi) const
 {
-    tmp<Field<Type> > tHpsi(H(tpsi()));
+    tmp<Field<Type>> tHpsi(H(tpsi()));
     tpsi.clear();
     return tHpsi;
 }
 
 
 template<class Type, class DType, class LUType>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::LduMatrix<Type, DType, LUType>::faceH(const Field<Type>& psi) const
 {
     const Field<LUType>& Lower = const_cast<const LduMatrix&>(*this).lower();
@@ -139,7 +139,7 @@ Foam::LduMatrix<Type, DType, LUType>::faceH(const Field<Type>& psi) const
     const unallocLabelList& l = lduAddr().lowerAddr();
     const unallocLabelList& u = lduAddr().upperAddr();
 
-    tmp<Field<Type> > tfaceHpsi(new Field<Type> (Lower.size()));
+    tmp<Field<Type>> tfaceHpsi(new Field<Type> (Lower.size()));
     Field<Type> & faceHpsi = tfaceHpsi();
 
     for (label face=0; face<l.size(); face++)
@@ -152,10 +152,10 @@ Foam::LduMatrix<Type, DType, LUType>::faceH(const Field<Type>& psi) const
 
 
 template<class Type, class DType, class LUType>
-Foam::tmp<Foam::Field<Type> >
-Foam::LduMatrix<Type, DType, LUType>::faceH(const tmp<Field<Type> >& tpsi) const
+Foam::tmp<Foam::Field<Type>>
+Foam::LduMatrix<Type, DType, LUType>::faceH(const tmp<Field<Type>>& tpsi) const
 {
-    tmp<Field<Type> > tfaceHpsi(faceH(tpsi()));
+    tmp<Field<Type>> tfaceHpsi(faceH(tpsi()));
     tpsi.clear();
     return tfaceHpsi;
 }
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.H b/src/OpenFOAM/matrices/Matrix/Matrix.H
index 005982d9e0052f6a3056631cda362523b15c80b9..dc8e1f9e88655b91b32b902c60164b8cc46e78bb 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.H
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.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
@@ -113,7 +113,7 @@ public:
         Matrix(Istream&);
 
         //- Clone
-        inline autoPtr<Matrix<Form, Type> > clone() const;
+        inline autoPtr<Matrix<Form, Type>> clone() const;
 
 
     //- Destructor
diff --git a/src/OpenFOAM/matrices/Matrix/MatrixI.H b/src/OpenFOAM/matrices/Matrix/MatrixI.H
index ccffa5c3db57a6f316bc66a4104a1fd9358ff7c2..07e987580b4e2d876cf026c3cdc8f7d96323f6af 100644
--- a/src/OpenFOAM/matrices/Matrix/MatrixI.H
+++ b/src/OpenFOAM/matrices/Matrix/MatrixI.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
@@ -35,10 +35,10 @@ inline Foam::Matrix<Form, Type>::Matrix()
 
 
 template<class Form, class Type>
-inline Foam::autoPtr<Foam::Matrix<Form, Type> > Foam::Matrix<Form, Type>::
+inline Foam::autoPtr<Foam::Matrix<Form, Type>> Foam::Matrix<Form, Type>::
 clone() const
 {
-    return autoPtr<Matrix<Form, Type> >(new Matrix<Form, Type>(*this));
+    return autoPtr<Matrix<Form, Type>>(new Matrix<Form, Type>(*this));
 }
 
 
@@ -47,7 +47,7 @@ clone() const
 template<class Form, class Type>
 inline const Foam::Matrix<Form, Type>& Foam::Matrix<Form, Type>::null()
 {
-    return NullObjectRef<Matrix<Form, Type> >();
+    return NullObjectRef<Matrix<Form, Type>>();
 }
 
 
diff --git a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H
index ca91c9ca5b722d61a170eadd037a70d40e71a123..fa255b03b429a96c6ff873c5a234ddaf1cacfcae 100644
--- a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H
+++ b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.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 @@ public:
         inline RectangularMatrix(Istream&);
 
         //- Clone
-        inline autoPtr<RectangularMatrix<Type> > clone() const;
+        inline autoPtr<RectangularMatrix<Type>> clone() const;
 };
 
 
diff --git a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
index 2319b778a1a9221e45dd711d3d711525fd7e7d22..55c3f69699f08b4dc93b6a8fb2e6530f70a184e3 100644
--- a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
+++ b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
@@ -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
@@ -59,10 +59,10 @@ inline Foam::RectangularMatrix<Type>::RectangularMatrix(Istream& is)
 {}
 
 template<class Type>
-inline Foam::autoPtr<Foam::RectangularMatrix<Type> >
+inline Foam::autoPtr<Foam::RectangularMatrix<Type>>
 Foam::RectangularMatrix<Type>::clone() const
 {
-    return autoPtr<RectangularMatrix<Type> >
+    return autoPtr<RectangularMatrix<Type>>
     (
         new RectangularMatrix<Type>(*this)
     );
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H
index 531b649588b27286ea9f3316e0fbf429f8ff46cc..3938728b361142304fa02e2bef34c3f1d98e82ea 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.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
@@ -77,7 +77,7 @@ public:
         inline SquareMatrix(Istream&);
 
         //- Clone
-        inline autoPtr<SquareMatrix<Type> > clone() const;
+        inline autoPtr<SquareMatrix<Type>> clone() const;
 };
 
 
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
index 243d31904e3bd620ea79760df6f2460608c57341..74d7bdb95c2df48fad77496dc47c054d1bc36767 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.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,10 +73,10 @@ inline Foam::SquareMatrix<Type>::SquareMatrix(Istream& is)
 {}
 
 template<class Type>
-inline Foam::autoPtr<Foam::SquareMatrix<Type> >
+inline Foam::autoPtr<Foam::SquareMatrix<Type>>
 Foam::SquareMatrix<Type>::clone() const
 {
-    return autoPtr<SquareMatrix<Type> >(new SquareMatrix<Type>(*this));
+    return autoPtr<SquareMatrix<Type>>(new SquareMatrix<Type>(*this));
 }
 
 
diff --git a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H
index 69832500784a49cf54cbe845de2227025e62a14c..f6fee5f7329db674e7240ad6af416e81fb32e38e 100644
--- a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H
+++ b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.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
@@ -75,7 +75,7 @@ public:
         inline SymmetricSquareMatrix(Istream&);
 
         //- Clone
-        inline autoPtr<SymmetricSquareMatrix<Type> > clone() const;
+        inline autoPtr<SymmetricSquareMatrix<Type>> clone() const;
 
 
         //- Return subscript-checked row of Matrix.
diff --git a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
index b067cc2669b03a9c5625b951a675f29946947256..00757eabc6a85030cf251d3128dab3b3dbf8125a 100644
--- a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
+++ b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.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
@@ -84,10 +84,10 @@ inline Foam::SymmetricSquareMatrix<Type>::SymmetricSquareMatrix(Istream& is)
 
 
 template<class Type>
-inline Foam::autoPtr<Foam::SymmetricSquareMatrix<Type> >
+inline Foam::autoPtr<Foam::SymmetricSquareMatrix<Type>>
 Foam::SymmetricSquareMatrix<Type>::clone() const
 {
-    return autoPtr<SymmetricSquareMatrix<Type> >
+    return autoPtr<SymmetricSquareMatrix<Type>>
     (
         new SymmetricSquareMatrix<Type>(*this)
     );
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
index 2a4f156c8d7a158ce03db7a17b47c24dddf56331..2ca3c7290c5a91c93c95230fd7bfce9ca1e7bd7c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,7 +119,7 @@ public:
 
             //- Raw field receive function returning field
             template<class Type>
-            tmp<Field<Type> > receive
+            tmp<Field<Type>> receive
             (
                 const Pstream::commsTypes commsType,
                 const label size
@@ -144,7 +144,7 @@ public:
 
             //- Raw field receive function with data compression returning field
             template<class Type>
-            tmp<Field<Type> > compressedReceive
+            tmp<Field<Type>> compressedReceive
             (
                 const Pstream::commsTypes commsType,
                 const label size
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
index 645c1de157e1211332052b8572c9ab1bf5387e20..bcbc3385f8d463aa56b8755c8c1db04efcd0c7ff 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.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,13 +119,13 @@ void Foam::processorLduInterface::receive
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::processorLduInterface::receive
+Foam::tmp<Foam::Field<Type>> Foam::processorLduInterface::receive
 (
     const Pstream::commsTypes commsType,
     const label size
 ) const
 {
-    tmp<Field<Type> > tf(new Field<Type>(size));
+    tmp<Field<Type>> tf(new Field<Type>(size));
     receive(commsType, tf());
     return tf;
 }
@@ -261,13 +261,13 @@ void Foam::processorLduInterface::compressedReceive
 }
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::processorLduInterface::compressedReceive
+Foam::tmp<Foam::Field<Type>> Foam::processorLduInterface::compressedReceive
 (
     const Pstream::commsTypes commsType,
     const label size
 ) const
 {
-    tmp<Field<Type> > tf(new Field<Type>(size));
+    tmp<Field<Type>> tf(new Field<Type>(size));
     compressedReceive(commsType, tf());
     return tf;
 }
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
index e9ae3af8894bb9347d62627e6cb76d8c2e5efe12..43566e164fe787c6bd21c4b244747b2e66158384 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.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
@@ -684,18 +684,18 @@ public:
 
 
             template<class Type>
-            tmp<Field<Type> > H(const Field<Type>&) const;
+            tmp<Field<Type>> H(const Field<Type>&) const;
 
             template<class Type>
-            tmp<Field<Type> > H(const tmp<Field<Type> >&) const;
+            tmp<Field<Type>> H(const tmp<Field<Type>>&) const;
 
             tmp<scalarField> H1() const;
 
             template<class Type>
-            tmp<Field<Type> > faceH(const Field<Type>&) const;
+            tmp<Field<Type>> faceH(const Field<Type>&) const;
 
             template<class Type>
-            tmp<Field<Type> > faceH(const tmp<Field<Type> >&) const;
+            tmp<Field<Type>> faceH(const tmp<Field<Type>>&) const;
 
 
         // Info
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
index a473b2d63714bcc4811ffbc411b45366bbfb8f03..f674bba7a9f62ecefed3e2a967401ec4af04b895 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.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
@@ -31,9 +31,9 @@ Description
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::lduMatrix::H(const Field<Type>& psi) const
+Foam::tmp<Foam::Field<Type>> Foam::lduMatrix::H(const Field<Type>& psi) const
 {
-    tmp<Field<Type> > tHpsi
+    tmp<Field<Type>> tHpsi
     (
         new Field<Type>(lduAddr().size(), pTraits<Type>::zero)
     );
@@ -65,17 +65,17 @@ Foam::tmp<Foam::Field<Type> > Foam::lduMatrix::H(const Field<Type>& psi) const
 }
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
-Foam::lduMatrix::H(const tmp<Field<Type> >& tpsi) const
+Foam::tmp<Foam::Field<Type>>
+Foam::lduMatrix::H(const tmp<Field<Type>>& tpsi) const
 {
-    tmp<Field<Type> > tHpsi(H(tpsi()));
+    tmp<Field<Type>> tHpsi(H(tpsi()));
     tpsi.clear();
     return tHpsi;
 }
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
+Foam::tmp<Foam::Field<Type>>
 Foam::lduMatrix::faceH(const Field<Type>& psi) const
 {
     if (lowerPtr_ || upperPtr_)
@@ -86,7 +86,7 @@ Foam::lduMatrix::faceH(const Field<Type>& psi) const
         const labelUList& l = lduAddr().lowerAddr();
         const labelUList& u = lduAddr().upperAddr();
 
-        tmp<Field<Type> > tfaceHpsi(new Field<Type> (Lower.size()));
+        tmp<Field<Type>> tfaceHpsi(new Field<Type> (Lower.size()));
         Field<Type> & faceHpsi = tfaceHpsi();
 
         for (label face=0; face<l.size(); face++)
@@ -105,16 +105,16 @@ Foam::lduMatrix::faceH(const Field<Type>& psi) const
                " the matrix does not have any off-diagonal coefficients."
             << exit(FatalError);
 
-        return tmp<Field<Type> >(NULL);
+        return tmp<Field<Type>>(NULL);
     }
 }
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> >
-Foam::lduMatrix::faceH(const tmp<Field<Type> >& tpsi) const
+Foam::tmp<Foam::Field<Type>>
+Foam::lduMatrix::faceH(const tmp<Field<Type>>& tpsi) const
 {
-    tmp<Field<Type> > tfaceHpsi(faceH(tpsi()));
+    tmp<Field<Type>> tfaceHpsi(faceH(tpsi()));
     tpsi.clear();
     return tfaceHpsi;
 }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.H
index 1c93711dd3708422a4de80478ef85fd468fef06b..a7cdae8e4e6a7e2031fcf4eb061115895667bd51 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/manualGAMGProcAgglomeration/manualGAMGProcAgglomeration.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,7 +81,7 @@ class manualGAMGProcAgglomeration
     // Private data
 
         //- Per level the agglomeration map
-        const List<Tuple2<label, List<labelList> > > procAgglomMaps_;
+        const List<Tuple2<label, List<labelList>>> procAgglomMaps_;
 
         //- Any allocated communicators
         DynamicList<label> comms_;
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
index 689ae4455c5e165e20a03c1d590955536cb20dcc..c34040c27d1d3096c078fd1add851bbbed441b64 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ Foam::procFacesGAMGProcAgglomeration::singleCellMesh
 ) const
 {
     // Count number of faces per processor
-    List<Map<label> > procFaces(UPstream::nProcs(mesh.comm()));
+    List<Map<label>> procFaces(UPstream::nProcs(mesh.comm()));
     Map<label>& myNeighbours = procFaces[UPstream::myProcNo(mesh.comm())];
 
     {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
index 2ced631e3911adc8ccffc481c9262ed1fbffdad0..9e220067d1726b99c0293f3b99b65d37320fa931 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,16 +116,16 @@ class GAMGSolver
         PtrList<lduMatrix> matrixLevels_;
 
         //- Hierarchy of interfaces.
-        PtrList<PtrList<lduInterfaceField> > primitiveInterfaceLevels_;
+        PtrList<PtrList<lduInterfaceField>> primitiveInterfaceLevels_;
 
         //- Hierarchy of interfaces in lduInterfaceFieldPtrs form
         PtrList<lduInterfaceFieldPtrsList> interfaceLevels_;
 
         //- Hierarchy of interface boundary coefficients
-        PtrList<FieldField<Field, scalar> > interfaceLevelsBouCoeffs_;
+        PtrList<FieldField<Field, scalar>> interfaceLevelsBouCoeffs_;
 
         //- Hierarchy of interface internal coefficients
-        PtrList<FieldField<Field, scalar> > interfaceLevelsIntCoeffs_;
+        PtrList<FieldField<Field, scalar>> interfaceLevelsIntCoeffs_;
 
         //- LU decompsed coarsest matrix
         autoPtr<LUscalarMatrix> coarsestLUMatrixPtr_;
@@ -191,10 +191,10 @@ class GAMGSolver
             const lduInterfaceFieldPtrsList& interfaces,
 
             PtrList<lduMatrix>& otherMats,
-            PtrList<FieldField<Field, scalar> >& otherBouCoeffs,
-            PtrList<FieldField<Field, scalar> >& otherIntCoeffs,
+            PtrList<FieldField<Field, scalar>>& otherBouCoeffs,
+            PtrList<FieldField<Field, scalar>>& otherIntCoeffs,
             List<boolList>& otherTransforms,
-            List<List<label> >& otherRanks
+            List<List<label>>& otherRanks
         ) const;
 
         //- Agglomerate processor matrices
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
index d848394675ce79b54d312646f98c4f59f983ed84..e12be87d61dd3395018d5d65a3fdf49ea8b09932 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.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
@@ -293,10 +293,10 @@ void Foam::GAMGSolver::gatherMatrices
     const lduInterfaceFieldPtrsList& interfaces,
 
     PtrList<lduMatrix>& otherMats,
-    PtrList<FieldField<Field, scalar> >& otherBouCoeffs,
-    PtrList<FieldField<Field, scalar> >& otherIntCoeffs,
+    PtrList<FieldField<Field, scalar>>& otherBouCoeffs,
+    PtrList<FieldField<Field, scalar>>& otherIntCoeffs,
     List<boolList>& otherTransforms,
-    List<List<label> >& otherRanks
+    List<List<label>>& otherRanks
 ) const
 {
     if (debug)
@@ -448,10 +448,10 @@ void Foam::GAMGSolver::procAgglomerateMatrix
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     PtrList<lduMatrix> otherMats;
-    PtrList<FieldField<Field, scalar> > otherBouCoeffs;
-    PtrList<FieldField<Field, scalar> > otherIntCoeffs;
+    PtrList<FieldField<Field, scalar>> otherBouCoeffs;
+    PtrList<FieldField<Field, scalar>> otherIntCoeffs;
     List<boolList> otherTransforms;
-    List<List<label> > otherRanks;
+    List<List<label>> otherRanks;
     gatherMatrices
     (
         agglomProcIDs,
@@ -751,15 +751,15 @@ void Foam::GAMGSolver::procAgglomerateMatrix
 )
 {
     autoPtr<lduMatrix> allMatrixPtr;
-    autoPtr<FieldField<Field, scalar> > allInterfaceBouCoeffs
+    autoPtr<FieldField<Field, scalar>> allInterfaceBouCoeffs
     (
         new FieldField<Field, scalar>(0)
     );
-    autoPtr<FieldField<Field, scalar> > allInterfaceIntCoeffs
+    autoPtr<FieldField<Field, scalar>> allInterfaceIntCoeffs
     (
         new FieldField<Field, scalar>(0)
     );
-    autoPtr<PtrList<lduInterfaceField> > allPrimitiveInterfaces
+    autoPtr<PtrList<lduInterfaceField>> allPrimitiveInterfaces
     (
         new PtrList<lduInterfaceField>(0)
     );
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
index 66c1ab2f32d77dee8d9ed66f18c6c11d8541b2cc..dea8a20d3667a933f55e27059db63edb3b1e4433 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.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
@@ -238,7 +238,7 @@ public:
 
             //- Return the interface internal field of the given field
             template<class Type>
-            tmp<Field<Type> > interfaceInternalField
+            tmp<Field<Type>> interfaceInternalField
             (
                 const UList<Type>& internalData
             ) const;
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C
index 79e5f04259ed232a643fddbd2f0fbc71d016d3dc..2f55a362eed572bfed3331cee1ce57e5e0d8fb1f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.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
@@ -28,12 +28,12 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::Field<Type> > Foam::GAMGInterface::interfaceInternalField
+Foam::tmp<Foam::Field<Type>> Foam::GAMGInterface::interfaceInternalField
 (
     const UList<Type>& iF
 ) const
 {
-    tmp<Field<Type> > tresult(new Field<Type>(size()));
+    tmp<Field<Type>> tresult(new Field<Type>(size()));
     interfaceInternalField(iF, tresult());
     return tresult;
 }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
index 4610c24c896b1c6f3e9bb46624d394cc2e015f08..94e3e03dc9f874c15d82ce870dae562f3f30aef1 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.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
@@ -96,7 +96,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
     );
 
     // From coarse cell pair to coarse face
-    HashTable<label, labelPair, labelPair::Hash<> > cellsToCoarseFace
+    HashTable<label, labelPair, labelPair::Hash<>> cellsToCoarseFace
     (
         2*localRestrictAddressing.size()
     );
@@ -126,7 +126,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
             );
         }
 
-        HashTable<label, labelPair, labelPair::Hash<> >::const_iterator fnd =
+        HashTable<label, labelPair, labelPair::Hash<>>::const_iterator fnd =
             cellsToCoarseFace.find(cellPair);
 
         if (fnd == cellsToCoarseFace.end())
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
index d0cbc9ade6cceebe0d13deddef812769fb0a5442..f68e1a853b00ab21f40c25ffe8a9ed060bb843fc 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.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
@@ -84,7 +84,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
     );
 
     // From coarse cell pair to coarse face
-    HashTable<label, labelPair, labelPair::Hash<> > cellsToCoarseFace
+    HashTable<label, labelPair, labelPair::Hash<>> cellsToCoarseFace
     (
         2*localRestrictAddressing.size()
     );
@@ -114,7 +114,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
             );
         }
 
-        HashTable<label, labelPair, labelPair::Hash<> >::const_iterator fnd =
+        HashTable<label, labelPair, labelPair::Hash<>>::const_iterator fnd =
             cellsToCoarseFace.find(cellPair);
 
         if (fnd == cellsToCoarseFace.end())
@@ -213,7 +213,7 @@ Foam::tmp<Foam::labelField> Foam::processorGAMGInterface::internalFieldTransfer
     label oldWarn = UPstream::warnComm;
     UPstream::warnComm = comm();
 
-    tmp<Field<label> > tfld(receive<label>(commsType, this->size()));
+    tmp<Field<label>> tfld(receive<label>(commsType, this->size()));
 
     UPstream::warnComm = oldWarn;
 
diff --git a/src/OpenFOAM/memory/Xfer/XferI.H b/src/OpenFOAM/memory/Xfer/XferI.H
index d1127393dfab4da6b8edaac34e0cd1a2f97e26fd..eddfa5cd1838c48a63854c20e3dc3f1bc5ab849f 100644
--- a/src/OpenFOAM/memory/Xfer/XferI.H
+++ b/src/OpenFOAM/memory/Xfer/XferI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 template<class T>
 inline const Foam::Xfer<T>& Foam::Xfer<T>::null()
 {
-    return NullObjectRef<Xfer<T> >();
+    return NullObjectRef<Xfer<T>>();
 }
 
 
diff --git a/src/OpenFOAM/meshes/MeshObject/MeshObject.C b/src/OpenFOAM/meshes/MeshObject/MeshObject.C
index 53267d90aa85be6f47f7951f734ad2570c4a097a..f8fae85d411486b4a1223dfcdb82d017c21dbb54 100644
--- a/src/OpenFOAM/meshes/MeshObject/MeshObject.C
+++ b/src/OpenFOAM/meshes/MeshObject/MeshObject.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
@@ -287,7 +287,7 @@ void Foam::meshObject::movePoints(objectRegistry& obr)
 {
     HashTable<GeometricMeshObject<Mesh>*> meshObjects
     (
-        obr.lookupClass<GeometricMeshObject<Mesh> >()
+        obr.lookupClass<GeometricMeshObject<Mesh>>()
     );
 
     if (meshObject::debug)
@@ -304,7 +304,7 @@ void Foam::meshObject::movePoints(objectRegistry& obr)
         iter
     )
     {
-        if (isA<MoveableMeshObject<Mesh> >(*iter()))
+        if (isA<MoveableMeshObject<Mesh>>(*iter()))
         {
             if (meshObject::debug)
             {
@@ -329,7 +329,7 @@ void Foam::meshObject::updateMesh(objectRegistry& obr, const mapPolyMesh& mpm)
 {
     HashTable<GeometricMeshObject<Mesh>*> meshObjects
     (
-        obr.lookupClass<GeometricMeshObject<Mesh> >()
+        obr.lookupClass<GeometricMeshObject<Mesh>>()
     );
 
     if (meshObject::debug)
@@ -346,7 +346,7 @@ void Foam::meshObject::updateMesh(objectRegistry& obr, const mapPolyMesh& mpm)
         iter
     )
     {
-        if (isA<UpdateableMeshObject<Mesh> >(*iter()))
+        if (isA<UpdateableMeshObject<Mesh>>(*iter()))
         {
             if (meshObject::debug)
             {
@@ -371,7 +371,7 @@ void Foam::meshObject::clear(objectRegistry& obr)
 {
     HashTable<MeshObjectType<Mesh>*> meshObjects
     (
-        obr.lookupClass<MeshObjectType<Mesh> >()
+        obr.lookupClass<MeshObjectType<Mesh>>()
     );
 
     if (meshObject::debug)
@@ -402,7 +402,7 @@ void Foam::meshObject::clearUpto(objectRegistry& obr)
 {
     HashTable<FromType<Mesh>*> meshObjects
     (
-        obr.lookupClass<FromType<Mesh> >()
+        obr.lookupClass<FromType<Mesh>>()
     );
 
     if (meshObject::debug)
@@ -414,7 +414,7 @@ void Foam::meshObject::clearUpto(objectRegistry& obr)
 
     forAllIter(typename HashTable<FromType<Mesh>*>, meshObjects, iter)
     {
-        if (!isA<ToType<Mesh> >(*iter()))
+        if (!isA<ToType<Mesh>>(*iter()))
         {
             if (meshObject::debug)
             {
diff --git a/src/OpenFOAM/meshes/ProcessorTopology/commSchedule.C b/src/OpenFOAM/meshes/ProcessorTopology/commSchedule.C
index ca625a2a882e1fd0bceb76bac28666abb36704a3..c7992b78236f415d89d57b97390637000beddd50 100644
--- a/src/OpenFOAM/meshes/ProcessorTopology/commSchedule.C
+++ b/src/OpenFOAM/meshes/ProcessorTopology/commSchedule.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
@@ -73,7 +73,7 @@ Foam::commSchedule::commSchedule
     procSchedule_(nProcs)
 {
     // Determine comms per processor.
-    List<DynamicList<label> > procToComms(nProcs);
+    List<DynamicList<label>> procToComms(nProcs);
 
     forAll(comms, commI)
     {
diff --git a/src/OpenFOAM/meshes/data/dataTemplates.C b/src/OpenFOAM/meshes/data/dataTemplates.C
index 8929ee123c750fcd00b9b8b71b517b7bf91f01d9..536c433081e76205bf07080931e17b0c5f4f00a9 100644
--- a/src/OpenFOAM/meshes/data/dataTemplates.C
+++ b/src/OpenFOAM/meshes/data/dataTemplates.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
@@ -38,7 +38,7 @@ void Foam::data::setSolverPerformance
 {
     dictionary& dict = const_cast<dictionary&>(solverPerformanceDict());
 
-    List<SolverPerformance<Type> > perfs;
+    List<SolverPerformance<Type>> perfs;
 
     if (prevTimeIndex_ != this->time().timeIndex())
     {
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H b/src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H
index 11596bc4eb14a4b7387cdd1fb676eda3db742a53..971202495c9bd81ca468307bb30c0dc8998627d9 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H
@@ -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
@@ -47,7 +47,7 @@ namespace Foam
 template<class T>
 class EdgeMap
 :
-    public HashTable<T, edge, Hash<edge> >
+    public HashTable<T, edge, Hash<edge>>
 {
 
 public:
@@ -57,19 +57,19 @@ public:
         //- Construct given initial map size
         EdgeMap(const label size = 128)
         :
-            HashTable<T, edge, Hash<edge> >(size)
+            HashTable<T, edge, Hash<edge>>(size)
         {}
 
         //- Construct from Istream
         EdgeMap(Istream& is)
         :
-            HashTable<T, edge, Hash<edge> >(is)
+            HashTable<T, edge, Hash<edge>>(is)
         {}
 
         //- Construct as copy
         EdgeMap(const EdgeMap<T>& map)
         :
-            HashTable<T, edge, Hash<edge> >(map)
+            HashTable<T, edge, Hash<edge>>(map)
         {}
 };
 
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 6db748009374692138506ebe843fa356f12f66ce..59705a16e1cf06cd127e11f69610fd3559edfc67 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.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
@@ -1051,7 +1051,7 @@ void Foam::globalMeshData::calcGlobalEdgeSlaves() const
     // Construct map
     globalEdgeTransformedSlavesPtr_.reset(new labelListList());
 
-    List<Map<label> > compactMap(Pstream::nProcs());
+    List<Map<label>> compactMap(Pstream::nProcs());
     globalEdgeSlavesMapPtr_.reset
     (
         new mapDistribute
@@ -1435,7 +1435,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryFaces() const
     }
 
     // Construct a map to get the face data directly
-    List<Map<label> > compactMap(Pstream::nProcs());
+    List<Map<label>> compactMap(Pstream::nProcs());
 
     globalPointTransformedBoundaryFacesPtr_.reset
     (
@@ -1662,7 +1662,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryCells() const
     }
 
     // Construct a map to get the cell data directly
-    List<Map<label> > compactMap(Pstream::nProcs());
+    List<Map<label>> compactMap(Pstream::nProcs());
 
     globalPointTransformedBoundaryCellsPtr_.reset
     (
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
index 35543fd0937d399aa4df018d4f0e75b88c0c8482..3c1cb48cb0128be2ef963cc43a0c2e72dfb10eac 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.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
@@ -153,7 +153,7 @@ class globalMeshData
             //      edges : meshEdges(), meshEdgeMap()
             mutable autoPtr<indirectPrimitivePatch> coupledPatchPtr_;
             mutable autoPtr<labelList> coupledPatchMeshEdgesPtr_;
-            mutable autoPtr<Map<label> > coupledPatchMeshEdgeMapPtr_;
+            mutable autoPtr<Map<label>> coupledPatchMeshEdgeMapPtr_;
 
             //- Global numbering for coupledPatch points
             mutable autoPtr<globalIndex> globalPointNumberingPtr_;
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
index 2b6b17da92d3e4fe0fc885200ee59b12029a5ec4..53399ca8d2f49289d6035465e593bfceeaba3d4e 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.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
@@ -1061,7 +1061,7 @@ void Foam::globalPoints::calculateSharedPoints
     }
 
 
-    List<Map<label> > compactMap;
+    List<Map<label>> compactMap;
     map_.reset
     (
         new mapDistribute
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
index c7d93e6d9c078b57f35ddc6bc4c0ccdd8c16de42..5d0650ef2ee1c96fbd716aaedee1f254726586d7 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.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
@@ -145,7 +145,7 @@ Foam::List<Foam::labelPair> Foam::mapDistribute::schedule
     List<labelPair> allComms;
 
     {
-        HashSet<labelPair, labelPair::Hash<> > commsSet(Pstream::nProcs());
+        HashSet<labelPair, labelPair::Hash<>> commsSet(Pstream::nProcs());
 
         // Find what communication is required
         forAll(subMap, procI)
@@ -365,7 +365,7 @@ void Foam::mapDistribute::calcCompactAddressing
 (
     const globalIndex& globalNumbering,
     const labelList& elements,
-    List<Map<label> >& compactMap
+    List<Map<label>>& compactMap
 ) const
 {
     compactMap.setSize(Pstream::nProcs());
@@ -414,7 +414,7 @@ void Foam::mapDistribute::calcCompactAddressing
 (
     const globalIndex& globalNumbering,
     const labelListList& cellCells,
-    List<Map<label> >& compactMap
+    List<Map<label>>& compactMap
 ) const
 {
     compactMap.setSize(Pstream::nProcs());
@@ -474,7 +474,7 @@ void Foam::mapDistribute::exchangeAddressing
     const int tag,
     const globalIndex& globalNumbering,
     labelList& elements,
-    List<Map<label> >& compactMap,
+    List<Map<label>>& compactMap,
     labelList& compactStart
 )
 {
@@ -554,7 +554,7 @@ void Foam::mapDistribute::exchangeAddressing
     const int tag,
     const globalIndex& globalNumbering,
     labelListList& cellCells,
-    List<Map<label> >& compactMap,
+    List<Map<label>>& compactMap,
     labelList& compactStart
 )
 {
@@ -754,7 +754,7 @@ Foam::mapDistribute::mapDistribute
 (
     const globalIndex& globalNumbering,
     labelList& elements,
-    List<Map<label> >& compactMap,
+    List<Map<label>>& compactMap,
     const int tag
 )
 :
@@ -812,7 +812,7 @@ Foam::mapDistribute::mapDistribute
 (
     const globalIndex& globalNumbering,
     labelListList& cellCells,
-    List<Map<label> >& compactMap,
+    List<Map<label>>& compactMap,
     const int tag
 )
 :
@@ -873,7 +873,7 @@ Foam::mapDistribute::mapDistribute
     const globalIndexAndTransform& globalTransforms,
     const labelPairList& transformedElements,
     labelList& transformedIndices,
-    List<Map<label> >& compactMap,
+    List<Map<label>>& compactMap,
     const int tag
 )
 :
@@ -979,7 +979,7 @@ Foam::mapDistribute::mapDistribute
     const globalIndexAndTransform& globalTransforms,
     const List<labelPairList>& transformedElements,
     labelListList& transformedIndices,
-    List<Map<label> >& compactMap,
+    List<Map<label>>& compactMap,
     const int tag
 )
 :
@@ -1141,7 +1141,7 @@ Foam::Xfer<Foam::mapDistribute> Foam::mapDistribute::xfer()
 Foam::label Foam::mapDistribute::renumber
 (
     const globalIndex& globalNumbering,
-    const List<Map<label> >& compactMap,
+    const List<Map<label>>& compactMap,
     const label globalI
 )
 {
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
index 28540fa8e2cee065b5c27ba22110398132dccdec..8a5b06d446f7a058299752b90ed0038748d9d123 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.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
@@ -174,7 +174,7 @@ class mapDistribute
 
 
         //- Schedule
-        mutable autoPtr<List<labelPair> > schedulePtr_;
+        mutable autoPtr<List<labelPair>> schedulePtr_;
 
 
    // Private Member Functions
@@ -190,13 +190,13 @@ class mapDistribute
         (
             const globalIndex& globalNumbering,
             const labelList& elements,
-            List<Map<label> >& compactMap
+            List<Map<label>>& compactMap
         ) const;
         void calcCompactAddressing
         (
             const globalIndex& globalNumbering,
             const labelListList& elements,
-            List<Map<label> >& compactMap
+            List<Map<label>>& compactMap
         ) const;
 
         void exchangeAddressing
@@ -204,7 +204,7 @@ class mapDistribute
             const int tag,
             const globalIndex& globalNumbering,
             labelList& elements,
-            List<Map<label> >& compactMap,
+            List<Map<label>>& compactMap,
             labelList& compactStart
         );
         void exchangeAddressing
@@ -212,7 +212,7 @@ class mapDistribute
             const int tag,
             const globalIndex& globalNumbering,
             labelListList& elements,
-            List<Map<label> >& compactMap,
+            List<Map<label>>& compactMap,
             labelList& compactStart
         );
 
@@ -268,7 +268,7 @@ public:
             (
                 const vectorTensorTransform& vt,
                 const bool forward,
-                List<List<Type> >& flds
+                List<List<Type>>& flds
             ) const
             {
                 forAll(flds, i)
@@ -325,7 +325,7 @@ public:
             (
                 const vectorTensorTransform& vt,
                 const bool forward,
-                List<List<point> >& flds
+                List<List<point>>& flds
             ) const
             {
                 forAll(flds, i)
@@ -403,7 +403,7 @@ public:
         (
             const globalIndex&,
             labelList& elements,
-            List<Map<label> >& compactMap,
+            List<Map<label>>& compactMap,
             const int tag = Pstream::msgType()
         );
 
@@ -414,7 +414,7 @@ public:
         (
             const globalIndex&,
             labelListList& cellCells,
-            List<Map<label> >& compactMap,
+            List<Map<label>>& compactMap,
             const int tag = Pstream::msgType()
         );
 
@@ -431,7 +431,7 @@ public:
             const globalIndexAndTransform&,
             const labelPairList& transformedElements,
             labelList& transformedIndices,
-            List<Map<label> >& compactMap,
+            List<Map<label>>& compactMap,
             const int tag = Pstream::msgType()
         );
 
@@ -443,7 +443,7 @@ public:
             const globalIndexAndTransform&,
             const List<labelPairList>& transformedElements,
             labelListList& transformedIndices,
-            List<Map<label> >& compactMap,
+            List<Map<label>>& compactMap,
             const int tag = Pstream::msgType()
         );
 
@@ -535,7 +535,7 @@ public:
             static label renumber
             (
                 const globalIndex&,
-                const List<Map<label> >& compactMap,
+                const List<Map<label>>& compactMap,
                 const label globalElement
             );
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
index becc4a77ce97a7bf242485e005c50c5ef15d53d8..849b3ee3666152e462f517d73181d23317b2bd72 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.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
@@ -267,7 +267,7 @@ void Foam::mapDistribute::distribute
         {
             // Set up sends to neighbours
 
-            List<List<T > > sendFields(Pstream::nProcs());
+            List<List<T >> sendFields(Pstream::nProcs());
 
             for (label domain = 0; domain < Pstream::nProcs(); domain++)
             {
@@ -295,7 +295,7 @@ void Foam::mapDistribute::distribute
 
             // Set up receives from neighbours
 
-            List<List<T > > recvFields(Pstream::nProcs());
+            List<List<T >> recvFields(Pstream::nProcs());
 
             for (label domain = 0; domain < Pstream::nProcs(); domain++)
             {
@@ -615,7 +615,7 @@ void Foam::mapDistribute::distribute
         {
             // Set up sends to neighbours
 
-            List<List<T > > sendFields(Pstream::nProcs());
+            List<List<T >> sendFields(Pstream::nProcs());
 
             for (label domain = 0; domain < Pstream::nProcs(); domain++)
             {
@@ -643,7 +643,7 @@ void Foam::mapDistribute::distribute
 
             // Set up receives from neighbours
 
-            List<List<T > > recvFields(Pstream::nProcs());
+            List<List<T >> recvFields(Pstream::nProcs());
 
             for (label domain = 0; domain < Pstream::nProcs(); domain++)
             {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index a795557339a55c4ed51209fefbebbba4cc4996b4..4b90fb078b2c00dd57c36df875efb03d4ccb9dbf 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -299,7 +299,7 @@ Foam::polyBoundaryMesh::neighbourEdges() const
 
         // From mesh edge (expressed as a point pair so as not to construct
         // point addressing) to patch + relative edge index.
-        HashTable<labelPair, edge, Hash<edge> > pointsToEdge(nEdgePairs);
+        HashTable<labelPair, edge, Hash<edge>> pointsToEdge(nEdgePairs);
 
         forAll(*this, patchI)
         {
@@ -320,7 +320,7 @@ Foam::polyBoundaryMesh::neighbourEdges() const
                 // Edge in mesh points.
                 edge meshEdge(pp.meshPoints()[e[0]], pp.meshPoints()[e[1]]);
 
-                HashTable<labelPair, edge, Hash<edge> >::iterator fnd =
+                HashTable<labelPair, edge, Hash<edge>>::iterator fnd =
                     pointsToEdge.find(meshEdge);
 
                 if (fnd == pointsToEdge.end())
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
index 1906b422ac5587b14286da9693cfb868faad2f1c..114fc231689348e9c249bb61d609f60423be6fb4 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.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
@@ -70,10 +70,10 @@ class polyBoundaryMesh
 
         mutable autoPtr<labelList> patchIDPtr_;
 
-        mutable autoPtr<HashTable<labelList, word> > groupPatchIDsPtr_;
+        mutable autoPtr<HashTable<labelList, word>> groupPatchIDsPtr_;
 
         //- Edges of neighbouring patches
-        mutable autoPtr<List<labelPairList> > neighbourEdgesPtr_;
+        mutable autoPtr<List<labelPairList>> neighbourEdgesPtr_;
 
 
     // Private Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index 11d60fec9fef4d1621b9b12c1e7e32889f8f8a01..9ce9703810b04eb4c77bdaee420f1b06edc1ee6d 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.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
@@ -153,7 +153,7 @@ private:
             mutable autoPtr<labelList> tetBasePtIsPtr_;
 
             //- Search tree to allow spatial cell searching
-            mutable autoPtr<indexedOctree<treeDataCell> > cellTreePtr_;
+            mutable autoPtr<indexedOctree<treeDataCell>> cellTreePtr_;
 
 
         // Zoning information
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index bd778285200aad661364b3566fb3e558be4b2c7e..ec1495c267af4d6c569223a7b27c4d69036f6301 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.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
@@ -38,7 +38,7 @@ Foam::labelListList Foam::polyMesh::cellShapePointCells
     const cellSh