From b393d6eca12e8be0067b1611a4cb5a44c35b473a Mon Sep 17 00:00:00 2001 From: Kutalmis Bercin Date: Fri, 19 Jan 2024 15:44:04 +0000 Subject: [PATCH] STYLE: finiteArea: add/fix comments STYLE: finiteArea: consistent use of =delete for removed ctors/assignments --- src/finiteArea/areaMesh/areaFaMesh.H | 15 ++-------- .../distributed/faMeshDistributor.H | 1 + src/finiteArea/edgeMesh/edgeFaMesh.H | 16 +++-------- src/finiteArea/faMatrices/faMatrix/faMatrix.C | 4 +-- .../faGlobalMeshData/faGlobalMeshData.H | 14 +++++----- src/finiteArea/faMesh/faMesh.H | 15 ++++++---- src/finiteArea/faMesh/faMeshLduAddressing.H | 6 ++-- .../faMesh/faMeshMapper/faAreaMapper.H | 17 ++++++----- .../faMesh/faMeshMapper/faEdgeMapper.C | 1 - .../faMesh/faMeshMapper/faEdgeMapper.H | 20 ++++++------- .../faMesh/faMeshMapper/faMeshMapper.H | 8 +++--- .../faMesh/faMeshMapper/faPatchMapper.H | 18 ++++++------ .../faMesh/faMeshSubset/faMeshSubset.H | 14 ++++++---- src/finiteArea/faSolution/faSolution.H | 10 ++++--- .../constraint/cyclic/cyclicFaPatchField.H | 2 +- .../faPatchField/faPatchFieldMapperPatchRef.H | 2 +- .../constraint/cyclic/cyclicFaePatchField.H | 2 +- .../faConvectionScheme/faConvectionScheme.H | 27 +++++++++--------- .../gaussFaConvectionScheme.H | 21 +++++++------- .../EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.H | 15 ++++++---- .../faD2dt2Scheme/faD2dt2Scheme.C | 3 -- .../faD2dt2Scheme/faD2dt2Scheme.H | 28 +++++++++---------- .../EulerFaDdtScheme/EulerFaDdtScheme.H | 14 +++++----- .../backwardFaDdtScheme/backwardFaDdtScheme.H | 15 ++++++---- .../boundedBackwardFaDdtScheme.H | 14 ++++++---- .../ddtSchemes/faDdtScheme/faDdtScheme.H | 28 +++++++++---------- .../steadyStateFaDdtScheme.H | 14 +++++----- .../divSchemes/faDivScheme/faDivScheme.H | 25 ++++++++--------- .../gaussFaDivScheme/gaussFaDivScheme.H | 14 +++++----- .../finiteArea/faSchemes/faSchemes.H | 10 ++++--- src/finiteArea/finiteArea/fac/facAverage.H | 1 - src/finiteArea/finiteArea/fac/facDdt.H | 1 - src/finiteArea/finiteArea/fac/facDiv.H | 1 - .../finiteArea/fac/facEdgeIntegrate.H | 1 - src/finiteArea/finiteArea/fac/facGrad.H | 1 - src/finiteArea/finiteArea/fac/facLaplacian.H | 1 - src/finiteArea/finiteArea/fac/facLnGrad.H | 1 - .../gradSchemes/faGradScheme/faGradScheme.H | 24 ++++++++-------- .../gradSchemes/gaussFaGrad/gaussFaGrad.H | 14 +++++----- .../leastSquaresFaGrad/leastSquaresFaGrad.H | 14 +++++----- .../leastSquaresFaVectors.H | 4 +-- .../edgeLimitedFaGrad/edgeLimitedFaGrad.H | 15 ++++++---- .../faceLimitedFaGrad/faceLimitedFaGrad.H | 15 +++++----- .../faLaplacianScheme/faLaplacianScheme.H | 18 ++++++------ .../gaussFaLaplacianScheme.H | 14 +++++----- .../correctedLnGrad/correctedLnGrad.H | 15 ++++++---- .../lnGradSchemes/fourthLnGrad/fourthLnGrad.H | 20 ++++++------- .../limitedLnGrad/limitedLnGrad.C | 2 +- .../limitedLnGrad/limitedLnGrad.H | 17 ++++++----- .../lnGradSchemes/lnGradScheme/lnGradScheme.H | 28 +++++++++---------- .../uncorrectedLnGrad/uncorrectedLnGrad.H | 20 ++++++------- .../edgeInterpolation/edgeInterpolate.C | 20 ++++++------- .../edgeInterpolation/edgeInterpolation.H | 14 +++++++--- .../edgeInterpolationScheme.H | 24 ++++++++-------- .../edgeInterpolation/schemes/Gamma/Gamma.H | 6 +++- .../schemes/NVDscheme/faNVDscheme.H | 17 +++++------ .../blended/blendedEdgeInterpolation.H | 21 +++++++------- .../leastSquaresEdgeInterpolation.H | 16 +++++++---- .../schemes/linear/linearEdgeInterpolation.H | 14 ++++++---- .../schemes/linearUpwind/linearUpwind.H | 10 ++++++- .../skewCorrectedEdgeInterpolation.H | 20 +++++++------ .../schemes/upwind/upwindEdgeInterpolation.H | 18 +++++++----- src/finiteArea/output/ensight/ensightFaMesh.H | 7 +++-- 63 files changed, 423 insertions(+), 384 deletions(-) diff --git a/src/finiteArea/areaMesh/areaFaMesh.H b/src/finiteArea/areaMesh/areaFaMesh.H index 0a9cea06d4..039a574c7c 100644 --- a/src/finiteArea/areaMesh/areaFaMesh.H +++ b/src/finiteArea/areaMesh/areaFaMesh.H @@ -69,22 +69,13 @@ public: // Member Functions //- Return size. Number of faces - static label size(const Mesh& mesh) - { - return mesh.nFaces(); - } + static label size(const Mesh& mesh) { return mesh.nFaces(); } //- Return size. Number of faces - label size() const - { - return size(mesh_); - } + label size() const { return size(mesh_); } //- Field of face centres - const areaVectorField& C() const - { - return mesh_.areaCentres(); - } + const areaVectorField& C() const { return mesh_.areaCentres(); } }; diff --git a/src/finiteArea/distributed/faMeshDistributor.H b/src/finiteArea/distributed/faMeshDistributor.H index 52f2c4d825..05f40ab9cc 100644 --- a/src/finiteArea/distributed/faMeshDistributor.H +++ b/src/finiteArea/distributed/faMeshDistributor.H @@ -99,6 +99,7 @@ class faMeshDistributor //- Debug: check addressing void checkAddressing() const; + //- Construct reconstruct mapping static mapDistributePolyMesh createReconstructMap ( const faMesh& mesh, diff --git a/src/finiteArea/edgeMesh/edgeFaMesh.H b/src/finiteArea/edgeMesh/edgeFaMesh.H index e726f62881..214af6a9c7 100644 --- a/src/finiteArea/edgeMesh/edgeFaMesh.H +++ b/src/finiteArea/edgeMesh/edgeFaMesh.H @@ -65,25 +65,17 @@ public: GeoMesh(mesh) {} + // Member Functions //- Return size. Number of internal edges - static label size(const Mesh& mesh) - { - return mesh.nInternalEdges(); - } + static label size(const Mesh& mesh) { return mesh.nInternalEdges(); } //- Return size. Number of internal edges - label size() const - { - return size(mesh_); - } + label size() const { return size(mesh_); } //- Field of edge centres - const edgeVectorField& C() const - { - return mesh_.edgeCentres(); - } + const edgeVectorField& C() const { return mesh_.edgeCentres(); } }; diff --git a/src/finiteArea/faMatrices/faMatrix/faMatrix.C b/src/finiteArea/faMatrices/faMatrix/faMatrix.C index 4d06db262d..ca564e8d7c 100644 --- a/src/finiteArea/faMatrices/faMatrix/faMatrix.C +++ b/src/finiteArea/faMatrices/faMatrix/faMatrix.C @@ -50,7 +50,7 @@ void Foam::faMatrix::addToInternalField { FatalErrorInFunction << "addressing (" << addr.size() - << ") and field (" << pf.size() << ") are different sizes" << endl + << ") and field (" << pf.size() << ") are different sizes" << abort(FatalError); } @@ -88,7 +88,7 @@ void Foam::faMatrix::subtractFromInternalField { FatalErrorInFunction << "addressing (" << addr.size() - << ") and field (" << pf.size() << ") are different sizes" << endl + << ") and field (" << pf.size() << ") are different sizes" << abort(FatalError); } diff --git a/src/finiteArea/faMesh/faGlobalMeshData/faGlobalMeshData.H b/src/finiteArea/faMesh/faGlobalMeshData/faGlobalMeshData.H index c494e22f53..ea6da26d7f 100644 --- a/src/finiteArea/faMesh/faGlobalMeshData/faGlobalMeshData.H +++ b/src/finiteArea/faMesh/faGlobalMeshData/faGlobalMeshData.H @@ -77,7 +77,13 @@ class faGlobalMeshData labelList sharedPointAddr_; - // Private Member Functions +public: + + //- Runtime type information + ClassName("faGlobalMeshData"); + + + // Generated Methods //- No copy construct faGlobalMeshData(const faGlobalMeshData&) = delete; @@ -86,12 +92,6 @@ class faGlobalMeshData void operator=(const faGlobalMeshData&) = delete; -public: - - //- Runtime type information - ClassName("faGlobalMeshData"); - - // Constructors //- Construct from mesh diff --git a/src/finiteArea/faMesh/faMesh.H b/src/finiteArea/faMesh/faMesh.H index ce875b9a79..f587973530 100644 --- a/src/finiteArea/faMesh/faMesh.H +++ b/src/finiteArea/faMesh/faMesh.H @@ -332,12 +332,6 @@ class faMesh // Private Member Functions - //- No copy construct - faMesh(const faMesh&) = delete; - - //- No copy assignment - void operator=(const faMesh&) = delete; - //- Set indirect patch, removing any old one. // No communication void initPatch() const; @@ -524,6 +518,15 @@ public: static word meshSubDir; + // Generated Methods + + //- No copy construct + faMesh(const faMesh&) = delete; + + //- No copy assignment + void operator=(const faMesh&) = delete; + + // Constructors //- Read construct from polyMesh, using its IOobject properties diff --git a/src/finiteArea/faMesh/faMeshLduAddressing.H b/src/finiteArea/faMesh/faMeshLduAddressing.H index 28981c11c8..3e6d41e3e5 100644 --- a/src/finiteArea/faMesh/faMeshLduAddressing.H +++ b/src/finiteArea/faMesh/faMeshLduAddressing.H @@ -73,7 +73,9 @@ class faMeshLduAddressing const lduSchedule& patchSchedule_; - // Private Member Functions +public: + + // Generated Methods //- No copy construct faMeshLduAddressing(const faMeshLduAddressing&) = delete; @@ -82,8 +84,6 @@ class faMeshLduAddressing void operator=(const faMeshLduAddressing&) = delete; -public: - // Constructors //- Construct from components diff --git a/src/finiteArea/faMesh/faMeshMapper/faAreaMapper.H b/src/finiteArea/faMesh/faMeshMapper/faAreaMapper.H index e13c97c6bf..ee7a950484 100644 --- a/src/finiteArea/faMesh/faMeshMapper/faAreaMapper.H +++ b/src/finiteArea/faMesh/faMeshMapper/faAreaMapper.H @@ -60,7 +60,7 @@ class faAreaMapper : public morphFieldMapper { - // Private data + // Private Data //- Reference to mesh mapper const faMesh& mesh_; @@ -101,12 +101,6 @@ class faAreaMapper // Private Member Functions - //- No copy construct - faAreaMapper(const faAreaMapper&) = delete; - - //- No copy assignment - void operator=(const faAreaMapper&) = delete; - //- Calculate addressing void calcAddressing() const; @@ -116,6 +110,15 @@ class faAreaMapper public: + // Generated Methods + + //- No copy construct + faAreaMapper(const faAreaMapper&) = delete; + + //- No copy assignment + void operator=(const faAreaMapper&) = delete; + + //- Construct from components faAreaMapper ( diff --git a/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.C b/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.C index dd0684a39c..582faf239a 100644 --- a/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.C +++ b/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.C @@ -63,7 +63,6 @@ Foam::faEdgeMapper::faEdgeMapper ) : mesh_(mesh), -// mpm_(mpm), sizeBeforeMapping_(mesh.nInternalEdges()), hasUnmapped_(false), directAddrPtr_(nullptr) diff --git a/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.H b/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.H index 267790b7d2..f01ef5ea97 100644 --- a/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.H +++ b/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.H @@ -61,14 +61,11 @@ class faEdgeMapper : public morphFieldMapper { - // Private data + // Private Data //- Reference to mesh const faMesh& mesh_; - //- Reference to mapPolyMesh - //const mapPolyMesh& mpm_; - //- Old mesh size label sizeBeforeMapping_; @@ -83,12 +80,6 @@ class faEdgeMapper // Private Member Functions - //- No copy construct - faEdgeMapper(const faEdgeMapper&) = delete; - - //- No copy assignment - void operator=(const faEdgeMapper&) = delete; - //- Calculate addressing void calcAddressing() const; @@ -98,6 +89,15 @@ class faEdgeMapper public: + // Generated Methods + + //- No copy construct + faEdgeMapper(const faEdgeMapper&) = delete; + + //- No copy assignment + void operator=(const faEdgeMapper&) = delete; + + //- Construct from components faEdgeMapper ( diff --git a/src/finiteArea/faMesh/faMeshMapper/faMeshMapper.H b/src/finiteArea/faMesh/faMeshMapper/faMeshMapper.H index aaef4826d8..16760b12e6 100644 --- a/src/finiteArea/faMesh/faMeshMapper/faMeshMapper.H +++ b/src/finiteArea/faMesh/faMeshMapper/faMeshMapper.H @@ -68,7 +68,7 @@ class mapPolyMesh; class faMeshMapper { - // Private data + // Private Data //- Reference to mesh const faMesh& mesh_; @@ -110,7 +110,9 @@ class faMeshMapper faBoundaryMeshMapper boundaryMap_; - // Private Member Functions +public: + + // Generated Methods //- No copy construct faMeshMapper(const faMeshMapper&) = delete; @@ -119,8 +121,6 @@ class faMeshMapper void operator=(const faMeshMapper&) = delete; -public: - // Constructors //- Construct from components diff --git a/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.H b/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.H index 764ecd34a4..ec35ef1310 100644 --- a/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.H +++ b/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.H @@ -64,7 +64,7 @@ class faPatchMapper : public faPatchFieldMapper { - // Private data + // Private Data //- Reference to patch const faPatch& patch_; @@ -89,13 +89,6 @@ class faPatchMapper // Private Member Functions - //- No copy construct - faPatchMapper(const faPatchMapper&) = delete; - - //- No copy assignment - void operator=(const faPatchMapper&) = delete; - - //- Calculate addressing for mapping with inserted cells void calcAddressing() const; @@ -105,6 +98,15 @@ class faPatchMapper public: + // Generated Methods + + //- No copy construct + faPatchMapper(const faPatchMapper&) = delete; + + //- No copy assignment + void operator=(const faPatchMapper&) = delete; + + //- Construct from mappers faPatchMapper ( diff --git a/src/finiteArea/faMesh/faMeshSubset/faMeshSubset.H b/src/finiteArea/faMesh/faMeshSubset/faMeshSubset.H index 0617e7e7d6..3c4c3b217f 100644 --- a/src/finiteArea/faMesh/faMeshSubset/faMeshSubset.H +++ b/src/finiteArea/faMesh/faMeshSubset/faMeshSubset.H @@ -102,12 +102,6 @@ protected: //- FatalError if subset has not been performed bool checkHasSubMesh() const; - //- No copy construct - faMeshSubset(const faMeshSubset&) = delete; - - //- No copy assignment - void operator=(const faMeshSubset&) = delete; - public: @@ -116,6 +110,14 @@ public: //- Name for exposed internal edges (default: oldInternalEdges) static word exposedPatchName; + // Generated Methods + + //- No copy construct + faMeshSubset(const faMeshSubset&) = delete; + + //- No copy assignment + void operator=(const faMeshSubset&) = delete; + // Constructors diff --git a/src/finiteArea/faSolution/faSolution.H b/src/finiteArea/faSolution/faSolution.H index ded55b7431..c3e4772b0d 100644 --- a/src/finiteArea/faSolution/faSolution.H +++ b/src/finiteArea/faSolution/faSolution.H @@ -61,11 +61,13 @@ class faSolution { public: - //- No copy construct - faSolution(const faSolution&) = delete; + // Generated Methods - //- No copy assignment - void operator=(const faSolution&) = delete; + //- No copy construct + faSolution(const faSolution&) = delete; + + //- No copy assignment + void operator=(const faSolution&) = delete; // Constructors diff --git a/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.H b/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.H index 5ac2a891c5..7a6f8e158c 100644 --- a/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.H +++ b/src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.H @@ -68,7 +68,7 @@ class cyclicFaPatchField const cyclicFaPatch& cyclicPatch_; - // Private member functions + // Private Member Functions //- Return neighbour side field given internal fields template diff --git a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldMapperPatchRef.H b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldMapperPatchRef.H index fc0bb216a6..ba6e52aa05 100644 --- a/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldMapperPatchRef.H +++ b/src/finiteArea/fields/faPatchFields/faPatchField/faPatchFieldMapperPatchRef.H @@ -48,7 +48,7 @@ class faPatchFieldMapperPatchRef : public faPatchFieldMapper { - // Private data + // Private Data const faPatch& sourcePatch_; const faPatch& targetPatch_; diff --git a/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchField.H b/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchField.H index 3993605ab3..77dd918918 100644 --- a/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchField.H +++ b/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchField.H @@ -59,7 +59,7 @@ class cyclicFaePatchField : public coupledFaePatchField { - // Private data + // Private Data //- Local reference cast into the cyclic patch const cyclicFaPatch& cyclicPatch_; diff --git a/src/finiteArea/finiteArea/convectionSchemes/faConvectionScheme/faConvectionScheme.H b/src/finiteArea/finiteArea/convectionSchemes/faConvectionScheme/faConvectionScheme.H index ae2673c8fc..43e0f9d67b 100644 --- a/src/finiteArea/finiteArea/convectionSchemes/faConvectionScheme/faConvectionScheme.H +++ b/src/finiteArea/finiteArea/convectionSchemes/faConvectionScheme/faConvectionScheme.H @@ -48,6 +48,7 @@ SourceFiles namespace Foam { +// Forward Declarations template class faMatrix; @@ -67,20 +68,12 @@ class convectionScheme : public refCount { - // Private data + // Private Data + //- Reference to mesh const faMesh& mesh_; - // Private Member Functions - - //- No copy construct - convectionScheme(const convectionScheme&) = delete; - - //- No copy assignment - void operator=(const convectionScheme&) = delete; - - public: // Declare run-time constructor selection tables @@ -99,6 +92,15 @@ public: ); + // Generated Methods + + //- No copy construct + convectionScheme(const convectionScheme&) = delete; + + //- No copy assignment + void operator=(const convectionScheme&) = delete; + + // Constructors //- Construct from mesh, flux and Istream @@ -130,10 +132,7 @@ public: // Member Functions //- Return mesh reference - const faMesh& mesh() const - { - return mesh_; - } + const faMesh& mesh() const noexcept { return mesh_; } virtual tmp> flux ( diff --git a/src/finiteArea/finiteArea/convectionSchemes/gaussFaConvectionScheme/gaussFaConvectionScheme.H b/src/finiteArea/finiteArea/convectionSchemes/gaussFaConvectionScheme/gaussFaConvectionScheme.H index be22ae9dbc..b3b46da0f9 100644 --- a/src/finiteArea/finiteArea/convectionSchemes/gaussFaConvectionScheme/gaussFaConvectionScheme.H +++ b/src/finiteArea/finiteArea/convectionSchemes/gaussFaConvectionScheme/gaussFaConvectionScheme.H @@ -60,26 +60,27 @@ class gaussConvectionScheme : public fa::convectionScheme { - // Private data + // Private Data + //- Edge-interpolation scheme tmp> tinterpScheme_; - // Private Member Functions - - //- No copy construct - gaussConvectionScheme(const gaussConvectionScheme&) = delete; - - //- No copy assignment - void operator=(const gaussConvectionScheme&) = delete; - - public: //- Runtime type information TypeName("Gauss"); + // Generated Methods + + //- No copy construct + gaussConvectionScheme(const gaussConvectionScheme&) = delete; + + //- No copy assignment + void operator=(const gaussConvectionScheme&) = delete; + + // Constructors //- Construct from flux and interpolation scheme diff --git a/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.H b/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.H index f25ca65a79..584114c2fa 100644 --- a/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.H +++ b/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.H @@ -67,12 +67,6 @@ class EulerFaD2dt2Scheme //- Return the previous time-step scalar deltaT0_() const; - //- No copy construct - EulerFaD2dt2Scheme(const EulerFaD2dt2Scheme&) = delete; - - //- No copy assignment - void operator=(const EulerFaD2dt2Scheme&) = delete; - public: @@ -80,6 +74,15 @@ public: TypeName("Euler"); + // Generated Methods + + //- No copy construct + EulerFaD2dt2Scheme(const EulerFaD2dt2Scheme&) = delete; + + //- No copy assignment + void operator=(const EulerFaD2dt2Scheme&) = delete; + + // Constructors //- Construct from mesh diff --git a/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.C b/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.C index 2f33acefcf..6f0d7a84b5 100644 --- a/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.C +++ b/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.C @@ -24,9 +24,6 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . -Description - Abstract base class for finite area d2dt2 schemes. - \*---------------------------------------------------------------------------*/ #include "fa.H" diff --git a/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.H b/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.H index 1b679b5f7e..96a2b5d4e3 100644 --- a/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.H +++ b/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.H @@ -49,6 +49,7 @@ SourceFiles namespace Foam { +// Forward Declarations template class faMatrix; @@ -68,23 +69,14 @@ class faD2dt2Scheme : public refCount { - protected: - // Protected data + // Protected Data + //- Reference to mesh const faMesh& mesh_; - // Private Member Functions - - //- No copy construct - faD2dt2Scheme(const faD2dt2Scheme&) = delete; - - //- No copy assignment - void operator=(const faD2dt2Scheme&) = delete; - - public: //- Runtime type information @@ -103,6 +95,15 @@ public: ); + // Generated Methods + + //- No copy construct + faD2dt2Scheme(const faD2dt2Scheme&) = delete; + + //- No copy assignment + void operator=(const faD2dt2Scheme&) = delete; + + // Constructors //- Construct from mesh @@ -135,10 +136,7 @@ public: // Member Functions //- Return mesh reference - const faMesh& mesh() const - { - return mesh_; - } + const faMesh& mesh() const noexcept { return mesh_; } virtual tmp> facD2dt2 ( diff --git a/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.H b/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.H index 6d0d96c140..834cc62a23 100644 --- a/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.H +++ b/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.H @@ -59,7 +59,13 @@ class EulerFaDdtScheme : public fa::faDdtScheme { - // Private Member Functions +public: + + //- Runtime type information + TypeName("Euler"); + + + // Generated Methods //- No copy construct EulerFaDdtScheme(const EulerFaDdtScheme&) = delete; @@ -68,12 +74,6 @@ class EulerFaDdtScheme void operator=(const EulerFaDdtScheme&) = delete; -public: - - //- Runtime type information - TypeName("Euler"); - - // Constructors //- Construct from mesh diff --git a/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.H b/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.H index e2bff70518..54fcb89e4e 100644 --- a/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.H +++ b/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.H @@ -72,12 +72,6 @@ class backwardFaDdtScheme template scalar deltaT0_(const GeoField&) const; - //- No copy construct - backwardFaDdtScheme(const backwardFaDdtScheme&) = delete; - - //- No copy assignment - void operator=(const backwardFaDdtScheme&) = delete; - public: @@ -85,6 +79,15 @@ public: TypeName("backward"); + // Generated Methods + + //- No copy construct + backwardFaDdtScheme(const backwardFaDdtScheme&) = delete; + + //- No copy assignment + void operator=(const backwardFaDdtScheme&) = delete; + + // Constructors //- Construct from mesh diff --git a/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.H b/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.H index 02163a746b..97d501734b 100644 --- a/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.H +++ b/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.H @@ -83,6 +83,14 @@ class boundedBackwardFaDdtScheme } +public: + + //- Runtime type information + TypeName("boundedBackward"); + + + // Generated Methods + //- No copy construct boundedBackwardFaDdtScheme(const boundedBackwardFaDdtScheme&) = delete; @@ -90,12 +98,6 @@ class boundedBackwardFaDdtScheme void operator=(const boundedBackwardFaDdtScheme&) = delete; -public: - - //- Runtime type information - TypeName("boundedBackward"); - - // Constructors //- Construct from mesh diff --git a/src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.H b/src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.H index 3415c5332e..59020f1143 100644 --- a/src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.H +++ b/src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.H @@ -49,6 +49,7 @@ SourceFiles namespace Foam { +// Forward Declarations template class faMatrix; @@ -68,23 +69,14 @@ class faDdtScheme : public refCount { - protected: - // Protected data + // Protected Data + //- Reference to mesh const faMesh& mesh_; - // Private Member Functions - - //- No copy construct - faDdtScheme(const faDdtScheme&) = delete; - - //- No copy assignment - void operator=(const faDdtScheme&) = delete; - - public: //- Runtime type information @@ -103,6 +95,15 @@ public: ); + // Generated Methods + + //- No copy construct + faDdtScheme(const faDdtScheme&) = delete; + + //- No copy assignment + void operator=(const faDdtScheme&) = delete; + + // Constructors //- Construct from mesh @@ -135,10 +136,7 @@ public: // Member Functions //- Return mesh reference - const faMesh& mesh() const - { - return mesh_; - } + const faMesh& mesh() const noexcept { return mesh_; } virtual tmp> facDdt ( diff --git a/src/finiteArea/finiteArea/ddtSchemes/steadyStateFaDdtScheme/steadyStateFaDdtScheme.H b/src/finiteArea/finiteArea/ddtSchemes/steadyStateFaDdtScheme/steadyStateFaDdtScheme.H index af83dcc556..48704d0d19 100644 --- a/src/finiteArea/finiteArea/ddtSchemes/steadyStateFaDdtScheme/steadyStateFaDdtScheme.H +++ b/src/finiteArea/finiteArea/ddtSchemes/steadyStateFaDdtScheme/steadyStateFaDdtScheme.H @@ -58,7 +58,13 @@ class steadyStateFaDdtScheme : public fa::faDdtScheme { - // Private Member Functions +public: + + //- Runtime type information + TypeName("steadyState"); + + + // Generated Methods //- No copy construct steadyStateFaDdtScheme(const steadyStateFaDdtScheme&) = delete; @@ -67,12 +73,6 @@ class steadyStateFaDdtScheme void operator=(const steadyStateFaDdtScheme&) = delete; -public: - - //- Runtime type information - TypeName("steadyState"); - - // Constructors //- Construct from mesh diff --git a/src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.H b/src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.H index 47414a9123..fb8bb441da 100644 --- a/src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.H +++ b/src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.H @@ -72,20 +72,13 @@ protected: // Protected Data + //- Reference to mesh const faMesh& mesh_; + //- Edge interpolation scheme tmp> tinterpScheme_; - // Private Member Functions - - //- No copy construct - divScheme(const divScheme&) = delete; - - //- No copy assignment - void operator=(const divScheme&) = delete; - - public: // Declare run-time constructor selection tables @@ -100,6 +93,15 @@ public: ); + // Generated Methods + + //- No copy construct + divScheme(const divScheme&) = delete; + + //- No copy assignment + void operator=(const divScheme&) = delete; + + // Constructors //- Construct from mesh @@ -148,10 +150,7 @@ public: // Member Functions //- Return mesh reference - const faMesh& mesh() const - { - return mesh_; - } + const faMesh& mesh() const noexcept { return mesh_; } virtual tmp < diff --git a/src/finiteArea/finiteArea/divSchemes/gaussFaDivScheme/gaussFaDivScheme.H b/src/finiteArea/finiteArea/divSchemes/gaussFaDivScheme/gaussFaDivScheme.H index 98e834128f..7217f80acc 100644 --- a/src/finiteArea/finiteArea/divSchemes/gaussFaDivScheme/gaussFaDivScheme.H +++ b/src/finiteArea/finiteArea/divSchemes/gaussFaDivScheme/gaussFaDivScheme.H @@ -59,7 +59,13 @@ class gaussDivScheme : public fa::divScheme { - // Private Member Functions +public: + + //- Runtime type information + TypeName("Gauss"); + + + // Generated Methods //- No copy construct gaussDivScheme(const gaussDivScheme&) = delete; @@ -68,12 +74,6 @@ class gaussDivScheme void operator=(const gaussDivScheme&) = delete; -public: - - //- Runtime type information - TypeName("Gauss"); - - // Constructors //- Construct from mesh diff --git a/src/finiteArea/finiteArea/faSchemes/faSchemes.H b/src/finiteArea/finiteArea/faSchemes/faSchemes.H index 8647069ad3..0d666c3c96 100644 --- a/src/finiteArea/finiteArea/faSchemes/faSchemes.H +++ b/src/finiteArea/finiteArea/faSchemes/faSchemes.H @@ -61,11 +61,13 @@ class faSchemes { public: - //- No copy construct - faSchemes(const faSchemes&) = delete; + // Generated Methods - //- No copy assignment - void operator=(const faSchemes&) = delete; + //- No copy construct + faSchemes(const faSchemes&) = delete; + + //- No copy assignment + void operator=(const faSchemes&) = delete; // Constructors diff --git a/src/finiteArea/finiteArea/fac/facAverage.H b/src/finiteArea/finiteArea/fac/facAverage.H index 5ff0a1993a..1aac0cdb27 100644 --- a/src/finiteArea/finiteArea/fac/facAverage.H +++ b/src/finiteArea/finiteArea/fac/facAverage.H @@ -34,7 +34,6 @@ SourceFiles \*---------------------------------------------------------------------------*/ - #ifndef facAverage_H #define facAverage_H diff --git a/src/finiteArea/finiteArea/fac/facDdt.H b/src/finiteArea/finiteArea/fac/facDdt.H index 64c6d35d76..2b9c872477 100644 --- a/src/finiteArea/finiteArea/fac/facDdt.H +++ b/src/finiteArea/finiteArea/fac/facDdt.H @@ -37,7 +37,6 @@ Author \*---------------------------------------------------------------------------*/ - #ifndef facDdt_H #define facDdt_H diff --git a/src/finiteArea/finiteArea/fac/facDiv.H b/src/finiteArea/finiteArea/fac/facDiv.H index d98e2d4ca7..b3f4ecadba 100644 --- a/src/finiteArea/finiteArea/fac/facDiv.H +++ b/src/finiteArea/finiteArea/fac/facDiv.H @@ -34,7 +34,6 @@ SourceFiles \*---------------------------------------------------------------------------*/ - #ifndef facDiv_H #define facDiv_H diff --git a/src/finiteArea/finiteArea/fac/facEdgeIntegrate.H b/src/finiteArea/finiteArea/fac/facEdgeIntegrate.H index d7acc4231c..b9a1d887c7 100644 --- a/src/finiteArea/finiteArea/fac/facEdgeIntegrate.H +++ b/src/finiteArea/finiteArea/fac/facEdgeIntegrate.H @@ -35,7 +35,6 @@ SourceFiles \*---------------------------------------------------------------------------*/ - #ifndef facEdgeIntegrate_H #define facEdgeIntegrate_H diff --git a/src/finiteArea/finiteArea/fac/facGrad.H b/src/finiteArea/finiteArea/fac/facGrad.H index 29c9d4ef0c..89e6070834 100644 --- a/src/finiteArea/finiteArea/fac/facGrad.H +++ b/src/finiteArea/finiteArea/fac/facGrad.H @@ -34,7 +34,6 @@ SourceFiles \*---------------------------------------------------------------------------*/ - #ifndef facGrad_H #define facGrad_H diff --git a/src/finiteArea/finiteArea/fac/facLaplacian.H b/src/finiteArea/finiteArea/fac/facLaplacian.H index 0e29d7c97d..53697dcdce 100644 --- a/src/finiteArea/finiteArea/fac/facLaplacian.H +++ b/src/finiteArea/finiteArea/fac/facLaplacian.H @@ -34,7 +34,6 @@ SourceFiles \*---------------------------------------------------------------------------*/ - #ifndef facLaplacian_H #define facLaplacian_H diff --git a/src/finiteArea/finiteArea/fac/facLnGrad.H b/src/finiteArea/finiteArea/fac/facLnGrad.H index 8a136ed844..cfc3cbb111 100644 --- a/src/finiteArea/finiteArea/fac/facLnGrad.H +++ b/src/finiteArea/finiteArea/fac/facLnGrad.H @@ -34,7 +34,6 @@ SourceFiles \*---------------------------------------------------------------------------*/ - #ifndef facLnGrad_H #define facLnGrad_H diff --git a/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.H b/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.H index e6f2bac9c1..07dc9cdb85 100644 --- a/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.H +++ b/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.H @@ -50,6 +50,7 @@ SourceFiles namespace Foam { +// Forward Declarations class faMesh; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -66,20 +67,12 @@ class gradScheme : public refCount { - // Private data + // Private Data + //- Reference to mesh const faMesh& mesh_; - // Private Member Functions - - //- No copy construct - gradScheme(const gradScheme&) = delete; - - //- No copy assignment - void operator=(const gradScheme&) = delete; - - public: // Declare run-time constructor selection tables @@ -94,6 +87,15 @@ public: ); + // Generated Methods + + //- No copy construct + gradScheme(const gradScheme&) = delete; + + //- No copy assignment + void operator=(const gradScheme&) = delete; + + // Constructors //- Construct from mesh @@ -120,7 +122,7 @@ public: // Member Functions //- Return mesh reference - const faMesh& mesh() const { return mesh_; } + const faMesh& mesh() const noexcept { return mesh_; } //- Calculate and return the grad of the given field. // Used by grad either to recalculate the cached gradient when it is diff --git a/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.H b/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.H index 59fc08d91d..9b008cabed 100644 --- a/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.H +++ b/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.H @@ -69,7 +69,13 @@ class gaussGrad tmp> tinterpScheme_; - // Private Member Functions +public: + + //- Runtime type information + TypeName("Gauss"); + + + // Generated Methods //- No copy construct gaussGrad(const gaussGrad&) = delete; @@ -78,12 +84,6 @@ class gaussGrad void operator=(const gaussGrad&) = delete; -public: - - //- Runtime type information - TypeName("Gauss"); - - // Constructors //- Construct from mesh diff --git a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.H b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.H index 1e3e518f76..95612b1225 100644 --- a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.H +++ b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.H @@ -62,7 +62,13 @@ class leastSquaresFaGrad : public fa::gradScheme { - // Private Member Functions +public: + + //- Runtime type information + TypeName("leastSquares"); + + + // Generated Methods //- No copy construct leastSquaresFaGrad(const leastSquaresFaGrad&) = delete; @@ -71,12 +77,6 @@ class leastSquaresFaGrad void operator=(const leastSquaresFaGrad&) = delete; -public: - - //- Runtime type information - TypeName("leastSquares"); - - // Constructors //- Construct from mesh diff --git a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.H b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.H index db963c6786..b60907520c 100644 --- a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.H +++ b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.H @@ -58,14 +58,14 @@ class leastSquaresFaVectors : public MeshObject { - // Private data + // Private Data //- Least-squares gradient vectors mutable edgeVectorField* pVectorsPtr_; mutable edgeVectorField* nVectorsPtr_; - // Private member functions + // Private Member Functions //- Construct Least-squares gradient vectors void makeLeastSquaresVectors() const; diff --git a/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrad.H b/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrad.H index 1d4ca927fd..4eef13831f 100644 --- a/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrad.H +++ b/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrad.H @@ -66,6 +66,7 @@ class edgeLimitedGrad { // Private Data + //- Basic gradient scheme tmp> basicGradScheme_; //- Limiter coefficient @@ -83,6 +84,14 @@ class edgeLimitedGrad ) const; +public: + + //- RunTime type information + TypeName("edgeLimited"); + + + // Generated Methods + //- No copy construct edgeLimitedGrad(const edgeLimitedGrad&) = delete; @@ -90,12 +99,6 @@ class edgeLimitedGrad void operator=(const edgeLimitedGrad&) = delete; -public: - - //- RunTime type information - TypeName("edgeLimited"); - - // Constructors //- Construct from mesh and schemeData diff --git a/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrad.H b/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrad.H index 16f5033264..006280d265 100644 --- a/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrad.H +++ b/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrad.H @@ -69,13 +69,20 @@ class faceLimitedGrad { // Private Data + //- Basic gradient scheme tmp> basicGradScheme_; //- Limiter coefficient scalar k_; - // Private Member Functions +public: + + //- RunTime type information + TypeName("faceLimited"); + + + // Generated Methods //- No copy construct faceLimitedGrad(const faceLimitedGrad&) = delete; @@ -84,12 +91,6 @@ class faceLimitedGrad void operator=(const faceLimitedGrad&) = delete; -public: - - //- RunTime type information - TypeName("faceLimited"); - - // Constructors //- Construct from mesh and schemeData diff --git a/src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.H b/src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.H index 009d2a8001..112e8540ef 100644 --- a/src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.H +++ b/src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.H @@ -79,15 +79,6 @@ protected: tmp> tlnGradScheme_; - // Private Member Functions - - //- No copy construct - laplacianScheme(const laplacianScheme&) = delete; - - //- No copy assignment - void operator=(const laplacianScheme&) = delete; - - public: // Declare run-time constructor selection tables @@ -102,6 +93,15 @@ public: ); + // Generated Methods + + //- No copy construct + laplacianScheme(const laplacianScheme&) = delete; + + //- No copy assignment + void operator=(const laplacianScheme&) = delete; + + // Constructors //- Construct from mesh diff --git a/src/finiteArea/finiteArea/laplacianSchemes/gaussFaLaplacianScheme/gaussFaLaplacianScheme.H b/src/finiteArea/finiteArea/laplacianSchemes/gaussFaLaplacianScheme/gaussFaLaplacianScheme.H index 7da2395700..86130d54b5 100644 --- a/src/finiteArea/finiteArea/laplacianSchemes/gaussFaLaplacianScheme/gaussFaLaplacianScheme.H +++ b/src/finiteArea/finiteArea/laplacianSchemes/gaussFaLaplacianScheme/gaussFaLaplacianScheme.H @@ -59,7 +59,13 @@ class gaussLaplacianScheme : public fa::laplacianScheme { - // Private Member Functions +public: + + //- Runtime type information + TypeName("Gauss"); + + + // Generated Methods //- No copy construct gaussLaplacianScheme(const gaussLaplacianScheme&) = delete; @@ -68,12 +74,6 @@ class gaussLaplacianScheme void operator=(const gaussLaplacianScheme&) = delete; -public: - - //- Runtime type information - TypeName("Gauss"); - - // Constructors //- Construct from mesh diff --git a/src/finiteArea/finiteArea/lnGradSchemes/correctedLnGrad/correctedLnGrad.H b/src/finiteArea/finiteArea/lnGradSchemes/correctedLnGrad/correctedLnGrad.H index b7128c00a6..74bcf22ba1 100644 --- a/src/finiteArea/finiteArea/lnGradSchemes/correctedLnGrad/correctedLnGrad.H +++ b/src/finiteArea/finiteArea/lnGradSchemes/correctedLnGrad/correctedLnGrad.H @@ -58,18 +58,21 @@ class correctedLnGrad : public lnGradScheme { - // Private Member Functions - - //- No copy assignment - void operator=(const correctedLnGrad&) = delete; - - public: //- Runtime type information TypeName("corrected"); + // Generated Methods + + //- No copy construct + correctedLnGrad(const correctedLnGrad&) = delete; + + //- No copy assignment + void operator=(const correctedLnGrad&) = delete; + + // Constructors //- Construct from mesh diff --git a/src/finiteArea/finiteArea/lnGradSchemes/fourthLnGrad/fourthLnGrad.H b/src/finiteArea/finiteArea/lnGradSchemes/fourthLnGrad/fourthLnGrad.H index 97a250e9c6..6a9ad2331a 100644 --- a/src/finiteArea/finiteArea/lnGradSchemes/fourthLnGrad/fourthLnGrad.H +++ b/src/finiteArea/finiteArea/lnGradSchemes/fourthLnGrad/fourthLnGrad.H @@ -58,18 +58,21 @@ class fourthLnGrad : public lnGradScheme { - // Private Member Functions - - //- No copy assignment - void operator=(const fourthLnGrad&) = delete; - - public: //- Runtime type information TypeName("fourth"); + // Generated Methods + + //- No copy construct + fourthLnGrad(const fourthLnGrad&) = delete; + + //- No copy assignment + void operator=(const fourthLnGrad&) = delete; + + // Constructors //- Construct from mesh @@ -102,10 +105,7 @@ public: } //- Return true if this scheme uses an explicit correction - virtual bool corrected() const - { - return true; - } + virtual bool corrected() const { return true; } //- Return the explicit correction to the fourthLnGrad // for the given field diff --git a/src/finiteArea/finiteArea/lnGradSchemes/limitedLnGrad/limitedLnGrad.C b/src/finiteArea/finiteArea/lnGradSchemes/limitedLnGrad/limitedLnGrad.C index 8c3f93a3f6..d8857d4e1f 100644 --- a/src/finiteArea/finiteArea/lnGradSchemes/limitedLnGrad/limitedLnGrad.C +++ b/src/finiteArea/finiteArea/lnGradSchemes/limitedLnGrad/limitedLnGrad.C @@ -72,7 +72,7 @@ limitedLnGrad::correction (1 - limitCoeff_)*mag(corr) + dimensionedScalar("small", corr.dimensions(), SMALL) ), - dimensionedScalar("one", dimless, 1.0) + dimensionedScalar(dimless, Foam::one{}) ) ); diff --git a/src/finiteArea/finiteArea/lnGradSchemes/limitedLnGrad/limitedLnGrad.H b/src/finiteArea/finiteArea/lnGradSchemes/limitedLnGrad/limitedLnGrad.H index 1e0a6d7720..eef75a51f8 100644 --- a/src/finiteArea/finiteArea/lnGradSchemes/limitedLnGrad/limitedLnGrad.H +++ b/src/finiteArea/finiteArea/lnGradSchemes/limitedLnGrad/limitedLnGrad.H @@ -68,24 +68,27 @@ class limitedLnGrad : public lnGradScheme { - // Private data + // Private Data //- Limiter. 0 = no limiting, 1 = full limiting scalar limitCoeff_; - // Private Member Functions - - //- No copy assignment - void operator=(const limitedLnGrad&) = delete; - - public: //- Runtime type information TypeName("limited"); + // Generated Methods + + //- No copy construct + limitedLnGrad(const limitedLnGrad&) = delete; + + //- No copy assignment + void operator=(const limitedLnGrad&) = delete; + + // Constructors //- Construct from mesh diff --git a/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.H b/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.H index 63adf7ea78..89831bba59 100644 --- a/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.H +++ b/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.H @@ -48,6 +48,7 @@ SourceFiles namespace Foam { +// Forward Declarations class faMesh; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -64,18 +65,12 @@ class lnGradScheme : public refCount { - // Private data + // Private Data //- Hold reference to mesh const faMesh& mesh_; - // Private Member Functions - - //- No copy assignment - void operator=(const lnGradScheme&) = delete; - - public: // Declare run-time constructor selection tables @@ -90,6 +85,15 @@ public: ); + // Generated Methods + + //- No copy construct + lnGradScheme(const lnGradScheme&) = delete; + + //- No copy assignment + void operator=(const lnGradScheme&) = delete; + + // Constructors //- Construct from mesh @@ -116,10 +120,7 @@ public: // Member Functions //- Return mesh reference - const faMesh& mesh() const - { - return mesh_; - } + const faMesh& mesh() const noexcept { return mesh_; } //- Return the lnGrad of the given cell field // with the given weighting factors @@ -138,10 +139,7 @@ public: ) const = 0; //- Return true if this scheme uses an explicit correction - virtual bool corrected() const - { - return false; - } + virtual bool corrected() const { return false; } //- Return the explicit correction to the lnGrad // for the given field diff --git a/src/finiteArea/finiteArea/lnGradSchemes/uncorrectedLnGrad/uncorrectedLnGrad.H b/src/finiteArea/finiteArea/lnGradSchemes/uncorrectedLnGrad/uncorrectedLnGrad.H index 8ff48692ce..ecda9a6e1f 100644 --- a/src/finiteArea/finiteArea/lnGradSchemes/uncorrectedLnGrad/uncorrectedLnGrad.H +++ b/src/finiteArea/finiteArea/lnGradSchemes/uncorrectedLnGrad/uncorrectedLnGrad.H @@ -58,18 +58,21 @@ class uncorrectedLnGrad : public lnGradScheme { - // Private Member Functions - - //- No copy assignment - void operator=(const uncorrectedLnGrad&) = delete; - - public: //- Runtime type information TypeName("uncorrected"); + // Generated Methods + + //- No copy construct + uncorrectedLnGrad(const uncorrectedLnGrad&) = delete; + + //- No copy assignment + void operator=(const uncorrectedLnGrad&) = delete; + + // Constructors //- Construct from mesh @@ -101,10 +104,7 @@ public: } //- Return true if this scheme uses an explicit correction - virtual bool corrected() const - { - return false; - } + virtual bool corrected() const { return false; } //- Return the explicit correction to the uncorrectedLnGrad //- for the given field diff --git a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolate.C b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolate.C index 54dcd271b1..2fcbe116a1 100644 --- a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolate.C +++ b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolate.C @@ -100,14 +100,14 @@ Foam::fac::interpolate Istream& schemeData ) { -# ifdef DEBUGInterpolations + #ifdef DEBUGInterpolations if (edgeInterpolation::debug) { InfoInFunction << "interpolating GeometricField " << endl; } -# endif + #endif return scheme(faceFlux, schemeData)().interpolate(vf); } @@ -122,7 +122,7 @@ Foam::fac::interpolate const word& name ) { -# ifdef DEBUGInterpolations + #ifdef DEBUGInterpolations if (edgeInterpolation::debug) { InfoInFunction @@ -130,7 +130,7 @@ Foam::fac::interpolate << "using " << name << endl; } -# endif + #endif return scheme(faceFlux, name)().interpolate(vf); } @@ -199,14 +199,14 @@ Foam::fac::interpolate Istream& schemeData ) { -# ifdef DEBUGInterpolations + #ifdef DEBUGInterpolations if (edgeInterpolation::debug) { InfoInFunction << "interpolating GeometricField " << endl; } -# endif + #endif return scheme(vf.mesh(), schemeData)().interpolate(vf); } @@ -220,7 +220,7 @@ Foam::fac::interpolate const word& name ) { -# ifdef DEBUGInterpolations + #ifdef DEBUGInterpolations if (edgeInterpolation::debug) { InfoInFunction @@ -228,7 +228,7 @@ Foam::fac::interpolate << "using " << name << endl; } -# endif + #endif return scheme(vf.mesh(), name)().interpolate(vf); } @@ -257,7 +257,7 @@ Foam::fac::interpolate const GeometricField& vf ) { -# ifdef DEBUGInterpolations + #ifdef DEBUGInterpolations if (edgeInterpolation::debug) { InfoInFunction @@ -265,7 +265,7 @@ Foam::fac::interpolate << "using run-time selected scheme" << endl; } -# endif + #endif return interpolate(vf, "interpolate(" + vf.name() + ')'); } diff --git a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.H b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.H index ff84b3c742..1de506b5aa 100644 --- a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.H +++ b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.H @@ -129,6 +129,15 @@ public: ClassName("edgeInterpolation"); + // Generated Methods + + //- No copy construct + edgeInterpolation(const edgeInterpolation&) = delete; + + //- No copy assignment + void operator=(const edgeInterpolation&) = delete; + + // Constructors //- Construct given an faMesh @@ -142,10 +151,7 @@ public: // Member Functions //- Return mesh reference - const faMesh& mesh() const noexcept - { - return faMesh_; - } + const faMesh& mesh() const noexcept { return faMesh_; } //- Return reference to PN geodesic distance const edgeScalarField& lPN() const; diff --git a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.H b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.H index 64bc2a9cef..597cd2c507 100644 --- a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.H +++ b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.H @@ -59,18 +59,12 @@ class edgeInterpolationScheme : public refCount { - // Private data + // Private Data - //- Hold reference to mesh + //- Reference to mesh const faMesh& mesh_; - // Private Member Functions - - //- No copy assignment - void operator=(const edgeInterpolationScheme&) = delete; - - public: // Declare run-time constructor selection tables @@ -101,6 +95,15 @@ public: ); + // Private Member Functions + + //- No copy construct + edgeInterpolationScheme(const edgeInterpolationScheme&) = delete; + + //- No copy assignment + void operator=(const edgeInterpolationScheme&) = delete; + + // Constructors //- Construct from mesh @@ -179,10 +182,7 @@ public: ) const = 0; //- Return true if this scheme uses an explicit correction - virtual bool corrected() const - { - return false; - } + virtual bool corrected() const { return false; } //- Return the explicit correction to the face-interpolate // for the given field diff --git a/src/finiteArea/interpolation/edgeInterpolation/schemes/Gamma/Gamma.H b/src/finiteArea/interpolation/edgeInterpolation/schemes/Gamma/Gamma.H index 39b547745d..18b4973828 100644 --- a/src/finiteArea/interpolation/edgeInterpolation/schemes/Gamma/Gamma.H +++ b/src/finiteArea/interpolation/edgeInterpolation/schemes/Gamma/Gamma.H @@ -54,7 +54,11 @@ namespace Foam class GammaWeight { - scalar k_; + // Private Data + + //- Model coefficient [0,1] + scalar k_; + public: diff --git a/src/finiteArea/interpolation/edgeInterpolation/schemes/NVDscheme/faNVDscheme.H b/src/finiteArea/interpolation/edgeInterpolation/schemes/NVDscheme/faNVDscheme.H index b6ad35709a..442d045698 100644 --- a/src/finiteArea/interpolation/edgeInterpolation/schemes/NVDscheme/faNVDscheme.H +++ b/src/finiteArea/interpolation/edgeInterpolation/schemes/NVDscheme/faNVDscheme.H @@ -72,14 +72,6 @@ protected: const edgeScalarField& edgeFlux_; - // Protected Member Functions - - //- No copy construct - faNVDscheme(const faNVDscheme&) = delete; - - //- No copy assignment - void operator=(const faNVDscheme&) = delete; - public: @@ -91,6 +83,15 @@ public: TypeName("faNVDscheme"); + // Generated Methods + + //- No copy construct + faNVDscheme(const faNVDscheme&) = delete; + + //- No copy assignment + void operator=(const faNVDscheme&) = delete; + + // Constructors //- Construct from mesh and edgeFlux and blendingFactor diff --git a/src/finiteArea/interpolation/edgeInterpolation/schemes/blended/blendedEdgeInterpolation.H b/src/finiteArea/interpolation/edgeInterpolation/schemes/blended/blendedEdgeInterpolation.H index 5e3bfc513a..f4a027d4a2 100644 --- a/src/finiteArea/interpolation/edgeInterpolation/schemes/blended/blendedEdgeInterpolation.H +++ b/src/finiteArea/interpolation/edgeInterpolation/schemes/blended/blendedEdgeInterpolation.H @@ -56,26 +56,27 @@ class blendedEdgeInterpolation public linearEdgeInterpolation, public upwindEdgeInterpolation { - // Private data + // Private Data + //- Blending factor const scalar blendingFactor_; - // Private Member Functions - - //- No copy construct - blendedEdgeInterpolation(const blendedEdgeInterpolation&) = delete; - - //- No copy assignment - void operator=(const blendedEdgeInterpolation&) = delete; - - public: //- Runtime type information TypeName("blended"); + // Generated Methods + + //- No copy construct + blendedEdgeInterpolation(const blendedEdgeInterpolation&) = delete; + + //- No copy assignment + void operator=(const blendedEdgeInterpolation&) = delete; + + // Constructors //- Construct from mesh, faceFlux and blendingFactor diff --git a/src/finiteArea/interpolation/edgeInterpolation/schemes/leastSquares/leastSquaresEdgeInterpolation.H b/src/finiteArea/interpolation/edgeInterpolation/schemes/leastSquares/leastSquaresEdgeInterpolation.H index fd261bae44..6ccff4b795 100644 --- a/src/finiteArea/interpolation/edgeInterpolation/schemes/leastSquares/leastSquaresEdgeInterpolation.H +++ b/src/finiteArea/interpolation/edgeInterpolation/schemes/leastSquares/leastSquaresEdgeInterpolation.H @@ -67,18 +67,22 @@ class leastSquaresEdgeInterpolation : virtual public edgeInterpolationScheme { - // Private Member Functions - - //- No copy assignment - void operator=(const leastSquaresEdgeInterpolation&) = delete; - - public: //- Runtime type information TypeName("leastSquares"); + // Generated Methods + + //- No copy construct + leastSquaresEdgeInterpolation(const leastSquaresEdgeInterpolation&) + = delete; + + //- No copy assignment + void operator=(const leastSquaresEdgeInterpolation&) = delete; + + // Constructors //- Construct from mesh diff --git a/src/finiteArea/interpolation/edgeInterpolation/schemes/linear/linearEdgeInterpolation.H b/src/finiteArea/interpolation/edgeInterpolation/schemes/linear/linearEdgeInterpolation.H index 9a1c99c3d2..e4ce7041bd 100644 --- a/src/finiteArea/interpolation/edgeInterpolation/schemes/linear/linearEdgeInterpolation.H +++ b/src/finiteArea/interpolation/edgeInterpolation/schemes/linear/linearEdgeInterpolation.H @@ -54,17 +54,21 @@ class linearEdgeInterpolation : virtual public edgeInterpolationScheme { - // Private Member Functions - - //- No copy assignment - void operator=(const linearEdgeInterpolation&) = delete; - public: //- Runtime type information TypeName("linear"); + // Generated Methods + + //- No copy construct + linearEdgeInterpolation(const linearEdgeInterpolation&) = delete; + + //- No copy assignment + void operator=(const linearEdgeInterpolation&) = delete; + + // Constructors //- Construct from mesh diff --git a/src/finiteArea/interpolation/edgeInterpolation/schemes/linearUpwind/linearUpwind.H b/src/finiteArea/interpolation/edgeInterpolation/schemes/linearUpwind/linearUpwind.H index da9b6bdfc7..5ac45a7913 100644 --- a/src/finiteArea/interpolation/edgeInterpolation/schemes/linearUpwind/linearUpwind.H +++ b/src/finiteArea/interpolation/edgeInterpolation/schemes/linearUpwind/linearUpwind.H @@ -58,9 +58,17 @@ namespace Foam class linearUpwindWeight { - public: + // Generated Methods + + //- No copy construct + linearUpwindWeight(const linearUpwindWeight&) = delete; + + //- No copy assignment + void operator=(const linearUpwindWeight&) = delete; + + linearUpwindWeight(Istream&) {} diff --git a/src/finiteArea/interpolation/edgeInterpolation/schemes/skewCorrected/skewCorrectedEdgeInterpolation.H b/src/finiteArea/interpolation/edgeInterpolation/schemes/skewCorrected/skewCorrectedEdgeInterpolation.H index da63c64444..d5c7202339 100644 --- a/src/finiteArea/interpolation/edgeInterpolation/schemes/skewCorrected/skewCorrectedEdgeInterpolation.H +++ b/src/finiteArea/interpolation/edgeInterpolation/schemes/skewCorrected/skewCorrectedEdgeInterpolation.H @@ -60,6 +60,7 @@ class skewCorrectedEdgeInterpolation { // Private Data + //- Edge-interpolation scheme tmp> tScheme_; @@ -69,6 +70,16 @@ public: TypeName("skewCorrected"); + // Generated Methods + + //- No copy construct + skewCorrectedEdgeInterpolation(const skewCorrectedEdgeInterpolation&) + = delete; + + //- No copy assignment + void operator=(const skewCorrectedEdgeInterpolation&) = delete; + + // Constructors //- Construct from Istream @@ -96,13 +107,6 @@ public: ) {} - //- No copy construct - skewCorrectedEdgeInterpolation(const skewCorrectedEdgeInterpolation&) = - delete; - - //- No copy assignment - void operator=(const skewCorrectedEdgeInterpolation&) = delete; - // Member Functions @@ -115,7 +119,7 @@ public: return tScheme_().weights(vf); } - //- Return true if this scheme uses an explicit correction + //- Return true if this scheme uses an explicit correction virtual bool corrected() const { return diff --git a/src/finiteArea/interpolation/edgeInterpolation/schemes/upwind/upwindEdgeInterpolation.H b/src/finiteArea/interpolation/edgeInterpolation/schemes/upwind/upwindEdgeInterpolation.H index 7384f19d5e..fbafdcb4e8 100644 --- a/src/finiteArea/interpolation/edgeInterpolation/schemes/upwind/upwindEdgeInterpolation.H +++ b/src/finiteArea/interpolation/edgeInterpolation/schemes/upwind/upwindEdgeInterpolation.H @@ -55,23 +55,27 @@ class upwindEdgeInterpolation : virtual public edgeInterpolationScheme { - // Private data + // Private Data + //- Face flux const edgeScalarField& faceFlux_; - // Private Member Functions - - //- No copy assignment - void operator=(const upwindEdgeInterpolation&) = delete; - - public: //- Runtime type information TypeName("upwind"); + // Generated Methods + + //- No copy construct + upwindEdgeInterpolation(const upwindEdgeInterpolation&) = delete; + + //- No copy assignment + void operator=(const upwindEdgeInterpolation&) = delete; + + // Constructors //- Construct from faceFlux diff --git a/src/finiteArea/output/ensight/ensightFaMesh.H b/src/finiteArea/output/ensight/ensightFaMesh.H index ce3deb7534..ae30d33ea7 100644 --- a/src/finiteArea/output/ensight/ensightFaMesh.H +++ b/src/finiteArea/output/ensight/ensightFaMesh.H @@ -85,6 +85,11 @@ class ensightFaMesh //- Enforce consistent index/part numbering void renumber(); + +public: + + // Generated Methods + //- No copy construct ensightFaMesh(const ensightFaMesh&) = delete; @@ -92,8 +97,6 @@ class ensightFaMesh void operator=(const ensightFaMesh&) = delete; -public: - // Constructors //- Construct from mesh with all default options