From 563456087c44c889b7ed33e0fc676d36368b5389 Mon Sep 17 00:00:00 2001 From: Kutalmis Bercin Date: Fri, 26 Nov 2021 09:14:19 +0000 Subject: [PATCH 1/3] STYLE: gradSchemes: modernise and clean up code --- .../LeastSquaresGrad/LeastSquaresGrad.C | 8 ++- .../LeastSquaresGrad/LeastSquaresGrad.H | 3 +- .../LeastSquaresGrad/LeastSquaresVectors.C | 10 +-- .../LeastSquaresGrad/LeastSquaresVectors.H | 7 +- .../gradSchemes/fourthGrad/fourthGrad.C | 14 ++-- .../gradSchemes/fourthGrad/fourthGrad.H | 3 +- .../gradSchemes/gaussGrad/gaussGrad.C | 15 ++-- .../gradSchemes/gaussGrad/gaussGrad.H | 10 +-- .../gradSchemes/gradScheme/gradScheme.H | 16 +++-- .../gradSchemes/gradScheme/gradSchemes.C | 4 +- .../invDistLeastSquaresVectors.C | 20 +++--- .../leastSquaresGrad/leastSquaresGrad.C | 14 ++-- .../leastSquaresGrad/leastSquaresGrad.H | 3 +- .../leastSquaresGrad/leastSquaresVectors.C | 28 ++++---- .../leastSquaresGrad/leastSquaresVectors.H | 11 +-- .../unweightedLeastSquaresVectors.C | 20 +++--- .../cellLimitedGrad/cellLimitedGrad.C | 15 ++-- .../cellMDLimitedGrad/cellMDLimitedGrad.H | 8 ++- .../cellMDLimitedGrad/cellMDLimitedGrads.C | 37 +++++----- .../faceLimitedGrad/faceLimitedGrad.H | 4 +- .../faceLimitedGrad/faceLimitedGrads.C | 71 ++++++++++--------- .../faceMDLimitedGrad/faceMDLimitedGrad.H | 4 +- .../faceMDLimitedGrad/faceMDLimitedGrads.C | 65 ++++++++--------- 23 files changed, 209 insertions(+), 181 deletions(-) diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C index 74f4102262..a97dab0be0 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C +++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2013-2016 OpenFOAM Foundation + Copyright (C) 2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -51,6 +52,7 @@ Foam::fv::LeastSquaresGrad::calcGrad ) const { typedef typename outerProduct::type GradType; + typedef GeometricField GradFieldType; const fvMesh& mesh = vtf.mesh(); @@ -60,9 +62,9 @@ Foam::fv::LeastSquaresGrad::calcGrad mesh ); - tmp> tlsGrad + tmp tlsGrad ( - new GeometricField + new GradFieldType ( IOobject ( @@ -77,7 +79,7 @@ Foam::fv::LeastSquaresGrad::calcGrad extrapolatedCalculatedFvPatchField::typeName ) ); - GeometricField& lsGrad = tlsGrad.ref(); + GradFieldType& lsGrad = tlsGrad.ref(); Field& lsGradIf = lsGrad; const extendedCentredCellToCellStencil& stencil = lsv.stencil(); diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H index 54a7597ccf..83d926ae31 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H +++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2013-2016 OpenFOAM Foundation + Copyright (C) 2018-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -121,7 +122,7 @@ public: // Member Functions //- Return the gradient of the given field to the gradScheme::grad - // for optional caching + //- for optional caching virtual tmp < GeometricField diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C index 5aad6991f8..f050487a2c 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C +++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2013-2016 OpenFOAM Foundation - Copyright (C) 2020 OpenCFD Ltd. + Copyright (C) 2020-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -64,7 +64,7 @@ void Foam::fv::LeastSquaresVectors::calcLeastSquaresVectors() // Create the base form of the dd-tensor // including components for the "empty" directions - symmTensor dd0(sqr((Vector