From b393d6eca12e8be0067b1611a4cb5a44c35b473a Mon Sep 17 00:00:00 2001 From: Kutalmis Bercin Date: Fri, 19 Jan 2024 15:44:04 +0000 Subject: [PATCH 1/7] 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 From 1cbbcf15d3ac9b3ff69bcb1e434fd0612484ac46 Mon Sep 17 00:00:00 2001 From: Kutalmis Bercin Date: Fri, 19 Jan 2024 16:28:05 +0000 Subject: [PATCH 2/7] ENH: finiteArea: remove redundant header files --- .../interfaceTrackingFvMesh/interfaceTrackingFvMesh.C | 1 + src/finiteArea/faMatrices/faMatrix/faMatrix.C | 3 --- src/finiteArea/faMatrices/faMatrix/faMatrix.H | 4 ---- src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C | 1 - src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H | 2 -- src/finiteArea/faMesh/faMeshMapper/faAreaMapper.H | 3 --- src/finiteArea/faMesh/faMeshMapper/faBoundaryMeshMapper.H | 1 - src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.H | 1 - src/finiteArea/faMesh/faMeshMapper/faPatchMapper.C | 4 ---- src/finiteArea/faMesh/faMeshMapper/faPatchMapper.H | 1 - .../faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C | 2 -- .../faMesh/faPatches/constraint/processor/processorFaPatch.C | 1 - .../faMesh/faPatches/constraint/wedge/wedgeFaPatch.C | 3 --- src/finiteArea/fields/areaFields/areaFields.H | 1 - src/finiteArea/fields/edgeFields/edgeFields.H | 1 - .../faConvectionScheme/faConvectionScheme.H | 2 -- .../d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C | 1 - .../finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.C | 1 - .../finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.H | 2 -- .../ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.C | 1 - .../ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.C | 1 - .../boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.C | 1 - .../finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.C | 1 - .../finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.H | 2 -- .../finiteArea/divSchemes/faDivScheme/faDivScheme.C | 2 -- .../finiteArea/divSchemes/faDivScheme/faDivScheme.H | 2 -- .../finiteArea/gradSchemes/faGradScheme/faGradScheme.C | 1 - .../finiteArea/gradSchemes/faGradScheme/faGradScheme.H | 3 --- .../finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.C | 2 -- .../finiteArea/gradSchemes/gaussFaGrad/gaussFaGrads.C | 1 - .../gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.C | 5 ----- .../gradSchemes/leastSquaresFaGrad/leastSquaresFaGrads.C | 1 - .../gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C | 1 - .../gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.H | 1 - .../edgeLimitedFaGrad/edgeLimitedFaGrads.C | 5 ----- .../faceLimitedFaGrad/faceLimitedFaGrads.C | 5 ----- .../laplacianSchemes/faLaplacianScheme/faLaplacianScheme.C | 2 -- .../laplacianSchemes/faLaplacianScheme/faLaplacianScheme.H | 3 --- .../lnGradSchemes/correctedLnGrad/correctedLnGrad.C | 2 -- .../finiteArea/lnGradSchemes/fourthLnGrad/fourthLnGrad.C | 1 - .../finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.C | 1 - .../finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.H | 2 -- .../finiteArea/lnGradSchemes/lnGradScheme/lnGradSchemes.C | 1 - .../interpolation/edgeInterpolation/edgeInterpolate.H | 1 - .../interpolation/edgeInterpolation/edgeInterpolation.C | 2 -- .../interpolation/edgeInterpolation/edgeInterpolation.H | 3 --- .../edgeInterpolationScheme/edgeInterpolationScheme.C | 2 -- .../edgeInterpolationScheme/edgeInterpolationScheme.H | 2 -- .../schemes/skewCorrected/skewCorrectedEdgeInterpolation.H | 2 -- 49 files changed, 1 insertion(+), 93 deletions(-) diff --git a/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C b/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C index 4197ef6bac..bc97ae9c80 100644 --- a/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C +++ b/src/dynamicFaMesh/interfaceTrackingFvMesh/interfaceTrackingFvMesh.C @@ -50,6 +50,7 @@ License #include "demandDrivenData.H" #include "unitConversion.H" #include "foamVtkIndPatchWriter.H" +#include "calculatedFaPatchFields.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/finiteArea/faMatrices/faMatrix/faMatrix.C b/src/finiteArea/faMatrices/faMatrix/faMatrix.C index ca564e8d7c..9db099316f 100644 --- a/src/finiteArea/faMatrices/faMatrix/faMatrix.C +++ b/src/finiteArea/faMatrices/faMatrix/faMatrix.C @@ -28,12 +28,9 @@ License #include "areaFields.H" #include "edgeFields.H" -#include "calculatedFaPatchFields.H" #include "extrapolatedCalculatedFaPatchFields.H" -#include "zeroGradientFaPatchFields.H" #include "IndirectList.H" #include "UniformList.H" -#include "demandDrivenData.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // diff --git a/src/finiteArea/faMatrices/faMatrix/faMatrix.H b/src/finiteArea/faMatrices/faMatrix/faMatrix.H index 47b19d7604..dd56ad68db 100644 --- a/src/finiteArea/faMatrices/faMatrix/faMatrix.H +++ b/src/finiteArea/faMatrices/faMatrix/faMatrix.H @@ -46,10 +46,6 @@ Author #include "areaFields.H" #include "edgeFields.H" #include "lduMatrix.H" -#include "tmp.H" -#include "autoPtr.H" -#include "dimensionedTypes.H" -#include "className.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C index 5df6a43abe..3ed9ea7f8f 100644 --- a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C +++ b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C @@ -29,7 +29,6 @@ License #include "faBoundaryMesh.H" #include "faMesh.H" #include "globalIndex.H" -#include "primitiveMesh.H" #include "processorFaPatch.H" #include "wordRes.H" #include "PtrListOps.H" diff --git a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H index 9a147781d5..0603bd28d2 100644 --- a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H +++ b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H @@ -46,8 +46,6 @@ Author #include "faPatch.H" #include "labelPair.H" #include "lduInterfacePtrsList.H" -#include "wordList.H" -#include "pointField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/faMesh/faMeshMapper/faAreaMapper.H b/src/finiteArea/faMesh/faMeshMapper/faAreaMapper.H index ee7a950484..7569df58f7 100644 --- a/src/finiteArea/faMesh/faMeshMapper/faAreaMapper.H +++ b/src/finiteArea/faMesh/faMeshMapper/faAreaMapper.H @@ -43,9 +43,6 @@ SourceFiles #include "morphFieldMapper.H" #include "faMesh.H" -#include "faceMapper.H" -#include "HashSet.H" -#include "mapPolyMesh.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/faMesh/faMeshMapper/faBoundaryMeshMapper.H b/src/finiteArea/faMesh/faMeshMapper/faBoundaryMeshMapper.H index 8cb95b3358..b60d1a6612 100644 --- a/src/finiteArea/faMesh/faMeshMapper/faBoundaryMeshMapper.H +++ b/src/finiteArea/faMesh/faMeshMapper/faBoundaryMeshMapper.H @@ -34,7 +34,6 @@ Description #ifndef faBoundaryMeshMapper_H #define faBoundaryMeshMapper_H -#include "PtrList.H" #include "faPatchMapper.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.H b/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.H index f01ef5ea97..620795a0e8 100644 --- a/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.H +++ b/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.H @@ -45,7 +45,6 @@ SourceFiles #include "morphFieldMapper.H" #include "faMesh.H" #include "faceMapper.H" -#include "HashSet.H" #include "mapPolyMesh.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.C b/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.C index 569a2c02f3..b54faafc13 100644 --- a/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.C +++ b/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.C @@ -26,11 +26,7 @@ License \*---------------------------------------------------------------------------*/ #include "faPatchMapper.H" -#include "faPatch.H" -#include "faBoundaryMesh.H" -#include "faMesh.H" #include "mapPolyMesh.H" -#include "faceMapper.H" #include "demandDrivenData.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // diff --git a/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.H b/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.H index ec35ef1310..8672301bd8 100644 --- a/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.H +++ b/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.H @@ -45,7 +45,6 @@ SourceFiles #include "faPatchFieldMapper.H" #include "faceMapper.H" #include "faPatch.H" -#include "primitiveFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C b/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C index f513163190..5d0ffcb436 100644 --- a/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C +++ b/src/finiteArea/faMesh/faPatches/constraint/cyclic/cyclicFaPatch.C @@ -27,10 +27,8 @@ License \*---------------------------------------------------------------------------*/ #include "cyclicFaPatch.H" -#include "coupledPolyPatch.H" #include "addToRunTimeSelectionTable.H" #include "transform.H" -#include "faMesh.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C index 3404034980..c60a08a0ba 100644 --- a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C +++ b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.C @@ -30,7 +30,6 @@ License #include "processorPolyPatch.H" // For newName() #include "addToRunTimeSelectionTable.H" #include "transformField.H" -#include "faBoundaryMesh.H" #include "faMesh.H" #include "globalMeshData.H" diff --git a/src/finiteArea/faMesh/faPatches/constraint/wedge/wedgeFaPatch.C b/src/finiteArea/faMesh/faPatches/constraint/wedge/wedgeFaPatch.C index c6dc075505..8c8e70e661 100644 --- a/src/finiteArea/faMesh/faPatches/constraint/wedge/wedgeFaPatch.C +++ b/src/finiteArea/faMesh/faPatches/constraint/wedge/wedgeFaPatch.C @@ -28,9 +28,6 @@ License #include "wedgeFaPatch.H" #include "addToRunTimeSelectionTable.H" -#include "faBoundaryMesh.H" -#include "wedgePolyPatch.H" -#include "polyMesh.H" #include "faMesh.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/fields/areaFields/areaFields.H b/src/finiteArea/fields/areaFields/areaFields.H index eedec105a2..22ce54161a 100644 --- a/src/finiteArea/fields/areaFields/areaFields.H +++ b/src/finiteArea/fields/areaFields/areaFields.H @@ -47,7 +47,6 @@ SourceFiles #include "faMesh.H" #include "faPatchFields.H" #include "areaFieldsFwd.H" -#include "calculatedFaPatchFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/fields/edgeFields/edgeFields.H b/src/finiteArea/fields/edgeFields/edgeFields.H index 974dfc7d0a..73c95fb2d7 100644 --- a/src/finiteArea/fields/edgeFields/edgeFields.H +++ b/src/finiteArea/fields/edgeFields/edgeFields.H @@ -48,7 +48,6 @@ SourceFiles #include "faMesh.H" #include "faePatchFields.H" #include "edgeFieldsFwd.H" -#include "calculatedFaePatchFields.H" #endif diff --git a/src/finiteArea/finiteArea/convectionSchemes/faConvectionScheme/faConvectionScheme.H b/src/finiteArea/finiteArea/convectionSchemes/faConvectionScheme/faConvectionScheme.H index 43e0f9d67b..cb882d1206 100644 --- a/src/finiteArea/finiteArea/convectionSchemes/faConvectionScheme/faConvectionScheme.H +++ b/src/finiteArea/finiteArea/convectionSchemes/faConvectionScheme/faConvectionScheme.H @@ -37,10 +37,8 @@ SourceFiles #ifndef faConvectionScheme_H #define faConvectionScheme_H -#include "tmp.H" #include "areaFieldsFwd.H" #include "edgeFieldsFwd.H" -#include "typeInfo.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C b/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C index 7327de14f5..0788c39e60 100644 --- a/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C +++ b/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C @@ -26,7 +26,6 @@ License \*---------------------------------------------------------------------------*/ #include "EulerFaD2dt2Scheme.H" -#include "facDiv.H" #include "faMatrices.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.C b/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.C index 6f0d7a84b5..76a5c8b615 100644 --- a/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.C +++ b/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.C @@ -27,7 +27,6 @@ License \*---------------------------------------------------------------------------*/ #include "fa.H" -#include "HashTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.H b/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.H index 96a2b5d4e3..9d040c4062 100644 --- a/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.H +++ b/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.H @@ -37,11 +37,9 @@ SourceFiles #ifndef faD2dt2Scheme_H #define faD2dt2Scheme_H -#include "tmp.H" #include "dimensionedType.H" #include "areaFieldsFwd.H" #include "edgeFieldsFwd.H" -#include "typeInfo.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.C b/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.C index 8b9c8e9fac..33452b4ccb 100644 --- a/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.C +++ b/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.C @@ -26,7 +26,6 @@ License \*---------------------------------------------------------------------------*/ #include "EulerFaDdtScheme.H" -#include "facDiv.H" #include "faMatrices.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.C b/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.C index 01c0576d71..98d1889a46 100644 --- a/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.C +++ b/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.C @@ -26,7 +26,6 @@ License \*---------------------------------------------------------------------------*/ #include "backwardFaDdtScheme.H" -#include "facDiv.H" #include "faMatrices.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.C b/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.C index b63446ae20..32aeac7c15 100644 --- a/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.C +++ b/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.C @@ -26,7 +26,6 @@ License \*---------------------------------------------------------------------------*/ #include "boundedBackwardFaDdtScheme.H" -#include "facDiv.H" #include "faMatrices.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.C b/src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.C index 9c18bf8f16..d8f2c65505 100644 --- a/src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.C +++ b/src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.C @@ -27,7 +27,6 @@ License \*---------------------------------------------------------------------------*/ #include "fa.H" -#include "HashTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.H b/src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.H index 59020f1143..1cbaa58008 100644 --- a/src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.H +++ b/src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.H @@ -37,11 +37,9 @@ SourceFiles #ifndef faDdtScheme_H #define faDdtScheme_H -#include "tmp.H" #include "dimensionedType.H" #include "areaFieldsFwd.H" #include "edgeFieldsFwd.H" -#include "typeInfo.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.C b/src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.C index 6d85dfafd9..d2fdc7ca43 100644 --- a/src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.C +++ b/src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.C @@ -27,8 +27,6 @@ License \*---------------------------------------------------------------------------*/ #include "fa.H" -#include "HashTable.H" -#include "linearEdgeInterpolation.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.H b/src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.H index fb8bb441da..8fac369c6a 100644 --- a/src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.H +++ b/src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.H @@ -38,11 +38,9 @@ SourceFiles #ifndef Foam_faDivScheme_H #define Foam_faDivScheme_H -#include "tmp.H" #include "areaFieldsFwd.H" #include "edgeFieldsFwd.H" #include "linearEdgeInterpolation.H" -#include "typeInfo.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.C b/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.C index 597355f714..e008472d0b 100644 --- a/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.C +++ b/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.C @@ -27,7 +27,6 @@ License \*---------------------------------------------------------------------------*/ #include "fa.H" -#include "HashTable.H" #include "objectRegistry.H" #include "solution.H" diff --git a/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.H b/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.H index 07dc9cdb85..9cd17ef905 100644 --- a/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.H +++ b/src/finiteArea/finiteArea/gradSchemes/faGradScheme/faGradScheme.H @@ -39,11 +39,8 @@ SourceFiles #ifndef faGradScheme_H #define faGradScheme_H -#include "tmp.H" #include "areaFieldsFwd.H" #include "edgeFieldsFwd.H" -#include "typeInfo.H" -#include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.C b/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.C index af88fa2cf9..f83661c1bd 100644 --- a/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.C +++ b/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.C @@ -28,8 +28,6 @@ License #include "gaussFaGrad.H" #include "facGrad.H" -#include "areaFields.H" -#include "edgeFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrads.C b/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrads.C index 7780036413..479ec97c5a 100644 --- a/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrads.C +++ b/src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrads.C @@ -26,7 +26,6 @@ License \*---------------------------------------------------------------------------*/ #include "gaussFaGrad.H" -#include "faMesh.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.C b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.C index ea983b8975..656187479e 100644 --- a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.C +++ b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.C @@ -29,11 +29,6 @@ License #include "leastSquaresFaGrad.H" #include "leastSquaresFaVectors.H" #include "gaussFaGrad.H" -#include "faMesh.H" -#include "areaFaMesh.H" -#include "edgeFaMesh.H" -#include "GeometricField.H" -#include "zeroGradientFaPatchField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrads.C b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrads.C index b593bbde11..04927b5399 100644 --- a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrads.C +++ b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrads.C @@ -25,7 +25,6 @@ License \*---------------------------------------------------------------------------*/ -#include "faMesh.H" #include "leastSquaresFaGrad.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C index 3421ea6379..10d4aff368 100644 --- a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C +++ b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.C @@ -29,7 +29,6 @@ License #include "leastSquaresFaVectors.H" #include "edgeFields.H" #include "areaFields.H" -#include "mapPolyMesh.H" #include "demandDrivenData.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.H b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.H index b60907520c..9b032a5167 100644 --- a/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.H +++ b/src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.H @@ -43,7 +43,6 @@ SourceFiles #include "MeshObject.H" #include "faMesh.H" #include "edgeFieldsFwd.H" -#include "labelPair.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrads.C b/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrads.C index d86270a326..3aa9c4d205 100644 --- a/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrads.C +++ b/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrads.C @@ -28,11 +28,6 @@ License #include "edgeLimitedFaGrad.H" #include "gaussFaGrad.H" -#include "faMesh.H" -#include "areaFaMesh.H" -#include "edgeFaMesh.H" -#include "areaFields.H" -#include "fixedValueFaPatchFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrads.C b/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrads.C index c32dda42fe..da2fb1bf7b 100644 --- a/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrads.C +++ b/src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrads.C @@ -28,11 +28,6 @@ License #include "faceLimitedFaGrad.H" #include "gaussFaGrad.H" -#include "faMesh.H" -#include "areaFaMesh.H" -#include "edgeFaMesh.H" -#include "areaFields.H" -#include "fixedValueFaPatchFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.C b/src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.C index 821f2c74e3..af560bc7db 100644 --- a/src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.C +++ b/src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.C @@ -27,8 +27,6 @@ License \*---------------------------------------------------------------------------*/ #include "fa.H" -#include "HashTable.H" -#include "linearEdgeInterpolation.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.H b/src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.H index 112e8540ef..63c76b9f92 100644 --- a/src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.H +++ b/src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.H @@ -38,12 +38,9 @@ SourceFiles #ifndef Foam_faLaplacianScheme_H #define Foam_faLaplacianScheme_H -#include "tmp.H" #include "areaFieldsFwd.H" #include "edgeFieldsFwd.H" -#include "linearEdgeInterpolation.H" #include "correctedLnGrad.H" -#include "typeInfo.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/lnGradSchemes/correctedLnGrad/correctedLnGrad.C b/src/finiteArea/finiteArea/lnGradSchemes/correctedLnGrad/correctedLnGrad.C index 808fd89648..53805d07ae 100644 --- a/src/finiteArea/finiteArea/lnGradSchemes/correctedLnGrad/correctedLnGrad.C +++ b/src/finiteArea/finiteArea/lnGradSchemes/correctedLnGrad/correctedLnGrad.C @@ -25,10 +25,8 @@ License \*---------------------------------------------------------------------------*/ -#include "correctedLnGrad.H" #include "areaFields.H" #include "edgeFields.H" -#include "linearEdgeInterpolation.H" #include "gaussFaGrad.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/lnGradSchemes/fourthLnGrad/fourthLnGrad.C b/src/finiteArea/finiteArea/lnGradSchemes/fourthLnGrad/fourthLnGrad.C index b8cef67777..425891626a 100644 --- a/src/finiteArea/finiteArea/lnGradSchemes/fourthLnGrad/fourthLnGrad.C +++ b/src/finiteArea/finiteArea/lnGradSchemes/fourthLnGrad/fourthLnGrad.C @@ -29,7 +29,6 @@ License #include "areaFields.H" #include "edgeFields.H" #include "correctedLnGrad.H" -#include "linearEdgeInterpolation.H" #include "gaussFaGrad.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.C b/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.C index 2fbc4fbc81..1e073adb51 100644 --- a/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.C +++ b/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.C @@ -30,7 +30,6 @@ License #include "lnGradScheme.H" #include "areaFields.H" #include "edgeFields.H" -#include "HashTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.H b/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.H index 89831bba59..a1692f0d8d 100644 --- a/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.H +++ b/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradScheme.H @@ -37,10 +37,8 @@ SourceFiles #ifndef lnGradScheme_H #define lnGradScheme_H -#include "tmp.H" #include "areaFieldsFwd.H" #include "edgeFieldsFwd.H" -#include "typeInfo.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradSchemes.C b/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradSchemes.C index 65acc73304..49ae846a8b 100644 --- a/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradSchemes.C +++ b/src/finiteArea/finiteArea/lnGradSchemes/lnGradScheme/lnGradSchemes.C @@ -26,7 +26,6 @@ License \*---------------------------------------------------------------------------*/ #include "lnGradScheme.H" -#include "HashTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolate.H b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolate.H index 2b38213350..a9a974ad01 100644 --- a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolate.H +++ b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolate.H @@ -36,7 +36,6 @@ SourceFiles #ifndef edgeInterpolate_H #define edgeInterpolate_H -#include "tmp.H" #include "areaFieldsFwd.H" #include "edgeFieldsFwd.H" #include "edgeInterpolationScheme.H" diff --git a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.C b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.C index be58b30325..4bdedcf6b7 100644 --- a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.C +++ b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.C @@ -29,8 +29,6 @@ License #include "faMesh.H" #include "areaFields.H" #include "edgeFields.H" -#include "demandDrivenData.H" -#include "faPatchFields.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.H b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.H index 1de506b5aa..f33a44cbf7 100644 --- a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.H +++ b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.H @@ -42,11 +42,8 @@ SourceFiles #ifndef Foam_edgeInterpolation_H #define Foam_edgeInterpolation_H -#include "tmp.H" -#include "scalar.H" #include "areaFieldsFwd.H" #include "edgeFieldsFwd.H" -#include "className.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.C b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.C index b348c7ca0f..5d4ead9d02 100644 --- a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.C +++ b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.C @@ -29,9 +29,7 @@ License #include "edgeInterpolationScheme.H" #include "areaFields.H" #include "edgeFields.H" -#include "faPatchFields.H" #include "coupledFaPatchField.H" -#include "transform.H" // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.H b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.H index 597cd2c507..bc4a12f06f 100644 --- a/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.H +++ b/src/finiteArea/interpolation/edgeInterpolation/edgeInterpolationScheme/edgeInterpolationScheme.H @@ -37,10 +37,8 @@ SourceFiles #ifndef edgeInterpolationScheme_H #define edgeInterpolationScheme_H -#include "tmp.H" #include "areaFieldsFwd.H" #include "edgeFieldsFwd.H" -#include "typeInfo.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteArea/interpolation/edgeInterpolation/schemes/skewCorrected/skewCorrectedEdgeInterpolation.H b/src/finiteArea/interpolation/edgeInterpolation/schemes/skewCorrected/skewCorrectedEdgeInterpolation.H index d5c7202339..a725730e35 100644 --- a/src/finiteArea/interpolation/edgeInterpolation/schemes/skewCorrected/skewCorrectedEdgeInterpolation.H +++ b/src/finiteArea/interpolation/edgeInterpolation/schemes/skewCorrected/skewCorrectedEdgeInterpolation.H @@ -39,10 +39,8 @@ SourceFiles #define skewCorrectedEdgeInterpolation_H #include "edgeInterpolationScheme.H" -#include "linearEdgeInterpolation.H" #include "gaussFaGrad.H" #include "areaFields.H" -#include "zeroGradientFaPatchFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // From cd8bc891f0ea0651fada48f19ffa51765d0299a1 Mon Sep 17 00:00:00 2001 From: Kutalmis Bercin Date: Tue, 27 Feb 2024 13:40:36 +0000 Subject: [PATCH 3/7] ENH: fvMatrix, faMatrix: replace raw pointers with unique_ptr (#3107) --- .../reactingMultiphaseEulerFoam/pUf/pEqn.H | 5 +- src/finiteArea/faMatrices/faMatrix/faMatrix.C | 54 ++++++++---------- src/finiteArea/faMatrices/faMatrix/faMatrix.H | 11 +++- .../gaussFaLaplacianScheme.C | 6 +- .../gaussLaplacianScheme.C | 2 +- .../gaussLaplacianSchemes.C | 6 +- .../relaxedNonOrthoGaussLaplacianScheme.C | 2 +- .../relaxedNonOrthoGaussLaplacianSchemes.C | 2 +- .../fvMatrices/fvMatrix/fvMatrix.C | 57 +++++++++---------- .../fvMatrices/fvMatrix/fvMatrix.H | 11 +++- 10 files changed, 78 insertions(+), 78 deletions(-) diff --git a/applications/solvers/multiphase/reactingMultiphaseEulerFoam/pUf/pEqn.H b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/pUf/pEqn.H index 08d97031b0..b66aabffce 100644 --- a/applications/solvers/multiphase/reactingMultiphaseEulerFoam/pUf/pEqn.H +++ b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/pUf/pEqn.H @@ -272,10 +272,7 @@ while (pimple.correct()) ).ptr() ); - deleteDemandDrivenData - ( - pEqnComps[phasei].faceFluxCorrectionPtr() - ); + pEqnComps[phasei].faceFluxCorrectionPtr(nullptr); pEqnComps[phasei].relax(); } diff --git a/src/finiteArea/faMatrices/faMatrix/faMatrix.C b/src/finiteArea/faMatrices/faMatrix/faMatrix.C index 9db099316f..ac90e71012 100644 --- a/src/finiteArea/faMatrices/faMatrix/faMatrix.C +++ b/src/finiteArea/faMatrices/faMatrix/faMatrix.C @@ -190,8 +190,7 @@ Foam::faMatrix::faMatrix dimensions_(ds), source_(psi.size(), Zero), internalCoeffs_(psi.mesh().boundary().size()), - boundaryCoeffs_(psi.mesh().boundary().size()), - faceFluxCorrectionPtr_(nullptr) + boundaryCoeffs_(psi.mesh().boundary().size()) { DebugInFunction << "constructing faMatrix for field " << psi_.name() @@ -231,19 +230,17 @@ Foam::faMatrix::faMatrix(const faMatrix& fam) dimensions_(fam.dimensions_), source_(fam.source_), internalCoeffs_(fam.internalCoeffs_), - boundaryCoeffs_(fam.boundaryCoeffs_), - faceFluxCorrectionPtr_(nullptr) + boundaryCoeffs_(fam.boundaryCoeffs_) { DebugInFunction << "Copying faMatrix for field " << psi_.name() << endl; if (fam.faceFluxCorrectionPtr_) { - faceFluxCorrectionPtr_ = - new GeometricField - ( - *(fam.faceFluxCorrectionPtr_) - ); + faceFluxCorrectionPtr_ = std::make_unique + ( + *(fam.faceFluxCorrectionPtr_) + ); } } @@ -256,8 +253,7 @@ Foam::faMatrix::faMatrix(const tmp>& tmat) dimensions_(tmat().dimensions_), source_(tmat.constCast().source_, tmat.movable()), internalCoeffs_(tmat.constCast().internalCoeffs_, tmat.movable()), - boundaryCoeffs_(tmat.constCast().boundaryCoeffs_, tmat.movable()), - faceFluxCorrectionPtr_(nullptr) + boundaryCoeffs_(tmat.constCast().boundaryCoeffs_, tmat.movable()) { DebugInFunction << "Copy/Move faMatrix for field " << psi_.name() << endl; @@ -265,17 +261,16 @@ Foam::faMatrix::faMatrix(const tmp>& tmat) if (tmat().faceFluxCorrectionPtr_) { if (tmat.movable()) - { - faceFluxCorrectionPtr_ = tmat().faceFluxCorrectionPtr_; - tmat().faceFluxCorrectionPtr_ = nullptr; - } - else { faceFluxCorrectionPtr_ = - new GeometricField - ( - *(tmat().faceFluxCorrectionPtr_) - ); + std::move(tmat.constCast().faceFluxCorrectionPtr_); + } + else if (tmat().faceFluxCorrectionPtr_) + { + faceFluxCorrectionPtr_ = std::make_unique + ( + *(tmat().faceFluxCorrectionPtr_) + ); } } @@ -290,8 +285,6 @@ Foam::faMatrix::~faMatrix() { DebugInFunction << "Destroying faMatrix for field " << psi_.name() << endl; - - deleteDemandDrivenData(faceFluxCorrectionPtr_); } @@ -788,9 +781,10 @@ void Foam::faMatrix::operator=(const faMatrix& famv) } else if (famv.faceFluxCorrectionPtr_) { - faceFluxCorrectionPtr_ = - new GeometricField - (*famv.faceFluxCorrectionPtr_); + faceFluxCorrectionPtr_ = std::make_unique + ( + *famv.faceFluxCorrectionPtr_ + ); } } @@ -835,8 +829,7 @@ void Foam::faMatrix::operator+=(const faMatrix& famv) } else if (famv.faceFluxCorrectionPtr_) { - faceFluxCorrectionPtr_ = new - GeometricField + faceFluxCorrectionPtr_ = std::make_unique ( *famv.faceFluxCorrectionPtr_ ); @@ -869,9 +862,10 @@ void Foam::faMatrix::operator-=(const faMatrix& famv) } else if (famv.faceFluxCorrectionPtr_) { - faceFluxCorrectionPtr_ = - new GeometricField - (-*famv.faceFluxCorrectionPtr_); + faceFluxCorrectionPtr_ = std::make_unique + ( + -*famv.faceFluxCorrectionPtr_ + ); } } diff --git a/src/finiteArea/faMatrices/faMatrix/faMatrix.H b/src/finiteArea/faMatrices/faMatrix/faMatrix.H index dd56ad68db..0b4681537c 100644 --- a/src/finiteArea/faMatrices/faMatrix/faMatrix.H +++ b/src/finiteArea/faMatrices/faMatrix/faMatrix.H @@ -151,7 +151,7 @@ private: FieldField boundaryCoeffs_; //- Face flux field for non-orthogonal correction - mutable faceFluxFieldType* faceFluxCorrectionPtr_; + mutable std::unique_ptr faceFluxCorrectionPtr_; protected: @@ -353,8 +353,7 @@ public: } //- Declare return type of the faceFluxCorrectionPtr() function - typedef GeometricField - *faceFluxFieldPtrType; + typedef std::unique_ptr faceFluxFieldPtrType; //- Return pointer to face-flux non-orthogonal correction field faceFluxFieldPtrType& faceFluxCorrectionPtr() @@ -362,6 +361,12 @@ public: return faceFluxCorrectionPtr_; } + //- Set pointer to face-flux non-orthogonal correction field + void faceFluxCorrectionPtr(faceFluxFieldType* flux) + { + faceFluxCorrectionPtr_.reset(flux); + } + //- True if face-flux non-orthogonal correction field exists bool hasFaceFluxCorrection() const noexcept { diff --git a/src/finiteArea/finiteArea/laplacianSchemes/gaussFaLaplacianScheme/gaussFaLaplacianScheme.C b/src/finiteArea/finiteArea/laplacianSchemes/gaussFaLaplacianScheme/gaussFaLaplacianScheme.C index 46e7d4bb4f..b5236b2369 100644 --- a/src/finiteArea/finiteArea/laplacianSchemes/gaussFaLaplacianScheme/gaussFaLaplacianScheme.C +++ b/src/finiteArea/finiteArea/laplacianSchemes/gaussFaLaplacianScheme/gaussFaLaplacianScheme.C @@ -82,8 +82,10 @@ gaussLaplacianScheme::famLaplacian { if (this->mesh().fluxRequired(vf.name())) { - fam.faceFluxCorrectionPtr() = new - GeometricField + fam.faceFluxCorrectionPtr() = std::make_unique + < + GeometricField + > ( gammaMagSf*this->tlnGradScheme_().correction(vf) ); diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C index 20f20e80e1..27f420f72e 100644 --- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C +++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C @@ -194,7 +194,7 @@ gaussLaplacianScheme::fvmLaplacian if (mesh.fluxRequired(vf.name())) { - fvm.faceFluxCorrectionPtr() = tfaceFluxCorrection.ptr(); + fvm.faceFluxCorrectionPtr(tfaceFluxCorrection.ptr()); } return tfvm; diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C index 1201bad1fe..7d19f5b265 100644 --- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C +++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C @@ -61,8 +61,10 @@ Foam::fv::gaussLaplacianScheme::fvmLaplacian \ { \ if (mesh.fluxRequired(vf.name())) \ { \ - fvm.faceFluxCorrectionPtr() = new \ - GeometricField \ + fvm.faceFluxCorrectionPtr() = std::make_unique \ + < \ + GeometricField \ + > \ ( \ gammaMagSf*this->tsnGradScheme_().correction(vf) \ ); \ diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/relaxedNonOrthoGaussLaplacianScheme/relaxedNonOrthoGaussLaplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/relaxedNonOrthoGaussLaplacianScheme/relaxedNonOrthoGaussLaplacianScheme.C index ef0efdb299..44e554ad40 100644 --- a/src/finiteVolume/finiteVolume/laplacianSchemes/relaxedNonOrthoGaussLaplacianScheme/relaxedNonOrthoGaussLaplacianScheme.C +++ b/src/finiteVolume/finiteVolume/laplacianSchemes/relaxedNonOrthoGaussLaplacianScheme/relaxedNonOrthoGaussLaplacianScheme.C @@ -222,7 +222,7 @@ relaxedNonOrthoGaussLaplacianScheme::fvmLaplacian if (mesh.fluxRequired(vf.name())) { - fvm.faceFluxCorrectionPtr() = trelaxedCorrection.ptr(); + fvm.faceFluxCorrectionPtr(trelaxedCorrection.ptr()); } return tfvm; diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/relaxedNonOrthoGaussLaplacianScheme/relaxedNonOrthoGaussLaplacianSchemes.C b/src/finiteVolume/finiteVolume/laplacianSchemes/relaxedNonOrthoGaussLaplacianScheme/relaxedNonOrthoGaussLaplacianSchemes.C index ce32fd20fb..662e909dd5 100644 --- a/src/finiteVolume/finiteVolume/laplacianSchemes/relaxedNonOrthoGaussLaplacianScheme/relaxedNonOrthoGaussLaplacianSchemes.C +++ b/src/finiteVolume/finiteVolume/laplacianSchemes/relaxedNonOrthoGaussLaplacianScheme/relaxedNonOrthoGaussLaplacianSchemes.C @@ -98,7 +98,7 @@ fvmLaplacian \ \ if (mesh.fluxRequired(vf.name())) \ { \ - fvm.faceFluxCorrectionPtr() = trelaxedCorrection.ptr(); \ + fvm.faceFluxCorrectionPtr(trelaxedCorrection.ptr()); \ } \ } \ \ diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C index bf2ab42635..254436784f 100644 --- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C +++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C @@ -369,8 +369,7 @@ Foam::fvMatrix::fvMatrix dimensions_(ds), source_(psi.size(), Zero), internalCoeffs_(psi.mesh().boundary().size()), - boundaryCoeffs_(psi.mesh().boundary().size()), - faceFluxCorrectionPtr_(nullptr) + boundaryCoeffs_(psi.mesh().boundary().size()) { DebugInFunction << "Constructing fvMatrix for field " << psi_.name() << endl; @@ -410,19 +409,17 @@ Foam::fvMatrix::fvMatrix(const fvMatrix& fvm) dimensions_(fvm.dimensions_), source_(fvm.source_), internalCoeffs_(fvm.internalCoeffs_), - boundaryCoeffs_(fvm.boundaryCoeffs_), - faceFluxCorrectionPtr_(nullptr) + boundaryCoeffs_(fvm.boundaryCoeffs_) { DebugInFunction << "Copying fvMatrix for field " << psi_.name() << endl; if (fvm.faceFluxCorrectionPtr_) { - faceFluxCorrectionPtr_ = - new GeometricField - ( - *(fvm.faceFluxCorrectionPtr_) - ); + faceFluxCorrectionPtr_ = std::make_unique + ( + *(fvm.faceFluxCorrectionPtr_) + ); } } @@ -438,8 +435,7 @@ Foam::fvMatrix::fvMatrix(const tmp>& tmat) dimensions_(tmat().dimensions_), source_(tmat.constCast().source_, tmat.movable()), internalCoeffs_(tmat.constCast().internalCoeffs_, tmat.movable()), - boundaryCoeffs_(tmat.constCast().boundaryCoeffs_, tmat.movable()), - faceFluxCorrectionPtr_(nullptr) + boundaryCoeffs_(tmat.constCast().boundaryCoeffs_, tmat.movable()) { DebugInFunction << "Copy/move fvMatrix for field " << psi_.name() << endl; @@ -447,17 +443,16 @@ Foam::fvMatrix::fvMatrix(const tmp>& tmat) if (tmat().faceFluxCorrectionPtr_) { if (tmat.movable()) - { - faceFluxCorrectionPtr_ = tmat().faceFluxCorrectionPtr_; - tmat().faceFluxCorrectionPtr_ = nullptr; - } - else { faceFluxCorrectionPtr_ = - new GeometricField - ( - *(tmat().faceFluxCorrectionPtr_) - ); + std::move(tmat.constCast().faceFluxCorrectionPtr_); + } + else if (tmat().faceFluxCorrectionPtr_) + { + faceFluxCorrectionPtr_ = std::make_unique + ( + *(tmat().faceFluxCorrectionPtr_) + ); } } @@ -473,7 +468,6 @@ Foam::fvMatrix::~fvMatrix() DebugInFunction << "Destroying fvMatrix for field " << psi_.name() << endl; - deleteDemandDrivenData(faceFluxCorrectionPtr_); subMatrices_.clear(); } @@ -1577,9 +1571,10 @@ void Foam::fvMatrix::operator=(const fvMatrix& fvmv) } else if (fvmv.faceFluxCorrectionPtr_) { - faceFluxCorrectionPtr_ = - new GeometricField - (*fvmv.faceFluxCorrectionPtr_); + faceFluxCorrectionPtr_ = std::make_unique + ( + *fvmv.faceFluxCorrectionPtr_ + ); } useImplicit_ = fvmv.useImplicit_; @@ -1631,8 +1626,7 @@ void Foam::fvMatrix::operator+=(const fvMatrix& fvmv) } else if (fvmv.faceFluxCorrectionPtr_) { - faceFluxCorrectionPtr_ = new - GeometricField + faceFluxCorrectionPtr_ = std::make_unique ( *fvmv.faceFluxCorrectionPtr_ ); @@ -1669,9 +1663,10 @@ void Foam::fvMatrix::operator-=(const fvMatrix& fvmv) } else if (fvmv.faceFluxCorrectionPtr_) { - faceFluxCorrectionPtr_ = - new GeometricField - (-*fvmv.faceFluxCorrectionPtr_); + faceFluxCorrectionPtr_ = std::make_unique + ( + -*fvmv.faceFluxCorrectionPtr_ + ); } } @@ -2002,7 +1997,7 @@ Foam::tmp> Foam::correction // Delete the faceFluxCorrection from the correction matrix // as it does not have a clear meaning or purpose - deleteDemandDrivenData(tAcorr.ref().faceFluxCorrectionPtr()); + tAcorr.ref().faceFluxCorrectionPtr(nullptr); return tAcorr; } @@ -2018,7 +2013,7 @@ Foam::tmp> Foam::correction // Delete the faceFluxCorrection from the correction matrix // as it does not have a clear meaning or purpose - deleteDemandDrivenData(tAcorr.ref().faceFluxCorrectionPtr()); + tAcorr.ref().faceFluxCorrectionPtr(nullptr); return tAcorr; } diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H index c00236f7c9..78f18d22c3 100644 --- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H +++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H @@ -172,7 +172,7 @@ private: FieldField boundaryCoeffs_; //- Face flux field for non-orthogonal correction - mutable faceFluxFieldType* faceFluxCorrectionPtr_; + mutable std::unique_ptr faceFluxCorrectionPtr_; protected: @@ -494,8 +494,7 @@ public: } //- Declare return type of the faceFluxCorrectionPtr() function - typedef GeometricField - *faceFluxFieldPtrType; + typedef std::unique_ptr faceFluxFieldPtrType; //- Return pointer to face-flux non-orthogonal correction field faceFluxFieldPtrType& faceFluxCorrectionPtr() @@ -503,6 +502,12 @@ public: return faceFluxCorrectionPtr_; } + //- Set pointer to face-flux non-orthogonal correction field + void faceFluxCorrectionPtr(faceFluxFieldType* flux) + { + faceFluxCorrectionPtr_.reset(flux); + } + //- True if face-flux non-orthogonal correction field exists bool hasFaceFluxCorrection() const noexcept { From 47232ccf664cf0ed7010ceea853d4d6381eaa78d Mon Sep 17 00:00:00 2001 From: Kutalmis Bercin Date: Tue, 27 Feb 2024 13:40:27 +0000 Subject: [PATCH 4/7] ENH: finiteArea: replace raw pointers with unique_ptr --- .../distributed/faMeshDistributor.C | 8 +- .../distributed/faMeshDistributor.H | 2 +- .../distributed/faMeshDistributorTemplates.C | 4 +- src/finiteArea/faMesh/faMesh.C | 135 +++------- src/finiteArea/faMesh/faMesh.H | 29 +-- .../faMesh/faMeshDemandDrivenData.C | 231 +++++++++--------- .../faMesh/faMeshMapper/faAreaMapper.C | 45 ++-- .../faMesh/faMeshMapper/faAreaMapper.H | 13 +- .../faMesh/faMeshMapper/faEdgeMapper.C | 7 +- .../faMesh/faMeshMapper/faEdgeMapper.H | 2 +- .../faMesh/faMeshMapper/faPatchMapper.C | 7 +- .../faMesh/faMeshMapper/faPatchMapper.H | 2 +- src/finiteArea/faMesh/faMeshTopology.C | 11 +- .../faMesh/faPatches/faPatch/faPatch.C | 26 +- .../leastSquaresFaVectors.C | 21 +- .../leastSquaresFaVectors.H | 6 +- .../edgeInterpolation/edgeInterpolation.C | 88 +++---- .../edgeInterpolation/edgeInterpolation.H | 24 +- 18 files changed, 257 insertions(+), 404 deletions(-) diff --git a/src/finiteArea/distributed/faMeshDistributor.C b/src/finiteArea/distributed/faMeshDistributor.C index 9ee084fd94..a3b8841d1e 100644 --- a/src/finiteArea/distributed/faMeshDistributor.C +++ b/src/finiteArea/distributed/faMeshDistributor.C @@ -84,10 +84,10 @@ void Foam::faMeshDistributor::createInternalEdgeMap() const const auto& faEdgeMap = distMap_.faceMap(); // Copy full map - internalEdgeMap_.reset(new mapDistributeBase(faEdgeMap)); + internalEdgeMapPtr_ = std::make_unique(faEdgeMap); // Retain internal edges - internalEdgeMap_->compactRemoteData + internalEdgeMapPtr_->compactRemoteData ( bitSet(tgtMesh_.nInternalEdges(), true), UPstream::msgType(), @@ -200,8 +200,6 @@ Foam::faMeshDistributor::faMeshDistributor srcMesh_(srcMesh), tgtMesh_(tgtMesh), distMap_(distMap), - internalEdgeMap_(), - patchEdgeMaps_(), dummyHandler_(fileOperation::null()), writeHandler_(dummyHandler_), isWriteProc_(isWriteProc) @@ -221,8 +219,6 @@ Foam::faMeshDistributor::faMeshDistributor srcMesh_(srcMesh), tgtMesh_(tgtMesh), distMap_(distMap), - internalEdgeMap_(), - patchEdgeMaps_(), dummyHandler_(nullptr), writeHandler_(writeHandler), isWriteProc_(Switch::INVALID) diff --git a/src/finiteArea/distributed/faMeshDistributor.H b/src/finiteArea/distributed/faMeshDistributor.H index 05f40ab9cc..632d617308 100644 --- a/src/finiteArea/distributed/faMeshDistributor.H +++ b/src/finiteArea/distributed/faMeshDistributor.H @@ -73,7 +73,7 @@ class faMeshDistributor const mapDistributePolyMesh& distMap_; //- Internal edge mapper - mutable std::unique_ptr internalEdgeMap_; + mutable std::unique_ptr internalEdgeMapPtr_; //- Patch edge mappers mutable PtrList patchEdgeMaps_; diff --git a/src/finiteArea/distributed/faMeshDistributorTemplates.C b/src/finiteArea/distributed/faMeshDistributorTemplates.C index 9215cc3b2b..8df66fe2ab 100644 --- a/src/finiteArea/distributed/faMeshDistributorTemplates.C +++ b/src/finiteArea/distributed/faMeshDistributorTemplates.C @@ -154,7 +154,7 @@ Foam::faMeshDistributor::distributeField const GeometricField& fld ) const { - if (!internalEdgeMap_) + if (!internalEdgeMapPtr_) { createInternalEdgeMap(); } @@ -165,7 +165,7 @@ Foam::faMeshDistributor::distributeField const distributedFieldMapper mapper ( labelUList::null(), - *(internalEdgeMap_) + *(internalEdgeMapPtr_) ); DimensionedField internalField diff --git a/src/finiteArea/faMesh/faMesh.C b/src/finiteArea/faMesh/faMesh.C index cfb9e1608c..49c518363d 100644 --- a/src/finiteArea/faMesh/faMesh.C +++ b/src/finiteArea/faMesh/faMesh.C @@ -169,14 +169,12 @@ void Foam::faMesh::checkBoundaryEdgeLabelRange void Foam::faMesh::initPatch() const { - patchPtr_.reset + patchPtr_ = std::make_unique ( - new uindirectPrimitivePatch - ( - UIndirectList(mesh().faces(), faceLabels_), - mesh().points() - ) + UIndirectList(mesh().faces(), faceLabels_), + mesh().points() ); + // Could set some basic primitive data here... // nEdges_ = patchPtr_->nEdges(); // nInternalEdges_ = patchPtr_->nInternalEdges(); @@ -253,17 +251,17 @@ void Foam::faMesh::clearGeomNotAreas() const polyPatchFacesPtr_.reset(nullptr); polyPatchIdsPtr_.reset(nullptr); bndConnectPtr_.reset(nullptr); - deleteDemandDrivenData(SPtr_); - deleteDemandDrivenData(patchStartsPtr_); - deleteDemandDrivenData(LePtr_); - deleteDemandDrivenData(magLePtr_); - deleteDemandDrivenData(faceCentresPtr_); - deleteDemandDrivenData(edgeCentresPtr_); - deleteDemandDrivenData(faceAreaNormalsPtr_); - deleteDemandDrivenData(edgeAreaNormalsPtr_); + SPtr_.reset(nullptr); + patchStartsPtr_.reset(nullptr); + LePtr_.reset(nullptr); + magLePtr_.reset(nullptr); + faceCentresPtr_.reset(nullptr); + edgeCentresPtr_.reset(nullptr); + faceAreaNormalsPtr_.reset(nullptr); + edgeAreaNormalsPtr_.reset(nullptr); pointAreaNormalsPtr_.reset(nullptr); - deleteDemandDrivenData(faceCurvaturesPtr_); - deleteDemandDrivenData(edgeTransformTensorsPtr_); + faceCurvaturesPtr_.reset(nullptr); + edgeTransformTensorsPtr_.reset(nullptr); } @@ -272,9 +270,9 @@ void Foam::faMesh::clearGeom() const DebugInFunction << "Clearing geometry" << endl; clearGeomNotAreas(); - deleteDemandDrivenData(S0Ptr_); - deleteDemandDrivenData(S00Ptr_); - deleteDemandDrivenData(correctPatchPointNormalsPtr_); + S0Ptr_.reset(nullptr); + S00Ptr_.reset(nullptr); + correctPatchPointNormalsPtr_.reset(nullptr); } @@ -282,7 +280,7 @@ void Foam::faMesh::clearAddressing() const { DebugInFunction << "Clearing addressing" << endl; - deleteDemandDrivenData(lduPtr_); + lduPtr_.reset(nullptr); } @@ -402,33 +400,7 @@ Foam::faMesh::faMesh *this ), comm_(UPstream::worldComm), - curTimeIndex_(time().timeIndex()), - - patchPtr_(nullptr), - polyPatchFacesPtr_(nullptr), - polyPatchIdsPtr_(nullptr), - bndConnectPtr_(nullptr), - lduPtr_(nullptr), - - SPtr_(nullptr), - S0Ptr_(nullptr), - S00Ptr_(nullptr), - patchStartsPtr_(nullptr), - LePtr_(nullptr), - magLePtr_(nullptr), - faceCentresPtr_(nullptr), - edgeCentresPtr_(nullptr), - faceAreaNormalsPtr_(nullptr), - edgeAreaNormalsPtr_(nullptr), - pointAreaNormalsPtr_(nullptr), - faceCurvaturesPtr_(nullptr), - edgeTransformTensorsPtr_(nullptr), - correctPatchPointNormalsPtr_(nullptr), - globalMeshDataPtr_(nullptr), - - haloMapPtr_(nullptr), - haloFaceCentresPtr_(nullptr), - haloFaceNormalsPtr_(nullptr) + curTimeIndex_(time().timeIndex()) { DebugInFunction << "Creating from IOobject" << endl; @@ -459,7 +431,7 @@ Foam::faMesh::faMesh rio.resetHeader("S0"); if (returnReduceOr(rio.typeHeaderOk(false))) { - S0Ptr_ = new DimensionedField + S0Ptr_ = std::make_unique> ( rio, *this, @@ -524,33 +496,7 @@ Foam::faMesh::faMesh label(0) ), comm_(UPstream::worldComm), - curTimeIndex_(time().timeIndex()), - - patchPtr_(nullptr), - polyPatchFacesPtr_(nullptr), - polyPatchIdsPtr_(nullptr), - bndConnectPtr_(nullptr), - lduPtr_(nullptr), - - SPtr_(nullptr), - S0Ptr_(nullptr), - S00Ptr_(nullptr), - patchStartsPtr_(nullptr), - LePtr_(nullptr), - magLePtr_(nullptr), - faceCentresPtr_(nullptr), - edgeCentresPtr_(nullptr), - faceAreaNormalsPtr_(nullptr), - edgeAreaNormalsPtr_(nullptr), - pointAreaNormalsPtr_(nullptr), - faceCurvaturesPtr_(nullptr), - edgeTransformTensorsPtr_(nullptr), - correctPatchPointNormalsPtr_(nullptr), - globalMeshDataPtr_(nullptr), - - haloMapPtr_(nullptr), - haloFaceCentresPtr_(nullptr), - haloFaceNormalsPtr_(nullptr) + curTimeIndex_(time().timeIndex()) { // Not yet much for primitive mesh data possible... nPoints_ = 0; @@ -609,33 +555,7 @@ Foam::faMesh::faMesh label(0) ), comm_(UPstream::worldComm), - curTimeIndex_(time().timeIndex()), - - patchPtr_(nullptr), - polyPatchFacesPtr_(nullptr), - polyPatchIdsPtr_(nullptr), - bndConnectPtr_(nullptr), - lduPtr_(nullptr), - - SPtr_(nullptr), - S0Ptr_(nullptr), - S00Ptr_(nullptr), - patchStartsPtr_(nullptr), - LePtr_(nullptr), - magLePtr_(nullptr), - faceCentresPtr_(nullptr), - edgeCentresPtr_(nullptr), - faceAreaNormalsPtr_(nullptr), - edgeAreaNormalsPtr_(nullptr), - pointAreaNormalsPtr_(nullptr), - faceCurvaturesPtr_(nullptr), - edgeTransformTensorsPtr_(nullptr), - correctPatchPointNormalsPtr_(nullptr), - globalMeshDataPtr_(nullptr), - - haloMapPtr_(nullptr), - haloFaceCentresPtr_(nullptr), - haloFaceNormalsPtr_(nullptr) + curTimeIndex_(time().timeIndex()) { // Not yet much for primitive mesh data possible... nPoints_ = 0; @@ -732,7 +652,7 @@ Foam::faMesh::faMesh rio.resetHeader("S0"); if (returnReduceOr(rio.typeHeaderOk(false))) { - S0Ptr_ = new DimensionedField + S0Ptr_ = std::make_unique> ( rio, *this, @@ -948,7 +868,7 @@ Foam::faMesh::S00() const { if (!S00Ptr_) { - S00Ptr_ = new DimensionedField + S00Ptr_ = std::make_unique> ( IOobject ( @@ -994,7 +914,7 @@ const Foam::vectorField& Foam::faMesh::pointAreaNormals() const { if (!pointAreaNormalsPtr_) { - pointAreaNormalsPtr_.reset(new vectorField(nPoints())); + pointAreaNormalsPtr_ = std::make_unique(nPoints()); calcPointAreaNormals(*pointAreaNormalsPtr_); @@ -1082,7 +1002,7 @@ bool Foam::faMesh::movePoints() { DebugInfo<< "Creating old cell volumes." << endl; - S0Ptr_ = new DimensionedField + S0Ptr_ = std::make_unique> ( IOobject ( @@ -1140,7 +1060,8 @@ Foam::boolList& Foam::faMesh::correctPatchPointNormals() const { if (!correctPatchPointNormalsPtr_) { - correctPatchPointNormalsPtr_ = new boolList(boundary().size(), false); + correctPatchPointNormalsPtr_ = + std::make_unique(boundary().size(), false); } return *correctPatchPointNormalsPtr_; diff --git a/src/finiteArea/faMesh/faMesh.H b/src/finiteArea/faMesh/faMesh.H index f587973530..34e1352250 100644 --- a/src/finiteArea/faMesh/faMesh.H +++ b/src/finiteArea/faMesh/faMesh.H @@ -261,52 +261,53 @@ class faMesh mutable std::unique_ptr> bndConnectPtr_; //- Ldu addressing data - mutable faMeshLduAddressing* lduPtr_; + mutable std::unique_ptr lduPtr_; // Geometric Data //- Face areas - mutable DimensionedField* SPtr_; + mutable std::unique_ptr> SPtr_; //- Face areas old time level - mutable DimensionedField* S0Ptr_; + mutable std::unique_ptr> S0Ptr_; //- Face areas old-old time level - mutable DimensionedField* S00Ptr_; + mutable std::unique_ptr> S00Ptr_; //- Patch starts in the edge list - mutable labelList* patchStartsPtr_; + mutable std::unique_ptr patchStartsPtr_; //- Edge length vectors - mutable edgeVectorField* LePtr_; + mutable std::unique_ptr LePtr_; //- Mag edge length vectors - mutable edgeScalarField* magLePtr_; + mutable std::unique_ptr magLePtr_; //- Face centres - mutable areaVectorField* faceCentresPtr_; + mutable std::unique_ptr faceCentresPtr_; //- Edge centres - mutable edgeVectorField* edgeCentresPtr_; + mutable std::unique_ptr edgeCentresPtr_; //- Face area normals - mutable areaVectorField* faceAreaNormalsPtr_; + mutable std::unique_ptr faceAreaNormalsPtr_; //- Edge area normals - mutable edgeVectorField* edgeAreaNormalsPtr_; + mutable std::unique_ptr edgeAreaNormalsPtr_; //- Point area normals mutable std::unique_ptr pointAreaNormalsPtr_; //- Face curvatures - mutable areaScalarField* faceCurvaturesPtr_; + mutable std::unique_ptr faceCurvaturesPtr_; //- Edge transformation tensors - mutable FieldField* edgeTransformTensorsPtr_; + mutable std::unique_ptr> + edgeTransformTensorsPtr_; //- Whether point normals must be corrected for a patch - mutable boolList* correctPatchPointNormalsPtr_; + mutable std::unique_ptr correctPatchPointNormalsPtr_; // Other mesh-related data diff --git a/src/finiteArea/faMesh/faMeshDemandDrivenData.C b/src/finiteArea/faMesh/faMeshDemandDrivenData.C index 3f94292886..49b60d4018 100644 --- a/src/finiteArea/faMesh/faMeshDemandDrivenData.C +++ b/src/finiteArea/faMesh/faMeshDemandDrivenData.C @@ -222,7 +222,7 @@ void Foam::faMesh::calcLduAddressing() const << abort(FatalError); } - lduPtr_ = new faMeshLduAddressing(*this); + lduPtr_ = std::make_unique(*this); } @@ -238,7 +238,7 @@ void Foam::faMesh::calcPatchStarts() const << abort(FatalError); } - patchStartsPtr_ = new labelList(boundary().patchStarts()); + patchStartsPtr_ = std::make_unique(boundary().patchStarts()); } @@ -254,9 +254,9 @@ void Foam::faMesh::calcWhichPatchFaces() const const polyBoundaryMesh& pbm = mesh().boundaryMesh(); - polyPatchFacesPtr_.reset + polyPatchFacesPtr_ = std::make_unique> ( - new List(pbm.whichPatchFace(faceLabels_)) + pbm.whichPatchFace(faceLabels_) ); labelHashSet ids; @@ -278,7 +278,7 @@ void Foam::faMesh::calcWhichPatchFaces() const this->comm() ); - polyPatchIdsPtr_.reset(new labelList(ids.sortedToc())); + polyPatchIdsPtr_ = std::make_unique(ids.sortedToc()); } @@ -675,23 +675,22 @@ void Foam::faMesh::calcLe() const << abort(FatalError); } - LePtr_ = - new edgeVectorField + LePtr_ = std::make_unique + ( + IOobject ( - IOobject - ( - "Le", - mesh().pointsInstance(), - faMesh::meshSubDir, - faMesh::thisDb(), - IOobject::NO_READ, - IOobject::NO_WRITE, - IOobject::NO_REGISTER - ), - *this, - dimLength - // -> calculatedType() - ); + "Le", + mesh().pointsInstance(), + faMesh::meshSubDir, + faMesh::thisDb(), + IOobject::NO_READ, + IOobject::NO_WRITE, + IOobject::NO_REGISTER + ), + *this, + dimLength + // -> calculatedType() + ); edgeVectorField& Le = *LePtr_; // Need face centres @@ -773,23 +772,21 @@ void Foam::faMesh::calcMagLe() const << abort(FatalError); } - magLePtr_ = - new edgeScalarField + magLePtr_ = std::make_unique + ( + IOobject ( - IOobject - ( - "magLe", - mesh().pointsInstance(), - faMesh::meshSubDir, - faMesh::thisDb(), - IOobject::NO_READ, - IOobject::NO_WRITE, - IOobject::NO_REGISTER - ), - *this, - dimLength - ); - + "magLe", + mesh().pointsInstance(), + faMesh::meshSubDir, + faMesh::thisDb(), + IOobject::NO_READ, + IOobject::NO_WRITE, + IOobject::NO_REGISTER + ), + *this, + dimLength + ); edgeScalarField& magLe = *magLePtr_; const pointField& localPoints = points(); @@ -849,24 +846,22 @@ void Foam::faMesh::calcFaceCentres() const << abort(FatalError); } - faceCentresPtr_ = - new areaVectorField + faceCentresPtr_ = std::make_unique + ( + IOobject ( - IOobject - ( - "centres", - mesh().pointsInstance(), - faMesh::meshSubDir, - faMesh::thisDb(), - IOobject::NO_READ, - IOobject::NO_WRITE, - IOobject::NO_REGISTER - ), - *this, - dimLength - // -> calculatedType() - ); - + "centres", + mesh().pointsInstance(), + faMesh::meshSubDir, + faMesh::thisDb(), + IOobject::NO_READ, + IOobject::NO_WRITE, + IOobject::NO_REGISTER + ), + *this, + dimLength + // -> calculatedType() + ); areaVectorField& centres = *faceCentresPtr_; // Need local points @@ -931,24 +926,22 @@ void Foam::faMesh::calcEdgeCentres() const << abort(FatalError); } - edgeCentresPtr_ = - new edgeVectorField + edgeCentresPtr_ = std::make_unique + ( + IOobject ( - IOobject - ( - "edgeCentres", - mesh().pointsInstance(), - faMesh::meshSubDir, - faMesh::thisDb(), - IOobject::NO_READ, - IOobject::NO_WRITE, - IOobject::NO_REGISTER - ), - *this, - dimLength - // -> calculatedType() - ); - + "edgeCentres", + mesh().pointsInstance(), + faMesh::meshSubDir, + faMesh::thisDb(), + IOobject::NO_READ, + IOobject::NO_WRITE, + IOobject::NO_REGISTER + ), + *this, + dimLength + // -> calculatedType() + ); edgeVectorField& centres = *edgeCentresPtr_; // Need local points @@ -996,7 +989,7 @@ void Foam::faMesh::calcS() const << abort(FatalError); } - SPtr_ = new DimensionedField + SPtr_ = std::make_unique> ( IOobject ( @@ -1068,23 +1061,21 @@ void Foam::faMesh::calcFaceAreaNormals() const << abort(FatalError); } - faceAreaNormalsPtr_ = - new areaVectorField + faceAreaNormalsPtr_ = std::make_unique + ( + IOobject ( - IOobject - ( - "faceAreaNormals", - mesh().pointsInstance(), - faMesh::meshSubDir, - faMesh::thisDb(), - IOobject::NO_READ, - IOobject::NO_WRITE, - IOobject::NO_REGISTER - ), - *this, - dimless - ); - + "faceAreaNormals", + mesh().pointsInstance(), + faMesh::meshSubDir, + faMesh::thisDb(), + IOobject::NO_READ, + IOobject::NO_WRITE, + IOobject::NO_REGISTER + ), + *this, + dimless + ); areaVectorField& faceNormals = *faceAreaNormalsPtr_; const pointField& localPoints = points(); @@ -1149,23 +1140,22 @@ void Foam::faMesh::calcEdgeAreaNormals() const << abort(FatalError); } - edgeAreaNormalsPtr_ = - new edgeVectorField + edgeAreaNormalsPtr_ = std::make_unique + ( + IOobject ( - IOobject - ( - "edgeAreaNormals", - mesh().pointsInstance(), - faMesh::meshSubDir, - faMesh::thisDb(), - IOobject::NO_READ, - IOobject::NO_WRITE, - IOobject::NO_REGISTER - ), - *this, - dimless - // -> calculatedType() - ); + "edgeAreaNormals", + mesh().pointsInstance(), + faMesh::meshSubDir, + faMesh::thisDb(), + IOobject::NO_READ, + IOobject::NO_WRITE, + IOobject::NO_REGISTER + ), + *this, + dimless + // -> calculatedType() + ); edgeVectorField& edgeAreaNormals = *edgeAreaNormalsPtr_; @@ -1279,23 +1269,21 @@ void Foam::faMesh::calcFaceCurvatures() const << abort(FatalError); } - faceCurvaturesPtr_ = - new areaScalarField + faceCurvaturesPtr_ = std::make_unique + ( + IOobject ( - IOobject - ( - "faceCurvatures", - mesh().pointsInstance(), - faMesh::meshSubDir, - faMesh::thisDb(), - IOobject::NO_READ, - IOobject::NO_WRITE, - IOobject::NO_REGISTER - ), - *this, - dimless/dimLength - ); - + "faceCurvatures", + mesh().pointsInstance(), + faMesh::meshSubDir, + faMesh::thisDb(), + IOobject::NO_READ, + IOobject::NO_WRITE, + IOobject::NO_REGISTER + ), + *this, + dimless/dimLength + ); areaScalarField& faceCurvatures = *faceCurvaturesPtr_; @@ -1321,7 +1309,8 @@ void Foam::faMesh::calcEdgeTransformTensors() const << abort(FatalError); } - edgeTransformTensorsPtr_ = new FieldField(nEdges_); + edgeTransformTensorsPtr_ = + std::make_unique>(nEdges_); auto& edgeTransformTensors = *edgeTransformTensorsPtr_; // Initialize all transformation tensors diff --git a/src/finiteArea/faMesh/faMeshMapper/faAreaMapper.C b/src/finiteArea/faMesh/faMeshMapper/faAreaMapper.C index e079de2bab..f575d1a6e8 100644 --- a/src/finiteArea/faMesh/faMeshMapper/faAreaMapper.C +++ b/src/finiteArea/faMesh/faMeshMapper/faAreaMapper.C @@ -61,10 +61,18 @@ void Foam::faAreaMapper::calcAddressing() const // Prepare a list of new face labels and (preliminary) addressing // Note: dimensioned to number of boundary faces of polyMesh - newFaceLabelsPtr_ = new labelList(mesh_.mesh().nBoundaryFaces(), -1); - labelList& newFaceLabels = *newFaceLabelsPtr_; + newFaceLabelsPtr_ = std::make_unique + ( + mesh_.mesh().nBoundaryFaces(), + -1 + ); + auto& newFaceLabels = *newFaceLabelsPtr_; - newFaceLabelsMapPtr_ = new labelList(mesh_.mesh().nBoundaryFaces(), -1); + newFaceLabelsMapPtr_ = std::make_unique + ( + mesh_.mesh().nBoundaryFaces(), + -1 + ); labelList& newFaceLabelsMap = *newFaceLabelsMapPtr_; label nNewFaces = 0; @@ -94,7 +102,7 @@ void Foam::faAreaMapper::calcAddressing() const // Direct mapping: no further faces to add. Resize list newFaceLabels.setSize(nNewFaces); - directAddrPtr_ = new labelList(newFaceLabels.size()); + directAddrPtr_ = std::make_unique(newFaceLabels.size()); labelList& addr = *directAddrPtr_; // Adjust for creation of a boundary face from an internal face @@ -114,10 +122,13 @@ void Foam::faAreaMapper::calcAddressing() const { // There are further faces to add. Prepare interpolation addressing // and weights to full size - interpolationAddrPtr_ = new labelListList(newFaceLabels.size()); + interpolationAddrPtr_ = std::make_unique + ( + newFaceLabels.size() + ); labelListList& addr = *interpolationAddrPtr_; - weightsPtr_ = new scalarListList(newFaceLabels.size()); + weightsPtr_ = std::make_unique(newFaceLabels.size()); scalarListList& w = *weightsPtr_; // Insert single addressing and weights @@ -256,20 +267,20 @@ void Foam::faAreaMapper::calcAddressing() const // Inserted objects cannot appear in the new faMesh as they have no master // HJ, 10/Aug/2011 - insertedObjectLabelsPtr_ = new labelList(0); + insertedObjectLabelsPtr_ = std::make_unique(); } void Foam::faAreaMapper::clearOut() { - deleteDemandDrivenData(newFaceLabelsPtr_); - deleteDemandDrivenData(newFaceLabelsMapPtr_); + newFaceLabelsPtr_.reset(nullptr); + newFaceLabelsMapPtr_.reset(nullptr); - deleteDemandDrivenData(directAddrPtr_); - deleteDemandDrivenData(interpolationAddrPtr_); - deleteDemandDrivenData(weightsPtr_); + directAddrPtr_.reset(nullptr); + interpolationAddrPtr_.reset(nullptr); + weightsPtr_.reset(nullptr); - deleteDemandDrivenData(insertedObjectLabelsPtr_); + insertedObjectLabelsPtr_.reset(nullptr); hasUnmapped_ = false; } @@ -286,13 +297,7 @@ Foam::faAreaMapper::faAreaMapper mpm_(mpm), direct_(false), hasUnmapped_(false), - sizeBeforeMapping_(mesh.nFaces()), - newFaceLabelsPtr_(nullptr), - newFaceLabelsMapPtr_(nullptr), - directAddrPtr_(nullptr), - interpolationAddrPtr_(nullptr), - weightsPtr_(nullptr), - insertedObjectLabelsPtr_(nullptr) + sizeBeforeMapping_(mesh.nFaces()) { // Check for possibility of direct mapping if diff --git a/src/finiteArea/faMesh/faMeshMapper/faAreaMapper.H b/src/finiteArea/faMesh/faMeshMapper/faAreaMapper.H index 7569df58f7..9a75decf95 100644 --- a/src/finiteArea/faMesh/faMeshMapper/faAreaMapper.H +++ b/src/finiteArea/faMesh/faMeshMapper/faAreaMapper.H @@ -77,23 +77,23 @@ class faAreaMapper label sizeBeforeMapping_; //- New face labels after mapping - mutable labelList* newFaceLabelsPtr_; + mutable std::unique_ptr newFaceLabelsPtr_; //- New face labels after mapping - mutable labelList* newFaceLabelsMapPtr_; + mutable std::unique_ptr newFaceLabelsMapPtr_; //- Direct addressing (only one form of addressing is used) - mutable labelList* directAddrPtr_; + mutable std::unique_ptr directAddrPtr_; //- Interpolated addressing (only one form of addressing is used) - mutable labelListList* interpolationAddrPtr_; + mutable std::unique_ptr interpolationAddrPtr_; //- Interpolation weights - mutable scalarListList* weightsPtr_; + mutable std::unique_ptr weightsPtr_; //- Inserted faces - mutable labelList* insertedObjectLabelsPtr_; + mutable std::unique_ptr insertedObjectLabelsPtr_; // Private Member Functions @@ -127,7 +127,6 @@ public: //- Destructor virtual ~faAreaMapper(); - // Member Functions //- Return new face labels diff --git a/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.C b/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.C index 582faf239a..2dffd9ed7b 100644 --- a/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.C +++ b/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.C @@ -43,13 +43,13 @@ void Foam::faEdgeMapper::calcAddressing() const hasUnmapped_ = false; // Dummy mapping: take value from edge 0 - directAddrPtr_ = new labelList(size(), Zero); + directAddrPtr_ = std::make_unique(size(), Foam::zero{}); } void Foam::faEdgeMapper::clearOut() { - deleteDemandDrivenData(directAddrPtr_); + directAddrPtr_.reset(nullptr); hasUnmapped_ = false; } @@ -64,8 +64,7 @@ Foam::faEdgeMapper::faEdgeMapper : mesh_(mesh), sizeBeforeMapping_(mesh.nInternalEdges()), - hasUnmapped_(false), - directAddrPtr_(nullptr) + hasUnmapped_(false) {} diff --git a/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.H b/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.H index 620795a0e8..05f0cd0fda 100644 --- a/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.H +++ b/src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.H @@ -74,7 +74,7 @@ class faEdgeMapper mutable bool hasUnmapped_; //- Direct addressing - mutable labelList* directAddrPtr_; + mutable std::unique_ptr directAddrPtr_; // Private Member Functions diff --git a/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.C b/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.C index b54faafc13..69aa3177f6 100644 --- a/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.C +++ b/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.C @@ -43,7 +43,7 @@ void Foam::faPatchMapper::calcAddressing() const // Compatibility change HJ, 12/Aug/2017 hasUnmapped_ = false; - directAddrPtr_ = new labelList(patch_.size(), Zero); + directAddrPtr_ = std::make_unique(patch_.size(), Foam::zero{}); labelList& addr = *directAddrPtr_; // Make a map of old edgeFaces, giving edge index in patch given the new @@ -86,7 +86,7 @@ void Foam::faPatchMapper::calcAddressing() const void Foam::faPatchMapper::clearOut() { - deleteDemandDrivenData(directAddrPtr_); + directAddrPtr_.reset(nullptr); hasUnmapped_ = false; } @@ -103,8 +103,7 @@ Foam::faPatchMapper::faPatchMapper mpm_(mpm), sizeBeforeMapping_(patch.size()), oldEdgeFaces_(patch.edgeFaces()), - hasUnmapped_(false), - directAddrPtr_(nullptr) + hasUnmapped_(false) {} diff --git a/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.H b/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.H index 8672301bd8..b27bd6874d 100644 --- a/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.H +++ b/src/finiteArea/faMesh/faMeshMapper/faPatchMapper.H @@ -83,7 +83,7 @@ class faPatchMapper mutable bool hasUnmapped_; //- Direct addressing - mutable labelList* directAddrPtr_; + mutable std::unique_ptr directAddrPtr_; // Private Member Functions diff --git a/src/finiteArea/faMesh/faMeshTopology.C b/src/finiteArea/faMesh/faMeshTopology.C index 9c85727b5a..c9dbb6b130 100644 --- a/src/finiteArea/faMesh/faMeshTopology.C +++ b/src/finiteArea/faMesh/faMeshTopology.C @@ -849,9 +849,10 @@ void Foam::faMesh::setBoundaryConnections << abort(FatalError); } - bndConnectPtr_.reset + bndConnectPtr_ = std::make_unique> ( - new List(nBoundaryEdges, labelPair(-1,-1)) + nBoundaryEdges, + labelPair(-1,-1) ); auto& bndConnect = *bndConnectPtr_; @@ -989,7 +990,7 @@ const Foam::faMeshBoundaryHalo& Foam::faMesh::boundaryHaloMap() const { if (!haloMapPtr_) { - haloMapPtr_.reset(new faMeshBoundaryHalo(*this)); + haloMapPtr_ = std::make_unique(*this); } return *haloMapPtr_; @@ -1022,8 +1023,8 @@ void Foam::faMesh::calcHaloFaceGeometry() const const labelList& inputFaceIds = halo.inputMeshFaces(); - haloFaceCentresPtr_.reset(new pointField); - haloFaceNormalsPtr_.reset(new vectorField); + haloFaceCentresPtr_ = std::make_unique(); + haloFaceNormalsPtr_ = std::make_unique(); auto& centres = *haloFaceCentresPtr_; auto& normals = *haloFaceNormalsPtr_; diff --git a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C index 39c1627d59..1f0248689a 100644 --- a/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C +++ b/src/finiteArea/faMesh/faPatches/faPatch/faPatch.C @@ -105,10 +105,7 @@ Foam::faPatch::faPatch patchIdentifier(name, index), labelList(edgeLabels), nbrPolyPatchId_(nbrPolyPatchi), - boundaryMesh_(bm), - edgeFacesPtr_(nullptr), - pointLabelsPtr_(nullptr), - pointEdgesPtr_(nullptr) + boundaryMesh_(bm) { if (constraintType(patchType)) { @@ -129,10 +126,7 @@ Foam::faPatch::faPatch patchIdentifier(name, dict, index), labelList(dict.get("edgeLabels")), nbrPolyPatchId_(dict.get