From db8a8404591f0f4dbd1dfbbece7a38a4ff6f0617 Mon Sep 17 00:00:00 2001 From: Vaggelis Papoutsis Date: Thu, 12 Dec 2019 11:40:01 -0500 Subject: [PATCH] COMP: BFGS and SR1 failed to compile with SP - Failed due to double*Matrix multiplication. Style changes - use SquareMatrix with Identity on construction - use Zero in constructors - remove trailing space and semi-colons --- .../LES/LESdeltas/smoothDelta/smoothDelta.H | 4 +- .../adjoint/ATCModel/ATCModel/ATCModel.H | 4 +- .../adjoint/ATCModel/ATCUaGradU/ATCUaGradU.H | 4 +- .../ATCModel/ATCstandard/ATCstandard.H | 4 +- .../adjoint/ATCModel/cancelATC/cancelATC.H | 4 +- .../zeroATCcells/faceCells/faceCells.H | 4 +- .../zeroATCcells/pointCells/pointCells.H | 4 +- .../zeroATCcells/zeroATCcells/zeroATCcells.H | 5 +- .../adjointInletVelocityFvPatchVectorField.C | 2 +- ...ointOutletVelocityFluxFvPatchVectorField.C | 8 +- .../adjointWallVelocityFvPatchVectorField.C | 2 +- .../adjointZeroInletFvPatchField.C | 2 +- .../boundaryAdjointContribution.H | 4 +- ...oundaryAdjointContributionIncompressible.H | 4 +- ...jointContributionIncompressibleTemplates.C | 5 +- .../adjoint/deltaBoundary/deltaBoundary.C | 60 ++++++------ .../adjoint/deltaBoundary/deltaBoundary.H | 4 +- .../deltaBoundary/deltaBoundaryTemplates.C | 4 +- .../displacementMethod/displacementMethod.H | 4 +- .../displacementMethoddisplacementLaplacian.H | 4 +- ...displacementMethodelasticityMotionSolver.H | 4 +- .../displacementMethodlaplacianMotionSolver.H | 4 +- .../displacementMethodvelocityLaplacian.H | 4 +- ...mentMethodvolumetricBSplinesMotionSolver.H | 4 +- .../elasticityMotionSolver.C | 9 +- .../elasticityMotionSolver.H | 9 +- .../elasticityMotionSolverI.H | 5 +- .../laplacianMotionSolver.C | 7 +- .../laplacianMotionSolver.H | 4 +- .../laplacianMotionSolverI.H | 5 +- .../volumetricBSplinesMotionSolver.C | 4 +- .../volumetricBSplinesMotionSolver.H | 4 +- .../linearUpwindNormal/linearUpwindNormal.C | 2 +- .../linearUpwindNormal/linearUpwindNormal.H | 4 +- .../fvOptions/fvIOoptionListAdjoint.H | 4 +- .../fvOptions/fvOptionAdjointList.H | 4 +- .../objectiveManager/objectiveManager.C | 2 +- .../objectiveManager/objectiveManager.H | 7 +- .../objectiveManagerIncompressible.H | 4 +- .../objectiveForceTarget.C | 2 +- .../objectiveIncompressible.C | 2 +- .../objectiveIncompressible.H | 4 +- .../adjoint/objectives/objective/objective.C | 22 ++--- .../adjoint/objectives/objective/objective.H | 7 +- .../FIBase/FIBaseIncompressible.C | 10 +- .../FIBase/FIBaseIncompressible.H | 15 ++- .../SIBase/SIBaseIncompressible.C | 14 +-- .../SIBase/SIBaseIncompressible.H | 10 +- .../adjointEikonalSolverIncompressible.C | 2 +- .../adjointMeshMovementSolverIncompressible.C | 2 +- .../adjointMeshMovementSolverIncompressible.H | 4 +- .../adjointSensitivityIncompressible.C | 2 +- .../adjointSensitivityIncompressible.H | 7 +- .../sensitivityBezierIncompressible.C | 26 ++--- .../sensitivityBezierIncompressible.H | 8 +- .../sensitivityBezierFIIncompressible.C | 6 +- .../sensitivityBezierFIIncompressible.H | 9 +- .../sensitivityMultipleIncompressible.C | 2 +- .../sensitivityMultipleIncompressible.H | 7 +- .../sensitivitySurfaceIncompressible.C | 18 ++-- .../sensitivitySurfaceIncompressible.H | 7 +- .../sensitivitySurfaceIncompressibleI.H | 10 +- .../sensitivitySurfacePointsIncompressible.C | 26 ++--- .../sensitivitySurfacePointsIncompressible.H | 15 ++- .../sensitivityVolBSplinesIncompressible.C | 16 ++-- .../sensitivityVolBSplinesIncompressible.H | 7 +- .../sensitivityVolBSplinesFIIncompressible.C | 18 ++-- .../sensitivityVolBSplinesFIIncompressible.H | 7 +- .../sensitivity/sensitivity.H | 4 +- .../shapeSensitivitiesBase.C | 10 +- .../shapeSensitivitiesBase.H | 7 +- .../ArmijoConditions/ArmijoConditions.C | 2 +- .../ArmijoConditions/ArmijoConditions.H | 7 +- .../lineSearch/lineSearch/lineSearch.H | 10 +- .../stepUpdate/bisection/bisection.H | 4 +- .../stepUpdate/quadratic/quadratic.H | 4 +- .../stepUpdate/stepUpdate/stepUpdate.H | 6 +- .../optMeshMovement/optMeshMovement.C | 6 +- .../optMeshMovement/optMeshMovement.H | 10 +- .../optMeshMovementBezier.C | 6 +- .../optMeshMovementBezier.H | 6 +- .../optMeshMovementNULL/optMeshMovementNULL.C | 2 +- .../optMeshMovementNULL/optMeshMovementNULL.H | 4 +- .../optMeshMovementVolumetricBSplines.C | 2 +- .../optMeshMovementVolumetricBSplines.H | 4 +- ...ntVolumetricBSplinesExternalMotionSolver.C | 10 +- ...ntVolumetricBSplinesExternalMotionSolver.H | 6 +- .../optimisationManager/optimisationManager.H | 4 +- .../optimisationManager/singleRun/singleRun.H | 4 +- .../steadyOptimisation/steadyOptimisation.H | 4 +- .../optimisationTypeIncompressible.C | 2 +- .../optimisationTypeIncompressible.H | 4 +- .../shapeOptimisationIncompressible.C | 4 +- .../shapeOptimisationIncompressible.H | 4 +- .../optimisation/updateMethod/BFGS/BFGS.C | 22 ++--- .../optimisation/updateMethod/BFGS/BFGS.H | 4 +- .../optimisation/updateMethod/DBFGS/DBFGS.C | 16 ++-- .../optimisation/updateMethod/DBFGS/DBFGS.H | 4 +- .../optimisation/updateMethod/LBFGS/LBFGS.C | 20 ++-- .../optimisation/updateMethod/LBFGS/LBFGS.H | 9 +- .../optimisation/updateMethod/SQP/SQP.C | 16 ++-- .../optimisation/updateMethod/SQP/SQP.H | 4 +- .../optimisation/updateMethod/SR1/SR1.C | 19 ++-- .../optimisation/updateMethod/SR1/SR1.H | 4 +- .../conjugateGradient/conjugateGradient.C | 4 +- .../conjugateGradient/conjugateGradient.H | 4 +- .../steepestDescent/steepestDescent.H | 4 +- .../updateMethod/updateMethod/updateMethod.C | 12 +-- .../updateMethod/updateMethod/updateMethod.H | 7 +- .../adjoint/parameterization/Bezier/Bezier.C | 36 +++---- .../adjoint/parameterization/Bezier/Bezier.H | 7 +- .../NURBS/NURBS3DCurve/NURBS3DCurve.C | 44 ++++----- .../NURBS/NURBS3DSurface/NURBS3DSurface.C | 94 +++++++++---------- .../NURBS3DVolume/NURBS3DVolume.C | 53 ++++++----- .../NURBS3DVolume/NURBS3DVolume.H | 4 +- .../cartesian/NURBS3DVolumeCartesian.C | 2 +- .../cartesian/NURBS3DVolumeCartesian.H | 4 +- .../cylindrical/NURBS3DVolumeCylindrical.C | 4 +- .../cylindrical/NURBS3DVolumeCylindrical.H | 4 +- .../volBSplinesBase/volBSplinesBase.C | 8 +- .../NURBS/NURBSbasis/NURBSbasis.C | 12 +-- .../adjointSolver/adjointSolver.C | 2 +- .../adjointSolver/adjointSolver.H | 6 +- .../adjointSimple/adjointSimple.C | 16 ++-- .../adjointSimple/adjointSimple.H | 3 +- .../incompressibleAdjointSolver.C | 4 +- .../RASTurbulenceModel/RASTurbulenceModel.H | 9 +- .../incompressiblePrimalSolver.C | 4 +- .../incompressible/simple/simple.C | 2 +- .../incompressible/simple/simple.H | 9 +- .../primalSolvers/primalSolver/primalSolver.H | 4 +- .../adjoint/solvers/solver/solver.H | 3 +- .../optimisation/SIMPLEControlOpt.C | 2 +- .../incompressible/incompressibleVars.C | 2 +- .../incompressible/incompressibleVars.H | 13 ++- .../incompressibleAdjointVars.H | 4 +- .../incompressibleAdjointMeanFlowVars.H | 4 +- .../variablesSet/variablesSet/variablesSet.C | 2 +- .../variablesSet/variablesSet/variablesSet.H | 9 +- .../variablesSet/variablesSetTemplates.C | 18 ++-- .../adjointInletNuaTildaFvPatchScalarField.C | 2 +- .../adjointOutletFluxFvPatchScalarField.C | 8 +- ...ointOutletNuaTildaFluxFvPatchScalarField.C | 8 +- .../adjointTurbulenceModel.C | 11 ++- .../RAS/RASModelVariables/RASModelVariables.C | 6 +- .../RAS/RASModelVariables/RASModelVariables.H | 11 +-- 146 files changed, 590 insertions(+), 640 deletions(-) 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 . - 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& ) const { - return tmp>::New(this->size(), pTraits::zero); + return tmp>::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& ) const { - return tmp>::New(this->size(), pTraits::zero); + return tmp>::New(this->size(), Zero); } @@ -177,7 +177,7 @@ Foam::adjointOutletVelocityFluxFvPatchVectorField::valueBoundaryCoeffs const tmp& ) const { - return tmp>::New(this->size(), pTraits::zero); + return tmp>::New(this->size(), Zero); } @@ -185,7 +185,7 @@ Foam::tmp> Foam::adjointOutletVelocityFluxFvPatchVectorField:: gradientBoundaryCoeffs() const { - return tmp>::New(this->size(), pTraits::zero); + return tmp>::New(this->size(), Zero); } @@ -193,7 +193,7 @@ Foam::tmp> Foam::adjointOutletVelocityFluxFvPatchVectorField:: gradientInternalCoeffs() const { - return tmp>::New(this->size(), pTraits::zero); + return tmp>::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::valueBoundaryCoeffs const tmp& ) const { - return tmp>::New(this->size(), pTraits::zero); + return tmp>::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> tdJtotdvar - (new Field(patch_.size(), pTraits::zero)); - Field& dJtotdvar = tdJtotdvar.ref(); + auto tdJtotdvar = tmp>::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 deltaBoundary::cellCenters_d(const label pointI) const labelListList& pointCells(mesh_.pointCells()); const labelList& pointCellsI(pointCells[pointI]); const pointField& points(mesh_.points()); - tmp tC_d(new tensorField(pointCellsI.size(), tensor::zero)); - tensorField& C_d(tC_d.ref()); + auto tC_d = tmp::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 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::zero); pT cellCtrs_d(pTraits::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(pointBCs)) { - auto& fixedValueBCs = + auto& fixedValueBCs = refCast(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 . - 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 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 . - \*---------------------------------------------------------------------------*/ // * * * * * * * * * * * * * * * 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 . - \*---------------------------------------------------------------------------*/ // * * * * * * * * * * * * * * * 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::correction false ), mesh, - dimensioned(vf.name(), vf.dimensions(), pTraits::zero) + dimensioned(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 . - 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 . - 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(mesh_)), dnfdbMult_(createZeroBoundaryPtr(mesh_)), dxdbDirectMult_(createZeroBoundaryPtr(mesh_)), @@ -117,7 +117,7 @@ FIBase::FIBase eikonalSolver_(nullptr) { read(); -}; +} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // @@ -147,7 +147,7 @@ void FIBase::accumulateIntegrand(const scalar dt) PtrList& 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 . - 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 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("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(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 . - 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("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