diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H
index d7bb02b2b4..1397b6ba7f 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2004-2019 OpenCFD Ltd.
+    Copyright (C) 2016-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -223,7 +223,7 @@ private:
 
     // Private Member Functions
 
-        //- No copy construct and assignment
+        //- No copy construct
         smoothDelta(const smoothDelta&) = delete;
 
         //- No copy assignment
diff --git a/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCModel/ATCModel.H b/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCModel/ATCModel.H
index d9859b3854..d80c75b12e 100644
--- a/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCModel/ATCModel.H
+++ b/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCModel/ATCModel.H
@@ -66,10 +66,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         ATCModel(const ATCModel&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const ATCModel&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCUaGradU/ATCUaGradU.H b/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCUaGradU/ATCUaGradU.H
index 09de4ab1c4..03b889b22f 100644
--- a/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCUaGradU/ATCUaGradU.H
+++ b/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCUaGradU/ATCUaGradU.H
@@ -60,10 +60,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         ATCUaGradU(const ATCUaGradU&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const ATCUaGradU&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCstandard/ATCstandard.H b/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCstandard/ATCstandard.H
index 10c29b25b4..4c65a9c280 100644
--- a/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCstandard/ATCstandard.H
+++ b/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCstandard/ATCstandard.H
@@ -60,10 +60,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         ATCstandard(const ATCstandard&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const ATCstandard&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/ATCModel/cancelATC/cancelATC.H b/src/optimisation/adjointOptimisation/adjoint/ATCModel/cancelATC/cancelATC.H
index 6d8c63c572..a421a0e6fa 100644
--- a/src/optimisation/adjointOptimisation/adjoint/ATCModel/cancelATC/cancelATC.H
+++ b/src/optimisation/adjointOptimisation/adjoint/ATCModel/cancelATC/cancelATC.H
@@ -61,10 +61,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         cancelATC(const cancelATC&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const cancelATC&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/ATCModel/zeroATCcells/faceCells/faceCells.H b/src/optimisation/adjointOptimisation/adjoint/ATCModel/zeroATCcells/faceCells/faceCells.H
index db6a86ea39..2439f09948 100644
--- a/src/optimisation/adjointOptimisation/adjoint/ATCModel/zeroATCcells/faceCells/faceCells.H
+++ b/src/optimisation/adjointOptimisation/adjoint/ATCModel/zeroATCcells/faceCells/faceCells.H
@@ -63,10 +63,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         faceCells(const faceCells&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const faceCells&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/ATCModel/zeroATCcells/pointCells/pointCells.H b/src/optimisation/adjointOptimisation/adjoint/ATCModel/zeroATCcells/pointCells/pointCells.H
index 4eb3fc26ec..7d3908f41a 100644
--- a/src/optimisation/adjointOptimisation/adjoint/ATCModel/zeroATCcells/pointCells/pointCells.H
+++ b/src/optimisation/adjointOptimisation/adjoint/ATCModel/zeroATCcells/pointCells/pointCells.H
@@ -63,10 +63,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         pointCells(const pointCells&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const pointCells&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/ATCModel/zeroATCcells/zeroATCcells/zeroATCcells.H b/src/optimisation/adjointOptimisation/adjoint/ATCModel/zeroATCcells/zeroATCcells/zeroATCcells.H
index 5921919222..04bb80f9ee 100644
--- a/src/optimisation/adjointOptimisation/adjoint/ATCModel/zeroATCcells/zeroATCcells/zeroATCcells.H
+++ b/src/optimisation/adjointOptimisation/adjoint/ATCModel/zeroATCcells/zeroATCcells/zeroATCcells.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::zeroATCcells
 
@@ -61,10 +60,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         zeroATCcells(const zeroATCcells&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const zeroATCcells&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointInletVelocity/adjointInletVelocityFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointInletVelocity/adjointInletVelocityFvPatchVectorField.C
index d35be2fdf0..6350f30d63 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointInletVelocity/adjointInletVelocityFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointInletVelocity/adjointInletVelocityFvPatchVectorField.C
@@ -125,7 +125,7 @@ Foam::adjointInletVelocityFvPatchVectorField::valueBoundaryCoeffs
     const tmp<scalarField>&
 ) const
 {
-    return tmp<Field<vector>>::New(this->size(), pTraits<vector>::zero);
+    return tmp<Field<vector>>::New(this->size(), Zero);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C
index 8de2826314..871db0a786 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocityFlux/adjointOutletVelocityFluxFvPatchVectorField.C
@@ -167,7 +167,7 @@ Foam::adjointOutletVelocityFluxFvPatchVectorField::valueInternalCoeffs
     const tmp<scalarField>&
 ) const
 {
-    return tmp<Field<vector>>::New(this->size(), pTraits<vector>::zero);
+    return tmp<Field<vector>>::New(this->size(), Zero);
 }
 
 
@@ -177,7 +177,7 @@ Foam::adjointOutletVelocityFluxFvPatchVectorField::valueBoundaryCoeffs
     const tmp<scalarField>&
 ) const
 {
-    return tmp<Field<vector>>::New(this->size(), pTraits<vector>::zero);
+    return tmp<Field<vector>>::New(this->size(), Zero);
 }
 
 
@@ -185,7 +185,7 @@ Foam::tmp<Foam::Field<Foam::vector>>
 Foam::adjointOutletVelocityFluxFvPatchVectorField::
 gradientBoundaryCoeffs() const
 {
-    return tmp<Field<vector>>::New(this->size(), pTraits<vector>::zero);
+    return tmp<Field<vector>>::New(this->size(), Zero);
 }
 
 
@@ -193,7 +193,7 @@ Foam::tmp<Foam::Field<Foam::vector>>
 Foam::adjointOutletVelocityFluxFvPatchVectorField::
 gradientInternalCoeffs() const
 {
-    return tmp<Field<vector>>::New(this->size(), pTraits<vector>::zero);
+    return tmp<Field<vector>>::New(this->size(), Zero);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocity/adjointWallVelocityFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocity/adjointWallVelocityFvPatchVectorField.C
index 42385f2360..56c1f27026 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocity/adjointWallVelocityFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointWallVelocity/adjointWallVelocityFvPatchVectorField.C
@@ -193,7 +193,7 @@ void Foam::adjointWallVelocityFvPatchVectorField::updateCoeffs()
 
     // Tangential adjoint velocity in the t1 direction depends on the primal
     // wall function used
-    vectorField Uap_t1(patch().size(), vector::zero);
+    vectorField Uap_t1(patch().size(), Zero);
     typedef Foam::nutUSpaldingWallFunctionFvPatchScalarField
         SAwallFunctionPatchField;
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointZeroInlet/adjointZeroInletFvPatchField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointZeroInlet/adjointZeroInletFvPatchField.C
index 7dfc99e443..9746e610fb 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointZeroInlet/adjointZeroInletFvPatchField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointZeroInlet/adjointZeroInletFvPatchField.C
@@ -100,7 +100,7 @@ Foam::adjointZeroInletFvPatchField<Type>::valueBoundaryCoeffs
     const tmp<scalarField>&
 ) const
 {
-    return tmp<Field<Type>>::New(this->size(), pTraits<Type>::zero);
+    return tmp<Field<Type>>::New(this->size(), Zero);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/boundaryAdjointContributions/boundaryAdjointContribution/boundaryAdjointContribution.H b/src/optimisation/adjointOptimisation/adjoint/boundaryAdjointContributions/boundaryAdjointContribution/boundaryAdjointContribution.H
index 07908ad5cf..d8063d0407 100644
--- a/src/optimisation/adjointOptimisation/adjoint/boundaryAdjointContributions/boundaryAdjointContribution/boundaryAdjointContribution.H
+++ b/src/optimisation/adjointOptimisation/adjoint/boundaryAdjointContributions/boundaryAdjointContribution/boundaryAdjointContribution.H
@@ -62,13 +62,13 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         boundaryAdjointContribution
         (
             const boundaryAdjointContribution&
         ) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const boundaryAdjointContribution&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/boundaryAdjointContributions/boundaryAdjointContributionIncompressible/boundaryAdjointContributionIncompressible.H b/src/optimisation/adjointOptimisation/adjoint/boundaryAdjointContributions/boundaryAdjointContributionIncompressible/boundaryAdjointContributionIncompressible.H
index b4b728dbf8..d6f7ff20c4 100644
--- a/src/optimisation/adjointOptimisation/adjoint/boundaryAdjointContributions/boundaryAdjointContributionIncompressible/boundaryAdjointContributionIncompressible.H
+++ b/src/optimisation/adjointOptimisation/adjoint/boundaryAdjointContributions/boundaryAdjointContributionIncompressible/boundaryAdjointContributionIncompressible.H
@@ -67,13 +67,13 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         boundaryAdjointContributionIncompressible
         (
             const boundaryAdjointContributionIncompressible&
         ) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=
         (
             const boundaryAdjointContributionIncompressible&
diff --git a/src/optimisation/adjointOptimisation/adjoint/boundaryAdjointContributions/boundaryAdjointContributionIncompressible/boundaryAdjointContributionIncompressibleTemplates.C b/src/optimisation/adjointOptimisation/adjoint/boundaryAdjointContributions/boundaryAdjointContributionIncompressible/boundaryAdjointContributionIncompressibleTemplates.C
index 38e3def8b8..0fd968f776 100644
--- a/src/optimisation/adjointOptimisation/adjoint/boundaryAdjointContributions/boundaryAdjointContributionIncompressible/boundaryAdjointContributionIncompressibleTemplates.C
+++ b/src/optimisation/adjointOptimisation/adjoint/boundaryAdjointContributions/boundaryAdjointContributionIncompressible/boundaryAdjointContributionIncompressibleTemplates.C
@@ -38,9 +38,8 @@ Foam::boundaryAdjointContributionIncompressible::sumContributions
 )
 {
     // Objective function contribution
-    tmp<Field<returnType>> tdJtotdvar
-        (new Field<returnType>(patch_.size(), pTraits<returnType>::zero));
-    Field<returnType>& dJtotdvar = tdJtotdvar.ref();
+    auto tdJtotdvar = tmp<Field<returnType>>::New(patch_.size(), Zero);
+    auto& dJtotdvar = tdJtotdvar.ref();
 
     // Get weighthed contribution
     for (sourceType& funcI : sourceList)
diff --git a/src/optimisation/adjointOptimisation/adjoint/deltaBoundary/deltaBoundary.C b/src/optimisation/adjointOptimisation/adjoint/deltaBoundary/deltaBoundary.C
index 59fdc2618d..ed6bfd8014 100644
--- a/src/optimisation/adjointOptimisation/adjoint/deltaBoundary/deltaBoundary.C
+++ b/src/optimisation/adjointOptimisation/adjoint/deltaBoundary/deltaBoundary.C
@@ -41,7 +41,7 @@ namespace Foam
 tensor deltaBoundary::tensorCrossVector(const tensor& T, const vector& v)
 {
     // The correct approach when T is not a diagonal tensor
-    tensor res(tensor::zero);
+    tensor res(Zero);
     vector vec1(T.xx(), T.yx(), T.zx());
     vector res1(vec1 ^ v);
     res.xx() = res1.x(); res.yx() = res1.y(); res.zx() = res1.z();
@@ -74,12 +74,12 @@ vectorField deltaBoundary::makeFaceCentresAndAreas_d
     const pointField& p_d
 )
 {
-    vector fCtrs_d(vector::zero);
-    vector fAreas_d(vector::zero);
-    vector unitVector_d(vector::zero);
+    vector fCtrs_d(Zero);
+    vector fAreas_d(Zero);
+    vector unitVector_d(Zero);
 
     // Container field to return results
-    vectorField deltaVecs(3, vector::zero);
+    vectorField deltaVecs(3, Zero);
 
     label nPoints = p.size();
 
@@ -103,12 +103,12 @@ vectorField deltaBoundary::makeFaceCentresAndAreas_d
     }
     else
     {
-        vector sumN(vector::zero);
-        vector sumN_d(vector::zero);
-        scalar sumA = Zero;
-        scalar sumA_d = Zero;
-        vector sumAc = vector::zero;
-        vector sumAc_d = vector::zero;
+        vector sumN(Zero);
+        vector sumN_d(Zero);
+        scalar sumA(0);
+        scalar sumA_d(0);
+        vector sumAc(Zero);
+        vector sumAc_d(Zero);
 
         point fCentre = p[0];
         point fCentre_d = p_d[0];
@@ -182,12 +182,12 @@ tensorField deltaBoundary::makeFaceCentresAndAreas_d
 )
 {
     label nPoints = p.size();
-    tensor fCtrs_d(tensor::zero);
-    tensor fAreas_d(tensor::zero);
-    tensor unitVector_d(tensor::zero);
+    tensor fCtrs_d(Zero);
+    tensor fAreas_d(Zero);
+    tensor unitVector_d(Zero);
 
     // Container field to return results
-    tensorField deltaVecs(3, tensor::zero);
+    tensorField deltaVecs(3, Zero);
 
     // If the face is a triangle, do a direct calculation for efficiency
     // and to avoid round-off error-related problems
@@ -209,12 +209,12 @@ tensorField deltaBoundary::makeFaceCentresAndAreas_d
     }
     else
     {
-        vector sumN(vector::zero);
-        tensor sumN_d(tensor::zero);
-        scalar sumA = Zero;
-        vector sumA_d(vector::zero);
-        vector sumAc(vector::zero);
-        tensor sumAc_d(tensor::zero);
+        vector sumN(Zero);
+        tensor sumN_d(Zero);
+        scalar sumA(0);
+        vector sumA_d(Zero);
+        vector sumAc(Zero);
+        tensor sumAc_d(Zero);
 
         point fCentre = p[0];
         tensor fCentre_d = p_d[0];
@@ -287,18 +287,18 @@ tmp<tensorField> deltaBoundary::cellCenters_d(const label pointI)
     const labelListList& pointCells(mesh_.pointCells());
     const labelList& pointCellsI(pointCells[pointI]);
     const pointField& points(mesh_.points());
-    tmp<tensorField> tC_d(new tensorField(pointCellsI.size(), tensor::zero));
-    tensorField& C_d(tC_d.ref());
+    auto tC_d = tmp<tensorField>::New(pointCellsI.size(), Zero);
+    auto& C_d = tC_d.ref();
 
     const labelList& pointFaces(mesh_.pointFaces()[pointI]);
-    tensorField Cf_d(pointFaces.size(), tensor::zero);
-    tensorField Sf_d(pointFaces.size(), tensor::zero);
+    tensorField Cf_d(pointFaces.size(), Zero);
+    tensorField Sf_d(pointFaces.size(), Zero);
 
     forAll(pointFaces, pfI)
     {
         const label pointFaceI = pointFaces[pfI];
         const face& faceI = mesh_.faces()[pointFaceI];
-        tensorField p_d(faceI.size(), tensor::zero);
+        tensorField p_d(faceI.size(), Zero);
         forAll(faceI, pI)
         {
             if (faceI[pI] == pointI)
@@ -321,10 +321,10 @@ tmp<tensorField> deltaBoundary::cellCenters_d(const label pointI)
     {
         const label pointCellI = pointCellsI[pcI];
         const cell& cellI(mesh_.cells()[pointCellI]);
-        vectorField fAreas(cellI.size(), vector::zero);
-        vectorField fCtrs(cellI.size(), vector::zero);
-        tensorField fAreas_d(cellI.size(), tensor::zero);
-        tensorField fCtrs_d(cellI.size(), tensor::zero);
+        vectorField fAreas(cellI.size(), Zero);
+        vectorField fCtrs(cellI.size(), Zero);
+        tensorField fAreas_d(cellI.size(), Zero);
+        tensorField fCtrs_d(cellI.size(), Zero);
         forAll(cellI, fI)
         {
             const label globalFaceI = cellI[fI];
diff --git a/src/optimisation/adjointOptimisation/adjoint/deltaBoundary/deltaBoundary.H b/src/optimisation/adjointOptimisation/adjoint/deltaBoundary/deltaBoundary.H
index a9be56754c..49bf63b6e3 100644
--- a/src/optimisation/adjointOptimisation/adjoint/deltaBoundary/deltaBoundary.H
+++ b/src/optimisation/adjointOptimisation/adjoint/deltaBoundary/deltaBoundary.H
@@ -70,10 +70,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         deltaBoundary(const deltaBoundary&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const deltaBoundary&) = delete;
 
         //- Compute tensor-vector products
diff --git a/src/optimisation/adjointOptimisation/adjoint/deltaBoundary/deltaBoundaryTemplates.C b/src/optimisation/adjointOptimisation/adjoint/deltaBoundary/deltaBoundaryTemplates.C
index 62d1926c2a..23fcbb7ef9 100644
--- a/src/optimisation/adjointOptimisation/adjoint/deltaBoundary/deltaBoundaryTemplates.C
+++ b/src/optimisation/adjointOptimisation/adjoint/deltaBoundary/deltaBoundaryTemplates.C
@@ -51,8 +51,8 @@ pT deltaBoundary::makeCellCentres_d
 
     // First estimate the approximate cell centre as the average of
     // face centres
-    vector cEst(vector::zero);
-    vector cellCtrs(vector::zero);
+    vector cEst(Zero);
+    vector cellCtrs(Zero);
     scalar cellVols(Zero);
     pT cEst_d(pTraits<pT>::zero);
     pT cellCtrs_d(pTraits<pT>::zero);
diff --git a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethod/displacementMethod.H b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethod/displacementMethod.H
index a6f8b6a133..0521fe4edc 100644
--- a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethod/displacementMethod.H
+++ b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethod/displacementMethod.H
@@ -77,10 +77,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         displacementMethod(const displacementMethod&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const displacementMethod&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethoddisplacementLaplacian/displacementMethoddisplacementLaplacian.H b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethoddisplacementLaplacian/displacementMethoddisplacementLaplacian.H
index 62efa5dd56..2a4c30245b 100644
--- a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethoddisplacementLaplacian/displacementMethoddisplacementLaplacian.H
+++ b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethoddisplacementLaplacian/displacementMethoddisplacementLaplacian.H
@@ -69,13 +69,13 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         displacementMethoddisplacementLaplacian
         (
             const displacementMethoddisplacementLaplacian&
         ) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const displacementMethoddisplacementLaplacian&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodelasticityMotionSolver/displacementMethodelasticityMotionSolver.H b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodelasticityMotionSolver/displacementMethodelasticityMotionSolver.H
index e2fb51d148..a412364160 100644
--- a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodelasticityMotionSolver/displacementMethodelasticityMotionSolver.H
+++ b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodelasticityMotionSolver/displacementMethodelasticityMotionSolver.H
@@ -70,13 +70,13 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         displacementMethodelasticityMotionSolver
         (
             const displacementMethodelasticityMotionSolver&
         ) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=
         (
             const displacementMethodelasticityMotionSolver&
diff --git a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodlaplacianMotionSolver/displacementMethodlaplacianMotionSolver.H b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodlaplacianMotionSolver/displacementMethodlaplacianMotionSolver.H
index 39e88bf1bf..294c0ddd22 100644
--- a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodlaplacianMotionSolver/displacementMethodlaplacianMotionSolver.H
+++ b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodlaplacianMotionSolver/displacementMethodlaplacianMotionSolver.H
@@ -70,13 +70,13 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         displacementMethodlaplacianMotionSolver
         (
             const displacementMethodlaplacianMotionSolver&
         ) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const displacementMethodlaplacianMotionSolver&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvelocityLaplacian/displacementMethodvelocityLaplacian.H b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvelocityLaplacian/displacementMethodvelocityLaplacian.H
index 3f1bb5be5c..1f109009e0 100644
--- a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvelocityLaplacian/displacementMethodvelocityLaplacian.H
+++ b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvelocityLaplacian/displacementMethodvelocityLaplacian.H
@@ -71,13 +71,13 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         displacementMethodvelocityLaplacian
         (
             const displacementMethodvelocityLaplacian&
         ) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const displacementMethodvelocityLaplacian&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvolumetricBSplinesMotionSolver/displacementMethodvolumetricBSplinesMotionSolver.H b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvolumetricBSplinesMotionSolver/displacementMethodvolumetricBSplinesMotionSolver.H
index 80ef311c71..e82a17dd0f 100644
--- a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvolumetricBSplinesMotionSolver/displacementMethodvolumetricBSplinesMotionSolver.H
+++ b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodvolumetricBSplinesMotionSolver/displacementMethodvolumetricBSplinesMotionSolver.H
@@ -61,13 +61,13 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         displacementMethodvolumetricBSplinesMotionSolver
         (
             const displacementMethodvolumetricBSplinesMotionSolver&
         ) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=
         (
             const displacementMethodvolumetricBSplinesMotionSolver&
diff --git a/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolver.C b/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolver.C
index 97c8653287..89f048fcc0 100644
--- a/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolver.C
+++ b/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolver.C
@@ -64,7 +64,7 @@ void Foam::elasticityMotionSolver::setBoundaryConditions()
             pointMotionU_.boundaryFieldRef()[patchI];
         if (isA<fixedValuePointPatchVectorField>(pointBCs))
         {
-            auto& fixedValueBCs = 
+            auto& fixedValueBCs =
                 refCast<fixedValuePointPatchVectorField>(pointBCs);
             fixedValueBCs == fixedValueBCs/scalar(nSteps_);
         }
@@ -132,12 +132,7 @@ Foam::elasticityMotionSolver::elasticityMotionSolver
             IOobject::AUTO_WRITE
         ),
         fvMesh_,
-        dimensionedVector
-        (
-            "cellMotionU",
-            pointMotionU_.dimensions(),
-            vector::zero
-        ),
+        dimensionedVector(pointMotionU_.dimensions(), Zero),
         pointMotionU_.boundaryField().types()
     ),
     interpolationPtr_
diff --git a/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolver.H b/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolver.H
index d1df514266..bd82107e46 100644
--- a/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolver.H
+++ b/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolver.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::elasticityMotionSolver
 
@@ -75,8 +74,8 @@ protected:
 
     // Protected data
 
-        //- Since the mesh deformation is broken down to multiple steps, 
-        //- mesh points need to be moved here. 
+        //- Since the mesh deformation is broken down to multiple steps,
+        //- mesh points need to be moved here.
         //- Hence, the non-const mesh reference
         fvMesh& fvMesh_;
         pointVectorField pointMotionU_;
@@ -155,8 +154,8 @@ public:
         //- Return point location. Mesh is actually moved in solve()
         virtual tmp<pointField> curPoints() const;
 
-        //- Solve for motion. 
-        //  Does the actual mesh displacement here, since it is broken down 
+        //- Solve for motion.
+        //  Does the actual mesh displacement here, since it is broken down
         //  into multiple steps
         virtual void solve();
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolverI.H b/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolverI.H
index 8742efe96d..8d825d5dbc 100644
--- a/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolverI.H
+++ b/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolverI.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 \*---------------------------------------------------------------------------*/
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -36,7 +35,7 @@ inline Foam::pointVectorField& Foam::elasticityMotionSolver::pointMotionU()
 }
 
 
-inline const Foam::pointVectorField& 
+inline const Foam::pointVectorField&
 Foam::elasticityMotionSolver::pointMotionU() const
 {
     return pointMotionU_;
@@ -49,7 +48,7 @@ inline Foam::volVectorField& Foam::elasticityMotionSolver::cellMotionU()
 }
 
 
-inline const Foam::volVectorField& 
+inline const Foam::volVectorField&
 Foam::elasticityMotionSolver::cellMotionU() const
 {
     return cellMotionU_;
diff --git a/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/laplacianMotionSolver/laplacianMotionSolver.C b/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/laplacianMotionSolver/laplacianMotionSolver.C
index 91cc51abe9..fa7039ff59 100644
--- a/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/laplacianMotionSolver/laplacianMotionSolver.C
+++ b/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/laplacianMotionSolver/laplacianMotionSolver.C
@@ -105,12 +105,7 @@ Foam::laplacianMotionSolver::laplacianMotionSolver
             IOobject::AUTO_WRITE
         ),
         fvMesh_,
-        dimensionedVector
-        (
-            "cellMotionU",
-            pointMotionU_.dimensions(),
-            vector::zero
-        ),
+        dimensionedVector(pointMotionU_.dimensions(), Zero),
         pointMotionU_.boundaryField().types()
     ),
     interpolationPtr_
diff --git a/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/laplacianMotionSolver/laplacianMotionSolver.H b/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/laplacianMotionSolver/laplacianMotionSolver.H
index dd5d44fcd4..8c80f6a13e 100644
--- a/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/laplacianMotionSolver/laplacianMotionSolver.H
+++ b/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/laplacianMotionSolver/laplacianMotionSolver.H
@@ -102,10 +102,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         laplacianMotionSolver(const laplacianMotionSolver&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const laplacianMotionSolver&) = delete;
 
 public:
diff --git a/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/laplacianMotionSolver/laplacianMotionSolverI.H b/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/laplacianMotionSolver/laplacianMotionSolverI.H
index d912b062e0..5a0672d7f8 100644
--- a/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/laplacianMotionSolver/laplacianMotionSolverI.H
+++ b/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/laplacianMotionSolver/laplacianMotionSolverI.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 \*---------------------------------------------------------------------------*/
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -36,7 +35,7 @@ inline Foam::pointVectorField& Foam::laplacianMotionSolver::pointMotionU()
 }
 
 
-inline const Foam::pointVectorField& 
+inline const Foam::pointVectorField&
 Foam::laplacianMotionSolver::pointMotionU() const
 {
     return pointMotionU_;
@@ -49,7 +48,7 @@ inline Foam::volVectorField& Foam::laplacianMotionSolver::cellMotionU()
 }
 
 
-inline const Foam::volVectorField& 
+inline const Foam::volVectorField&
 Foam::laplacianMotionSolver::cellMotionU() const
 {
     return cellMotionU_;
diff --git a/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/volumetricBSplinesMotionSolver/volumetricBSplinesMotionSolver.C b/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/volumetricBSplinesMotionSolver/volumetricBSplinesMotionSolver.C
index 8b47730fc7..989e00bbd9 100644
--- a/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/volumetricBSplinesMotionSolver/volumetricBSplinesMotionSolver.C
+++ b/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/volumetricBSplinesMotionSolver/volumetricBSplinesMotionSolver.C
@@ -64,7 +64,7 @@ Foam::volumetricBSplinesMotionSolver::volumetricBSplinesMotionSolver
     controlPointsMovement_
     (
         volBSplinesBase_.getTotalControlPointsNumber(),
-        vector::zero
+        Zero
     )
 {}
 
@@ -82,7 +82,7 @@ Foam::volumetricBSplinesMotionSolver::curPoints() const
     forAll(boxes, iNURB)
     {
         const label nb = boxes[iNURB].getControlPoints().size();
-        vectorField localControlPointsMovement(nb, vector::zero);
+        vectorField localControlPointsMovement(nb, Zero);
 
         forAll(localControlPointsMovement, iCP)
         {
diff --git a/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/volumetricBSplinesMotionSolver/volumetricBSplinesMotionSolver.H b/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/volumetricBSplinesMotionSolver/volumetricBSplinesMotionSolver.H
index 8ef48a8d72..32ed7f2f3e 100644
--- a/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/volumetricBSplinesMotionSolver/volumetricBSplinesMotionSolver.H
+++ b/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/volumetricBSplinesMotionSolver/volumetricBSplinesMotionSolver.H
@@ -82,13 +82,13 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         volumetricBSplinesMotionSolver
         (
             const volumetricBSplinesMotionSolver&
         ) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const volumetricBSplinesMotionSolver&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/finiteVolume/interpolation/surfaceInterpolation/schemes/limitedSchemes/linearUpwindNormal/linearUpwindNormal.C b/src/optimisation/adjointOptimisation/adjoint/finiteVolume/interpolation/surfaceInterpolation/schemes/limitedSchemes/linearUpwindNormal/linearUpwindNormal.C
index addcef91ee..ddfedb03f4 100644
--- a/src/optimisation/adjointOptimisation/adjoint/finiteVolume/interpolation/surfaceInterpolation/schemes/limitedSchemes/linearUpwindNormal/linearUpwindNormal.C
+++ b/src/optimisation/adjointOptimisation/adjoint/finiteVolume/interpolation/surfaceInterpolation/schemes/limitedSchemes/linearUpwindNormal/linearUpwindNormal.C
@@ -55,7 +55,7 @@ Foam::linearUpwindNormal<Type>::correction
                 false
             ),
             mesh,
-            dimensioned<Type>(vf.name(), vf.dimensions(), pTraits<Type>::zero)
+            dimensioned<Type>(vf.dimensions(), Zero)
         )
     );
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/finiteVolume/interpolation/surfaceInterpolation/schemes/limitedSchemes/linearUpwindNormal/linearUpwindNormal.H b/src/optimisation/adjointOptimisation/adjoint/finiteVolume/interpolation/surfaceInterpolation/schemes/limitedSchemes/linearUpwindNormal/linearUpwindNormal.H
index d78dc62669..93f48dd598 100644
--- a/src/optimisation/adjointOptimisation/adjoint/finiteVolume/interpolation/surfaceInterpolation/schemes/limitedSchemes/linearUpwindNormal/linearUpwindNormal.H
+++ b/src/optimisation/adjointOptimisation/adjoint/finiteVolume/interpolation/surfaceInterpolation/schemes/limitedSchemes/linearUpwindNormal/linearUpwindNormal.H
@@ -67,10 +67,10 @@ class linearUpwindNormal
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         linearUpwindNormal(const linearUpwindNormal&);
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const linearUpwindNormal&);
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/fvOptionsAdjoint/fvOptions/fvIOoptionListAdjoint.H b/src/optimisation/adjointOptimisation/adjoint/fvOptionsAdjoint/fvOptions/fvIOoptionListAdjoint.H
index e40069ef8c..0866976dd8 100644
--- a/src/optimisation/adjointOptimisation/adjoint/fvOptionsAdjoint/fvOptions/fvIOoptionListAdjoint.H
+++ b/src/optimisation/adjointOptimisation/adjoint/fvOptionsAdjoint/fvOptions/fvIOoptionListAdjoint.H
@@ -68,10 +68,10 @@ private:
         //- Create IO object if dictionary is present
         IOobject createIOobject(const fvMesh& mesh) const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         IOoptionListAdjoint(const IOoptionListAdjoint&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const IOoptionListAdjoint&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/fvOptionsAdjoint/fvOptions/fvOptionAdjointList.H b/src/optimisation/adjointOptimisation/adjoint/fvOptionsAdjoint/fvOptions/fvOptionAdjointList.H
index 6a691fe646..f9cf7ac895 100644
--- a/src/optimisation/adjointOptimisation/adjoint/fvOptionsAdjoint/fvOptions/fvOptionAdjointList.H
+++ b/src/optimisation/adjointOptimisation/adjoint/fvOptionsAdjoint/fvOptions/fvOptionAdjointList.H
@@ -65,10 +65,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         optionAdjointList(const optionAdjointList&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const optionAdjointList&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.C b/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.C
index 7942cc4849..89c6ef89be 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.C
+++ b/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.C
@@ -190,7 +190,7 @@ void objectiveManager::updateOrNullify()
 
 void objectiveManager::incrementIntegrationTimes(const scalar timeSpan)
 {
-    // Update start and end integration times by adding the timeSpan 
+    // Update start and end integration times by adding the timeSpan
     // of the optimisation cycle
     for (objective& obj : objectives_)
     {
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.H b/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.H
index 97b7b914bc..6c1c6f603d 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.H
+++ b/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::objectiveManager
 
@@ -72,10 +71,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         objectiveManager(const objectiveManager&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const objectiveManager&) = delete;
 
 
@@ -139,7 +138,7 @@ public:
         //- Update contributions to adjoint if true, otherwise return nulls
         void updateOrNullify();
 
-        //- Increment integration times by the optimisation cycle time-span 
+        //- Increment integration times by the optimisation cycle time-span
         void incrementIntegrationTimes(const scalar timeSpan);
 
         //- Print to screen
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManagerIncompressible/objectiveManagerIncompressible.H b/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManagerIncompressible/objectiveManagerIncompressible.H
index a06c1092cf..ff13355b09 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManagerIncompressible/objectiveManagerIncompressible.H
+++ b/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManagerIncompressible/objectiveManagerIncompressible.H
@@ -61,13 +61,13 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         objectiveManagerIncompressible
         (
             const objectiveManagerIncompressible&
         ) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const objectiveManagerIncompressible&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveForceTarget/objectiveForceTarget.C b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveForceTarget/objectiveForceTarget.C
index 58cdf59022..19195b77b0 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveForceTarget/objectiveForceTarget.C
+++ b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveForceTarget/objectiveForceTarget.C
@@ -91,7 +91,7 @@ void objectiveForceTarget::write() const
                 << setw(width) << "J" << " "
                 << setw(width) << "Force" << " "
                 << setw(width) << "Target" << endl;
-        };
+        }
 
         objFunctionFilePtr_()
             << setw(3) << mesh_.time().value() << " "
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveIncompressible/objectiveIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveIncompressible/objectiveIncompressible.C
index 9375b36bc1..ac7fa6fb1f 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveIncompressible/objectiveIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveIncompressible/objectiveIncompressible.C
@@ -439,7 +439,7 @@ void objectiveIncompressible::nullify()
         }
         if (hasdJdTMVar1())
         {
-            dJdTMvar1Ptr_() == 
+            dJdTMvar1Ptr_() ==
                 dimensionedScalar(dJdTMvar1Ptr_().dimensions(), Zero);
         }
         if (hasdJdTMVar2())
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveIncompressible/objectiveIncompressible.H b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveIncompressible/objectiveIncompressible.H
index d2a5fdac2c..1bf89badd9 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveIncompressible/objectiveIncompressible.H
+++ b/src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectiveIncompressible/objectiveIncompressible.H
@@ -102,10 +102,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         objectiveIncompressible(const objectiveIncompressible&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const objectiveIncompressible&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objective.C b/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objective.C
index 48913a71c5..669999ec4a 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objective.C
+++ b/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objective.C
@@ -142,7 +142,7 @@ objective::objective
     meanValueFilePtr_(nullptr)
 {
     makeFolder();
-    // Read integration start and end times, if present. 
+    // Read integration start and end times, if present.
     // For unsteady runs only
     if (dict.found("integrationStartTime"))
     {
@@ -225,9 +225,9 @@ bool objective::readDict(const dictionary& dict)
 scalar objective::JCycle() const
 {
     scalar J(J_);
-    if 
+    if
     (
-        computeMeanFields_ 
+        computeMeanFields_
      || (hasIntegrationStartTime() && hasIntegrationEndTime())
     )
     {
@@ -293,9 +293,9 @@ bool objective::isWithinIntegrationTime() const
     if (hasIntegrationStartTime() && hasIntegrationEndTime())
     {
         const scalar time = mesh_.time().value();
-        return 
+        return
             (
-                time >= integrationStartTimePtr_() 
+                time >= integrationStartTimePtr_()
              && time <= integrationEndTimePtr_()
             );
     }
@@ -313,8 +313,8 @@ void objective::incrementIntegrationTimes(const scalar timeSpan)
 {
     if (hasIntegrationStartTime() && hasIntegrationEndTime())
     {
-        integrationStartTimePtr_() += timeSpan; 
-        integrationEndTimePtr_() += timeSpan; 
+        integrationStartTimePtr_() += timeSpan;
+        integrationEndTimePtr_() += timeSpan;
     }
     else
     {
@@ -576,12 +576,12 @@ void objective::nullify()
         }
         if (hasDivDxDbMult())
         {
-            divDxDbMultPtr_() == 
+            divDxDbMultPtr_() ==
                 dimensionedScalar(divDxDbMultPtr_().dimensions(), Zero);
         }
         if (hasGradDxDbMult())
         {
-            gradDxDbMultPtr_() == 
+            gradDxDbMultPtr_() ==
                 dimensionedTensor(gradDxDbMultPtr_().dimensions(), Zero);
         }
 
@@ -630,9 +630,9 @@ void objective::writeMeanValue() const
     {
         // Write mean value if necessary
         // Covers both steady and unsteady runs
-        if 
+        if
         (
-            computeMeanFields_ 
+            computeMeanFields_
          || (hasIntegrationStartTime() && hasIntegrationEndTime())
         )
         {
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objective.H b/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objective.H
index f805f1f4df..2293da74de 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objective.H
+++ b/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objective.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::objective
 
@@ -158,10 +157,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         objective(const objective&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const objective&) = delete;
 
         //- Make objective Function Folder
@@ -227,7 +226,7 @@ public:
         //- Return the instantaneous objective function value
         virtual scalar J() = 0;
 
-        //- Return the mean objective function value, if it exists, 
+        //- Return the mean objective function value, if it exists,
         //- otherwise the mean one
         scalar JCycle() const;
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/FIBase/FIBaseIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/FIBase/FIBaseIncompressible.C
index 08f2fe8522..9cab363ca0 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/FIBase/FIBaseIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/FIBase/FIBaseIncompressible.C
@@ -108,7 +108,7 @@ FIBase::FIBase
         dimensionedTensor(sqr(dimLength)/pow3(dimTime), Zero)
     ),
     divDxDbMult_(mesh_.nCells(), Zero),
-    optionsDxDbMult_(mesh_.nCells(), vector::zero),
+    optionsDxDbMult_(mesh_.nCells(), Zero),
     dSfdbMult_(createZeroBoundaryPtr<vector>(mesh_)),
     dnfdbMult_(createZeroBoundaryPtr<vector>(mesh_)),
     dxdbDirectMult_(createZeroBoundaryPtr<vector>(mesh_)),
@@ -117,7 +117,7 @@ FIBase::FIBase
     eikonalSolver_(nullptr)
 {
     read();
-};
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -147,7 +147,7 @@ void FIBase::accumulateIntegrand(const scalar dt)
     PtrList<objective>& functions(objectiveManager_.getObjectiveFunctions());
     for (objective& func : functions)
     {
-        divDxDbMult_ += 
+        divDxDbMult_ +=
             func.weight()*func.divDxDbMultiplier().primitiveField()*dt;
     }
 
@@ -173,7 +173,7 @@ void FIBase::accumulateIntegrand(const scalar dt)
             const scalar wei = func.weight();
             dSfdbMult_()[patchI] += wei*func.dSdbMultiplier(patchI)*dt;
             dnfdbMult_()[patchI] += wei*func.dndbMultiplier(patchI)*magSfDt;
-            dxdbDirectMult_()[patchI] += 
+            dxdbDirectMult_()[patchI] +=
                 wei*func.dxdbDirectMultiplier(patchI)*magSfDt;
         }
     }
@@ -193,7 +193,7 @@ void FIBase::clearSensitivities()
     {
         eikonalSolver_->reset();
     }
-    
+
     adjointSensitivity::clearSensitivities();
     shapeSensitivitiesBase::clear();
 }
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/FIBase/FIBaseIncompressible.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/FIBase/FIBaseIncompressible.H
index be7bdcc0a3..e7f1120cae 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/FIBase/FIBaseIncompressible.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/FIBase/FIBaseIncompressible.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::incompressible::FIBase
 
@@ -66,13 +65,13 @@ protected:
     // Protected data
 
         //- grad(dx/db) multiplier
-        volTensorField gradDxDbMult_; 
+        volTensorField gradDxDbMult_;
 
         //- div(dx/db) multiplier
-        scalarField divDxDbMult_; 
+        scalarField divDxDbMult_;
 
         //- dx/db multiplier coming from fvOptions
-        vectorField optionsDxDbMult_; 
+        vectorField optionsDxDbMult_;
 
         //- Fields related to direct sensitivities
         autoPtr<boundaryVectorField> dSfdbMult_;
@@ -96,10 +95,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         FIBase(const FIBase&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const FIBase&) = delete;
 
 
@@ -131,11 +130,11 @@ public:
 
         //- Read dict if changed
         virtual bool readDict(const dictionary& dict);
- 
+
         //- Accumulate sensitivity integrands
         virtual void accumulateIntegrand(const scalar dt);
 
-        //- Assemble sensitivities 
+        //- Assemble sensitivities
         virtual void assembleSensitivities() = 0;
 
         //- Zero sensitivity fields and their constituents
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/SIBase/SIBaseIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/SIBase/SIBaseIncompressible.C
index 4dac99d2ee..3b65ddf04c 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/SIBase/SIBaseIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/SIBase/SIBaseIncompressible.C
@@ -51,8 +51,8 @@ void SIBase::read()
     includeObjective_ =
         dict().lookupOrDefault<bool>("includeObjectiveContribution", true);
 
-    // If includeObjective is set to true both here and in the surface 
-    // sensitivities, set the one in the latter to false to avoid double 
+    // If includeObjective is set to true both here and in the surface
+    // sensitivities, set the one in the latter to false to avoid double
     // contributions
     bool surfSensIncludeObjective(surfaceSensitivity_.getIncludeObjective());
     if (includeObjective_ && surfSensIncludeObjective)
@@ -96,9 +96,9 @@ SIBase::SIBase
     surfaceSensitivity_
     (
         mesh,
-        // Ideally, subOrEmptyDict would be used. 
+        // Ideally, subOrEmptyDict would be used.
         // Since we need a recursive search in shapeSensitivitiesBase though
-        // and the dict returned by subOrEmptyDict (if found) 
+        // and the dict returned by subOrEmptyDict (if found)
         // does not know its parent, optionalSubDict is used
         dict.optionalSubDict("surfaceSensitivities"),
         primalVars,
@@ -112,7 +112,7 @@ SIBase::SIBase
     includeObjective_(true)
 {
     read();
-};
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -153,7 +153,7 @@ void SIBase::accumulateIntegrand(const scalar dt)
                 const scalar wei = func.weight();
                 dSfdbMult_()[patchI] += wei*func.dSdbMultiplier(patchI)*dt;
                 dnfdbMult_()[patchI] += wei*func.dndbMultiplier(patchI)*magSfDt;
-                dxdbDirectMult_()[patchI] += 
+                dxdbDirectMult_()[patchI] +=
                     wei*func.dxdbDirectMultiplier(patchI)*magSfDt;
             }
         }
@@ -167,7 +167,7 @@ void SIBase::clearSensitivities()
     dSfdbMult_() = vector::zero;
     dnfdbMult_() = vector::zero;
     dxdbDirectMult_() = vector::zero;
-    
+
     adjointSensitivity::clearSensitivities();
     shapeSensitivitiesBase::clear();
 }
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/SIBase/SIBaseIncompressible.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/SIBase/SIBaseIncompressible.H
index f666977f12..c4a91aabdc 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/SIBase/SIBaseIncompressible.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/SIBase/SIBaseIncompressible.H
@@ -77,7 +77,7 @@ protected:
 
 
     // Protected Member Fuctions
-        
+
         //- Read options from dict
         void read();
 
@@ -86,10 +86,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         SIBase(const SIBase&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const SIBase&) = delete;
 
 
@@ -121,11 +121,11 @@ public:
 
         //- Read dict if changed
         virtual bool readDict(const dictionary& dict);
- 
+
         //- Accumulate sensitivity integrands
         virtual void accumulateIntegrand(const scalar dt);
 
-        //- Assemble sensitivities 
+        //- Assemble sensitivities
         virtual void assembleSensitivities() = 0;
 
         //- Zero sensitivity fields and their constituents
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointEikonalSolver/adjointEikonalSolverIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointEikonalSolver/adjointEikonalSolverIncompressible.C
index f068098b23..b1ccc4875b 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointEikonalSolver/adjointEikonalSolverIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointEikonalSolver/adjointEikonalSolverIncompressible.C
@@ -157,7 +157,7 @@ adjointEikonalSolver::adjointEikonalSolver
     distanceSensPtr_(createZeroBoundaryPtr<vector>(mesh_))
 {
     read();
-};
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointMeshMovementSolver/adjointMeshMovementSolverIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointMeshMovementSolver/adjointMeshMovementSolverIncompressible.C
index ad7dc9ffc7..06e60201a8 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointMeshMovementSolver/adjointMeshMovementSolverIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointMeshMovementSolver/adjointMeshMovementSolverIncompressible.C
@@ -94,7 +94,7 @@ adjointMeshMovementSolver::adjointMeshMovementSolver
     adjointEikonalSolverPtr_(adjointEikonalSolverPtr)
 {
     read();
-};
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointMeshMovementSolver/adjointMeshMovementSolverIncompressible.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointMeshMovementSolver/adjointMeshMovementSolverIncompressible.H
index 3d6ea16979..814777256a 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointMeshMovementSolver/adjointMeshMovementSolverIncompressible.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointMeshMovementSolver/adjointMeshMovementSolverIncompressible.H
@@ -93,10 +93,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         adjointMeshMovementSolver(const adjointMeshMovementSolver&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const adjointMeshMovementSolver&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointSensitivity/adjointSensitivityIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointSensitivity/adjointSensitivityIncompressible.C
index 2a4c87058c..b904c4032e 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointSensitivity/adjointSensitivityIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointSensitivity/adjointSensitivityIncompressible.C
@@ -126,7 +126,7 @@ void adjointSensitivity::clearSensitivities()
     derivatives_ = scalar(0);
     if (fieldSensPtr_.valid())
     {
-        fieldSensPtr_().primitiveFieldRef() = scalar(0); 
+        fieldSensPtr_().primitiveFieldRef() = scalar(0);
     }
 }
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointSensitivity/adjointSensitivityIncompressible.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointSensitivity/adjointSensitivityIncompressible.H
index e042b8030e..71b0f3b1bd 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointSensitivity/adjointSensitivityIncompressible.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointSensitivity/adjointSensitivityIncompressible.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::incompressible::adjointSensitivity
 
@@ -94,10 +93,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         adjointSensitivity(const adjointSensitivity&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const adjointSensitivity&) = delete;
 
 
@@ -170,7 +169,7 @@ public:
        //  Corresponds to the flow and adjoint part of the sensitivities
        virtual void accumulateIntegrand(const scalar dt) = 0;
 
-       //- Assemble sensitivities 
+       //- Assemble sensitivities
        //  Adds the geometric part of the sensitivities
        virtual void assembleSensitivities() = 0;
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezier/sensitivityBezierIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezier/sensitivityBezierIncompressible.C
index 73303a18a2..4e1b1cfd50 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezier/sensitivityBezierIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezier/sensitivityBezierIncompressible.C
@@ -72,17 +72,17 @@ sensitivityBezier::sensitivityBezier
     ),
     //Bezier_(mesh, dict), // AJH Read locally?
     Bezier_(mesh, mesh.lookupObject<IOdictionary>("optimisationDict")),
-    sens_(Bezier_.nBezier(), vector::zero),
-    flowSens_(Bezier_.nBezier(), vector::zero),
-    dSdbSens_(Bezier_.nBezier(), vector::zero),
-    dndbSens_(Bezier_.nBezier(), vector::zero),
-    dxdbDirectSens_(Bezier_.nBezier(), vector::zero),
+    sens_(Bezier_.nBezier(), Zero),
+    flowSens_(Bezier_.nBezier(), Zero),
+    dSdbSens_(Bezier_.nBezier(), Zero),
+    dndbSens_(Bezier_.nBezier(), Zero),
+    dxdbDirectSens_(Bezier_.nBezier(), Zero),
     derivativesFolder_("optimisation"/type() + "Derivatives")
 {
     derivatives_ = scalarField(3*Bezier_.nBezier(), Zero);
     // Create folder to store sensitivities
     mkDir(derivativesFolder_);
-};
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -90,7 +90,7 @@ sensitivityBezier::sensitivityBezier
 void sensitivityBezier::assembleSensitivities()
 {
     // Assemble the sensitivity map
-    // Solves for the post-processing equations and adds their contribution to 
+    // Solves for the post-processing equations and adds their contribution to
     // the sensitivity map
     surfaceSensitivity_.assembleSensitivities();
 
@@ -182,12 +182,12 @@ void sensitivityBezier::assembleSensitivities()
 
 void sensitivityBezier::clearSensitivities()
 {
-    sens_ = vector::zero;
-    flowSens_ = vector::zero;
-    dSdbSens_ = vector::zero;
-    dndbSens_ = vector::zero;
-    dxdbDirectSens_ = vector::zero;
-    
+    sens_ = Zero;
+    flowSens_ = Zero;
+    dSdbSens_ = Zero;
+    dndbSens_ = Zero;
+    dxdbDirectSens_ = Zero;
+
     SIBase::clearSensitivities();
 }
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezier/sensitivityBezierIncompressible.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezier/sensitivityBezierIncompressible.H
index 21ec6bef49..cd450e0e11 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezier/sensitivityBezierIncompressible.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezier/sensitivityBezierIncompressible.H
@@ -86,10 +86,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         sensitivityBezier(const sensitivityBezier&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const sensitivityBezier&) = delete;
 
 
@@ -118,8 +118,8 @@ public:
 
 
     // Member Functions
-        
-        //- Assemble sensitivities 
+
+        //- Assemble sensitivities
         virtual void assembleSensitivities();
 
         //- Zero sensitivity fields and their constituents
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezierFI/sensitivityBezierFIIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezierFI/sensitivityBezierFIIncompressible.C
index d4fc89a627..c25f94ebfa 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezierFI/sensitivityBezierFIIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezierFI/sensitivityBezierFIIncompressible.C
@@ -57,7 +57,7 @@ void sensitivityBezierFI::read()
     meshMovementIters_ = dxdbDict.lookupOrDefault<label>("iters", 1000);
     meshMovementResidualLimit_ =
         dxdbDict.lookupOrDefault<scalar>("tolerance", 1.e-07);
-    
+
     // Read variables related to the adjoint eikonal solver
     FIBase::read();
 }
@@ -166,7 +166,7 @@ sensitivityBezierFI::sensitivityBezierFI
     derivatives_ = scalarField(3*Bezier_.nBezier(), Zero),
     // Create folder to store sensitivities
     mkDir(derivativesFolder_);
-};
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -247,7 +247,7 @@ void sensitivityBezierFI::assembleSensitivities()
                 tmp<vectorField> tdxdbFace =
                     Bezier_.dxdbFace(patchI, iCP, idir);
                 const vectorField& dxdbFace = tdxdbFace();
-                dxdbDirectSens_[iDV] += 
+                dxdbDirectSens_[iDV] +=
                     gSum(dxdbDirectMult_()[patchI] & dxdbFace);
             }
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezierFI/sensitivityBezierFIIncompressible.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezierFI/sensitivityBezierFIIncompressible.H
index 007e3ef12a..382316b432 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezierFI/sensitivityBezierFIIncompressible.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezierFI/sensitivityBezierFIIncompressible.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::incompressible::sensitivityBezierFI
 
@@ -104,7 +103,7 @@ protected:
 
         tmp<volVectorField> solveMeshMovementEqn
         (
-            const label iCP, 
+            const label iCP,
             const label idir
         );
 
@@ -113,10 +112,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         sensitivityBezierFI(const sensitivityBezierFI&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const sensitivityBezierFI&) = delete;
 
 
@@ -146,7 +145,7 @@ public:
 
     // Member Functions
 
-        //- Assemble sensitivities 
+        //- Assemble sensitivities
         virtual void assembleSensitivities();
 
         //- Zero sensitivity fields and their constituents
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityMultiple/sensitivityMultipleIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityMultiple/sensitivityMultipleIncompressible.C
index 81bbb66a1f..4a583747bd 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityMultiple/sensitivityMultipleIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityMultiple/sensitivityMultipleIncompressible.C
@@ -88,7 +88,7 @@ sensitivityMultiple::sensitivityMultiple
             )
         );
     }
-};
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityMultiple/sensitivityMultipleIncompressible.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityMultiple/sensitivityMultipleIncompressible.H
index efa3c24774..a43e2ffb39 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityMultiple/sensitivityMultipleIncompressible.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityMultiple/sensitivityMultipleIncompressible.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::incompressible::sensitivityMultiple
 
@@ -71,10 +70,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         sensitivityMultiple(const sensitivityMultiple&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const sensitivityMultiple&) = delete;
 
 
@@ -110,7 +109,7 @@ public:
        //- Accumulate sensitivity integrands
        virtual void accumulateIntegrand(const scalar dt);
 
-       //- Assemble sensitivities 
+       //- Assemble sensitivities
        virtual void assembleSensitivities();
 
        //- Calculates sensitivities at wall surface points
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C
index 142f22dd68..9e384a5028 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C
@@ -80,8 +80,8 @@ void sensitivitySurface::addGeometricSens()
             vectorField& patchdSdb = pointSensdSdb()[patchI];
             vectorField& patchdndb = pointSensdndb()[patchI];
 
-            vectorField dSdbMultiplierTot(patch.size(), vector::zero);
-            vectorField dndbMultiplierTot(patch.size(), vector::zero);
+            vectorField dSdbMultiplierTot(patch.size(), Zero);
+            vectorField dndbMultiplierTot(patch.size(), Zero);
             forAll(functions, funcI)
             {
                 dSdbMultiplierTot +=
@@ -116,7 +116,7 @@ void sensitivitySurface::addGeometricSens()
                     const face& faceI = faces[globalFaceIndex];
                     // Point coordinates. All indices in global numbering
                     pointField p(faceI.points(mesh_.points()));
-                    tensorField p_d(faceI.size(), tensor::zero);
+                    tensorField p_d(faceI.size(), Zero);
                     forAll(faceI, facePointI)
                     {
                         if (faceI[facePointI] == meshPoints[ppI])
@@ -141,8 +141,8 @@ void sensitivitySurface::addGeometricSens()
         }
         // Do parallel communications to avoid wrong values at processor
         // boundaries
-        vectorField dSdbGlobal(mesh_.nPoints(), vector::zero);
-        vectorField dndbGlobal(mesh_.nPoints(), vector::zero);
+        vectorField dSdbGlobal(mesh_.nPoints(), Zero);
+        vectorField dndbGlobal(mesh_.nPoints(), Zero);
         for (const label patchI : sensitivityPatchIDs_)
         {
             const labelList& meshPoints =
@@ -310,7 +310,7 @@ sensitivitySurface::sensitivitySurface
 
     // Allocate appropriate space for the sensitivity field
     computeDerivativesSize();
-};
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -544,7 +544,7 @@ void sensitivitySurface::accumulateIntegrand(const scalar dt)
               * nf;
         }
 
-        vectorField gradStressTerm(patch.size(), vector::zero);
+        vectorField gradStressTerm(patch.size(), Zero);
         if (includeGradStressTerm_)
         {
             // Terms corresponding to contributions from converting delta to
@@ -563,7 +563,7 @@ void sensitivitySurface::accumulateIntegrand(const scalar dt)
         }
 
         // Adjoint pressure terms
-        vectorField pressureTerm(patch.size(), vector::zero);
+        vectorField pressureTerm(patch.size(), Zero);
         if (includePressureTerm_)
         {
             pressureTerm =
@@ -577,7 +577,7 @@ void sensitivitySurface::accumulateIntegrand(const scalar dt)
             (objectiveManager_.getObjectiveFunctions());
 
         // Term from objectives including x directly (e.g. moments)
-        vectorField dxdbMultiplierTot(pressureTerm.size(), vector::zero);
+        vectorField dxdbMultiplierTot(pressureTerm.size(), Zero);
         if (includeObjective_)
         {
             forAll(functions, funcI)
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.H
index a3d49e7465..59cc575291 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::incompressible::sensitivitySurface
 
@@ -119,10 +118,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         sensitivitySurface(const sensitivitySurface&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const sensitivitySurface&) = delete;
 
 
@@ -164,7 +163,7 @@ public:
        //- Accumulate sensitivity integrands
        virtual void accumulateIntegrand(const scalar dt);
 
-       //- Assemble sensitivities 
+       //- Assemble sensitivities
        virtual void assembleSensitivities();
 
        //- Zero sensitivity fields and their constituents
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressibleI.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressibleI.H
index 72160a914e..c6274f3b44 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressibleI.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressibleI.H
@@ -2,11 +2,12 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
+    \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-                            | Copyright (C) 2007-2019 PCOpt/NTUA
-                            | Copyright (C) 2013-2019 FOSS GP
+    Copyright (C) 2013-2019 FOSS GP
+    Copyright (C) 2007-2019 PCOpt/NTUA
+    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 \*---------------------------------------------------------------------------*/
 
 namespace Foam
@@ -69,3 +69,5 @@ inline void sensitivitySurface::setIncludeSurfaceArea
 
 } // End namespace incompressible
 } // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurfacePoints/sensitivitySurfacePointsIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurfacePoints/sensitivitySurfacePointsIncompressible.C
index fc1e39b4ec..92d1a1a040 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurfacePoints/sensitivitySurfacePointsIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurfacePoints/sensitivitySurfacePointsIncompressible.C
@@ -110,7 +110,7 @@ void sensitivitySurfacePoints::read()
 void sensitivitySurfacePoints::finaliseFaceMultiplier()
 {
     // Solve extra equations if necessary
-    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
+    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     autoPtr<boundaryVectorField> distanceSensPtr(nullptr);
     if (includeDistance_)
     {
@@ -157,7 +157,7 @@ void sensitivitySurfacePoints::finaliseFaceMultiplier()
         }
 
         // Add local face area
-        //~~~~~~~~~~~~~~~~~~~~ 
+        //~~~~~~~~~~~~~~~~~~~~
         // Sensitivities DO include locale surface area, to get
         // the correct weighting from the contributions of various faces.
         // Normalized at the end.
@@ -216,7 +216,7 @@ void sensitivitySurfacePoints::finalisePointSensitivities()
 
                 // Point coordinates. All indices in global numbering
                 pointField p(faceI.points(mesh_.points()));
-                tensorField p_d(faceI.size(), tensor::zero);
+                tensorField p_d(faceI.size(), Zero);
                 forAll(faceI, facePointI)
                 {
                     if (faceI[facePointI] == meshPoints[ppI])
@@ -378,7 +378,7 @@ sensitivitySurfacePoints::sensitivitySurfacePoints
 
     // Derivatives for all (x,y,z) components of the displacement are kept
     derivatives_ = scalarField(3*nTotalPoints, Zero);
-};
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -492,7 +492,7 @@ void sensitivitySurfacePoints::accumulateIntegrand(const scalar dt)
         << "    Calculating adjoint sensitivity. " << endl;
 
     // The face-based part of the sensitivities, i.e. terms that multiply
-    // dxFace/dxPoint. 
+    // dxFace/dxPoint.
     for (const label patchI : sensitivityPatchIDs_)
     {
         const fvPatch& patch = mesh_.boundary()[patchI];
@@ -517,7 +517,7 @@ void sensitivitySurfacePoints::accumulateIntegrand(const scalar dt)
           * nf
         );
 
-        vectorField gradStressTerm(patch.size(), vector::zero);
+        vectorField gradStressTerm(patch.size(), Zero);
         if (includeGradStressTerm_)
         {
             // Terms corresponding to contributions from converting delta to
@@ -561,7 +561,7 @@ void sensitivitySurfacePoints::accumulateIntegrand(const scalar dt)
         }
 
         // Adjoint pressure terms
-        vectorField pressureTerm(patch.size(), vector::zero);
+        vectorField pressureTerm(patch.size(), Zero);
         if (includePressureTerm_)
         {
             pressureTerm =
@@ -572,7 +572,7 @@ void sensitivitySurfacePoints::accumulateIntegrand(const scalar dt)
            *nf;
         }
 
-        vectorField dxdbMultiplierTot(patch.size(), vector::zero);
+        vectorField dxdbMultiplierTot(patch.size(), Zero);
         if (includeObjective_)
         {
             // Term from objectives multiplying dxdb
@@ -584,9 +584,9 @@ void sensitivitySurfacePoints::accumulateIntegrand(const scalar dt)
                     wei*functions[funcI].dxdbDirectMultiplier(patchI);
 
                 // Fill in multipliers of d(Sf)/db and d(nf)/db
-                dSfdbMult_()[patchI] += 
+                dSfdbMult_()[patchI] +=
                     wei*dt*functions[funcI].dSdbMultiplier(patchI);
-                dnfdbMult_()[patchI] += 
+                dnfdbMult_()[patchI] +=
                     wei*dt*functions[funcI].dndbMultiplier(patchI);
             }
         }
@@ -620,13 +620,13 @@ void sensitivitySurfacePoints::assembleSensitivities()
     // belonging to multiple patches or patch-processorPatch intersections.
     // Keeping a mesh-wide field to allow easy reduction using syncTools.
     // A bit expensive? Better way?
-    vectorField pointNormals(mesh_.nPoints(), vector::zero);
+    vectorField pointNormals(mesh_.nPoints(), Zero);
     scalarField pointMagSf(mesh_.nPoints(), Zero);
     constructGlobalPointNormalsAndAreas(pointNormals, pointMagSf);
 
     // Do parallel communications to avoid wrong values at processor boundaries
     // Global field for accumulation
-    vectorField pointSensGlobal(mesh_.nPoints(), vector::zero);
+    vectorField pointSensGlobal(mesh_.nPoints(), Zero);
     for (const label patchI : sensitivityPatchIDs_)
     {
         const labelList& meshPoints = mesh_.boundaryMesh()[patchI].meshPoints();
@@ -736,7 +736,7 @@ void sensitivitySurfacePoints::clearSensitivities()
         meshMovementSolver_->reset();
     }
 
-    // Reset local fields to zero 
+    // Reset local fields to zero
     wallFaceSens_() = vector::zero;
     dSfdbMult_() = vector::zero;
     dnfdbMult_() = vector::zero;
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurfacePoints/sensitivitySurfacePointsIncompressible.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurfacePoints/sensitivitySurfacePointsIncompressible.H
index 080b05dd5c..bf889a0f4d 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurfacePoints/sensitivitySurfacePointsIncompressible.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurfacePoints/sensitivitySurfacePointsIncompressible.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::incompressible::sensitivitySurfacePoints
 
@@ -97,7 +96,7 @@ protected:
         autoPtr<adjointMeshMovementSolver> meshMovementSolver_;
 
         //- The face-based part of the sensitivities
-        //  i.e. terms that multiply dxFace/dxPoint. 
+        //  i.e. terms that multiply dxFace/dxPoint.
         //  Sensitivities DO include locale surface area, to get
         //  the correct weighting from the contributions of various faces.
         //  Normalized at the end.
@@ -114,12 +113,12 @@ protected:
         void read();
 
         //- Add terms related to post-processing PDEs
-        //- (i.e. adjoint Eikonal, adjoint mesh movement) 
+        //- (i.e. adjoint Eikonal, adjoint mesh movement)
         //- and add local face area
         void finaliseFaceMultiplier();
 
-        //- Converts face sensitivities to point sensitivities and adds the 
-        //- ones directly computed in points (i.e. dSf/db and dnf/db). 
+        //- Converts face sensitivities to point sensitivities and adds the
+        //- ones directly computed in points (i.e. dSf/db and dnf/db).
         void finalisePointSensitivities();
 
         //- Construct globally correct point normals and point areas
@@ -137,10 +136,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         sensitivitySurfacePoints(const sensitivitySurfacePoints&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const sensitivitySurfacePoints&) = delete;
 
 
@@ -176,7 +175,7 @@ public:
        //- Accumulate sensitivity integrands
        virtual void accumulateIntegrand(const scalar dt);
 
-       //- Assemble sensitivities 
+       //- Assemble sensitivities
        virtual void assembleSensitivities();
 
        //- Zero sensitivity fields and their constituents
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityVolBSplines/sensitivityVolBSplinesIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityVolBSplines/sensitivityVolBSplinesIncompressible.C
index f257ea725b..13cd21c685 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityVolBSplines/sensitivityVolBSplinesIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityVolBSplines/sensitivityVolBSplinesIncompressible.C
@@ -62,8 +62,8 @@ void sensitivityVolBSplines::computeObjectiveContributions()
             label nb = boxes[iNURB].getControlPoints().size();
             for (label cpI = 0; cpI < nb; cpI++)
             {
-                vector dSdbSensCP(vector::zero);
-                vector dndbSensCP(vector::zero);
+                vector dSdbSensCP(Zero);
+                vector dndbSensCP(Zero);
                 for (const label patchI : sensitivityPatchIDs_)
                 {
                     tensorField dSdb
@@ -149,14 +149,14 @@ sensitivityVolBSplines::sensitivityVolBSplines
     // No boundary field pointers need to be allocated
     label nCPs = volBSplinesBase_.getTotalControlPointsNumber();
     derivatives_ = scalarField(3*nCPs, Zero);
-    flowSens_ = vectorField(nCPs, vector::zero);
-    dSdbSens_ = vectorField(nCPs, vector::zero);
-    dndbSens_ = vectorField(nCPs, vector::zero);
-    dxdbDirectSens_ = vectorField(nCPs, vector::zero);
+    flowSens_ = vectorField(nCPs, Zero);
+    dSdbSens_ = vectorField(nCPs, Zero);
+    dndbSens_ = vectorField(nCPs, Zero);
+    dxdbDirectSens_ = vectorField(nCPs, Zero);
 
     // Create folder to store sensitivities
     mkDir(derivativesFolder_);
-};
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -164,7 +164,7 @@ sensitivityVolBSplines::sensitivityVolBSplines
 void sensitivityVolBSplines::assembleSensitivities()
 {
     // Assemble the sensitivity map
-    // Solves for the post-processing equations and adds their contribution to 
+    // Solves for the post-processing equations and adds their contribution to
     // the sensitivity map
     surfaceSensitivity_.assembleSensitivities();
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityVolBSplines/sensitivityVolBSplinesIncompressible.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityVolBSplines/sensitivityVolBSplinesIncompressible.H
index f1548b04a9..c55abad36a 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityVolBSplines/sensitivityVolBSplinesIncompressible.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityVolBSplines/sensitivityVolBSplinesIncompressible.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::incompressible::sensitivityVolBSplines
 
@@ -92,10 +91,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         sensitivityVolBSplines(const sensitivityVolBSplines&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const sensitivityVolBSplines&) = delete;
 
 
@@ -125,7 +124,7 @@ public:
 
     // Member Functions
 
-        //- Assemble sensitivities 
+        //- Assemble sensitivities
         virtual void assembleSensitivities();
 
         //- Zero sensitivity fields and their constituents
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityVolBSplinesFI/sensitivityVolBSplinesFIIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityVolBSplinesFI/sensitivityVolBSplinesFIIncompressible.C
index 7f38518f48..aba56274ec 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityVolBSplinesFI/sensitivityVolBSplinesFIIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityVolBSplinesFI/sensitivityVolBSplinesFIIncompressible.C
@@ -90,17 +90,17 @@ sensitivityVolBSplinesFI::sensitivityVolBSplinesFI
 
     label nCPs = volBSplinesBase_.getTotalControlPointsNumber();
     derivatives_ = scalarField(3*nCPs, Zero);
-    flowSens_ = vectorField(nCPs, vector::zero);
-    dSdbSens_ = vectorField(nCPs, vector::zero);
-    dndbSens_ = vectorField(nCPs, vector::zero);
-    dxdbDirectSens_ = vectorField(nCPs, vector::zero);
-    dVdbSens_ = vectorField(nCPs, vector::zero);
-    distanceSens_ = vectorField(nCPs, vector::zero);
-    optionsSens_ = vectorField(nCPs, vector::zero);
+    flowSens_ = vectorField(nCPs, Zero);
+    dSdbSens_ = vectorField(nCPs, Zero);
+    dndbSens_ = vectorField(nCPs, Zero);
+    dxdbDirectSens_ = vectorField(nCPs, Zero);
+    dVdbSens_ = vectorField(nCPs, Zero);
+    distanceSens_ = vectorField(nCPs, Zero);
+    optionsSens_ = vectorField(nCPs, Zero);
 
     // Create folder to store sensitivities
     mkDir(derivativesFolder_);
-};
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -138,7 +138,7 @@ void sensitivityVolBSplinesFI::assembleSensitivities()
     forAll(boxes, iNURB)
     {
         label nb = boxes[iNURB].getControlPoints().size();
-        vectorField boxSensitivities(nb, vector::zero);
+        vectorField boxSensitivities(nb, Zero);
 
         vectorField dxdbSens = boxes[iNURB].computeControlPointSensitivities
         (
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityVolBSplinesFI/sensitivityVolBSplinesFIIncompressible.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityVolBSplinesFI/sensitivityVolBSplinesFIIncompressible.H
index 45b01fcb8f..24267624ba 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityVolBSplinesFI/sensitivityVolBSplinesFIIncompressible.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityVolBSplinesFI/sensitivityVolBSplinesFIIncompressible.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::incompressible::sensitivityVolBSplinesFI
 
@@ -96,10 +95,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         sensitivityVolBSplinesFI(const sensitivityVolBSplinesFI&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const sensitivityVolBSplinesFI&) = delete;
 
 
@@ -129,7 +128,7 @@ public:
 
     // Member Functions
 
-        //- Assemble sensitivities 
+        //- Assemble sensitivities
         virtual void assembleSensitivities();
 
         //- Zero sensitivity fields and their constituents
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/sensitivity/sensitivity.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/sensitivity/sensitivity.H
index 4425ef7e25..aa706a913b 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/sensitivity/sensitivity.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/sensitivity/sensitivity.H
@@ -81,10 +81,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         sensitivity(const sensitivity&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const sensitivity&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/shapeSensitivitiesBase/shapeSensitivitiesBase.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/shapeSensitivitiesBase/shapeSensitivitiesBase.C
index 57cb0d89d5..e2922f50fd 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/shapeSensitivitiesBase/shapeSensitivitiesBase.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/shapeSensitivitiesBase/shapeSensitivitiesBase.C
@@ -156,7 +156,7 @@ Foam::shapeSensitivitiesBase::shapeSensitivitiesBase
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const Foam::labelHashSet& 
+const Foam::labelHashSet&
 Foam::shapeSensitivitiesBase::sensitivityPatchIDs() const
 {
     return sensitivityPatchIDs_;
@@ -226,7 +226,7 @@ void Foam::shapeSensitivitiesBase::setSuffix(const word& suffix)
 }
 
 
-Foam::tmp<Foam::volVectorField> 
+Foam::tmp<Foam::volVectorField>
 Foam::shapeSensitivitiesBase::getWallFaceSensVec()
 {
     if (wallFaceSensVecPtr_.valid())
@@ -257,7 +257,7 @@ Foam::shapeSensitivitiesBase::getWallFaceSensVec()
 }
 
 
-Foam::tmp<Foam::volScalarField> 
+Foam::tmp<Foam::volScalarField>
 Foam::shapeSensitivitiesBase::getWallFaceSensNormal()
 {
     if (wallFaceSensNormalPtr_.valid())
@@ -319,7 +319,7 @@ Foam::shapeSensitivitiesBase::getWallFaceSensNormalVec()
 }
 
 
-Foam::tmp<Foam::pointVectorField> 
+Foam::tmp<Foam::pointVectorField>
 Foam::shapeSensitivitiesBase::getWallPointSensVec()
 {
     tmp<volVectorField> tWallFaceSensVec = getWallFaceSensVec();
@@ -329,7 +329,7 @@ Foam::shapeSensitivitiesBase::getWallPointSensVec()
 }
 
 
-Foam::tmp<Foam::pointScalarField> 
+Foam::tmp<Foam::pointScalarField>
 Foam::shapeSensitivitiesBase::getWallPointSensNormal()
 {
     tmp<volScalarField> tWallFaceSensNormal = getWallFaceSensNormal();
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/shapeSensitivitiesBase/shapeSensitivitiesBase.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/shapeSensitivitiesBase/shapeSensitivitiesBase.H
index 1d397aa5e7..170683ccb5 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/shapeSensitivitiesBase/shapeSensitivitiesBase.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/shapeSensitivitiesBase/shapeSensitivitiesBase.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::incompressible::shapeSensitivitiesBase
 
@@ -144,10 +143,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         shapeSensitivitiesBase(const shapeSensitivitiesBase&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const shapeSensitivitiesBase&) = delete;
 
 
@@ -186,7 +185,7 @@ public:
         //  If valid, copies boundaryFields to volFields and writes them.
         void write();
 
-        //- Set suffix 
+        //- Set suffix
         void setSuffix(const word& suffix);
 
         //- Get wall face sensitivity vectors field
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/ArmijoConditions/ArmijoConditions.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/ArmijoConditions/ArmijoConditions.C
index f3ef54c301..cbd48fd7c3 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/ArmijoConditions/ArmijoConditions.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/ArmijoConditions/ArmijoConditions.C
@@ -48,7 +48,7 @@ namespace Foam
 
 Foam::ArmijoConditions::ArmijoConditions
 (
-    const dictionary& dict, 
+    const dictionary& dict,
     const Time& time
 )
 :
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/ArmijoConditions/ArmijoConditions.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/ArmijoConditions/ArmijoConditions.H
index 08207b9b6e..3e1890e045 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/ArmijoConditions/ArmijoConditions.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/ArmijoConditions/ArmijoConditions.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::ArmijoConditions
 
@@ -59,7 +58,7 @@ protected:
 
     // Protected data
 
-        //- Multiplier of the merit function reduction computed using 
+        //- Multiplier of the merit function reduction computed using
         //- a first-order Taylor expansion
         scalar c1_;
 
@@ -68,10 +67,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         ArmijoConditions(const ArmijoConditions&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const ArmijoConditions&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/lineSearch/lineSearch.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/lineSearch/lineSearch.H
index f5fe310654..3b0c23e233 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/lineSearch/lineSearch.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/lineSearch/lineSearch.H
@@ -96,8 +96,8 @@ protected:
         //- Maximum line search iterations
         label maxIters_;
 
-        //- Whether to extrapolate the correction multiplier for 
-        //- this optimisation cycle based on the previous ones. 
+        //- Whether to extrapolate the correction multiplier for
+        //- this optimisation cycle based on the previous ones.
         //  Usefull for non-quasi Newton methods
         bool extrapolateInitialStep_;
 
@@ -106,7 +106,7 @@ protected:
 
 
     // Protected Member Functions
-        
+
         //- Optional coeffs dict
         const dictionary& coeffsDict();
 
@@ -115,10 +115,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         lineSearch(const lineSearch&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const lineSearch&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/stepUpdate/bisection/bisection.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/stepUpdate/bisection/bisection.H
index add417111f..d508a0952c 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/stepUpdate/bisection/bisection.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/stepUpdate/bisection/bisection.H
@@ -66,10 +66,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         bisection(const bisection&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const bisection&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/stepUpdate/quadratic/quadratic.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/stepUpdate/quadratic/quadratic.H
index 94f9f4d72c..0e2e07c767 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/stepUpdate/quadratic/quadratic.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/stepUpdate/quadratic/quadratic.H
@@ -70,10 +70,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         quadratic(const quadratic&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const quadratic&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/stepUpdate/stepUpdate/stepUpdate.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/stepUpdate/stepUpdate/stepUpdate.H
index 98108b5e8e..9c8b3ce666 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/stepUpdate/stepUpdate/stepUpdate.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/lineSearch/stepUpdate/stepUpdate/stepUpdate.H
@@ -62,7 +62,7 @@ protected:
 
 
     // Protected Member Functions
-        
+
         //- Optional coeffs dict
         const dictionary& coeffsDict();
 
@@ -71,10 +71,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         stepUpdate(const stepUpdate&);
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const stepUpdate&);
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovement/optMeshMovement.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovement/optMeshMovement.C
index f6f7ec2bb2..794ad1b04e 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovement/optMeshMovement.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovement/optMeshMovement.C
@@ -44,7 +44,7 @@ namespace Foam
 
 Foam::scalar Foam::optMeshMovement::getMaxAllowedDisplacement() const
 {
-    if (maxAllowedDisplacement_.empty()) 
+    if (maxAllowedDisplacement_.empty())
     {
         FatalErrorInFunction
             << "maxAllowedDisplacement requested but not set" << nl
@@ -106,7 +106,7 @@ Foam::autoPtr<Foam::optMeshMovement> Foam::optMeshMovement::New
     {
         FatalIOErrorInLookup
         (
-            dict, 
+            dict,
             "type",
             modelType,
             *dictionaryConstructorTablePtr_
@@ -138,7 +138,7 @@ void Foam::optMeshMovement::moveMesh()
 }
 
 
-Foam::autoPtr<Foam::displacementMethod>& 
+Foam::autoPtr<Foam::displacementMethod>&
 Foam::optMeshMovement::returnDisplacementMethod()
 {
     return displMethodPtr_;
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovement/optMeshMovement.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovement/optMeshMovement.H
index ec300a962a..5d96fc65c5 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovement/optMeshMovement.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovement/optMeshMovement.H
@@ -64,10 +64,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         optMeshMovement(const optMeshMovement&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const optMeshMovement&) = delete;
 
 
@@ -87,11 +87,11 @@ protected:
         //- Fall back points in case line-search is used
         vectorField pointsInit_;
 
-        //- Mesh movement engine and interface for applying mesh movement 
+        //- Mesh movement engine and interface for applying mesh movement
         //- boundary conditions
         autoPtr<displacementMethod> displMethodPtr_;
 
-        //- Whether to write the mesh quality metrics to files each time the 
+        //- Whether to write the mesh quality metrics to files each time the
         //- mesh is updated
         bool writeMeshQualityMetrics_;
 
@@ -184,7 +184,7 @@ public:
        //- Whether maxAllowedDisplacement has been set
        bool maxAllowedDisplacementSet() const;
 
-       //- Return active design variables. 
+       //- Return active design variables.
        //  Implemented only for certain parametetisations
        virtual labelList getActiveDesignVariables() const;
 };
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementBezier/optMeshMovementBezier.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementBezier/optMeshMovementBezier.C
index 95b557df52..1268260259 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementBezier/optMeshMovementBezier.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementBezier/optMeshMovementBezier.C
@@ -59,7 +59,7 @@ void Foam::optMeshMovementBezier::computeBoundaryMovement
     const boolList& confineXmovement = Bezier_.confineXmovement();
     const boolList& confineYmovement = Bezier_.confineYmovement();
     const boolList& confineZmovement = Bezier_.confineZmovement();
-    vectorField actualMovement(nBezier, vector::zero);
+    vectorField actualMovement(nBezier, Zero);
     for (label iCP = 0; iCP < nBezier; iCP++)
     {
         // Confine x movement
@@ -112,7 +112,7 @@ Foam::optMeshMovementBezier::optMeshMovementBezier
         pointMesh::New(mesh),
         dimensionedVector(dimless, Zero)
     ),
-    cumulativeChange_(Bezier_.nBezier(), vector::zero)
+    cumulativeChange_(Bezier_.nBezier(), Zero)
 {}
 
 
@@ -131,7 +131,7 @@ void Foam::optMeshMovementBezier::moveMesh()
 }
 
 
-Foam::scalar 
+Foam::scalar
 Foam::optMeshMovementBezier::computeEta(const scalarField& correction)
 {
     // Set unscaled correction
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementBezier/optMeshMovementBezier.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementBezier/optMeshMovementBezier.H
index 046ea6b3ca..94d19f2fa4 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementBezier/optMeshMovementBezier.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementBezier/optMeshMovementBezier.H
@@ -62,7 +62,7 @@ protected:
 
         //- Parameterization based on NURBS curves
         Bezier Bezier_;
-        
+
         //- Boundary movement due to change of NURBS control points
         pointVectorField dx_;
 
@@ -79,10 +79,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         optMeshMovementBezier(const optMeshMovementBezier&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const optMeshMovementBezier&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementNULL/optMeshMovementNULL.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementNULL/optMeshMovementNULL.C
index a3b232164d..a6e1a6de7e 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementNULL/optMeshMovementNULL.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementNULL/optMeshMovementNULL.C
@@ -65,7 +65,7 @@ void Foam::optMeshMovementNULL::moveMesh()
 }
 
 
-Foam::scalar 
+Foam::scalar
 Foam::optMeshMovementNULL::computeEta(const scalarField& correction)
 {
     return scalar(0);
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementNULL/optMeshMovementNULL.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementNULL/optMeshMovementNULL.H
index 248caa7f6d..eaccf4d71c 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementNULL/optMeshMovementNULL.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementNULL/optMeshMovementNULL.H
@@ -58,10 +58,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         optMeshMovementNULL(const optMeshMovementNULL&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const optMeshMovementNULL&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementVolumetricBSplines/optMeshMovementVolumetricBSplines.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementVolumetricBSplines/optMeshMovementVolumetricBSplines.C
index b73fbaef28..5da8a63bf5 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementVolumetricBSplines/optMeshMovementVolumetricBSplines.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementVolumetricBSplines/optMeshMovementVolumetricBSplines.C
@@ -53,7 +53,7 @@ Foam::vectorField Foam::optMeshMovementVolumetricBSplines::controlPointMovement
 )
 {
     const label nControlPoints(correction.size()/3);
-    vectorField cpMovement(nControlPoints, vector::zero);
+    vectorField cpMovement(nControlPoints, Zero);
 
     for (label iCP = 0; iCP < nControlPoints; ++iCP)
     {
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementVolumetricBSplines/optMeshMovementVolumetricBSplines.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementVolumetricBSplines/optMeshMovementVolumetricBSplines.H
index 56a1978e28..d2e0bead43 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementVolumetricBSplines/optMeshMovementVolumetricBSplines.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementVolumetricBSplines/optMeshMovementVolumetricBSplines.H
@@ -76,13 +76,13 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         optMeshMovementVolumetricBSplines
         (
             const optMeshMovementVolumetricBSplines&
         ) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const optMeshMovementVolumetricBSplines&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementVolumetricBSplinesExternalMotionSolver/optMeshMovementVolumetricBSplinesExternalMotionSolver.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementVolumetricBSplinesExternalMotionSolver/optMeshMovementVolumetricBSplinesExternalMotionSolver.C
index ea05324eb6..b53cc7669f 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementVolumetricBSplinesExternalMotionSolver/optMeshMovementVolumetricBSplinesExternalMotionSolver.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementVolumetricBSplinesExternalMotionSolver/optMeshMovementVolumetricBSplinesExternalMotionSolver.C
@@ -37,7 +37,7 @@ namespace Foam
 {
     defineTypeNameAndDebug
     (
-        optMeshMovementVolumetricBSplinesExternalMotionSolver, 
+        optMeshMovementVolumetricBSplinesExternalMotionSolver,
         0
     );
     addToRunTimeSelectionTable
@@ -131,7 +131,7 @@ optMeshMovementVolumetricBSplinesExternalMotionSolver
         pointMesh::New(mesh),
         dimensionedVector(dimless, Zero)
     ),
-    cpMovement_(volBSplinesBase_.getTotalControlPointsNumber(), vector::zero)
+    cpMovement_(volBSplinesBase_.getTotalControlPointsNumber(), Zero)
 {}
 
 
@@ -146,7 +146,7 @@ void Foam::optMeshMovementVolumetricBSplinesExternalMotionSolver::moveMesh()
     displMethodPtr_->setMotionField(dx_);
 
     // Positions of control points have not changed since only the boundary dx
-    // has been computed. 
+    // has been computed.
     // Use correction to update them
     volBSplinesBase_.moveControlPoints(cpMovement_);
 
@@ -158,7 +158,7 @@ void Foam::optMeshMovementVolumetricBSplinesExternalMotionSolver::moveMesh()
 }
 
 
-Foam::scalar 
+Foam::scalar
 Foam::optMeshMovementVolumetricBSplinesExternalMotionSolver::computeEta
 (
     const scalarField& correction
@@ -180,7 +180,7 @@ Foam::optMeshMovementVolumetricBSplinesExternalMotionSolver::computeEta
 
 
 Foam::labelList
-Foam::optMeshMovementVolumetricBSplinesExternalMotionSolver::getActiveDesignVariables() 
+Foam::optMeshMovementVolumetricBSplinesExternalMotionSolver::getActiveDesignVariables()
 const
 {
     return volBSplinesBase_.getActiveDesignVariables();
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementVolumetricBSplinesExternalMotionSolver/optMeshMovementVolumetricBSplinesExternalMotionSolver.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementVolumetricBSplinesExternalMotionSolver/optMeshMovementVolumetricBSplinesExternalMotionSolver.H
index 8b23d2c473..57d8e976be 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementVolumetricBSplinesExternalMotionSolver/optMeshMovementVolumetricBSplinesExternalMotionSolver.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optMeshMovement/optMeshMovementVolumetricBSplinesExternalMotionSolver/optMeshMovementVolumetricBSplinesExternalMotionSolver.H
@@ -30,7 +30,7 @@ Class
 
 Description
     Converts NURBS volume control points update to actual mesh movement.
-    Internal points are moved based on a motionSolver other than 
+    Internal points are moved based on a motionSolver other than
     volumetricBSplinesExternalMotionSolver.
 
 SourceFiles
@@ -80,13 +80,13 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         optMeshMovementVolumetricBSplinesExternalMotionSolver
         (
             const optMeshMovementVolumetricBSplinesExternalMotionSolver&
         ) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=
         (
             const optMeshMovementVolumetricBSplinesExternalMotionSolver&
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/optimisationManager/optimisationManager.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/optimisationManager/optimisationManager.H
index 7759b4a288..ecd752586a 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/optimisationManager/optimisationManager.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/optimisationManager/optimisationManager.H
@@ -75,10 +75,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         optimisationManager(const optimisationManager&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const optimisationManager&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/singleRun/singleRun.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/singleRun/singleRun.H
index 5c65f63c58..19c3ff9123 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/singleRun/singleRun.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/singleRun/singleRun.H
@@ -65,10 +65,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         singleRun(const singleRun&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const singleRun&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/steadyOptimisation/steadyOptimisation.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/steadyOptimisation/steadyOptimisation.H
index a681868e13..549b003687 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/steadyOptimisation/steadyOptimisation.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/steadyOptimisation/steadyOptimisation.H
@@ -63,10 +63,10 @@ private:
         //- Update optimisationType source for all primal and adjoint solvers
         void updateOptTypeSource();
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         steadyOptimisation(const steadyOptimisation&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const steadyOptimisation&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/optimisationType/optimisationTypeIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/optimisationType/optimisationTypeIncompressible.C
index 2a5191780d..0cfd8af5de 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/optimisationType/optimisationTypeIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/optimisationType/optimisationTypeIncompressible.C
@@ -65,7 +65,7 @@ optimisationType::optimisationType
     (
         lineSearch::New
         (
-            dict_.subDict("updateMethod").subOrEmptyDict("lineSearch"), 
+            dict_.subDict("updateMethod").subOrEmptyDict("lineSearch"),
             mesh.time()
         )
     )
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/optimisationType/optimisationTypeIncompressible.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/optimisationType/optimisationTypeIncompressible.H
index 9aa2675c87..8dd392c0e7 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/optimisationType/optimisationTypeIncompressible.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/optimisationType/optimisationTypeIncompressible.H
@@ -76,10 +76,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         optimisationType(const optimisationType&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const optimisationType&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/shapeOptimisation/shapeOptimisationIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/shapeOptimisation/shapeOptimisationIncompressible.C
index 23c21ae7eb..ecbc1bc8a0 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/shapeOptimisation/shapeOptimisationIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/shapeOptimisation/shapeOptimisationIncompressible.C
@@ -129,9 +129,9 @@ shapeOptimisation::shapeOptimisation
     );
 
     // Sanity checks: at least one of eta or maxAllowedDisplacement must be set
-    if 
+    if
     (
-        !updateMethod_->initialEtaSet() 
+        !updateMethod_->initialEtaSet()
      && !optMeshMovement_().maxAllowedDisplacementSet()
     )
     {
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/shapeOptimisation/shapeOptimisationIncompressible.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/shapeOptimisation/shapeOptimisationIncompressible.H
index 5a825e9865..5152941fb1 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/shapeOptimisation/shapeOptimisationIncompressible.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/shapeOptimisation/shapeOptimisationIncompressible.H
@@ -83,10 +83,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         shapeOptimisation(const shapeOptimisation&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const shapeOptimisation&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/BFGS/BFGS.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/BFGS/BFGS.C
index ecfd2355d4..26b80e1803 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/BFGS/BFGS.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/BFGS/BFGS.C
@@ -59,11 +59,7 @@ void Foam::BFGS::allocateMatrices()
     }
 
     // Set previous HessianInv to be a diagonal matrix
-    SquareMatrix<scalar> temp(activeDesignVars_.size(), Zero);
-    forAll(activeDesignVars_, i)
-    {
-        temp[i][i] = 1.;
-    };
+    SquareMatrix<scalar> temp(activeDesignVars_.size(), I);
 
     // Allocate correct size and content to HessianInv matrices
     // has a max. capability of approximately 34000 variables.
@@ -106,7 +102,7 @@ void Foam::BFGS::updateHessian()
     HessianInv_ =
         HessianInvOld_
       + (ys + globalSum(leftMult(y, HessianInvOld_)*y))/sqr(ys)*outerProd(s, s)
-      - (1./ys)*
+      - (scalar(1)/ys)*
         (
            outerProd(rightMult(HessianInvOld_, y), s)
          + outerProd(s, leftMult(y, HessianInvOld_))
@@ -160,8 +156,8 @@ void Foam::BFGS::readFromDict()
         optMethodIODict_.readEntry("eta", eta_);
 
         label n = HessianInvOld_.n();
-        HessianInv_ = SquareMatrix<scalar>(n, scalar(0));
-        correction_ = scalarField(correctionOld_.size(), scalar(0));
+        HessianInv_ = SquareMatrix<scalar>(n, Zero);
+        correction_ = scalarField(correctionOld_.size(), Zero);
     }
 }
 
@@ -177,7 +173,7 @@ Foam::BFGS::BFGS
     updateMethod(mesh, dict),
     etaHessian_
     (
-        coeffsDict().lookupOrDefault<scalar>("etaHessian", 1.)
+        coeffsDict().lookupOrDefault<scalar>("etaHessian", 1)
     ),
     nSteepestDescent_
     (
@@ -190,7 +186,7 @@ Foam::BFGS::BFGS
     ),
     curvatureThreshold_
     (
-        coeffsDict().lookupOrDefault<scalar>("curvatureThreshold", 1.e-10)
+        coeffsDict().lookupOrDefault<scalar>("curvatureThreshold", 1e-10)
     ),
     // Construct null matrix since we dont know the dimension yet
     HessianInv_(),
@@ -206,13 +202,13 @@ Foam::BFGS::BFGS
     {
         // If not, all available design variables will be used. Number is not
         // know at the moment
-        Info<< "\t Did not find explicit definition of active design variables. "
-            << "Treating all available ones as active " << endl;
+        Info<< "\t Did not find explicit definition of active design variables."
+            << " Treating all available ones as active" << endl;
     }
 
     // Read old hessian, correction and derivatives, if present
     readFromDict();
-};
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/BFGS/BFGS.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/BFGS/BFGS.H
index 8ce2284304..4995f7f502 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/BFGS/BFGS.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/BFGS/BFGS.H
@@ -60,10 +60,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         BFGS(const BFGS&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const BFGS&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/DBFGS/DBFGS.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/DBFGS/DBFGS.C
index 12db8881b2..0e5f0fe06c 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/DBFGS/DBFGS.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/DBFGS/DBFGS.C
@@ -59,11 +59,7 @@ void Foam::DBFGS::allocateMatrices()
     }
 
     // Set previous Hessian to be a diagonal matrix
-    SquareMatrix<scalar> temp(activeDesignVars_.size(), Zero);
-    forAll(activeDesignVars_, i)
-    {
-        temp[i][i] = 1.;
-    };
+    SquareMatrix<scalar> temp(activeDesignVars_.size(), I);
 
     // Allocate correct size and content to Hessian matrices
     // has a max. capability of approximately 34000 variables.
@@ -100,13 +96,13 @@ void Foam::DBFGS::updateHessian()
     {
         WarningInFunction
             << " y*s is below threshold. Using damped form" << endl;
-        theta = (1.-gamma_)*sBs/(sBs - ys);
+        theta = (scalar(1)-gamma_)*sBs/(sBs - ys);
     }
 
     DebugInfo
         << "Hessian curvature index " << ys << endl;
 
-    scalarField r(theta*y + (1.-theta)*rightMult(HessianOld_, s));
+    scalarField r(theta*y + (scalar(1)-theta)*rightMult(HessianOld_, s));
 
     // Construct the inverse Hessian
     Hessian_ =
@@ -183,7 +179,7 @@ Foam::DBFGS::DBFGS
     // Construct null matrix since we dont know the dimension yet
     etaHessian_
     (
-        coeffsDict().lookupOrDefault<scalar>("etaHessian", 1.)
+        coeffsDict().lookupOrDefault<scalar>("etaHessian", 1)
     ),
     nSteepestDescent_
     (
@@ -196,7 +192,7 @@ Foam::DBFGS::DBFGS
     ),
     curvatureThreshold_
     (
-        coeffsDict().lookupOrDefault<scalar>("curvatureThreshold", 1.e-10)
+        coeffsDict().lookupOrDefault<scalar>("curvatureThreshold", 1e-10)
     ),
     Hessian_(),
     HessianOld_(),
@@ -219,7 +215,7 @@ Foam::DBFGS::DBFGS
 
     // read old hessian, correction and derivatives, if present
     readFromDict();
-};
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/DBFGS/DBFGS.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/DBFGS/DBFGS.H
index 99df27fe21..44d171fd7f 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/DBFGS/DBFGS.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/DBFGS/DBFGS.H
@@ -112,10 +112,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         DBFGS(const DBFGS&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const DBFGS&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/LBFGS/LBFGS.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/LBFGS/LBFGS.C
index 1dedb58127..c60d094b9f 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/LBFGS/LBFGS.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/LBFGS/LBFGS.C
@@ -62,8 +62,8 @@ void Foam::LBFGS::allocateMatrices()
     label nVars(activeDesignVars_.size());
     for (label i = 0; i < nPrevSteps_; i++)
     {
-        y_.set(i, scalarField(nVars, scalar(0)));
-        s_.set(i, scalarField(nVars, scalar(0)));
+        y_.set(i, scalarField(nVars, Zero));
+        s_.set(i, scalarField(nVars, Zero));
     }
 }
 
@@ -77,10 +77,10 @@ void Foam::LBFGS::pivotFields(PtrList<scalarField>& list, const scalarField& f)
         newOrder[0] = nPrevSteps_ - 1;
         for (label i = 1; i < nPrevSteps_; ++i)
         {
-            newOrder[i] = i - 1;  
+            newOrder[i] = i - 1;
         }
         list.reorder(newOrder);
-        
+
         // Fill in last element with the provided field
         list[nPrevSteps_ - 1] = f;
     }
@@ -93,12 +93,12 @@ void Foam::LBFGS::pivotFields(PtrList<scalarField>& list, const scalarField& f)
 
 void Foam::LBFGS::updateVectors()
 {
-    // Update list of y. Can only be done here since objectiveDerivatives_ 
+    // Update list of y. Can only be done here since objectiveDerivatives_
     // was not known at the end of the previous loop
     scalarField yRecent
         (objectiveDerivatives_ - derivativesOld_, activeDesignVars_);
     pivotFields(y_, yRecent);
-    // Update list of s. 
+    // Update list of s.
     // correction_ holds the previous correction
     scalarField sActive(correctionOld_, activeDesignVars_);
     pivotFields(s_, sActive);
@@ -129,11 +129,11 @@ void Foam::LBFGS::LBFGSUpdate()
     for (label i = nLast; i > -1; --i)
     {
         r[i] = 1./globalSum(y_[i]*s_[i]);
-        a[i] = r[i]*globalSum(s_[i]*q);    
+        a[i] = r[i]*globalSum(s_[i]*q);
         q -= a[i]*y_[i];
     }
 
-    scalar gamma = 
+    scalar gamma =
         globalSum(y_[nLast]*s_[nLast])/globalSum(y_[nLast]*y_[nLast]);
     q *= gamma;
 
@@ -183,7 +183,7 @@ void Foam::LBFGS::readFromDict()
         optMethodIODict_.readEntry("eta", eta_);
         optMethodIODict_.readEntry("correctionOld", correctionOld_);
 
-        correction_ = scalarField(correctionOld_.size(), scalar(0));
+        correction_ = scalarField(correctionOld_.size(), Zero);
     }
 }
 
@@ -230,7 +230,7 @@ Foam::LBFGS::LBFGS
 
     // Read old Hessian, correction and derivatives, if present
     readFromDict();
-};
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/LBFGS/LBFGS.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/LBFGS/LBFGS.H
index a2fdd1e5f1..7bffc387e8 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/LBFGS/LBFGS.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/LBFGS/LBFGS.H
@@ -25,12 +25,11 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::LBFGS
 
 Description
-    The quasi-Newton Limited-memory BFGS formula. Keeps nPrevSteps_ of the 
+    The quasi-Newton Limited-memory BFGS formula. Keeps nPrevSteps_ of the
     y and s vectors and approximates the inverse areas through them.
     Values of 3 < nPrevSteps_ < 20 are suggested.
 
@@ -62,10 +61,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         LBFGS(const LBFGS&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const LBFGS&) = delete;
 
 
@@ -103,7 +102,7 @@ protected:
         //- Allocate matrices in the first optimisation cycle
         void allocateMatrices();
 
-        //- Move pointers in PtrList to the left and replace last element with 
+        //- Move pointers in PtrList to the left and replace last element with
         //- given field
         void pivotFields(PtrList<scalarField>& list, const scalarField& f);
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/SQP/SQP.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/SQP/SQP.C
index 62faf79419..155fc5726b 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/SQP/SQP.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/SQP/SQP.C
@@ -66,11 +66,7 @@ void Foam::SQP::allocateMatrices()
     }
 
     // Set previous Hessian to be a diagonal matrix
-    SquareMatrix<scalar> temp(activeDesignVars_.size(), Zero);
-    forAll(activeDesignVars_, i)
-    {
-        temp[i][i] = 1.;
-    };
+    SquareMatrix<scalar> temp(activeDesignVars_.size(), I);
 
     // Allocate correct size and content to Hessian matrices
     // Has a max. capability of approximately 34000 variables.
@@ -130,7 +126,7 @@ void Foam::SQP::updateHessian()
             << " y*s is below threshold. Using damped form" << endl;
         theta = (1 - dumpingThreshold_)*sBs/(sBs - ys);
     }
-    scalarField r(theta*y + (1. - theta)*rightMult(HessianOld_, s));
+    scalarField r(theta*y + (scalar(1) - theta)*rightMult(HessianOld_, s));
     DebugInfo
         << "Unmodified Hessian curvature index " << ys << endl;
     DebugInfo
@@ -264,7 +260,7 @@ void Foam::SQP::readFromDict()
         );
         optMethodIODict_.readEntry
         (
-            "constraintDerivativesOld", 
+            "constraintDerivativesOld",
             constraintDerivativesOld_
         );
         optMethodIODict_.readEntry("correctionOld", correctionOld_);
@@ -272,7 +268,7 @@ void Foam::SQP::readFromDict()
         optMethodIODict_.readEntry("counter", counter_);
         optMethodIODict_.readEntry("eta", eta_);
 
-        correction_ = scalarField(correctionOld_.size(), scalar(0));
+        correction_ = scalarField(correctionOld_.size(), Zero);
     }
 }
 
@@ -285,7 +281,7 @@ Foam::SQP::SQP(const fvMesh& mesh, const dictionary& dict)
 
     etaHessian_
     (
-        coeffsDict().lookupOrDefault<scalar>("etaHessian", 1.)
+        coeffsDict().lookupOrDefault<scalar>("etaHessian", 1)
     ),
     activeDesignVars_(0),
     scaleFirstHessian_
@@ -331,7 +327,7 @@ Foam::SQP::SQP(const fvMesh& mesh, const dictionary& dict)
 
     // Read old hessian, correction and derivatives, if present
     readFromDict();
-};
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/SQP/SQP.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/SQP/SQP.H
index ab836887dd..6e2e87ab9f 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/SQP/SQP.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/SQP/SQP.H
@@ -114,10 +114,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         SQP(const SQP&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const SQP&) = delete;
 
         //- Make folder holding the Lagrangian file
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/SR1/SR1.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/SR1/SR1.C
index fcc9f61629..69c98a54cb 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/SR1/SR1.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/SR1/SR1.C
@@ -62,8 +62,8 @@ void Foam::SR1::allocateMatrices()
     SquareMatrix<scalar> temp(activeDesignVars_.size(), Zero);
     forAll(activeDesignVars_, i)
     {
-        temp[i][i] = 1.;
-    };
+        temp[i][i] = scalar(1);
+    }
 
     // Allocate correct size and content to HessianInv matrices
     // has a max. capability of approximately 34000 variables.
@@ -91,7 +91,8 @@ void Foam::SR1::updateHessian()
     if (tempMag > ratioThreshold_ * yMag * HessYMag)
     {
         HessianInv_ =
-            HessianInvOld_ + (1./(globalSum(temp*y)))*outerProd(temp, temp);
+            HessianInvOld_
+          + (scalar(1)/(globalSum(temp*y)))*outerProd(temp, temp);
     }
     else
     {
@@ -161,7 +162,7 @@ Foam::SR1::SR1(const fvMesh& mesh, const dictionary& dict)
     // Construct null matrix since we dont know the dimension yet
     etaHessian_
     (
-        coeffsDict().lookupOrDefault<scalar>("etaHessian", 1.)
+        coeffsDict().lookupOrDefault<scalar>("etaHessian", 1)
     ),
     nSteepestDescent_
     (
@@ -169,7 +170,7 @@ Foam::SR1::SR1(const fvMesh& mesh, const dictionary& dict)
     ),
     ratioThreshold_
     (
-        coeffsDict().lookupOrDefault<scalar>("ratioThreshold", 1.e-08)
+        coeffsDict().lookupOrDefault<scalar>("ratioThreshold", 1e-08)
     ),
     activeDesignVars_(0),
     HessianInv_(),
@@ -191,7 +192,7 @@ Foam::SR1::SR1(const fvMesh& mesh, const dictionary& dict)
 
     // Read old hessian, correction and derivatives, if present
     readFromDict();
-};
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -221,14 +222,14 @@ void Foam::SR1::updateOldCorrection(const scalarField& oldCorrection)
 
 void Foam::SR1::write()
 {
-    optMethodIODict_.add < SquareMatrix<scalar>>
+    optMethodIODict_.add<SquareMatrix<scalar>>
     (
         "HessianInvOld",
         HessianInvOld_,
         true
     );
-    optMethodIODict_.add <scalarField>("derivativesOld", derivativesOld_, true);
-    optMethodIODict_.add <scalarField>("correctionOld", correctionOld_, true);
+    optMethodIODict_.add<scalarField>("derivativesOld", derivativesOld_, true);
+    optMethodIODict_.add<scalarField>("correctionOld", correctionOld_, true);
     optMethodIODict_.add<label>("counter", counter_, true);
 
     updateMethod::write();
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/SR1/SR1.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/SR1/SR1.H
index 0241390213..fa8fa1d5f0 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/SR1/SR1.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/SR1/SR1.H
@@ -108,10 +108,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         SR1(const SR1&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const SR1&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/conjugateGradient/conjugateGradient.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/conjugateGradient/conjugateGradient.C
index 0fc71f191e..629ba8221e 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/conjugateGradient/conjugateGradient.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/conjugateGradient/conjugateGradient.C
@@ -159,10 +159,10 @@ void Foam::conjugateGradient::computeCorrection()
         }
         else if (betaType_ == "PolakRibiereRestarted")
         {
-            beta = 
+            beta =
             max
             (
-                scalar(0), 
+                scalar(0),
                 globalSum(dx*(dx - dxOld_))/globalSum(dxOld_ * dxOld_)
             );
             if (beta == scalar(0))
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/conjugateGradient/conjugateGradient.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/conjugateGradient/conjugateGradient.H
index f4a4d1e476..5c42ecdcfd 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/conjugateGradient/conjugateGradient.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/conjugateGradient/conjugateGradient.H
@@ -83,10 +83,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         conjugateGradient(const conjugateGradient&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const conjugateGradient&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/steepestDescent/steepestDescent.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/steepestDescent/steepestDescent.H
index d5c2a52f35..4659916795 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/steepestDescent/steepestDescent.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/steepestDescent/steepestDescent.H
@@ -59,10 +59,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         steepestDescent(const steepestDescent&);
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const steepestDescent&);
 
 public:
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/updateMethod/updateMethod.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/updateMethod/updateMethod.C
index 2ce41de7b5..b16626c638 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/updateMethod/updateMethod.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/updateMethod/updateMethod.C
@@ -136,8 +136,8 @@ Foam::updateMethod::inv(SquareMatrix<scalar> A)
     // Compute inverse of A by successive back-substitutions.
     for (label j = 0; j < n; j++)
     {
-        scalarField rhs(n, 0.);
-        rhs[j] = 1.;
+        scalarField rhs(n, Zero);
+        rhs[j] = scalar(1);
         LUBacksubstitute(A, pivotIndices, rhs);
         // After LUBacksubstitute, rhs contains the j-th column of the inverse
         for (label i = 0; i < n; i++)
@@ -406,10 +406,10 @@ void Foam::updateMethod::write()
     optMethodIODict_.add<scalarField>("correction", correction_, true);
 
     // Write IOdictionary
-    // Always write in ASCII format. 
-    // Even when choosing to write in binary through controlDict, 
-    // the content is written in ASCII format but with a binary header. 
-    // This creates problems when the content is read back in 
+    // Always write in ASCII format.
+    // Even when choosing to write in binary through controlDict,
+    // the content is written in ASCII format but with a binary header.
+    // This creates problems when the content is read back in
     // (e.g. continuation)
     optMethodIODict_.regIOobject::writeObject
     (
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/updateMethod/updateMethod.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/updateMethod/updateMethod.H
index 2907744795..563490f36c 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/updateMethod/updateMethod.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/updateMethod/updateMethod.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::updateMethod
 
@@ -137,10 +136,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         updateMethod(const updateMethod&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const updateMethod&) = delete;
 
 
@@ -206,7 +205,7 @@ public:
        //- Set step for optimisation methods
        void setStep(const scalar eta);
 
-       //- Set globalSum variable. 
+       //- Set globalSum variable.
        //  Should be set by the optimisationType owining the updateMethod
        void setGlobalSum(const bool useGlobalSum);
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/parameterization/Bezier/Bezier.C b/src/optimisation/adjointOptimisation/adjoint/parameterization/Bezier/Bezier.C
index 48e896c616..0a3423a664 100644
--- a/src/optimisation/adjointOptimisation/adjoint/parameterization/Bezier/Bezier.C
+++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/Bezier/Bezier.C
@@ -84,7 +84,7 @@ Bezier::Bezier(const fvMesh& mesh, const dictionary& dict)
     confineMovement_[0] = confineXmovement_;
     confineMovement_[1] = confineYmovement_;
     confineMovement_[2] = confineZmovement_;
-    
+
     // Determine active design variables
     label iActive(0);
     for (label iDir = 0; iDir < 3; ++iDir)
@@ -171,8 +171,8 @@ tmp<tensorField> Bezier::dndbBasedSensitivities
     const polyPatch& ppatch = patch.patch();
 
     // Return field
-    tmp<tensorField> tdndbSens(new tensorField(patch.size(), tensor::zero));
-    tensorField& dndbSens = tdndbSens.ref();
+    auto tdndbSens = tmp<tensorField>::New(patch.size(), Zero);
+    auto& dndbSens = tdndbSens.ref();
 
     // Auxilary quantities
     deltaBoundary deltaBoundary(mesh_);
@@ -186,7 +186,7 @@ tmp<tensorField> Bezier::dndbBasedSensitivities
         const pointField facePoints = fGlobal.points(mesh_.points());
 
         // Loop over face points
-        tensorField facePointDerivs(facePoints.size(), tensor::zero);
+        tensorField facePointDerivs(facePoints.size(), Zero);
         forAll(fGlobal, pI)
         {
             facePointDerivs[pI] = dxdbInt[fGlobal[pI]];
@@ -228,14 +228,14 @@ tmp<vectorField> Bezier::dndbBasedSensitivities
     const polyPatch& ppatch = patch.patch();
 
     // Return field
-    tmp<vectorField> tdndbSens(new vectorField(patch.size(), vector::zero));
-    vectorField& dndbSens = tdndbSens.ref();
+    auto tdndbSens = tmp<vectorField>::New(patch.size(), Zero);
+    auto& dndbSens = tdndbSens.ref();
 
     // Auxilary quantities
     deltaBoundary deltaBoundary(mesh_);
     const label patchStart = ppatch.start();
     const tensorField& dxdbInt = dxidXj_[cpI].primitiveField();
-    vectorField dxdbDir(dxdbInt.size(), vector::zero);
+    vectorField dxdbDir(dxdbInt.size(), Zero);
     dxdbDir.replace(0, dxdbInt.component(3*idir));
     dxdbDir.replace(1, dxdbInt.component(3*idir + 1));
     dxdbDir.replace(2, dxdbInt.component(3*idir + 2));
@@ -247,7 +247,7 @@ tmp<vectorField> Bezier::dndbBasedSensitivities
         const pointField facePoints = fGlobal.points(mesh_.points());
 
         // Loop over face points
-        vectorField facePointDerivs(facePoints.size(), vector::zero);
+        vectorField facePointDerivs(facePoints.size(), Zero);
         forAll(fGlobal, pI)
         {
             facePointDerivs[pI] = dxdbDir[fGlobal[pI]];
@@ -287,8 +287,8 @@ tmp<tensorField> Bezier::dxdbFace
     const polyPatch& patch = mesh_.boundary()[patchI].patch();
 
     // Return field
-    tmp<tensorField> tdxdbFace(new tensorField(patch.size(), tensor::zero));
-    tensorField& dxdbFace = tdxdbFace.ref();
+    auto tdxdbFace = tmp<tensorField>::New(patch.size(), Zero);
+    auto& dxdbFace = tdxdbFace.ref();
     if (useChainRule)
     {
         // Auxilary quantities
@@ -303,7 +303,7 @@ tmp<tensorField> Bezier::dxdbFace
             const pointField facePoints = fGlobal.points(mesh_.points());
 
             // Loop over face points
-            tensorField facePointDerivs(facePoints.size(), tensor::zero);
+            tensorField facePointDerivs(facePoints.size(), Zero);
             forAll(fGlobal, pI)
             {
                 facePointDerivs[pI] = dxdbInt[fGlobal[pI]];
@@ -340,8 +340,8 @@ tmp<vectorField> Bezier::dxdbFace
     const polyPatch& patch = mesh_.boundary()[patchI].patch();
 
     // Return field
-    tmp<vectorField> tdxdbFace(new vectorField(patch.size(), vector::zero));
-    vectorField& dxdbFace = tdxdbFace.ref();
+    auto tdxdbFace = tmp<vectorField>::New(patch.size(), Zero);
+    auto& dxdbFace = tdxdbFace.ref();
 
     if (useChainRule)
     {
@@ -349,7 +349,7 @@ tmp<vectorField> Bezier::dxdbFace
         deltaBoundary deltaBoundary(mesh_);
         const label patchStart = patch.start();
         const tensorField& dxdbInt = dxidXj_[cpI].primitiveField();
-        vectorField dxdbDir(dxdbInt.size(), vector::zero);
+        vectorField dxdbDir(dxdbInt.size(), Zero);
         dxdbDir.replace(0, dxdbInt.component(3*idir));
         dxdbDir.replace(1, dxdbInt.component(3*idir + 1));
         dxdbDir.replace(2, dxdbInt.component(3*idir + 2));
@@ -361,7 +361,7 @@ tmp<vectorField> Bezier::dxdbFace
             const pointField facePoints = fGlobal.points(mesh_.points());
 
             // Loop over face points
-            vectorField facePointDerivs(facePoints.size(), vector::zero);
+            vectorField facePointDerivs(facePoints.size(), Zero);
             forAll(fGlobal, pI)
             {
                 facePointDerivs[pI] = dxdbDir[fGlobal[pI]];
@@ -378,7 +378,7 @@ tmp<vectorField> Bezier::dxdbFace
     else
     {
         PrimitivePatchInterpolation<polyPatch> patchInter(patch);
-        vectorField dxdb(patch.nPoints(), vector::zero);
+        vectorField dxdb(patch.nPoints(), Zero);
         dxdb.replace
         (
             idir,
@@ -398,7 +398,7 @@ tensorField Bezier::facePoints_d
 ) const
 {
     const face& faceI(mesh_.faces()[globalFaceI]);
-    tensorField fPoints_d(faceI.size(), tensor::zero);
+    tensorField fPoints_d(faceI.size(), Zero);
     forAll(faceI, fpI)
     {
         fPoints_d[fpI] = dxidXj_[cpI].primitiveField()[faceI[fpI]];
@@ -415,7 +415,7 @@ vectorField Bezier::facePoints_d
 ) const
 {
     const face& faceI(mesh_.faces()[globalFaceI]);
-    vectorField fPoints_d(faceI.size(), vector::zero);
+    vectorField fPoints_d(faceI.size(), Zero);
     forAll(faceI, fpI)
     {
         const tensor& dxdbTensor = dxidXj_[cpI].primitiveField()[faceI[fpI]];
diff --git a/src/optimisation/adjointOptimisation/adjoint/parameterization/Bezier/Bezier.H b/src/optimisation/adjointOptimisation/adjoint/parameterization/Bezier/Bezier.H
index af4a9e17c8..00470e7616 100644
--- a/src/optimisation/adjointOptimisation/adjoint/parameterization/Bezier/Bezier.H
+++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/Bezier/Bezier.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::Bezier
 
@@ -64,10 +63,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         Bezier(const Bezier&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const Bezier&) = delete;
 
 
@@ -124,7 +123,7 @@ public:
         //- Info about confining movement in all directions
         const boolListList& confineMovement() const;
 
-        //- Compute derivative of the normal vector for a Bezier 
+        //- Compute derivative of the normal vector for a Bezier
         //- parameterized patch
         tmp<tensorField> dndbBasedSensitivities
         (
diff --git a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DCurve/NURBS3DCurve.C b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DCurve/NURBS3DCurve.C
index 7220ad3d30..d608f6ccd9 100644
--- a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DCurve/NURBS3DCurve.C
+++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DCurve/NURBS3DCurve.C
@@ -216,14 +216,14 @@ NURBS3DCurve::NURBS3DCurve
     const word name
 )
 :
-    vectorField(nPts, vector::zero),
+    vectorField(nPts, Zero),
     CPs_(CPs),
     weights_(weights),
     u_(u),
     name_(name),
     basis_(basis),
 
-    givenInitNrm_(vector::zero),
+    givenInitNrm_(Zero),
 
     nrmOrientation_(ALLIGNED)
 
@@ -241,14 +241,14 @@ NURBS3DCurve::NURBS3DCurve
     const word name
 )
 :
-    vectorField(nPts, vector::zero),
+    vectorField(nPts, Zero),
     CPs_(CPs),
     weights_(weights),
     u_(nPts, Zero),
     name_(name),
     basis_(basis),
 
-    givenInitNrm_(vector::zero),
+    givenInitNrm_(Zero),
 
     nrmOrientation_(ALLIGNED)
 
@@ -266,14 +266,14 @@ NURBS3DCurve::NURBS3DCurve
     const word name
 )
 :
-    vectorField(nPts, vector::zero),
+    vectorField(nPts, Zero),
     CPs_(CPs),
     weights_(CPs.size(), scalar(1)),
     u_(nPts, Zero),
     name_(name),
     basis_(basis),
 
-    givenInitNrm_(vector::zero),
+    givenInitNrm_(Zero),
 
     nrmOrientation_(1)
 
@@ -322,7 +322,7 @@ void NURBS3DCurve::setNrm2DOrientation
     givenInitNrm_ = givenNrm;
 
     const vector tan(curveDerivativeU(Zero));
-    vector curveNrm(vector::zero);
+    vector curveNrm(Zero);
 
     curveNrm.x() = -tan.y();
     curveNrm.y() =  tan.x();
@@ -410,7 +410,7 @@ void NURBS3DCurve::invert()
     Info<< "Inverting NURBS curve " << name_ << endl;
 
     const label nCPs(CPs_.size());
-    List<vector> invertedCPs(nCPs, vector::zero);
+    List<vector> invertedCPs(nCPs, Zero);
     List<scalar> invertedWeights(nCPs, Zero);
 
     for (label CPI = 0; CPI<nCPs; CPI++)
@@ -466,7 +466,7 @@ vector NURBS3DCurve::curvePoint(const scalar u) const
     }
 
     // Compute curve point.
-    vector point(vector::zero);
+    vector point(Zero);
 
     forAll(CPs_, CPI)
     {
@@ -611,7 +611,7 @@ scalar NURBS3DCurve::findClosestCurvePoint
 
 const vector NURBS3DCurve::nrm3D(const vector& refTan, const scalar u) const
 {
-    vector curveNrm(vector::zero);
+    vector curveNrm(Zero);
 
     if (nrmOrientation_ == ALLIGNED)
     {
@@ -631,7 +631,7 @@ const vector NURBS3DCurve::nrm3D(const vector& refTan, const scalar u) const
 const vector NURBS3DCurve::nrm2D(const scalar zVal, const scalar u) const
 {
     const vector tan(curveDerivativeU(u));
-    vector curveNrm(vector::zero);
+    vector curveNrm(Zero);
 
     curveNrm.x()  = -nrmOrientation_*tan.y();
     curveNrm.y()  =  nrmOrientation_*tan.x();
@@ -653,7 +653,7 @@ void NURBS3DCurve::insertKnot
     // Insertion into curve of non-uniform weight is not currently supported.
     const label degree(basis_.degree());
     const label nCPs(basis_.nCPs());
-    List<vector> newCPs(nCPs, vector::zero);
+    List<vector> newCPs(nCPs, Zero);
     List<scalar> newWeights(nCPs, scalar(1));
 
     // Compute the new CPs and their weights.
@@ -737,7 +737,7 @@ scalar NURBS3DCurve::length(const label uIStart, const label uIEnd) const
 {
     // Compute derivatives wrt u for the given u interval.
     const label lenSize(uIEnd - uIStart + 1);
-    vectorField dxdu(lenSize, vector::zero);
+    vectorField dxdu(lenSize, Zero);
     scalar length(Zero);
 
     forAll(dxdu, uI)
@@ -768,7 +768,7 @@ scalar NURBS3DCurve::length
     // Compute derivatives wrt u for the given u interval.
     scalar length(Zero);
     scalarField localU(nPts, Zero);
-    vectorField dxdu(nPts, vector::zero);
+    vectorField dxdu(nPts, Zero);
 
     forAll(localU, uI)
     {
@@ -800,8 +800,8 @@ scalar NURBS3DCurve::length() const
 vector NURBS3DCurve::curveDerivativeU(const scalar u) const
 {
     const label degree(basis_.degree());
-    vector NWP(vector::zero);
-    vector dNduWP(vector::zero);
+    vector NWP(Zero);
+    vector dNduWP(Zero);
     scalar NW(Zero);
     scalar dNduW(Zero);
 
@@ -825,9 +825,9 @@ vector NURBS3DCurve::curveDerivativeU(const scalar u) const
 vector NURBS3DCurve::curveDerivativeUU(const scalar u) const
 {
     const label degree(basis_.degree());
-    vector NWP(vector::zero);
-    vector dNduWP(vector::zero);
-    vector d2Ndu2WP(vector::zero);
+    vector NWP(Zero);
+    vector dNduWP(Zero);
+    vector d2Ndu2WP(Zero);
     scalar NW(Zero);
     scalar dNduW(Zero);
     scalar d2Ndu2W(Zero);
@@ -890,7 +890,7 @@ vector NURBS3DCurve::curveDerivativeWeight
 {
     // Compute nominator, denominator.
     const label degree(basis_.degree());
-    vector NWP(vector::zero);
+    vector NWP(Zero);
     scalar NW(Zero);
 
     forAll(CPs_, CPJ)
@@ -916,8 +916,8 @@ scalar NURBS3DCurve::lengthDerivativeU
 )
 {
     // compute derivatives wrt u for the given u interval
-    vectorField dxdu(nPts, vector::zero);
-    vectorField d2xdu2(nPts, vector::zero);
+    vectorField dxdu(nPts, Zero);
+    vectorField d2xdu2(nPts, Zero);
     scalarField localU(nPts, Zero);
     scalar lDerivative(Zero);
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DSurface/NURBS3DSurface.C b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DSurface/NURBS3DSurface.C
index 184f41a442..f1fe2a0165 100644
--- a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DSurface/NURBS3DSurface.C
+++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DSurface/NURBS3DSurface.C
@@ -179,9 +179,9 @@ void NURBS3DSurface::setEquidistantR
     {
         const scalar& RPrev(R[ptI - 1]);
         scalar& RCurr(R[ptI]);
-        scalar direc(scalar(1));
-        scalar xDiff(scalar(0));
-        scalar delta(scalar(0));
+        scalar direc(1);
+        scalar xDiff(0);
+        scalar delta(0);
         bool overReached(false);
 
         RCurr = RPrev + rLength;
@@ -314,7 +314,7 @@ NURBS3DSurface::NURBS3DSurface
     const word name
 )
 :
-    vectorField (nUPts*nVPts, vector::zero),
+    vectorField (nUPts*nVPts, Zero),
 
     CPs_(CPs),
     u_(nUPts*nVPts, Zero),
@@ -326,7 +326,7 @@ NURBS3DSurface::NURBS3DSurface
     uBasis_(uBasis),
     vBasis_(vBasis),
 
-    givenInitNrm_(vector::zero),
+    givenInitNrm_(Zero),
 
     CPsUCPIs_(0),
     CPsVCPIs_(0),
@@ -352,7 +352,7 @@ NURBS3DSurface::NURBS3DSurface
     const word name
 )
 :
-    vectorField(nUPts*nVPts, vector::zero),
+    vectorField(nUPts*nVPts, Zero),
 
     CPs_(CPs),
     u_(nUPts*nVPts, Zero),
@@ -364,7 +364,7 @@ NURBS3DSurface::NURBS3DSurface
     uBasis_(uBasis),
     vBasis_(vBasis),
 
-    givenInitNrm_(vector::zero),
+    givenInitNrm_(Zero),
 
     CPsUCPIs_(0),
     CPsVCPIs_(0),
@@ -391,7 +391,7 @@ NURBS3DSurface::NURBS3DSurface
     const word name
 )
 :
-    vectorField(nUPts*nVPts, vector::zero),
+    vectorField(nUPts*nVPts, Zero),
 
     CPs_(CPs),
     u_(nUPts*nVPts, Zero),
@@ -403,7 +403,7 @@ NURBS3DSurface::NURBS3DSurface
     uBasis_(nCPsU, uDegree),
     vBasis_(nCPsV, vDegree),
 
-    givenInitNrm_(vector::zero),
+    givenInitNrm_(Zero),
 
     CPsUCPIs_(0),
     CPsVCPIs_(0),
@@ -441,7 +441,7 @@ NURBS3DSurface::NURBS3DSurface
     const word name
 )
 :
-    vectorField(nUPts*nVPts, vector::zero),
+    vectorField(nUPts*nVPts, Zero),
 
     CPs_(CPs),
     u_(nUPts*nVPts, Zero),
@@ -453,7 +453,7 @@ NURBS3DSurface::NURBS3DSurface
     uBasis_(nCPsU, uDegree, knotsU),
     vBasis_(nCPsV, vDegree, knotsV),
 
-    givenInitNrm_(vector::zero),
+    givenInitNrm_(Zero),
 
     CPsUCPIs_(0),
     CPsVCPIs_(0),
@@ -490,7 +490,7 @@ NURBS3DSurface::NURBS3DSurface
     const word name
 )
 :
-    vectorField(nUPts*nVPts, vector::zero),
+    vectorField(nUPts*nVPts, Zero),
 
     CPs_(CPs),
     u_(nUPts*nVPts, Zero),
@@ -502,7 +502,7 @@ NURBS3DSurface::NURBS3DSurface
     uBasis_(nCPsU, uDegree),
     vBasis_(nCPsV, vDegree),
 
-    givenInitNrm_(vector::zero),
+    givenInitNrm_(Zero),
 
     CPsUCPIs_(0),
     CPsVCPIs_(0),
@@ -542,7 +542,7 @@ NURBS3DSurface::NURBS3DSurface
     const word name
 )
 :
-    vectorField(nUPts*nVPts, vector::zero),
+    vectorField(nUPts*nVPts, Zero),
 
     CPs_(CPs),
     u_(nUPts*nVPts, Zero),
@@ -554,7 +554,7 @@ NURBS3DSurface::NURBS3DSurface
     uBasis_(nCPsU, uDegree, knotsU),
     vBasis_(nCPsV, vDegree, knotsV),
 
-    givenInitNrm_(vector::zero),
+    givenInitNrm_(Zero),
 
     CPsUCPIs_(0),
     CPsVCPIs_(0),
@@ -706,7 +706,7 @@ void NURBS3DSurface::invertU()
 
     const label  uNCPs(uBasis_.nCPs());
     const label  vNCPs(vBasis_.nCPs());
-    List<vector> invertedCPs(CPs_.size(), vector::zero);
+    List<vector> invertedCPs(CPs_.size(), Zero);
     List<scalar> invertedWeights(CPs_.size(), Zero);
 
     for (label vCPI = 0; vCPI<vNCPs; vCPI++)
@@ -735,7 +735,7 @@ void NURBS3DSurface::invertV()
 
     const label uNCPs(uBasis_.nCPs());
     const label vNCPs(vBasis_.nCPs());
-    List<vector> invertedCPs(CPs_.size(), vector::zero);
+    List<vector> invertedCPs(CPs_.size(), Zero);
     List<scalar> invertedWeights(CPs_.size(), Zero);
 
     for (label vCPI = 0; vCPI<vNCPs; vCPI++)
@@ -764,7 +764,7 @@ void NURBS3DSurface::invertUV()
 
     const label uNCPs(uBasis_.nCPs());
     const label vNCPs(vBasis_.nCPs());
-    List<vector> invertedCPs(CPs_.size(), vector::zero);
+    List<vector> invertedCPs(CPs_.size(), Zero);
     List<scalar> invertedWeights(CPs_.size(), Zero);
 
     for (label vCPI = 0; vCPI<vNCPs; vCPI++)
@@ -901,7 +901,7 @@ vector NURBS3DSurface::surfacePoint
     }
 
     // Compute the points.
-    vector point(vector::zero);
+    vector point(Zero);
 
     for (label vCPI = 0; vCPI<vNCPs; vCPI++)
     {
@@ -1072,11 +1072,9 @@ tmp<vector2DField> NURBS3DSurface::findClosestSurfacePoint
     const scalar tolerance
 )
 {
-    tmp<vector2DField> tparamCoors
-    (
-        new vector2DField(targetPoints.size(), vector2D::zero)
-    );
-    vector2DField& paramCoors = tparamCoors.ref();
+    auto tparamCoors = tmp<vector2DField>::New(targetPoints.size(), Zero);
+    auto& paramCoors = tparamCoors.ref();
+
     const vectorField& surface(*this);
     label nBoundedPoints(0);
     scalar maxResidual(0);
@@ -1266,7 +1264,7 @@ scalarList NURBS3DSurface::findClosestSurfacePoint
 
 const vector NURBS3DSurface::nrm(scalar u, scalar v)
 {
-    vector surfaceNrm(vector::zero);
+    vector surfaceNrm(Zero);
 
     if (nrmOrientation_ == ALLIGNED)
     {
@@ -1470,7 +1468,7 @@ scalar NURBS3DSurface::lengthU
 {
     // Compute derivatives wrt u for the given u interval.
     const label uLenSize(uIEnd - uIStart + 1);
-    vectorField dxdu(uLenSize, vector::zero);
+    vectorField dxdu(uLenSize, Zero);
     scalar uLength(Zero);
 
     forAll(dxdu, uI)
@@ -1504,7 +1502,7 @@ scalar NURBS3DSurface::lengthU
 ) const
 {
     // Compute derivatives wrt u for the given u interval.
-    vectorField dxdu(nPts, vector::zero);
+    vectorField dxdu(nPts, Zero);
     scalarField localU(nPts, Zero);
     scalar uLength(Zero);
 
@@ -1547,7 +1545,7 @@ scalar NURBS3DSurface::lengthV
 {
     // Compute derivatives wrt v for the given v interval.
     const label vLenSize(vIEnd - vIStart + 1);
-    vectorField dxdv(vLenSize, vector::zero);
+    vectorField dxdv(vLenSize, Zero);
     scalar vLength(Zero);
 
     forAll(dxdv, vI)
@@ -1581,7 +1579,7 @@ scalar NURBS3DSurface::lengthV
 ) const
 {
     // Compute derivatives wrt v for the given v interval.
-    vectorField dxdv(nPts, vector::zero);
+    vectorField dxdv(nPts, Zero);
     scalarField localV(nPts, Zero);
     scalar vLength(Zero);
 
@@ -1627,8 +1625,8 @@ vector NURBS3DSurface::surfaceDerivativeU
     const label vDegree(vBasis_.degree());
     const label uNCPs(uBasis_.nCPs());
     const label vNCPs(vBasis_.nCPs());
-    vector NMWP(vector::zero);
-    vector dNduMWP(vector::zero);
+    vector NMWP(Zero);
+    vector dNduMWP(Zero);
     scalar NMW(Zero);
     scalar dNduMW(Zero);
 
@@ -1669,8 +1667,8 @@ vector NURBS3DSurface::surfaceDerivativeV
     const label vDegree(vBasis_.degree());
     const label uNCPs(uBasis_.nCPs());
     const label vNCPs(vBasis_.nCPs());
-    vector NMWP(vector::zero);
-    vector dMdvNWP(vector::zero);
+    vector NMWP(Zero);
+    vector dMdvNWP(Zero);
     scalar NMW(Zero);
     scalar dMdvNW(Zero);
 
@@ -1711,10 +1709,10 @@ vector NURBS3DSurface::surfaceDerivativeUV
     const label vDegree(vBasis_.degree());
     const label uNCPs(uBasis_.nCPs());
     const label vNCPs(vBasis_.nCPs());
-    vector NMWP(vector::zero);
-    vector dNduMWP(vector::zero);
-    vector dMdvNWP(vector::zero);
-    vector dNMduvWP(vector::zero);
+    vector NMWP(Zero);
+    vector dNduMWP(Zero);
+    vector dMdvNWP(Zero);
+    vector dNMduvWP(Zero);
     scalar NMW(Zero);
     scalar dNduMW(Zero);
     scalar dMdvNW(Zero);
@@ -1773,9 +1771,9 @@ vector NURBS3DSurface::surfaceDerivativeUU
     const label vDegree(vBasis_.degree());
     const label uNCPs(uBasis_.nCPs());
     const label vNCPs(vBasis_.nCPs());
-    vector NMWP(vector::zero);
-    vector dNduMWP(vector::zero);
-    vector d2Ndu2MWP(vector::zero);
+    vector NMWP(Zero);
+    vector dNduMWP(Zero);
+    vector d2Ndu2MWP(Zero);
     scalar NMW(Zero);
     scalar dNduMW(Zero);
     scalar d2Ndu2MW(Zero);
@@ -1829,9 +1827,9 @@ vector NURBS3DSurface::surfaceDerivativeVV
     const label vDegree(vBasis_.degree());
     const label uNCPs(uBasis_.nCPs());
     const label vNCPs(vBasis_.nCPs());
-    vector NMWP(vector::zero);
-    vector dMdvNWP(vector::zero);
-    vector d2Mdv2NWP(vector::zero);
+    vector NMWP(Zero);
+    vector dMdvNWP(Zero);
+    vector d2Mdv2NWP(Zero);
     scalar NMW(Zero);
     scalar dMdvNW(Zero);
     scalar d2Mdv2NW(Zero);
@@ -1931,7 +1929,7 @@ vector NURBS3DSurface::surfaceDerivativeW
     const label vNCPs(vBasis_.nCPs());
     const label uCPI(CPsUCPIs_[CPI]);
     const label vCPI(CPsVCPIs_[CPI]);
-    vector NMWP(vector::zero);
+    vector NMWP(Zero);
     scalar NMW(Zero);
 
     for (label vCPJ=0; vCPJ<vNCPs; vCPJ++)
@@ -1969,8 +1967,8 @@ scalar NURBS3DSurface::lengthDerivativeU
 ) const
 {
     // compute derivatives wrt u for the given u interval
-    vectorField dxdu(nPts, vector::zero);
-    vectorField d2xdu2(nPts, vector::zero);
+    vectorField dxdu(nPts, Zero);
+    vectorField d2xdu2(nPts, Zero);
     scalarField localU(nPts, Zero);
     scalar ulDerivative(Zero);
 
@@ -2007,8 +2005,8 @@ scalar NURBS3DSurface::lengthDerivativeV
 ) const
 {
     // Compute derivatives wrt v for the given v interval.
-    vectorField dxdv(nPts, vector::zero);
-    vectorField d2xdv2(nPts, vector::zero);
+    vectorField dxdv(nPts, Zero);
+    vectorField d2xdv2(nPts, Zero);
     scalarField localV(nPts, Zero);
     scalar vlDerivative(Zero);
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C
index fe22715082..5b03aa37fc 100644
--- a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C
+++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C
@@ -656,7 +656,7 @@ Foam::NURBS3DVolume::NURBS3DVolume
     mapPtr_(nullptr),
     reverseMapPtr_(nullptr),
     parametricCoordinatesPtr_(nullptr),
-    localSystemCoordinates_(mesh_.nPoints(), vector::zero),
+    localSystemCoordinates_(mesh_.nPoints(), Zero),
     confineX1movement_(dict.lookupOrDefault<bool>("confineX1movement", false)),
     confineX2movement_(dict.lookupOrDefault<bool>("confineX2movement", false)),
     confineX3movement_(dict.lookupOrDefault<bool>("confineX3movement", false)),
@@ -737,7 +737,8 @@ Foam::NURBS3DVolume::NURBS3DVolume
         if (cps_.size() != (basisU_.nCPs()*basisV_.nCPs()*basisW_.nCPs()))
         {
             FatalErrorInFunction
-               << "Number of control points does not agree with nCPsU*nCPv*nCPsW"
+               << "Number of control points does not agree with "
+               << "nCPsU*nCPv*nCPsW"
                << exit(FatalError);
         }
     }
@@ -842,7 +843,7 @@ Foam::vector Foam::NURBS3DVolume::volumeDerivativeU
     const label nCPsV = basisV_.nCPs();
     const label nCPsW = basisW_.nCPs();
 
-    vector derivative(vector::zero);
+    vector derivative(Zero);
 
     for (label iCPw = 0; iCPw < nCPsW; ++iCPw)
     {
@@ -878,7 +879,7 @@ Foam::vector Foam::NURBS3DVolume::volumeDerivativeV
     const label nCPsV = basisV_.nCPs();
     const label nCPsW = basisW_.nCPs();
 
-    vector derivative(vector::zero);
+    vector derivative(Zero);
 
     for (label iCPw = 0; iCPw < nCPsW; ++iCPw)
     {
@@ -914,7 +915,7 @@ Foam::vector Foam::NURBS3DVolume::volumeDerivativeW
     const label nCPsV = basisV_.nCPs();
     const label nCPsW = basisW_.nCPs();
 
-    vector derivative(vector::zero);
+    vector derivative(Zero);
 
     for (label iCPw = 0; iCPw < nCPsW; iCPw++)
     {
@@ -948,7 +949,7 @@ Foam::tensor Foam::NURBS3DVolume::JacobianUVW
     vector vDeriv = volumeDerivativeV(u, v, w);
     vector wDeriv = volumeDerivativeW(u, v, w);
 
-    tensor Jacobian(tensor::zero);
+    tensor Jacobian(Zero);
 
     Jacobian[0] = uDeriv.component(0);
     Jacobian[1] = vDeriv.component(0);
@@ -1003,7 +1004,7 @@ Foam::vectorField Foam::NURBS3DVolume::computeControlPointSensitivities
     const labelList& sensitivityPatchIDs
 )
 {
-    vectorField controlPointDerivs(cps_.size(), vector::zero);
+    vectorField controlPointDerivs(cps_.size(), Zero);
 
     // Get parametric coordinates
     const vectorField& parametricCoordinates = getParametricCoordinates();
@@ -1070,7 +1071,7 @@ Foam::vectorField Foam::NURBS3DVolume::computeControlPointSensitivities
 )
 {
     // Return field
-    vectorField controlPointDerivs(cps_.size(), vector::zero);
+    vectorField controlPointDerivs(cps_.size(), Zero);
 
     // Get parametric coordinates
     const vectorField& parametricCoordinates = getParametricCoordinates();
@@ -1094,7 +1095,7 @@ Foam::vectorField Foam::NURBS3DVolume::computeControlPointSensitivities
                 const face& fGlobal = mesh_.faces()[fI + patchStart];
                 const pointField facePoints = fGlobal.points(mesh_.points());
                 // loop over face points
-                tensorField facePointDerivs(facePoints.size(), tensor::zero);
+                tensorField facePointDerivs(facePoints.size(), Zero);
                 forAll(fGlobal, pI)
                 {
                     const label globalIndex = fGlobal[pI]; //global point index
@@ -1142,7 +1143,7 @@ Foam::vector Foam::NURBS3DVolume::computeControlPointSensitivities
 )
 {
     // Return vector
-    vector cpSens(vector::zero);
+    vector cpSens(Zero);
     // Get parametric coordinates
     const vectorField& parametricCoordinates = getParametricCoordinates();
 
@@ -1158,7 +1159,7 @@ Foam::vector Foam::NURBS3DVolume::computeControlPointSensitivities
         const face& fGlobal = mesh_.faces()[fI + patchStart];
         const pointField facePoints = fGlobal.points(mesh_.points());
         // Loop over face points
-        tensorField facePointDerivs(facePoints.size(), tensor::zero);
+        tensorField facePointDerivs(facePoints.size(), Zero);
         forAll(fGlobal, pI)
         {
             const label globalIndex = fGlobal[pI];  //global point index
@@ -1204,7 +1205,7 @@ Foam::tmp<Foam::tensorField> Foam::NURBS3DVolume::dndbBasedSensitivities
     const fvPatch& patch = mesh_.boundary()[patchI];
     const polyPatch& ppatch = patch.patch();
     // Return field
-    tmp<tensorField> tdndbSens(new tensorField(patch.size(), tensor::zero));
+    tmp<tensorField> tdndbSens(new tensorField(patch.size(), Zero));
     tensorField& dndbSens = tdndbSens.ref();
     // Auxilary quantities
     deltaBoundary deltaBoundary(mesh_);
@@ -1220,7 +1221,7 @@ Foam::tmp<Foam::tensorField> Foam::NURBS3DVolume::dndbBasedSensitivities
         const face& fGlobal = mesh_.faces()[fI + patchStart];
         const pointField facePoints = fGlobal.points(mesh_.points());
         // Loop over face points
-        tensorField facePointDerivs(facePoints.size(), tensor::zero);
+        tensorField facePointDerivs(facePoints.size(), Zero);
         forAll(fGlobal, pI)
         {
             const label globalIndex = fGlobal[pI];  //global point index
@@ -1277,8 +1278,8 @@ Foam::tmp<Foam::tensorField> Foam::NURBS3DVolume::patchDxDb
     const labelList& meshPoints = patch.meshPoints();
 
     // Return field
-    tmp<tensorField> tdxdb(new tensorField(patch.nPoints(), tensor::zero));
-    tensorField& dxdb = tdxdb.ref();
+    auto tdxdb = tmp<tensorField>::New(patch.nPoints(), Zero);
+    auto& dxdb = tdxdb.ref();
 
     forAll(meshPoints, pI)
     {
@@ -1316,8 +1317,8 @@ Foam::tmp<Foam::tensorField> Foam::NURBS3DVolume::patchDxDbFace
     const label patchStart = patch.start();
 
     // Return field
-    tmp<tensorField> tdxdb(new tensorField(patch.size(), tensor::zero));
-    tensorField& dxdb = tdxdb.ref();
+    auto tdxdb = tmp<tensorField>::New(patch.size(), Zero);
+    auto& dxdb = tdxdb.ref();
 
     // Mesh differentiation engine
     deltaBoundary deltaBound(mesh_);
@@ -1327,7 +1328,7 @@ Foam::tmp<Foam::tensorField> Foam::NURBS3DVolume::patchDxDbFace
         const face& fGlobal = mesh_.faces()[fI + patchStart];
         const pointField facePoints = fGlobal.points(mesh_.points());
         // Loop over face points
-        tensorField facePointDerivs(facePoints.size(), tensor::zero);
+        tensorField facePointDerivs(facePoints.size(), Zero);
         forAll(fGlobal, pI)
         {
             const label globalIndex = fGlobal[pI];  //global point index
@@ -1374,8 +1375,8 @@ Foam::tmp<Foam::vectorField> Foam::NURBS3DVolume::coordinates
     const label nCPsW = basisW_.nCPs();
 
     const label nPoints = mapPtr_().size();
-    tmp<vectorField> tpoints(new vectorField(nPoints, vector::zero));
-    vectorField& points = tpoints.ref();
+    auto tpoints = tmp<vectorField>::New(nPoints, Zero);
+    auto& points = tpoints.ref();
 
     forAll(points, pI)
     {
@@ -1420,7 +1421,7 @@ Foam::vector Foam::NURBS3DVolume::coordinates
     const scalar v = uVector.y();
     const scalar w = uVector.z();
 
-    vector point(vector::zero);
+    vector point(Zero);
     for (label iCPw = 0; iCPw < nCPsW; iCPw++)
     {
         for (label iCPv = 0; iCPv < nCPsV; iCPv++)
@@ -1787,7 +1788,7 @@ void Foam::NURBS3DVolume::writeCps(const string fileName) const
     const label nCPsU = basisU_.nCPs();
     const label nCPsV = basisV_.nCPs();
 
-    vectorField cpsInCartesian(cps_.size(), vector::zero);
+    vectorField cpsInCartesian(cps_.size(), Zero);
     forAll(cpsInCartesian, cpI)
     {
         cpsInCartesian[cpI] = transformPointToCartesian(cps_[cpI]);
@@ -1843,10 +1844,10 @@ void Foam::NURBS3DVolume::writeCpsInDict() const
         );
 
         cpsDict.add("controlPoints", cps_);
-        // Always write in ASCII format. 
-        // Even when choosing to write in binary through controlDict, 
-        // the content is written in ASCII format but with a binary header. 
-        // This creates problems when the content is read back in 
+        // Always write in ASCII format.
+        // Even when choosing to write in binary through controlDict,
+        // the content is written in ASCII format but with a binary header.
+        // This creates problems when the content is read back in
         // (e.g. continuation)
         cpsDict.regIOobject::writeObject
         (
diff --git a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.H b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.H
index c6b27f6b9a..1ced58cde7 100644
--- a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.H
+++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.H
@@ -37,11 +37,11 @@ Description
         For a short introduction to a volumetric B-Splines morpher and its use
         in shape optimisation
 
-            Papoutsis-Kiachagias, E., Magoulas, N., Mueller, J., 
+            Papoutsis-Kiachagias, E., Magoulas, N., Mueller, J.,
             Othmer, C., & Giannakoglou, K. (2015).
             Noise reduction in car aerodynamics using a surrogate objective
             function and the continuous adjoint method with wall functions.
-            Computers & Fluids, 122, 223–232. 
+            Computers & Fluids, 122, 223-232.
             http://doi.org/10.1016/j.compfluid.2015.09.002
     \endverbatim
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/cartesian/NURBS3DVolumeCartesian.C b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/cartesian/NURBS3DVolumeCartesian.C
index e74a02437b..1ab353df04 100644
--- a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/cartesian/NURBS3DVolumeCartesian.C
+++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/cartesian/NURBS3DVolumeCartesian.C
@@ -90,7 +90,7 @@ void Foam::NURBS3DVolumeCartesian::updateLocalCoordinateSystem
     {
         getParametricCoordinates();
     }
-};
+}
 
 
 // ************************************************************************* //
diff --git a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/cartesian/NURBS3DVolumeCartesian.H b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/cartesian/NURBS3DVolumeCartesian.H
index eba13ffdb0..b83652661b 100644
--- a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/cartesian/NURBS3DVolumeCartesian.H
+++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/cartesian/NURBS3DVolumeCartesian.H
@@ -74,10 +74,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         NURBS3DVolumeCartesian(const NURBS3DVolumeCartesian&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const NURBS3DVolumeCartesian&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/cylindrical/NURBS3DVolumeCylindrical.C b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/cylindrical/NURBS3DVolumeCylindrical.C
index 40b7dc011e..f87ea8c195 100644
--- a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/cylindrical/NURBS3DVolumeCylindrical.C
+++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/cylindrical/NURBS3DVolumeCylindrical.C
@@ -91,7 +91,7 @@ void Foam::NURBS3DVolumeCylindrical::updateLocalCoordinateSystem
     forAll(cartesianPoints, pI)
     {
         const vector& point = cartesianPoints[pI];
-        vector cylindricalCoors(vector::zero);
+        vector cylindricalCoors(Zero);
 
         scalar R = Foam::sqrt(sqr(point.x()) + sqr(point.y()));
         scalar theta = atan2(point.y(), point.x());
@@ -136,7 +136,7 @@ Foam::NURBS3DVolumeCylindrical::NURBS3DVolumeCylindrical
     {
         getParametricCoordinates();
     }
-};
+}
 
 
 // ************************************************************************* //
diff --git a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/cylindrical/NURBS3DVolumeCylindrical.H b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/cylindrical/NURBS3DVolumeCylindrical.H
index 7a999998a8..dd59428032 100644
--- a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/cylindrical/NURBS3DVolumeCylindrical.H
+++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/cylindrical/NURBS3DVolumeCylindrical.H
@@ -74,10 +74,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         NURBS3DVolumeCylindrical(const NURBS3DVolumeCylindrical&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const NURBS3DVolumeCylindrical&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/volBSplinesBase/volBSplinesBase.C b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/volBSplinesBase/volBSplinesBase.C
index 28cabf722e..ca4d51eb30 100644
--- a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/volBSplinesBase/volBSplinesBase.C
+++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/volBSplinesBase/volBSplinesBase.C
@@ -204,7 +204,7 @@ Foam::scalar Foam::volBSplinesBase::computeMaxBoundaryDisplacement
     forAll(volume_, iNURB)
     {
         const label nb = volume_[iNURB].getControlPoints().size();
-        vectorField localControlPointsMovement(nb, vector::zero);
+        vectorField localControlPointsMovement(nb, Zero);
 
         // Set localControlPointsMovement
         forAll(localControlPointsMovement, iCPM)
@@ -239,7 +239,7 @@ void Foam::volBSplinesBase::boundControlPointsMovement
     forAll(volume_, iNURB)
     {
         label nb = volume_[iNURB].getControlPoints().size();
-        vectorField localControlPointsMovement(nb, vector::zero);
+        vectorField localControlPointsMovement(nb, Zero);
 
         // set localControlPointsMovement
         forAll (localControlPointsMovement, iCPM)
@@ -271,7 +271,7 @@ void Foam::volBSplinesBase::moveControlPoints
     forAll(volume_, iNURB)
     {
         const label nb = volume_[iNURB].getControlPoints().size();
-        vectorField localControlPointsMovement(nb, vector::zero);
+        vectorField localControlPointsMovement(nb, Zero);
 
         // set localControlPointsMovement
         forAll (localControlPointsMovement, iCPM)
@@ -282,7 +282,7 @@ void Foam::volBSplinesBase::moveControlPoints
 
         const vectorField newCps
         (
-            volume_[iNURB].getControlPoints() 
+            volume_[iNURB].getControlPoints()
           + localControlPointsMovement
         );
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBSbasis/NURBSbasis.C b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBSbasis/NURBSbasis.C
index 40a8d4700e..a1918a61a4 100644
--- a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBSbasis/NURBSbasis.C
+++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBSbasis/NURBSbasis.C
@@ -101,7 +101,7 @@ NURBSbasis::NURBSbasis
 :
     nCPs_(nCPs),
     basisDegree_(degree),
-    knots_((nCPs_ + basisDegree_ + 1), scalar(0))
+    knots_((nCPs_ + basisDegree_ + 1), Zero)
 {
     computeKnots();
 }
@@ -114,7 +114,7 @@ NURBSbasis::NURBSbasis
 :
     nCPs_(dict.get<label>("nCPs")),
     basisDegree_(dict.get<label>("basisDegree")),
-    knots_((nCPs_ + basisDegree_ + 1), scalar(0))
+    knots_((nCPs_ + basisDegree_ + 1), Zero)
 {
     computeKnots();
 }
@@ -143,7 +143,7 @@ scalar NURBSbasis::basisValue
     const scalar u
 ) const
 {
-    scalar value(scalar(0));
+    scalar value(0);
 
     if (checkRange(u, iCP, degree))
     {
@@ -196,7 +196,7 @@ scalar NURBSbasis::basisDerivativeU
     // Zero  basis function has a zero derivative,
     // irrespective of the knot span: ignore that case
     // - else, call recursively until reaching zero degree
-    scalar derivative(scalar(0));
+    scalar derivative(0);
 
     if ((degree != 0) && checkRange(u, iCP, degree))
     {
@@ -237,7 +237,7 @@ scalar NURBSbasis::basisDerivativeUU
     // Zero  basis function has a zero derivative,
     // irrespective of the knot span: ignore that case
     // - else, call recursively until reaching zero degree
-    scalar derivative(scalar(0));
+    scalar derivative(0);
 
     if ((degree != 0) && checkRange(u, iCP, degree))
     {
@@ -300,7 +300,7 @@ label NURBSbasis::insertKnot
 )
 {
     // Find the index of insertion, accounting for uBar=1.
-    scalarList newKnots((knots_.size()+1), scalar(0));
+    scalarList newKnots((knots_.size()+1), Zero);
     label kInsert(-1);
 
     for (label kI = 0; kI < (knots_.size()-1); kI++)
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/adjointSolver/adjointSolver.C b/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/adjointSolver/adjointSolver.C
index aa3394c78f..98f385c408 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/adjointSolver/adjointSolver.C
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/adjointSolver/adjointSolver.C
@@ -115,7 +115,7 @@ const Foam::primalSolver& Foam::adjointSolver::getPrimalSolver() const
 
 Foam::primalSolver& Foam::adjointSolver::getPrimalSolver()
 {
-    return 
+    return
         const_cast<primalSolver&>
         (
             mesh_.lookupObject<primalSolver>(primalSolverName_)
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/adjointSolver/adjointSolver.H b/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/adjointSolver/adjointSolver.H
index 7c23ef3ea7..1207eba238 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/adjointSolver/adjointSolver.H
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/adjointSolver/adjointSolver.H
@@ -154,12 +154,12 @@ public:
             {
                 return primalSolverName_;
             }
-           
-            //- Return a const-reference to the primal solver 
+
+            //- Return a const-reference to the primal solver
             //- corresponding to this adjoint solver
             const primalSolver& getPrimalSolver() const;
 
-            //- Return a non const-reference to the primal solver 
+            //- Return a non const-reference to the primal solver
             //- corresponding to this adjoint solver
             primalSolver& getPrimalSolver();
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/incompressible/adjointSimple/adjointSimple.C b/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/incompressible/adjointSimple/adjointSimple.C
index 27ba697db9..d59f6e9347 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/incompressible/adjointSimple/adjointSimple.C
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/incompressible/adjointSimple/adjointSimple.C
@@ -341,13 +341,13 @@ void Foam::adjointSimple::computeObjectiveSensitivities()
         const scalarField& sens = adjointSensitivity_->calculateSensitivities();
         if (sensitivities_.empty())
         {
-            sensitivities_.reset(new scalarField(sens.size(), scalar(0)));
+            sensitivities_.reset(new scalarField(sens.size(), Zero));
         }
         sensitivities_.ref() = sens;
     }
     else
     {
-        sensitivities_.reset(new scalarField(0));
+        sensitivities_.reset(new scalarField());
     }
 }
 
@@ -375,21 +375,17 @@ void Foam::adjointSimple::clearSensitivities()
 
 Foam::sensitivity& Foam::adjointSimple::getSensitivityBase()
 {
-    if (adjointSensitivity_.valid())
-    {
-        return adjointSensitivity_();
-    }
-    else
+    if (!adjointSensitivity_.valid())
     {
         FatalErrorInFunction
-            << "Sensitivity object not allocated \n"
+            << "Sensitivity object not allocated" << nl
             << "Turn computeSensitivities on in "
             << solverName_
             << nl << nl
             << exit(FatalError);
-
-        return adjointSensitivity_();
     }
+
+    return adjointSensitivity_();
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/incompressible/adjointSimple/adjointSimple.H b/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/incompressible/adjointSimple/adjointSimple.H
index 6c5658bbcd..14b348f632 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/incompressible/adjointSimple/adjointSimple.H
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/incompressible/adjointSimple/adjointSimple.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::adjointSimple
 
@@ -101,7 +100,7 @@ protected:
     // Protected Member Functions
 
         //- Allocate incompressibleAdjointVars and return reference to be used
-        //- for convenience in the rest of the class. 
+        //- for convenience in the rest of the class.
         incompressibleAdjointVars& allocateVars();
 
         //- In case variable names are different than the base ones,
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/incompressible/incompressibleAdjointSolver/incompressibleAdjointSolver.C b/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/incompressible/incompressibleAdjointSolver/incompressibleAdjointSolver.C
index 897c84240e..06c674033f 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/incompressible/incompressibleAdjointSolver/incompressibleAdjointSolver.C
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/incompressible/incompressibleAdjointSolver/incompressibleAdjointSolver.C
@@ -135,7 +135,7 @@ Foam::incompressibleAdjointSolver::getPrimalVars() const
 const Foam::incompressibleAdjointVars&
 Foam::incompressibleAdjointSolver::getAdjointVars() const
 {
-    const incompressibleAdjointVars& adjointVars = 
+    const incompressibleAdjointVars& adjointVars =
         refCast<incompressibleAdjointVars>(const_cast<variablesSet&>(vars_()));
     return adjointVars;
 }
@@ -144,7 +144,7 @@ Foam::incompressibleAdjointSolver::getAdjointVars() const
 Foam::incompressibleAdjointVars&
 Foam::incompressibleAdjointSolver::getAdjointVars()
 {
-    incompressibleAdjointVars& adjointVars = 
+    incompressibleAdjointVars& adjointVars =
         refCast<incompressibleAdjointVars>(const_cast<variablesSet&>(vars_()));
     return adjointVars;
 }
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/RASTurbulenceModel/RASTurbulenceModel.H b/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/RASTurbulenceModel/RASTurbulenceModel.H
index ab3ff088de..b4dd92895a 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/RASTurbulenceModel/RASTurbulenceModel.H
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/RASTurbulenceModel/RASTurbulenceModel.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::RASTurbulenceModel
 
@@ -57,10 +56,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         RASTurbulenceModel(const RASTurbulenceModel&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const RASTurbulenceModel&) = delete;
 
 
@@ -78,8 +77,8 @@ protected:
 
     //- Protected Member Functions
 
-        //- Allocate incompressibleVars and return reference to be used for 
-        //- convenience in the rest of the class. 
+        //- Allocate incompressibleVars and return reference to be used for
+        //- convenience in the rest of the class.
         incompressibleVars& allocateVars();
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/incompressiblePrimalSolver/incompressiblePrimalSolver.C b/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/incompressiblePrimalSolver/incompressiblePrimalSolver.C
index cab66b92c9..c540c919ea 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/incompressiblePrimalSolver/incompressiblePrimalSolver.C
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/incompressiblePrimalSolver/incompressiblePrimalSolver.C
@@ -155,7 +155,7 @@ bool Foam::incompressiblePrimalSolver::useSolverNameForFields() const
 const Foam::incompressibleVars&
 Foam::incompressiblePrimalSolver::getIncoVars() const
 {
-    const incompressibleVars& incoVars = 
+    const incompressibleVars& incoVars =
         refCast<incompressibleVars>(const_cast<variablesSet&>(vars_()));
     return incoVars;
 }
@@ -164,7 +164,7 @@ Foam::incompressiblePrimalSolver::getIncoVars() const
 Foam::incompressibleVars&
 Foam::incompressiblePrimalSolver::getIncoVars()
 {
-    incompressibleVars& incoVars = 
+    incompressibleVars& incoVars =
         refCast<incompressibleVars>(const_cast<variablesSet&>(vars_()));
     return incoVars;
 }
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/simple/simple.C b/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/simple/simple.C
index 6f2c345442..d966dae50b 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/simple/simple.C
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/simple/simple.C
@@ -137,7 +137,7 @@ void Foam::simple::solveIter()
     volScalarField& p = incoVars_.pInst();
     volVectorField& U = incoVars_.UInst();
     surfaceScalarField& phi = incoVars_.phiInst();
-    autoPtr<incompressible::turbulenceModel>& turbulence = 
+    autoPtr<incompressible::turbulenceModel>& turbulence =
         incoVars_.turbulence();
     label&  pRefCell  = solverControl_().pRefCell();
     scalar& pRefValue = solverControl_().pRefValue();
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/simple/simple.H b/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/simple/simple.H
index 48d102dede..bc384375a1 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/simple/simple.H
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/simple/simple.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::simple
 
@@ -59,10 +58,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         simple(const simple&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const simple&) = delete;
 
 
@@ -90,8 +89,8 @@ protected:
 
     //- Protected Member Functions
 
-        //- Allocate incompressibleVars and return reference to be used for 
-        //- convenience in the rest of the class. 
+        //- Allocate incompressibleVars and return reference to be used for
+        //- convenience in the rest of the class.
         incompressibleVars& allocateVars();
 
         //- In case variable names are different than the base ones,
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/primalSolver/primalSolver.H b/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/primalSolver/primalSolver.H
index 96f6c9a7c6..2a859ff1a7 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/primalSolver/primalSolver.H
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/primalSolver/primalSolver.H
@@ -58,10 +58,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         primalSolver(const primalSolver&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const primalSolver&) = delete;
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/solver/solver.H b/src/optimisation/adjointOptimisation/adjoint/solvers/solver/solver.H
index b9dfdebc07..79094cbc0e 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/solver/solver.H
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/solver/solver.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::solver
 
@@ -90,7 +89,7 @@ protected:
         //  in the destructor
         const volScalarField* optTypeSource_;
 
-        //- Base variableSet pointer. 
+        //- Base variableSet pointer.
         //  To be allocated in derived classes
         autoPtr<variablesSet> vars_;
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/solverControl/SIMPLEControl/optimisation/SIMPLEControlOpt.C b/src/optimisation/adjointOptimisation/adjoint/solvers/solverControl/SIMPLEControl/optimisation/SIMPLEControlOpt.C
index ede8960d8f..de5c9b9611 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/solverControl/SIMPLEControl/optimisation/SIMPLEControlOpt.C
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/solverControl/SIMPLEControl/optimisation/SIMPLEControlOpt.C
@@ -157,7 +157,7 @@ bool Foam::SIMPLEControlOpt::loop()
         runTime.write();
         solver_.write();
 
-        // Check whether mean fields have not been computed due to an 
+        // Check whether mean fields have not been computed due to an
         // unexpectedly early convergence
         checkMeanSolution();
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/incompressible/incompressibleVars.C b/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/incompressible/incompressibleVars.C
index 2e23dc896c..88ec489d12 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/incompressible/incompressibleVars.C
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/incompressible/incompressibleVars.C
@@ -530,7 +530,7 @@ void incompressibleVars::transfer(variablesSet& vars)
     swapAndRename(UPtr_, incoVars.UPtr_);
     swapAndRename(phiPtr_, incoVars.phiPtr_);
 
-    // Transfer turbulent fields. Copies fields since original fields are 
+    // Transfer turbulent fields. Copies fields since original fields are
     // not owned by RASModelVariables but from the turbulence model
     RASModelVariables_->transfer(incoVars.RASModelVariables()());
 }
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/incompressible/incompressibleVars.H b/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/incompressible/incompressibleVars.H
index 03a8492fd3..9771edd871 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/incompressible/incompressibleVars.H
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/incompressible/incompressibleVars.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::incompressibleVars
 
@@ -110,7 +109,7 @@ protected:
         //- Update boundary conditions of turbulent fields
         void correctTurbulentBoundaryConditions();
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const incompressibleVars&);
 
 
@@ -132,12 +131,12 @@ public:
         );
 
         //- Copy constructor
-        //  turbulence_ and laminarTransport_ are unitialized since there is 
+        //  turbulence_ and laminarTransport_ are unitialized since there is
         //  no clear way (and possibly no usage) of cloning them.
         //  The resulting incompressibleVars is hence incomplete.
-        //  Additionally, copied fields have the original name, appended with 
-        //  the timeName, to avoid database collisions. 
-        //  To be used as storing space during the solutiuon of the unsteady 
+        //  Additionally, copied fields have the original name, appended with
+        //  the timeName, to avoid database collisions.
+        //  To be used as storing space during the solutiuon of the unsteady
         //  adjoint equations
         incompressibleVars(const incompressibleVars& vs);
 
@@ -249,7 +248,7 @@ public:
             //- Transfer the fields of another variablesSet to this
             virtual void transfer(variablesSet& vars);
 
-            //- Write dummy turbulent fields to allow for continuation in 
+            //- Write dummy turbulent fields to allow for continuation in
             //- multi-point, turbulent runs
             bool write() const;
 };
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/incompressibleAdjoint/incompressibleAdjointVars.H b/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/incompressibleAdjoint/incompressibleAdjointVars.H
index dc44fd2cd9..815edfb43b 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/incompressibleAdjoint/incompressibleAdjointVars.H
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/incompressibleAdjoint/incompressibleAdjointVars.H
@@ -67,10 +67,10 @@ protected:
 
     // Protected Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         incompressibleAdjointVars(const incompressibleAdjointVars&);
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const incompressibleAdjointVars&);
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/incompressibleAdjointMeanFlow/incompressibleAdjointMeanFlowVars.H b/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/incompressibleAdjointMeanFlow/incompressibleAdjointMeanFlowVars.H
index abf60b3a8f..5082cf6f52 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/incompressibleAdjointMeanFlow/incompressibleAdjointMeanFlowVars.H
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/incompressibleAdjointMeanFlow/incompressibleAdjointMeanFlowVars.H
@@ -57,13 +57,13 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         incompressibleAdjointMeanFlowVars
         (
             const incompressibleAdjointMeanFlowVars&
         );
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const incompressibleAdjointMeanFlowVars&);
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/variablesSet/variablesSet.C b/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/variablesSet/variablesSet.C
index ed3e5c474e..5348d50148 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/variablesSet/variablesSet.C
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/variablesSet/variablesSet.C
@@ -193,7 +193,7 @@ tmp<volVectorField> variablesSet::autoCreateMeshMovementField
 }
 
 
-void variablesSet::transfer(variablesSet& vars) 
+void variablesSet::transfer(variablesSet& vars)
 {
     // Does nothing in base
 }
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/variablesSet/variablesSet.H b/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/variablesSet/variablesSet.H
index cbd603aba2..c798f0ac65 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/variablesSet/variablesSet.H
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/variablesSet/variablesSet.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::variablesSet
 
@@ -54,10 +53,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         variablesSet(const variablesSet&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const variablesSet&) = delete;
 
         //- Add the solverName to every patch entry read from the boundaryField
@@ -100,7 +99,7 @@ protected:
         bool useSolverNameForFields_;
 
 
-    // Protected Member Functions 
+    // Protected Member Functions
 
         template<class Type, template<class> class PatchField, class GeoMesh>
         autoPtr<GeometricField<Type, PatchField, GeoMesh>> allocateRenamedField
@@ -112,7 +111,7 @@ protected:
         template<class Type, template<class> class PatchField, class GeoMesh>
         void swapAndRename
         (
-            autoPtr<GeometricField<Type, PatchField, GeoMesh>>& p1, 
+            autoPtr<GeometricField<Type, PatchField, GeoMesh>>& p1,
             autoPtr<GeometricField<Type, PatchField, GeoMesh>>& p2
         );
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/variablesSet/variablesSetTemplates.C b/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/variablesSet/variablesSetTemplates.C
index 55f75f4ad9..763813ebf8 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/variablesSet/variablesSetTemplates.C
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/variablesSet/variablesSetTemplates.C
@@ -162,7 +162,7 @@ bool variablesSet::readFieldOK
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-autoPtr<GeometricField<Type, PatchField, GeoMesh>> 
+autoPtr<GeometricField<Type, PatchField, GeoMesh>>
 variablesSet::allocateRenamedField
 (
     const autoPtr<GeometricField<Type, PatchField, GeoMesh>>& bf
@@ -174,11 +174,11 @@ variablesSet::allocateRenamedField
     {
         const word timeName = bf().mesh().time().timeName();
         returnField.reset
-        ( 
+        (
             new fieldType
             (
-                bf().name() + timeName, 
-                bf() 
+                bf().name() + timeName,
+                bf()
             )
         );
     }
@@ -193,10 +193,10 @@ void variablesSet::swapAndRename
     autoPtr<GeometricField<Type, PatchField, GeoMesh>>& p2
 )
 {
-    // Swaping pointers is OK for the mean flow fields known by the 
-    // variablesSet (and, in essence, by the solver). 
-    // The problem is that turbulence models know references to U and phi 
-    // which cannot be swapped. 
+    // Swaping pointers is OK for the mean flow fields known by the
+    // variablesSet (and, in essence, by the solver).
+    // The problem is that turbulence models know references to U and phi
+    // which cannot be swapped.
     /*
     const word name1 = p1().name();
     const word name2 = p2().name();
@@ -207,7 +207,7 @@ void variablesSet::swapAndRename
     p2().rename(name2);
     */
 
-    // Copy back-up fields to original instead. Slower but there seems to be 
+    // Copy back-up fields to original instead. Slower but there seems to be
     // no other way
     GeometricField<Type, PatchField, GeoMesh> temp("temp", p1());
     p1() == p2();
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointInletNuaTilda/adjointInletNuaTildaFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointInletNuaTilda/adjointInletNuaTildaFvPatchScalarField.C
index 68feb1e9f7..ef3eee6b76 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointInletNuaTilda/adjointInletNuaTildaFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointInletNuaTilda/adjointInletNuaTildaFvPatchScalarField.C
@@ -113,7 +113,7 @@ tmp<Field<scalar>> adjointInletNuaTildaFvPatchScalarField::valueBoundaryCoeffs
     const tmp<scalarField>&
 ) const
 {
-    return tmp<Field<scalar>>::New(this->size(), pTraits<scalar>::zero);
+    return tmp<Field<scalar>>::New(this->size(), Zero);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchScalarField.C
index 0397f0da80..c9c2cdebf6 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletFlux/adjointOutletFluxFvPatchScalarField.C
@@ -106,7 +106,7 @@ tmp<Field<scalar>> adjointOutletFluxFvPatchScalarField::valueInternalCoeffs
     const tmp<scalarField>&
 ) const
 {
-    return tmp<Field<scalar>>::New(this->size(), pTraits<scalar>::zero);
+    return tmp<Field<scalar>>::New(this->size(), Zero);
 }
 
 
@@ -115,21 +115,21 @@ tmp<Field<scalar>> adjointOutletFluxFvPatchScalarField::valueBoundaryCoeffs
     const tmp<scalarField>&
 ) const
 {
-    return tmp<Field<scalar>>::New(this->size(), pTraits<scalar>::zero);
+    return tmp<Field<scalar>>::New(this->size(), Zero);
 }
 
 
 tmp<Field<scalar>>
 adjointOutletFluxFvPatchScalarField::gradientBoundaryCoeffs() const
 {
-    return tmp<Field<scalar>>::New(this->size(), pTraits<scalar>::zero);
+    return tmp<Field<scalar>>::New(this->size(), Zero);
 }
 
 
 tmp<Field<scalar>>
 adjointOutletFluxFvPatchScalarField::gradientInternalCoeffs() const
 {
-    return tmp<Field<scalar>>::New(this->size(), pTraits<scalar>::zero);
+    return tmp<Field<scalar>>::New(this->size(), Zero);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTildaFlux/adjointOutletNuaTildaFluxFvPatchScalarField.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTildaFlux/adjointOutletNuaTildaFluxFvPatchScalarField.C
index fe5238e934..b78448441a 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTildaFlux/adjointOutletNuaTildaFluxFvPatchScalarField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointOutletNuaTildaFlux/adjointOutletNuaTildaFluxFvPatchScalarField.C
@@ -116,7 +116,7 @@ adjointOutletNuaTildaFluxFvPatchScalarField::valueInternalCoeffs
     const tmp<scalarField>&
 ) const
 {
-    return tmp<Field<scalar>>::New(this->size(), pTraits<scalar>::zero);
+    return tmp<Field<scalar>>::New(this->size(), Zero);
 }
 
 
@@ -126,21 +126,21 @@ adjointOutletNuaTildaFluxFvPatchScalarField::valueBoundaryCoeffs
     const tmp<scalarField>&
 ) const
 {
-    return tmp<Field<scalar>>::New(this->size(), pTraits<scalar>::zero);
+    return tmp<Field<scalar>>::New(this->size(), Zero);
 }
 
 
 tmp<Field<scalar>>
 adjointOutletNuaTildaFluxFvPatchScalarField::gradientBoundaryCoeffs() const
 {
-    return tmp<Field<scalar>>::New(this->size(), pTraits<scalar>::zero);
+    return tmp<Field<scalar>>::New(this->size(), Zero);
 }
 
 
 tmp<Field<scalar>>
 adjointOutletNuaTildaFluxFvPatchScalarField::gradientInternalCoeffs() const
 {
-    return tmp<Field<scalar>>::New(this->size(), pTraits<scalar>::zero);
+    return tmp<Field<scalar>>::New(this->size(), Zero);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointTurbulenceModel/adjointTurbulenceModel.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointTurbulenceModel/adjointTurbulenceModel.C
index 7ddf2b4dc1..56e04d829b 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointTurbulenceModel/adjointTurbulenceModel.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointTurbulenceModel/adjointTurbulenceModel.C
@@ -104,11 +104,12 @@ autoPtr<adjointTurbulenceModel> adjointTurbulenceModel::New
 
     if (!cstrIter.found())
     {
-        FatalErrorInFunction
-            << modelType << nl << nl
-            << "Valid adjointTurbulenceModel types:" << endl
-            << adjointTurbulenceModelConstructorTablePtr_->sortedToc()
-            << exit(FatalError);
+        FatalErrorInLookup
+        (
+            "adjointTurbulenceModel",
+            modelType,
+            *adjointTurbulenceModelConstructorTablePtr_
+        ) << exit(FatalError);
     }
 
     return autoPtr<adjointTurbulenceModel>
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.C b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.C
index face1ddc47..7b9e724fc4 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.C
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.C
@@ -149,14 +149,14 @@ void RASModelVariables::allocateMeanFields()
 }
 
 
-RASModelVariables::autoTmp 
+RASModelVariables::autoTmp
 RASModelVariables::cloneAutoTmp(const autoTmp& source) const
 {
     autoTmp returnField(nullptr);
     if (source.valid() && source().valid())
     {
         const volScalarField& sf = source()();
-        DebugInfo 
+        DebugInfo
             << "Cloning " << sf.name() << endl;
         const word timeName = mesh_.time().timeName();
         returnField.reset
@@ -222,7 +222,7 @@ RASModelVariables::RASModelVariables
 (
     const RASModelVariables& rmv
 )
-:    
+:
     mesh_(rmv.mesh_),
     solverControl_(rmv.solverControl_),
     hasTMVar1_(rmv.hasTMVar1_),
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.H b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.H
index 7df92e3fe6..ac94b06479 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.H
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.H
@@ -25,7 +25,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Class
     Foam::incompressible::RASModelVariables
 
@@ -115,7 +114,7 @@ private:
     // Private Member Functions
 
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const RASModelVariables&) = delete;
 
 
@@ -150,9 +149,9 @@ public:
         );
 
         //- Copy constructor
-        //  Will allocate new fields (instead of referencing the ones in the 
+        //  Will allocate new fields (instead of referencing the ones in the
         //  turbulence model), so cannot be used directly to access the fields
-        //  of the turbulence model. 
+        //  of the turbulence model.
         //  Mainly used for checkpointing in unsteady adjoint
         RASModelVariables
         (
@@ -160,9 +159,9 @@ public:
         );
 
         //- Clone
-        //  Will allocate new fields (instead of referencing the ones in the 
+        //  Will allocate new fields (instead of referencing the ones in the
         //  turbulence model), so cannot be used directly to access the fields
-        //  of the turbulence model. 
+        //  of the turbulence model.
         //  Mainly used for checkpointing in unsteady adjoint
         autoPtr<RASModelVariables> clone() const;