STYLE: finiteArea: add/fix comments

STYLE: finiteArea: consistent use of =delete for removed ctors/assignments

src/finiteArea/areaMesh/areaFaMesh.H

@@ -69,22 +69,13 @@ public:
     // Member Functions
 
         //- Return size. Number of faces
-        static label size(const Mesh& mesh)
+        static label size(const Mesh& mesh) { return mesh.nFaces(); }
-        {
-            return mesh.nFaces();
-        }
 
         //- Return size. Number of faces
-        label size() const
+        label size() const { return size(mesh_); }
-        {
-            return size(mesh_);
-        }
 
         //- Field of face centres
-        const areaVectorField& C() const
+        const areaVectorField& C() const { return mesh_.areaCentres(); }
-        {
-            return mesh_.areaCentres();
-        }
 };
 
 

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,

src/finiteArea/edgeMesh/edgeFaMesh.H

@@ -65,25 +65,17 @@ public:
             GeoMesh<faMesh>(mesh)
         {}
 
+
     // Member Functions
 
         //- Return size. Number of internal edges
-        static label size(const Mesh& mesh)
+        static label size(const Mesh& mesh) { return mesh.nInternalEdges(); }
-        {
-            return mesh.nInternalEdges();
-        }
 
         //- Return size. Number of internal edges
-        label size() const
+        label size() const { return size(mesh_); }
-        {
-            return size(mesh_);
-        }
 
         //- Field of edge centres
-        const edgeVectorField& C() const
+        const edgeVectorField& C() const { return mesh_.edgeCentres(); }
-        {
-            return mesh_.edgeCentres();
-        }
 };
 
 

src/finiteArea/faMatrices/faMatrix/faMatrix.C

@@ -50,7 +50,7 @@ void Foam::faMatrix<Type>::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<Type>::subtractFromInternalField
     {
         FatalErrorInFunction
             << "addressing (" << addr.size()
-            << ") and field (" << pf.size() << ") are different sizes" << endl
+            << ") and field (" << pf.size() << ") are different sizes"
             << abort(FatalError);
     }
 

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

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

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

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
     (

src/finiteArea/faMesh/faMeshMapper/faEdgeMapper.C

@@ -63,7 +63,6 @@ Foam::faEdgeMapper::faEdgeMapper
 )
 :
     mesh_(mesh),
-//    mpm_(mpm),
     sizeBeforeMapping_(mesh.nInternalEdges()),
     hasUnmapped_(false),
     directAddrPtr_(nullptr)

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
     (

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

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
     (

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
 

src/finiteArea/faSolution/faSolution.H

@@ -61,11 +61,13 @@ class faSolution
 {
 public:
 
-    //- No copy construct
+    // Generated Methods
-    faSolution(const faSolution&) = delete;
 
-    //- No copy assignment
+        //- No copy construct
-    void operator=(const faSolution&) = delete;
+        faSolution(const faSolution&) = delete;
+
+        //- No copy assignment
+        void operator=(const faSolution&) = delete;
 
 
     // Constructors

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<class Type2>

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_;

src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchField.H

@@ -59,7 +59,7 @@ class cyclicFaePatchField
 :
     public coupledFaePatchField<Type>
 {
-    // Private data
+    // Private Data
 
         //- Local reference cast into the cyclic patch
         const cyclicFaPatch& cyclicPatch_;

src/finiteArea/finiteArea/convectionSchemes/faConvectionScheme/faConvectionScheme.H

@@ -48,6 +48,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 template<class Type>
 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
+        const faMesh& mesh() const noexcept { return mesh_; }
-        {
-            return mesh_;
-        }
 
         virtual tmp<GeometricField<Type, faePatchField, edgeMesh>> flux
         (

src/finiteArea/finiteArea/convectionSchemes/gaussFaConvectionScheme/gaussFaConvectionScheme.H

@@ -60,26 +60,27 @@ class gaussConvectionScheme
 :
     public fa::convectionScheme<Type>
 {
-    // Private data
+    // Private Data
 
+        //- Edge-interpolation scheme
         tmp<edgeInterpolationScheme<Type>> 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

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

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 <http://www.gnu.org/licenses/>.
 
-Description
-    Abstract base class for finite area d2dt2 schemes.
-
 \*---------------------------------------------------------------------------*/
 
 #include "fa.H"

src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.H

@@ -49,6 +49,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 template<class Type>
 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
+        const faMesh& mesh() const noexcept { return mesh_; }
-        {
-            return mesh_;
-        }
 
         virtual tmp<GeometricField<Type, faPatchField, areaMesh>> facD2dt2
         (

src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.H

@@ -59,7 +59,13 @@ class EulerFaDdtScheme
 :
     public fa::faDdtScheme<Type>
 {
-    // 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

src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.H

@@ -72,12 +72,6 @@ class backwardFaDdtScheme
         template<class GeoField>
         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

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

src/finiteArea/finiteArea/ddtSchemes/faDdtScheme/faDdtScheme.H

@@ -49,6 +49,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 template<class Type>
 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
+        const faMesh& mesh() const noexcept { return mesh_; }
-        {
-            return mesh_;
-        }
 
         virtual tmp<GeometricField<Type, faPatchField, areaMesh>> facDdt
         (

src/finiteArea/finiteArea/ddtSchemes/steadyStateFaDdtScheme/steadyStateFaDdtScheme.H

@@ -58,7 +58,13 @@ class steadyStateFaDdtScheme
 :
     public fa::faDdtScheme<Type>
 {
-    // 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

src/finiteArea/finiteArea/divSchemes/faDivScheme/faDivScheme.H

@@ -72,20 +72,13 @@ protected:
 
     // Protected Data
 
+        //- Reference to mesh
         const faMesh& mesh_;
 
+        //- Edge interpolation scheme
         tmp<edgeInterpolationScheme<Type>> 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
+        const faMesh& mesh() const noexcept { return mesh_; }
-        {
-            return mesh_;
-        }
 
         virtual tmp
         <

src/finiteArea/finiteArea/divSchemes/gaussFaDivScheme/gaussFaDivScheme.H

@@ -59,7 +59,13 @@ class gaussDivScheme
 :
     public fa::divScheme<Type>
 {
-    // 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

src/finiteArea/finiteArea/faSchemes/faSchemes.H

@@ -61,11 +61,13 @@ class faSchemes
 {
 public:
 
-    //- No copy construct
+    // Generated Methods
-    faSchemes(const faSchemes&) = delete;
 
-    //- No copy assignment
+        //- No copy construct
-    void operator=(const faSchemes&) = delete;
+        faSchemes(const faSchemes&) = delete;
+
+        //- No copy assignment
+        void operator=(const faSchemes&) = delete;
 
 
     // Constructors

src/finiteArea/finiteArea/fac/facAverage.H

@@ -34,7 +34,6 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-
 #ifndef facAverage_H
 #define facAverage_H
 

src/finiteArea/finiteArea/fac/facDdt.H

@@ -37,7 +37,6 @@ Author
 
 \*---------------------------------------------------------------------------*/
 
-
 #ifndef facDdt_H
 #define facDdt_H
 

src/finiteArea/finiteArea/fac/facDiv.H

@@ -34,7 +34,6 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-
 #ifndef facDiv_H
 #define facDiv_H
 

src/finiteArea/finiteArea/fac/facEdgeIntegrate.H

@@ -35,7 +35,6 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-
 #ifndef facEdgeIntegrate_H
 #define facEdgeIntegrate_H
 

src/finiteArea/finiteArea/fac/facGrad.H

@@ -34,7 +34,6 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-
 #ifndef facGrad_H
 #define facGrad_H
 

src/finiteArea/finiteArea/fac/facLaplacian.H

@@ -34,7 +34,6 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-
 #ifndef facLaplacian_H
 #define facLaplacian_H
 

src/finiteArea/finiteArea/fac/facLnGrad.H

@@ -34,7 +34,6 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-
 #ifndef facLnGrad_H
 #define facLnGrad_H
 

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

src/finiteArea/finiteArea/gradSchemes/gaussFaGrad/gaussFaGrad.H

@@ -69,7 +69,13 @@ class gaussGrad
         tmp<edgeInterpolationScheme<Type>> 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

src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaGrad.H

@@ -62,7 +62,13 @@ class leastSquaresFaGrad
 :
     public fa::gradScheme<Type>
 {
-    // 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

src/finiteArea/finiteArea/gradSchemes/leastSquaresFaGrad/leastSquaresFaVectors.H

@@ -58,14 +58,14 @@ class leastSquaresFaVectors
 :
     public MeshObject<faMesh, Foam::MoveableMeshObject, leastSquaresFaVectors>
 {
-    // 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;

src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/edgeLimitedFaGrad/edgeLimitedFaGrad.H

@@ -66,6 +66,7 @@ class edgeLimitedGrad
 {
     // Private Data
 
+        //- Basic gradient scheme
         tmp<fa::gradScheme<Type>> 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

src/finiteArea/finiteArea/gradSchemes/limitedGradSchemes/faceLimitedFaGrad/faceLimitedFaGrad.H

@@ -69,13 +69,20 @@ class faceLimitedGrad
 {
     // Private Data
 
+        //- Basic gradient scheme
         tmp<fa::gradScheme<Type>> 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

src/finiteArea/finiteArea/laplacianSchemes/faLaplacianScheme/faLaplacianScheme.H

@@ -79,15 +79,6 @@ protected:
         tmp<lnGradScheme<Type>> 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

src/finiteArea/finiteArea/laplacianSchemes/gaussFaLaplacianScheme/gaussFaLaplacianScheme.H

@@ -59,7 +59,13 @@ class gaussLaplacianScheme
 :
     public fa::laplacianScheme<Type>
 {
-    // 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

src/finiteArea/finiteArea/lnGradSchemes/correctedLnGrad/correctedLnGrad.H

@@ -58,18 +58,21 @@ class correctedLnGrad
 :
     public lnGradScheme<Type>
 {
-    // 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

src/finiteArea/finiteArea/lnGradSchemes/fourthLnGrad/fourthLnGrad.H

@@ -58,18 +58,21 @@ class fourthLnGrad
 :
     public lnGradScheme<Type>
 {
-    // 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
+        virtual bool corrected() const { return true; }
-        {
-            return true;
-        }
 
         //- Return the explicit correction to the fourthLnGrad
         //  for the given field

src/finiteArea/finiteArea/lnGradSchemes/limitedLnGrad/limitedLnGrad.C

@@ -72,7 +72,7 @@ limitedLnGrad<Type>::correction
                 (1 - limitCoeff_)*mag(corr)
               + dimensionedScalar("small", corr.dimensions(), SMALL)
             ),
-            dimensionedScalar("one", dimless, 1.0)
+            dimensionedScalar(dimless, Foam::one{})
         )
     );
 

src/finiteArea/finiteArea/lnGradSchemes/limitedLnGrad/limitedLnGrad.H

@@ -68,24 +68,27 @@ class limitedLnGrad
 :
     public lnGradScheme<Type>
 {
-    // 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

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
+        const faMesh& mesh() const noexcept { return mesh_; }
-        {
-            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
+        virtual bool corrected() const { return false; }
-        {
-            return false;
-        }
 
         //- Return the explicit correction to the lnGrad
         //  for the given field

src/finiteArea/finiteArea/lnGradSchemes/uncorrectedLnGrad/uncorrectedLnGrad.H

@@ -58,18 +58,21 @@ class uncorrectedLnGrad
 :
     public lnGradScheme<Type>
 {
-    // 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
+        virtual bool corrected() const { return false; }
-        {
-            return false;
-        }
 
         //- Return the explicit correction to the uncorrectedLnGrad
         //- for the given field

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<Type, faPatchField, areaMesh> "
             << endl;
     }
-#   endif
+    #endif
 
     return scheme<Type>(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<Type>(faceFlux, name)().interpolate(vf);
 }
@@ -199,14 +199,14 @@ Foam::fac::interpolate
     Istream& schemeData
 )
 {
-#   ifdef DEBUGInterpolations
+    #ifdef DEBUGInterpolations
     if (edgeInterpolation::debug)
     {
         InfoInFunction
             << "interpolating GeometricField<Type, faPatchField, areaMesh> "
             << endl;
     }
-#   endif
+    #endif
 
     return scheme<Type>(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<Type>(vf.mesh(), name)().interpolate(vf);
 }
@@ -257,7 +257,7 @@ Foam::fac::interpolate
     const GeometricField<Type, faPatchField, areaMesh>& 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() + ')');
 }

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
+        const faMesh& mesh() const noexcept { return faMesh_; }
-        {
-            return faMesh_;
-        }
 
         //- Return reference to PN geodesic distance
         const edgeScalarField& lPN() const;

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
+        virtual bool corrected() const { return false; }
-        {
-            return false;
-        }
 
         //- Return the explicit correction to the face-interpolate
         //  for the given field

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:
 

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

src/finiteArea/interpolation/edgeInterpolation/schemes/blended/blendedEdgeInterpolation.H

@@ -56,26 +56,27 @@ class blendedEdgeInterpolation
     public linearEdgeInterpolation<Type>,
     public upwindEdgeInterpolation<Type>
 {
-    // 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

src/finiteArea/interpolation/edgeInterpolation/schemes/leastSquares/leastSquaresEdgeInterpolation.H

@@ -67,18 +67,22 @@ class leastSquaresEdgeInterpolation
 :
     virtual public edgeInterpolationScheme<Type>
 {
-    // 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

src/finiteArea/interpolation/edgeInterpolation/schemes/linear/linearEdgeInterpolation.H

@@ -54,17 +54,21 @@ class linearEdgeInterpolation
 :
     virtual public edgeInterpolationScheme<Type>
 {
-    // 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

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&)
     {}
 

src/finiteArea/interpolation/edgeInterpolation/schemes/skewCorrected/skewCorrectedEdgeInterpolation.H

@@ -60,6 +60,7 @@ class skewCorrectedEdgeInterpolation
 {
     // Private Data
 
+        //- Edge-interpolation scheme
         tmp<edgeInterpolationScheme<Type>> 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

src/finiteArea/interpolation/edgeInterpolation/schemes/upwind/upwindEdgeInterpolation.H

@@ -55,23 +55,27 @@ class upwindEdgeInterpolation
 :
     virtual public edgeInterpolationScheme<Type>
 {
-    // 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

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