Standardised the class declaration section comments to correspond to the foamNewSource template

applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H

@@ -94,7 +94,7 @@ class basicSubGrid
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- Disallow default bitwise copy construction
         basicSubGrid(const basicSubGrid&);
 
         //- Disallow default bitwise assignment

applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H

@@ -82,7 +82,7 @@ class basicSubGrid
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- Disallow default bitwise copy construction
         basicSubGrid(const basicSubGrid&);
 
         //- Disallow default bitwise assignment

applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H

@@ -74,7 +74,7 @@ private:
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- Disallow default bitwise copy construction
         PDRDragModel(const PDRDragModel&);
 
         //- Disallow default bitwise assignment

applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H

@@ -108,7 +108,7 @@ class basic
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- Disallow default bitwise copy construction
         basic(const basic&);
 
         //- Disallow default bitwise assignment

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H

@@ -70,7 +70,7 @@ class Gulder
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- Disallow default bitwise copy construction
         Gulder(const Gulder&);
 
         //- Disallow default bitwise assignment

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H

@@ -66,7 +66,7 @@ class SCOPEBlend
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- Disallow default bitwise copy construction
         SCOPEBlend(const SCOPEBlend&);
 
         //- Disallow default bitwise assignment

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H

@@ -84,7 +84,7 @@ class SCOPEXiEq
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- Disallow default bitwise copy construction
         SCOPEXiEq(const SCOPEXiEq&);
 
         //- Disallow default bitwise assignment

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H

@@ -79,7 +79,7 @@ private:
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- Disallow default bitwise copy construction
         XiEqModel(const XiEqModel&);
 
         //- Disallow default bitwise assignment

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H

@@ -65,7 +65,7 @@ class instability
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- Disallow default bitwise copy construction
         instability(const instability&);
 
         //- Disallow default bitwise assignment

applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H

@@ -60,7 +60,7 @@ class KTS
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- Disallow default bitwise copy construction
         KTS(const KTS&);
 
         //- Disallow default bitwise assignment

applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H

@@ -70,7 +70,7 @@ private:
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- Disallow default bitwise copy construction
         XiGModel(const XiGModel&);
 
         //- Disallow default bitwise assignment

applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H

@@ -69,7 +69,7 @@ class instabilityG
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- Disallow default bitwise copy construction
         instabilityG(const instabilityG&);
 
         //- Disallow default bitwise assignment

applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H

@@ -130,7 +130,7 @@ private:
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- Disallow default bitwise copy construction
         XiModel(const XiModel&);
 
         //- Disallow default bitwise assignment

applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H

@@ -67,7 +67,7 @@ class algebraic
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- Disallow default bitwise copy construction
         algebraic(const algebraic&);
 
         //- Disallow default bitwise assignment

applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H

@@ -55,7 +55,7 @@ class fixed
 {
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- Disallow default bitwise copy construction
         fixed(const fixed&);
 
         //- Disallow default bitwise assignment

applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H

@@ -67,7 +67,7 @@ class transport
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- Disallow default bitwise copy construction
         transport(const transport&);
 
         //- Disallow default bitwise assignment

applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModel.H

@@ -73,7 +73,7 @@ protected:
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- Disallow default bitwise copy construction
         mixtureViscosityModel(const mixtureViscosityModel&);
 
         //- Disallow default bitwise assignment

applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H

@@ -73,12 +73,6 @@ class threePhaseInterfaceProperties
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        threePhaseInterfaceProperties
-        (
-            const threePhaseInterfaceProperties&
-        ) = delete;
-
         //- Correction for the boundary condition on the unit normal nHat on
         //  walls to produce the correct contact dynamic angle.
         //  Calculated from the component of U parallel to the wall
@@ -105,6 +99,12 @@ public:
             const incompressibleThreePhaseMixture& mixture
         );
 
+        //- Disallow default bitwise copy construction
+        threePhaseInterfaceProperties
+        (
+            const threePhaseInterfaceProperties&
+        ) = delete;
+
 
     // Member Functions
 

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H

@@ -69,7 +69,7 @@ protected:
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- Disallow default bitwise copy construction
         phaseChangeTwoPhaseMixture(const phaseChangeTwoPhaseMixture&);
 
         //- Disallow default bitwise assignment

applications/test/router/router.H

@@ -159,12 +159,6 @@ class router
             DynamicList<label>& route
         ) const;
 
-        //- Disallow default bitwise copy construction
-        router(const router&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const router&) = delete;
-
 
 public:
 
@@ -177,6 +171,9 @@ public:
             const List<point>& coords
         );
 
+        //- Disallow default bitwise copy construction
+        router(const router&) = delete;
+
 
     // Member Functions
 
@@ -197,6 +194,11 @@ public:
             //- Extract labels of route with given value.
             labelList getRoute(const label pathValue) const;
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const router&) = delete;
 };
 
 

applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposer.H

@@ -67,15 +67,6 @@ class dimFieldDecomposer
         const labelList& cellAddressing_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construction
-        dimFieldDecomposer(const dimFieldDecomposer&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const dimFieldDecomposer&) = delete;
-
-
 public:
 
     // Constructors
@@ -89,6 +80,9 @@ public:
             const labelList& cellAddressing
         );
 
+        //- Disallow default bitwise copy construction
+        dimFieldDecomposer(const dimFieldDecomposer&) = delete;
+
 
     //- Destructor
     ~dimFieldDecomposer();
@@ -107,6 +101,12 @@ public:
         //- Decompose llist of fields
         template<class GeoField>
         void decomposeFields(const PtrList<GeoField>& fields) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const dimFieldDecomposer&) = delete;
 };
 
 

applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H

@@ -66,15 +66,6 @@ class lagrangianFieldDecomposer
         labelList particleIndices_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construction
-        lagrangianFieldDecomposer(const lagrangianFieldDecomposer&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const lagrangianFieldDecomposer&) = delete;
-
-
 public:
 
     // Constructors
@@ -91,6 +82,9 @@ public:
             const List<SLList<indexedParticle*>*>& cellParticles
         );
 
+        //- Disallow default bitwise copy construction
+        lagrangianFieldDecomposer(const lagrangianFieldDecomposer&) = delete;
+
 
     // Member Functions
 
@@ -144,6 +138,12 @@ public:
             const word& cloudName,
             const PtrList<GeoField>& fields
         ) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const lagrangianFieldDecomposer&) = delete;
 };
 
 

applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H

@@ -123,15 +123,6 @@ private:
         List<patchFieldDecomposer*> patchFieldDecomposerPtrs_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construction
-        pointFieldDecomposer(const pointFieldDecomposer&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const pointFieldDecomposer&) = delete;
-
-
 public:
 
     // Constructors
@@ -145,6 +136,9 @@ public:
             const labelList& boundaryAddressing
         );
 
+        //- Disallow default bitwise copy construction
+        pointFieldDecomposer(const pointFieldDecomposer&) = delete;
+
 
     //- Destructor
     ~pointFieldDecomposer();
@@ -162,6 +156,12 @@ public:
 
         template<class GeoField>
         void decomposeFields(const PtrList<GeoField>& fields) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const pointFieldDecomposer&) = delete;
 };
 
 

applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightAsciiStream.H

@@ -56,15 +56,6 @@ class ensightAsciiStream
         OFstream str_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construction
-        ensightAsciiStream(const ensightAsciiStream&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const ensightAsciiStream&) = delete;
-
-
 public:
 
     // Constructors
@@ -86,6 +77,9 @@ public:
             str_.precision(5);
         }
 
+        //- Disallow default bitwise copy construction
+        ensightAsciiStream(const ensightAsciiStream&) = delete;
+
 
     //- Destructor
     virtual ~ensightAsciiStream()
@@ -139,14 +133,11 @@ public:
                 << setw(10) << partI << nl;
         }
 
+
     // Member Operators
 
-    // Friend Functions
+        //- Disallow default bitwise assignment
-
+        void operator=(const ensightAsciiStream&) = delete;
-    // Friend Operators
-
-    // IOstream Operators
-
 };
 
 

applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightBinaryStream.H

@@ -55,15 +55,6 @@ class ensightBinaryStream
         autoPtr<std::ofstream> str_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construction
-        ensightBinaryStream(const ensightBinaryStream&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const ensightBinaryStream&) = delete;
-
-
 public:
 
     // Constructors
@@ -82,6 +73,9 @@ public:
             )
         {}
 
+        //- Disallow default bitwise copy construction
+        ensightBinaryStream(const ensightBinaryStream&) = delete;
+
 
     //- Destructor
     virtual ~ensightBinaryStream()
@@ -141,14 +135,11 @@ public:
             write(partI);
         }
 
+
     // Member Operators
 
-    // Friend Functions
+        //- Disallow default bitwise assignment
-
+        void operator=(const ensightBinaryStream&) = delete;
-    // Friend Operators
-
-    // IOstream Operators
-
 };
 
 

applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H

@@ -139,12 +139,6 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construction
-        ensightMesh(const ensightMesh&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const ensightMesh&) = delete;
-
         void writePoints
         (
             const scalarField& pointsComponent,
@@ -270,6 +264,9 @@ public:
             const bool binary
         );
 
+        //- Disallow default bitwise copy construction
+        ensightMesh(const ensightMesh&) = delete;
+
 
     //- Destructor
     ~ensightMesh();
@@ -378,6 +375,11 @@ public:
             Ostream& ensightCaseFile
         ) const;
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const ensightMesh&) = delete;
 };
 
 

applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightStream.H

@@ -54,14 +54,6 @@ class ensightStream
 
         const fileName name_;
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construction
-        ensightStream(const ensightStream&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const ensightStream&) = delete;
-
 
 public:
 
@@ -73,6 +65,9 @@ public:
             name_(f)
         {}
 
+        //- Disallow default bitwise copy construction
+        ensightStream(const ensightStream&) = delete;
+
 
     //- Destructor
     virtual ~ensightStream()
@@ -99,7 +94,10 @@ public:
         virtual void writePartHeader(const label) = 0;
 
 
+    // Member Operators
 
+        //- Disallow default bitwise assignment
+        void operator=(const ensightStream&) = delete;
 };
 
 

applications/utilities/postProcessing/dataConversion/foamToTecplot360/vtkMesh.H

@@ -63,18 +63,6 @@ class vtkMesh
         //- Current cellSet (or empty)
         const word setName_;
 
-//        //- Current decomposition of topology
-//        mutable autoPtr<vtkTopo> topoPtr_;
-
-
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construction
-        vtkMesh(const vtkMesh&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const vtkMesh&) = delete;
 
 
 public:
@@ -84,6 +72,9 @@ public:
         //- Construct from components
         vtkMesh(fvMesh& baseMesh, const word& setName = "");
 
+        //- Disallow default bitwise copy construction
+        vtkMesh(const vtkMesh&) = delete;
+
 
     // Member Functions
 
@@ -106,16 +97,6 @@ public:
                 return setName_.size();
             }
 
-//            //- topology
-//            const vtkTopo& topo() const
-//            {
-//                if (topoPtr_.empty())
-//                {
-//                    topoPtr_.reset(new vtkTopo(mesh()));
-//                }
-//                return topoPtr_();
-//            }
-
             //- Access either mesh or submesh
             const fvMesh& mesh() const
             {
@@ -129,18 +110,6 @@ public:
                 }
             }
 
-//            //- Number of field cells
-//            label nFieldCells() const
-//            {
-//                return topo().vertLabels().size();
-//            }
-//
-//            //- Number of field points
-//            label nFieldPoints() const
-//            {
-//                return mesh().nPoints() + topo().addPointCellLabels().size();
-//            }
-
 
         // Edit
 
@@ -164,6 +133,12 @@ public:
                     return fld;
                 }
             }
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const vtkMesh&) = delete;
 };
 
 

applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkMesh.H

@@ -68,16 +68,6 @@ class vtkMesh
         mutable autoPtr<vtkTopo> topoPtr_;
 
 
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construction
-        vtkMesh(const vtkMesh&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const vtkMesh&) = delete;
-
-
 public:
 
     // Constructors
@@ -85,6 +75,9 @@ public:
         //- Construct from components
         vtkMesh(fvMesh& baseMesh, const word& setName = "");
 
+        //- Disallow default bitwise copy construction
+        vtkMesh(const vtkMesh&) = delete;
+
 
     // Member Functions
 
@@ -165,6 +158,12 @@ public:
                     return fld;
                 }
             }
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const vtkMesh&) = delete;
 };
 
 

applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkTopo.H

@@ -66,15 +66,6 @@ class vtkTopo
         labelList superCells_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construction
-        vtkTopo(const vtkTopo&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const vtkTopo&) = delete;
-
-
 public:
 
    // Public static data
@@ -102,6 +93,10 @@ public:
         //- Construct from components
         vtkTopo(const polyMesh&);
 
+        //- Disallow default bitwise copy construction
+        vtkTopo(const vtkTopo&) = delete;
+
+
     // Member Functions
 
         // Access
@@ -125,6 +120,12 @@ public:
             {
                 return superCells_;
             }
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const vtkTopo&) = delete;
 };
 
 

applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.H

@@ -92,12 +92,6 @@ class writeVTK
         template<class GeoField>
         UPtrList<const GeoField> lookupFields() const;
 
-        //- Disallow default bitwise copy construction
-        writeVTK(const writeVTK&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const writeVTK&) = delete;
-
 
 public:
 
@@ -115,6 +109,9 @@ public:
             const dictionary&
         );
 
+        //- Disallow default bitwise copy construction
+        writeVTK(const writeVTK&) = delete;
+
 
     //- Destructor
     virtual ~writeVTK();
@@ -130,6 +127,12 @@ public:
 
         //- Write the writeVTK
         virtual bool write();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const writeVTK&) = delete;
 };
 
 

applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoamReader.h

@@ -63,6 +63,7 @@ class vtkPVFoamReader
     public vtkMultiBlockDataSetAlgorithm
 {
 public:
+
     vtkTypeMacro(vtkPVFoamReader, vtkMultiBlockDataSetAlgorithm);
     void PrintSelf(ostream&, vtkIndent);
 
@@ -181,6 +182,9 @@ protected:
     //- Construct null
     vtkPVFoamReader();
 
+    //- Disallow default bitwise copy construction
+    vtkPVFoamReader(const vtkPVFoamReader&) = delete;
+
     //- Destructor
     ~vtkPVFoamReader();
 
@@ -209,15 +213,12 @@ protected:
     //- The file name for this case
     char* FileName;
 
-
-private:
-
-    //- Disallow default bitwise copy construction
-    vtkPVFoamReader(const vtkPVFoamReader&) = delete;
-
     //- Disallow default bitwise assignment
     void operator=(const vtkPVFoamReader&) = delete;
 
+
+private:
+
     //- Add/remove patch names to/from the view
     void updatePatchNamesView(const bool show);
 

applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMeshReader.h

@@ -113,6 +113,9 @@ protected:
     //- Construct null
     vtkPVblockMeshReader();
 
+    //- Disallow default bitwise copy construction
+    vtkPVblockMeshReader(const vtkPVblockMeshReader&) = delete;
+
     //- Destructor
     ~vtkPVblockMeshReader();
 
@@ -140,15 +143,12 @@ protected:
 
     char* FileName;
 
-
-private:
-
-    //- Disallow default bitwise copy construction
-    vtkPVblockMeshReader(const vtkPVblockMeshReader&) = delete;
-
     //- Disallow default bitwise assignment
     void operator=(const vtkPVblockMeshReader&) = delete;
 
+
+private:
+
     //- Add/remove point numbers to/from the view
     void updatePointNumbersView(const bool show);
 

applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.H

@@ -666,13 +666,6 @@ class vtkPVFoam
             word getPartName(const int);
 
 
-        //- Disallow default bitwise copy construction
-        vtkPVFoam(const vtkPVFoam&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const vtkPVFoam&) = delete;
-
-
 public:
 
     //- Static data members
@@ -689,6 +682,9 @@ public:
             vtkPVFoamReader* reader
         );
 
+        //- Disallow default bitwise copy construction
+        vtkPVFoam(const vtkPVFoam&) = delete;
+
 
     //- Destructor
     ~vtkPVFoam();
@@ -736,6 +732,12 @@ public:
         //- Simple memory used debugging information
         static void printMemory();
 
+
+    // Member Operators
+
+
+        //- Disallow default bitwise assignment
+        void operator=(const vtkPVFoam&) = delete;
 };
 
 

applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkPVblockMesh.H

@@ -293,13 +293,6 @@ class vtkPVblockMesh
             );
 
 
-        //- Disallow default bitwise copy construction
-        vtkPVblockMesh(const vtkPVblockMesh&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const vtkPVblockMesh&) = delete;
-
-
 public:
 
     //- Static data members
@@ -316,6 +309,9 @@ public:
             vtkPVblockMeshReader* reader
         );
 
+        //- Disallow default bitwise copy construction
+        vtkPVblockMesh(const vtkPVblockMesh&) = delete;
+
 
     //- Destructor
     ~vtkPVblockMesh();
@@ -339,6 +335,11 @@ public:
         //- Debug information
         void PrintSelf(ostream&, vtkIndent) const;
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const vtkPVblockMesh&) = delete;
 };
 
 

applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.H

@@ -45,7 +45,6 @@ SourceFiles
 namespace Foam
 {
 
-
 /*---------------------------------------------------------------------------*\
                            Class channelIndex Declaration
 \*---------------------------------------------------------------------------*/
@@ -93,10 +92,6 @@ class channelIndex
             const labelList& startFaces
         );
 
-        //- Disallow default bitwise copy construct and assignment
-        channelIndex(const channelIndex&) = delete;
-        void operator=(const channelIndex&);
-
 
 public:
 
@@ -114,6 +109,9 @@ public:
             const direction dir
         );
 
+        //- Disallow default bitwise copy construction
+        channelIndex(const channelIndex&) = delete;
+
 
     // Member Functions
 
@@ -137,6 +135,11 @@ public:
                 return y_;
             }
 
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const channelIndex&);
 };
 
 

src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H

@@ -106,7 +106,7 @@ class IndirectList
 {
     // Private Member Functions
 
-        //- Disallow default assignment operator
+        //- Disallow default bitwise assignment
         void operator=(const IndirectList<T>&);
 
         //- Disallow assignment from UIndirectList

src/OpenFOAM/containers/Lists/PackedList/PackedList.H

@@ -490,7 +490,7 @@ public:
             public iteratorBase
         {
 
-            //- Disallow copy constructor from const_iterator
+            //- Disallow default bitwise copy construction
             //  This would violate const-ness!
             iterator(const const_iterator&);
 

src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H

@@ -316,10 +316,6 @@ public:
         {
             label comm_;
 
-            //- Disallow copy and assignment
-            communicator(const communicator&);
-            void operator=(const communicator&);
-
         public:
 
             communicator
@@ -332,6 +328,9 @@ public:
                 comm_(allocateCommunicator(parent, subRanks, doPstream))
             {}
 
+            //- Disallow default bitwise copy construction
+            communicator(const communicator&) = delete;
+
             ~communicator()
             {
                 freeCommunicator(comm_);
@@ -341,6 +340,9 @@ public:
             {
                 return comm_;
             }
+
+            //- Disallow default bitwise assignment
+            void operator=(const communicator&) = delete;
         };
 
         //- Return physical processor number (i.e. processor number in

src/OpenFOAM/db/functionObjects/timeControl/timeControl.H

@@ -104,7 +104,7 @@ public:
             const word& prefix
         );
 
-        //- Disallow default bitwise copy construct and assignment
+        //- Disallow default bitwise copy construction
         timeControl(const timeControl&) = delete;
 
 

src/OpenFOAM/db/objectRegistry/objectRegistry.H

@@ -99,7 +99,7 @@ public:
             const label nIoObjects = 128
         );
 
-        //- Disallow Copy constructor
+        //- Disallow default bitwise copy construction
         objectRegistry(const objectRegistry&);
 
 
@@ -235,7 +235,7 @@ public:
 
     // Member Operators
 
-        //- Disallow default bitwise copy construct and assignment
+        //- Disallow default bitwise assignment
         void operator=(const objectRegistry&) = delete;
 };
 

src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H

@@ -114,6 +114,7 @@ protected:
         //- Step along face either in righthand or lefthand direction
         inline static label nextVert(const label, const label, const bool);
 
+
     // Protected data
 
         // Map from mesh to local vertex numbering
@@ -186,7 +187,7 @@ public:
             const word& cellModelName
         );
 
-        //- Disallow default bitwise copy construct and assignment
+        //- Disallow default bitwise copy construction
         cellMatcher(const cellMatcher&) = delete;
 
 

src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,10 +53,10 @@ class coupledPointPatch
 {
     // Private Member Functions
 
-        //- Disallow default construct as copy
+        //- Disallow default bitwise copy construction
         coupledPointPatch(const coupledPointPatch&);
 
-        //- Disallow default assignment
+        //- Disallow default bitwise assignment
         void operator=(const coupledPointPatch&);
 
 

src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H

@@ -60,10 +60,10 @@ class cyclicPointPatch
 
     // Private Member Functions
 
-        //- Disallow default construct as copy
+        //- Disallow default bitwise copy construction
         cyclicPointPatch(const cyclicPointPatch&);
 
-        //- Disallow default assignment
+        //- Disallow default bitwise assignment
         void operator=(const cyclicPointPatch&);
 
 

src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H

@@ -87,10 +87,10 @@ class processorPointPatch
         virtual void updateMesh(PstreamBuffers&);
 
 
-        //- Disallow default construct as copy
+        //- Disallow default bitwise copy construction
         processorPointPatch(const processorPointPatch&);
 
-        //- Disallow default assignment
+        //- Disallow default bitwise assignment
         void operator=(const processorPointPatch&);
 
 public:

src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.H

@@ -63,10 +63,10 @@ class processorCyclicPointPatch
 
         const processorCyclicPolyPatch& procCycPolyPatch_;
 
-        //- Disallow default construct as copy
+        //- Disallow default bitwise copy construction
         processorCyclicPointPatch(const processorCyclicPointPatch&);
 
-        //- Disallow default assignment
+        //- Disallow default bitwise assignment
         void operator=(const processorCyclicPointPatch&);
 
 public:

src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H

@@ -63,10 +63,10 @@ class coupledFacePointPatch
 
     // Private Member Functions
 
-        //- Disallow default construct as copy
+        //- Disallow default bitwise copy construction
         coupledFacePointPatch(const coupledFacePointPatch&);
 
-        //- Disallow default assignment
+        //- Disallow default bitwise assignment
         void operator=(const coupledFacePointPatch&);
 
 

src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H

@@ -81,10 +81,10 @@ class polyBoundaryMesh
         //- Calculate the geometry for the patches (transformation tensors etc.)
         void calcGeometry();
 
-        //- Disallow construct as copy
+        //- Disallow default bitwise copy construction
         polyBoundaryMesh(const polyBoundaryMesh&);
 
-        //- Disallow assignment
+        //- Disallow default bitwise assignment
         void operator=(const polyBoundaryMesh&);
 
 

src/OpenFOAM/meshes/polyMesh/polyMesh.H

@@ -372,7 +372,7 @@ public:
             const bool syncPar = true
         );
 
-        //- Disallow construct as copy
+        //- Disallow default bitwise copy construction
         polyMesh(const polyMesh&);
 
 

src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H

@@ -79,10 +79,10 @@ class ZoneMesh
         //- Read if IOobject flags set. Return true if read.
         bool read();
 
-        //- Disallow construct as copy
+        //- Disallow default bitwise copy construction
         ZoneMesh(const ZoneMesh&);
 
-        //- Disallow assignment
+        //- Disallow default bitwise assignment
         void operator=(const ZoneMesh<ZoneType, MeshType>&);
 
 

src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H

@@ -437,7 +437,7 @@ public:
             const label nCells
         );
 
-        //- Disallow construct as copy
+        //- Disallow default bitwise copy construction
         primitiveMesh(const primitiveMesh&);
 
 

src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H

@@ -79,13 +79,6 @@ class buoyantKEpsilon
 :
     public kEpsilon<BasicTurbulenceModel>
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        buoyantKEpsilon(const buoyantKEpsilon&) = delete;
-        void operator=(const buoyantKEpsilon&);
-
-
 protected:
 
     // Protected data
@@ -94,6 +87,7 @@ protected:
 
             dimensionedScalar Cg_;
 
+
     // Protected Member Functions
 
         tmp<volScalarField> Gcoef() const;
@@ -128,6 +122,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        buoyantKEpsilon(const buoyantKEpsilon&) = delete;
+
 
     //- Destructor
     virtual ~buoyantKEpsilon()
@@ -138,6 +135,12 @@ public:
 
         //- Re-read model coefficients if they have changed
         virtual bool read();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const buoyantKEpsilon&) = delete;
 };
 
 

src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H

@@ -65,10 +65,6 @@ class LamBremhorstKE
 {
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        LamBremhorstKE(const LamBremhorstKE&) = delete;
-        void operator=(const LamBremhorstKE&);
-
         tmp<volScalarField> Rt() const;
         tmp<volScalarField> fMu(const volScalarField& Rt) const;
         tmp<volScalarField> f1(const volScalarField& fMu) const;
@@ -120,6 +116,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        LamBremhorstKE(const LamBremhorstKE&) = delete;
+
 
     //- Destructor
     virtual ~LamBremhorstKE()
@@ -165,6 +164,12 @@ public:
 
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const LamBremhorstKE&) = delete;
 };
 
 

src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H

@@ -91,10 +91,6 @@ class NicenoKEqn
         >&
         gasTurbulence() const;
 
-        // Disallow default bitwise copy construct and assignment
-        NicenoKEqn(const NicenoKEqn&) = delete;
-        void operator=(const NicenoKEqn&);
-
 
 protected:
 
@@ -141,6 +137,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        NicenoKEqn(const NicenoKEqn&) = delete;
+
 
     //- Destructor
     virtual ~NicenoKEqn()
@@ -151,6 +150,12 @@ public:
 
         //- Read model coefficients if they have changed
         virtual bool read();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const NicenoKEqn&) = delete;
 };
 
 

src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H

@@ -89,10 +89,6 @@ class SmagorinskyZhang
         >&
         gasTurbulence() const;
 
-        // Disallow default bitwise copy construct and assignment
-        SmagorinskyZhang(const SmagorinskyZhang&) = delete;
-        void operator=(const SmagorinskyZhang&);
-
 
 protected:
 
@@ -134,6 +130,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        SmagorinskyZhang(const SmagorinskyZhang&) = delete;
+
 
     //- Destructor
     virtual ~SmagorinskyZhang()
@@ -144,6 +143,12 @@ public:
 
         //- Read model coefficients if they have changed
         virtual bool read();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const SmagorinskyZhang&) = delete;
 };
 
 

src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H

@@ -77,13 +77,6 @@ class continuousGasKEqn
         mutable const turbulenceModel *liquidTurbulencePtr_;
 
 
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        continuousGasKEqn(const continuousGasKEqn&) = delete;
-        void operator=(const continuousGasKEqn&);
-
-
 protected:
 
     // Protected data
@@ -128,6 +121,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        continuousGasKEqn(const continuousGasKEqn&) = delete;
+
 
     //- Destructor
     virtual ~continuousGasKEqn()
@@ -138,6 +134,12 @@ public:
 
         //- Read model coefficients if they have changed
         virtual bool read();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const continuousGasKEqn&) = delete;
 };
 
 

src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H

@@ -93,10 +93,6 @@ class LaheyKEpsilon
         >&
         gasTurbulence() const;
 
-        // Disallow default bitwise copy construct and assignment
-        LaheyKEpsilon(const LaheyKEpsilon&) = delete;
-        void operator=(const LaheyKEpsilon&);
-
 
 protected:
 
@@ -145,6 +141,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        LaheyKEpsilon(const LaheyKEpsilon&) = delete;
+
 
     //- Destructor
     virtual ~LaheyKEpsilon()
@@ -158,6 +157,12 @@ public:
 
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const LaheyKEpsilon&) = delete;
 };
 
 

src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H

@@ -84,13 +84,6 @@ class continuousGasKEpsilon
         volScalarField nutEff_;
 
 
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        continuousGasKEpsilon(const continuousGasKEpsilon&) = delete;
-        void operator=(const continuousGasKEpsilon&);
-
-
 protected:
 
     // Protected data
@@ -134,6 +127,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        continuousGasKEpsilon(const continuousGasKEpsilon&) = delete;
+
 
     //- Destructor
     virtual ~continuousGasKEpsilon()
@@ -156,6 +152,12 @@ public:
 
         //- Return the Reynolds stress tensor
         virtual tmp<volSymmTensorField> R() const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const continuousGasKEpsilon&) = delete;
 };
 
 

src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H

@@ -137,11 +137,6 @@ class kOmegaSSTSato
         gasTurbulence() const;
 
 
-        // Disallow default bitwise copy construct and assignment
-        kOmegaSSTSato(const kOmegaSSTSato&) = delete;
-        void operator=(const kOmegaSSTSato&);
-
-
 protected:
 
     // Protected data
@@ -186,6 +181,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        kOmegaSSTSato(const kOmegaSSTSato&) = delete;
+
 
     //- Destructor
     virtual ~kOmegaSSTSato()
@@ -199,6 +197,12 @@ public:
 
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const kOmegaSSTSato&) = delete;
 };
 
 

src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H

@@ -90,10 +90,6 @@ class mixtureKEpsilon
 
     // Private Member Functions
 
-        // Disallow default bitwise copy construct and assignment
-        mixtureKEpsilon(const mixtureKEpsilon&) = delete;
-        void operator=(const mixtureKEpsilon&);
-
         //- Return the turbulence model for the other phase
         mixtureKEpsilon<BasicTurbulenceModel>& liquidTurbulence() const;
 
@@ -213,6 +209,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        mixtureKEpsilon(const mixtureKEpsilon&) = delete;
+
 
     //- Destructor
     virtual ~mixtureKEpsilon()
@@ -238,6 +237,12 @@ public:
 
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const mixtureKEpsilon&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H

@@ -114,13 +114,6 @@ class kOmegaSST
 :
     public TurbulenceModel
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        kOmegaSST(const kOmegaSST&) = delete;
-        void operator=(const kOmegaSST&);
-
-
 protected:
 
     // Protected data
@@ -267,6 +260,9 @@ public:
             const word& propertiesName = turbulenceModel::propertiesName
         );
 
+        //- Disallow default bitwise copy construction
+        kOmegaSST(const kOmegaSST&) = delete;
+
 
     //- Destructor
     virtual ~kOmegaSST()
@@ -323,6 +319,12 @@ public:
 
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const kOmegaSST&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H

@@ -81,13 +81,6 @@ class DeardorffDiffStress
 :
     public ReynoldsStress<LESModel<BasicTurbulenceModel>>
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        DeardorffDiffStress(const DeardorffDiffStress&) = delete;
-        void operator=(const DeardorffDiffStress&);
-
-
 protected:
 
     // Protected data
@@ -132,6 +125,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        DeardorffDiffStress(const DeardorffDiffStress&) = delete;
+
 
     //- Destructor
     virtual ~DeardorffDiffStress()
@@ -148,6 +144,12 @@ public:
 
         //- Correct sub-grid stress, eddy-Viscosity and related properties
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const DeardorffDiffStress&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H

@@ -63,10 +63,6 @@ class IDDESDelta
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        IDDESDelta(const IDDESDelta&) = delete;
-        void operator=(const IDDESDelta&);
-
         //- Calculate the delta values
         void calcDelta();
 
@@ -87,6 +83,9 @@ public:
             const dictionary&
         );
 
+        //- Disallow default bitwise copy construction
+        IDDESDelta(const IDDESDelta&) = delete;
+
 
     // Destructor
 
@@ -107,6 +106,12 @@ public:
 
         // Correct values
         void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const IDDESDelta&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H

@@ -50,7 +50,6 @@ namespace Foam
 
 class LESdelta
 {
-
 protected:
 
     // Protected data
@@ -60,15 +59,6 @@ protected:
         volScalarField delta_;
 
 
-private:
-
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        LESdelta(const LESdelta&) = delete;
-        void operator=(const LESdelta&);
-
-
 public:
 
     //- Runtime type information
@@ -100,6 +90,9 @@ public:
             const turbulenceModel& turbulence
         );
 
+        //- Disallow default bitwise copy construction
+        LESdelta(const LESdelta&) = delete;
+
 
     // Selectors
 
@@ -143,6 +136,8 @@ public:
 
     // Member Operators
 
+        void operator=(const LESdelta&) = delete;
+
         virtual operator const volScalarField&() const
         {
             return delta_;

src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H

@@ -85,10 +85,6 @@ class PrandtlDelta
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        PrandtlDelta(const PrandtlDelta&) = delete;
-        void operator=(const PrandtlDelta&);
-
         // Calculate the delta values
         void calcDelta();
 
@@ -109,6 +105,9 @@ public:
             const dictionary&
         );
 
+        //- Disallow default bitwise copy construction
+        PrandtlDelta(const PrandtlDelta&) = delete;
+
 
     //- Destructor
     virtual ~PrandtlDelta()
@@ -122,6 +121,12 @@ public:
 
         // Correct values
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const PrandtlDelta&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H

@@ -59,10 +59,6 @@ class cubeRootVolDelta
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        cubeRootVolDelta(const cubeRootVolDelta&) = delete;
-        void operator=(const cubeRootVolDelta&);
-
         // Calculate the delta values
         void calcDelta();
 
@@ -83,6 +79,9 @@ public:
             const dictionary&
         );
 
+        //- Disallow default bitwise copy construction
+        cubeRootVolDelta(const cubeRootVolDelta&) = delete;
+
 
     //- Destructor
     virtual ~cubeRootVolDelta()
@@ -96,6 +95,12 @@ public:
 
         // Correct values
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const cubeRootVolDelta&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H

@@ -63,10 +63,6 @@ class maxDeltaxyz
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        maxDeltaxyz(const maxDeltaxyz&) = delete;
-        void operator=(const maxDeltaxyz&);
-
         // Calculate the delta values
         void calcDelta();
 
@@ -87,6 +83,9 @@ public:
             const dictionary&
         );
 
+        //- Disallow default bitwise copy construction
+        maxDeltaxyz(const maxDeltaxyz&) = delete;
+
 
     //- Destructor
     virtual ~maxDeltaxyz()
@@ -100,6 +99,12 @@ public:
 
         // Correct values
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const maxDeltaxyz&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H

@@ -220,10 +220,6 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        smoothDelta(const smoothDelta&) = delete;
-        void operator=(const smoothDelta&);
-
         // Calculate the delta values
         void calcDelta();
 
@@ -265,6 +261,9 @@ public:
             const dictionary&
         );
 
+        //- Disallow default bitwise copy construction
+        smoothDelta(const smoothDelta&) = delete;
+
 
     //- Destructor
     virtual ~smoothDelta()
@@ -278,6 +277,12 @@ public:
 
         // Correct values
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const smoothDelta&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.H

@@ -64,10 +64,6 @@ class vanDriestDelta
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
-        vanDriestDelta(const vanDriestDelta&) = delete;
-        void operator=(const vanDriestDelta&);
-
         // Calculate the delta values
         void calcDelta();
 
@@ -88,6 +84,9 @@ public:
             const dictionary&
         );
 
+        //- Disallow default bitwise copy construction
+        vanDriestDelta(const vanDriestDelta&) = delete;
+
 
     //- Destructor
     virtual ~vanDriestDelta()
@@ -101,6 +100,12 @@ public:
 
         // Correct values
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const vanDriestDelta&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H

@@ -54,13 +54,6 @@ class LESeddyViscosity
 :
     public eddyViscosity<LESModel<BasicTurbulenceModel>>
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        LESeddyViscosity(const LESeddyViscosity&) = delete;
-        void operator=(const LESeddyViscosity&);
-
-
 protected:
 
     // Protected data
@@ -90,6 +83,9 @@ public:
             const word& propertiesName = turbulenceModel::propertiesName
         );
 
+        //- Disallow default bitwise copy construction
+        LESeddyViscosity(const LESeddyViscosity&) = delete;
+
 
     //- Destructor
     virtual ~LESeddyViscosity()
@@ -103,6 +99,12 @@ public:
 
         //- Return sub-grid disipation rate
         virtual tmp<volScalarField> epsilon() const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const LESeddyViscosity&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H

@@ -59,13 +59,6 @@ class LESfilter
         const fvMesh& mesh_;
 
 
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        LESfilter(const LESfilter&) = delete;
-        void operator=(const LESfilter&);
-
-
 protected:
 
     //- Temporary function to ensure the coupled boundary conditions of the
@@ -112,6 +105,9 @@ public:
             mesh_(mesh)
         {}
 
+        //- Disallow default bitwise copy construction
+        LESfilter(const LESfilter&) = delete;
+
 
     // Selectors
 
@@ -143,6 +139,8 @@ public:
 
     // Member Operators
 
+        void operator=(const LESfilter&) = delete;
+
         virtual tmp<volScalarField> operator()
         (
             const tmp<volScalarField>&

src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H

@@ -64,13 +64,6 @@ class anisotropicFilter
         volVectorField coeff_;
 
 
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        anisotropicFilter(const anisotropicFilter&) = delete;
-        void operator=(const anisotropicFilter&);
-
-
 public:
 
     //- Runtime type information
@@ -84,6 +77,9 @@ public:
         //- Construct from IOdictionary
         anisotropicFilter(const fvMesh& mesh, const dictionary&);
 
+        //- Disallow default bitwise copy construction
+        anisotropicFilter(const anisotropicFilter&) = delete;
+
 
     //- Destructor
     virtual ~anisotropicFilter()
@@ -98,6 +94,8 @@ public:
 
     // Member Operators
 
+        void operator=(const anisotropicFilter&) = delete;
+
         virtual tmp<volScalarField> operator()
         (
             const tmp<volScalarField>&

src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.H

@@ -64,13 +64,6 @@ class laplaceFilter
         volScalarField coeff_;
 
 
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct and assignment
-        laplaceFilter(const laplaceFilter&) = delete;
-        void operator=(const laplaceFilter&);
-
-
 public:
 
     //- Runtime type information
@@ -85,6 +78,9 @@ public:
         //- Construct from IOdictionary
         laplaceFilter(const fvMesh& mesh, const dictionary&);
 
+        //- Disallow default bitwise copy construction
+        laplaceFilter(const laplaceFilter&) = delete;
+
 
     //- Destructor
     virtual ~laplaceFilter()
@@ -118,6 +114,12 @@ public:
         (
             const tmp<volTensorField>&
         ) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const laplaceFilter&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.H

@@ -53,13 +53,6 @@ class simpleFilter
     public LESfilter
 
 {
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct and assignment
-        simpleFilter(const simpleFilter&) = delete;
-        void operator=(const simpleFilter&);
-
-
 public:
 
     //- Runtime type information
@@ -74,6 +67,9 @@ public:
         //- Construct from IOdictionary
         simpleFilter(const fvMesh& mesh, const dictionary&);
 
+        //- Disallow default bitwise copy construction
+        simpleFilter(const simpleFilter&) = delete;
+
 
     //- Destructor
     virtual ~simpleFilter()
@@ -107,6 +103,12 @@ public:
         (
             const tmp<volTensorField>&
         ) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const simpleFilter&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H

@@ -88,13 +88,6 @@ class Smagorinsky
 :
     public LESeddyViscosity<BasicTurbulenceModel>
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        Smagorinsky(const Smagorinsky&) = delete;
-        void operator=(const Smagorinsky&);
-
-
 protected:
 
     // Protected data
@@ -138,6 +131,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        Smagorinsky(const Smagorinsky&) = delete;
+
 
     //- Destructor
     virtual ~Smagorinsky()
@@ -160,6 +156,12 @@ public:
 
         //- Correct Eddy-Viscosity and related properties
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const Smagorinsky&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H

@@ -69,10 +69,6 @@ class SpalartAllmarasDDES
 
         tmp<volScalarField> rd(const volScalarField& magGradU) const;
 
-        // Disallow default bitwise copy construct and assignment
-        SpalartAllmarasDDES(const SpalartAllmarasDDES&) = delete;
-        void operator=(const SpalartAllmarasDDES&);
-
 
 protected:
 
@@ -113,10 +109,19 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        SpalartAllmarasDDES(const SpalartAllmarasDDES&) = delete;
+
 
     //- Destructor
     virtual ~SpalartAllmarasDDES()
     {}
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const SpalartAllmarasDDES&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H

@@ -62,13 +62,6 @@ class SpalartAllmarasDES
 :
     public LESeddyViscosity<BasicTurbulenceModel>
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        SpalartAllmarasDES(const SpalartAllmarasDES&) = delete;
-        void operator=(const SpalartAllmarasDES&);
-
-
 protected:
 
     // Protected data
@@ -173,6 +166,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        SpalartAllmarasDES(const SpalartAllmarasDES&) = delete;
+
 
     //- Destructor
     virtual ~SpalartAllmarasDES()
@@ -200,6 +196,12 @@ public:
 
         //- Correct nuTilda and related properties
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const SpalartAllmarasDES&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H

@@ -91,10 +91,6 @@ class SpalartAllmarasIDDES
         //- Delay function
         tmp<volScalarField> fd(const volScalarField& magGradU) const;
 
-        // Disallow default bitwise copy construct and assignment
-        SpalartAllmarasIDDES(const SpalartAllmarasIDDES&) = delete;
-        void operator=(const SpalartAllmarasIDDES&);
-
 
 protected:
 
@@ -135,6 +131,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        SpalartAllmarasIDDES(const SpalartAllmarasIDDES&) = delete;
+
 
     //- Destructor
     virtual ~SpalartAllmarasIDDES()
@@ -145,6 +144,12 @@ public:
 
         //- Read model coefficients if they have changed
         virtual bool read();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const SpalartAllmarasIDDES&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H

@@ -75,13 +75,6 @@ class WALE
 :
     public LESeddyViscosity<BasicTurbulenceModel>
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        WALE(const WALE&) = delete;
-        void operator=(const WALE&);
-
-
 protected:
 
     // Protected data
@@ -130,6 +123,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        WALE(const WALE&) = delete;
+
 
     //- Destructor
     virtual ~WALE()
@@ -152,6 +148,12 @@ public:
 
         //- Correct Eddy-Viscosity and related properties
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const WALE&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H

@@ -75,13 +75,6 @@ class dynamicKEqn
 :
     public LESeddyViscosity<BasicTurbulenceModel>
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        dynamicKEqn(const dynamicKEqn&) = delete;
-        void operator=(const dynamicKEqn&);
-
-
 protected:
 
     // Protected data
@@ -157,6 +150,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        dynamicKEqn(const dynamicKEqn&) = delete;
+
 
     //- Destructor
     virtual ~dynamicKEqn()
@@ -189,6 +185,12 @@ public:
 
         //- Correct Eddy-Viscosity and related properties
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const dynamicKEqn&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H

@@ -61,13 +61,6 @@ class dynamicLagrangian
 :
     public LESeddyViscosity<BasicTurbulenceModel>
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        dynamicLagrangian(const dynamicLagrangian&) = delete;
-        void operator=(const dynamicLagrangian&);
-
-
 protected:
 
     // Protected data
@@ -118,6 +111,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        dynamicLagrangian(const dynamicLagrangian&) = delete;
+
 
     //- Destructor
     virtual ~dynamicLagrangian()
@@ -156,6 +152,12 @@ public:
 
         //- Correct Eddy-Viscosity and related properties
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const dynamicLagrangian&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H

@@ -73,13 +73,6 @@ class kEqn
 :
     public LESeddyViscosity<BasicTurbulenceModel>
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        kEqn(const kEqn&) = delete;
-        void operator=(const kEqn&);
-
-
 protected:
 
     // Protected data
@@ -126,6 +119,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        kEqn(const kEqn&) = delete;
+
 
     //- Destructor
     virtual ~kEqn()
@@ -158,6 +154,12 @@ public:
 
         //- Correct eddy-Viscosity and related properties
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const kEqn&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H

@@ -99,13 +99,6 @@ class LRR
 :
     public ReynoldsStress<RASModel<BasicTurbulenceModel>>
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        LRR(const LRR&) = delete;
-        void operator=(const LRR&);
-
-
 protected:
 
     // Protected data
@@ -169,6 +162,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        LRR(const LRR&) = delete;
+
 
     //- Destructor
     virtual ~LRR()
@@ -201,6 +197,12 @@ public:
         //- Solve the turbulence equations and correct eddy-Viscosity and
         //  related properties
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const LRR&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H

@@ -83,13 +83,6 @@ class LaunderSharmaKE
 :
     public eddyViscosity<RASModel<BasicTurbulenceModel>>
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        LaunderSharmaKE(const LaunderSharmaKE&) = delete;
-        void operator=(const LaunderSharmaKE&);
-
-
 protected:
 
     // Protected data
@@ -146,6 +139,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        LaunderSharmaKE(const LaunderSharmaKE&) = delete;
+
 
     //- Destructor
     virtual ~LaunderSharmaKE()
@@ -191,6 +187,12 @@ public:
 
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const LaunderSharmaKE&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H

@@ -84,13 +84,6 @@ class RNGkEpsilon
 :
     public eddyViscosity<RASModel<BasicTurbulenceModel>>
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        RNGkEpsilon(const RNGkEpsilon&) = delete;
-        void operator=(const RNGkEpsilon&);
-
-
 protected:
 
     // Protected data
@@ -146,6 +139,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        RNGkEpsilon(const RNGkEpsilon&) = delete;
+
 
     //- Destructor
     virtual ~RNGkEpsilon()
@@ -191,6 +187,12 @@ public:
 
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const RNGkEpsilon&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H

@@ -94,13 +94,6 @@ class SSG
 :
     public ReynoldsStress<RASModel<BasicTurbulenceModel>>
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        SSG(const SSG&) = delete;
-        void operator=(const SSG&);
-
-
 protected:
 
     // Protected data
@@ -160,6 +153,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        SSG(const SSG&) = delete;
+
 
     //- Destructor
     virtual ~SSG()
@@ -192,6 +188,12 @@ public:
         //- Solve the turbulence equations and correct eddy-Viscosity and
         //  related properties
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const SSG&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H

@@ -87,13 +87,6 @@ class SpalartAllmaras
 :
     public eddyViscosity<RASModel<BasicTurbulenceModel>>
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        SpalartAllmaras(const SpalartAllmaras&) = delete;
-        void operator=(const SpalartAllmaras&);
-
-
 protected:
 
     // Protected data
@@ -172,6 +165,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        SpalartAllmaras(const SpalartAllmaras&) = delete;
+
 
     //- Destructor
     virtual ~SpalartAllmaras()
@@ -194,6 +190,12 @@ public:
 
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const SpalartAllmaras&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H

@@ -85,13 +85,6 @@ class kEpsilon
 :
     public eddyViscosity<RASModel<BasicTurbulenceModel>>
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        kEpsilon(const kEpsilon&) = delete;
-        void operator=(const kEpsilon&);
-
-
 protected:
 
     // Protected data
@@ -144,6 +137,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        kEpsilon(const kEpsilon&) = delete;
+
 
     //- Destructor
     virtual ~kEpsilon()
@@ -189,6 +185,12 @@ public:
 
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const kEpsilon&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.H

@@ -103,13 +103,6 @@ class kOmegaSSTLM
 :
     public kOmegaSST<BasicTurbulenceModel>
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        kOmegaSSTLM(const kOmegaSSTLM&) = delete;
-        void operator=(const kOmegaSSTLM&);
-
-
 protected:
 
     // Protected data
@@ -231,6 +224,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        kOmegaSSTLM(const kOmegaSSTLM&) = delete;
+
 
     //- Destructor
     virtual ~kOmegaSSTLM()
@@ -277,6 +273,12 @@ public:
 
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const kOmegaSSTLM&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H

@@ -97,13 +97,6 @@ class kOmegaSSTSAS
 :
     public kOmegaSST<BasicTurbulenceModel>
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        kOmegaSSTSAS(const kOmegaSSTSAS&) = delete;
-        void operator=(const kOmegaSSTSAS&);
-
-
 protected:
 
     // Protected data
@@ -160,6 +153,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        kOmegaSSTSAS(const kOmegaSSTSAS&) = delete;
+
 
     //- Destructor
     virtual ~kOmegaSSTSAS()
@@ -176,6 +172,12 @@ public:
         {
             return delta_();
         }
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const kOmegaSSTSAS&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/laminar/Giesekus/Giesekus.H

@@ -64,13 +64,6 @@ class Giesekus
 :
     public Maxwell<BasicTurbulenceModel>
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        Giesekus(const Giesekus&) = delete;
-        void operator=(const Giesekus&);
-
-
 protected:
 
     // Protected data
@@ -79,6 +72,7 @@ protected:
 
             dimensionedScalar alphaG_;
 
+
     // Protected Member Functions
 
         virtual tmp<fvSymmTensorMatrix> sigmaSource() const;
@@ -110,6 +104,10 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        Giesekus(const Giesekus&) = delete;
+
+
 
     //- Destructor
     virtual ~Giesekus()
@@ -120,6 +118,12 @@ public:
 
         //- Re-read model coefficients if they have changed
         virtual bool read();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const Giesekus&) = delete;
 };
 
 

src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.H

@@ -70,7 +70,7 @@ protected:
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- Disallow default bitwise copy construction
         generalizedNewtonianViscosityModel
         (
             const generalizedNewtonianViscosityModel&

src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H

@@ -79,13 +79,6 @@ class kEpsilonLopesdaCosta
 :
     public eddyViscosity<RASModel<BasicTurbulenceModel>>
 {
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        kEpsilonLopesdaCosta(const kEpsilonLopesdaCosta&) = delete;
-        void operator=(const kEpsilonLopesdaCosta&);
-
-
 protected:
 
     // Protected data
@@ -170,6 +163,9 @@ public:
             const word& type = typeName
         );
 
+        //- Disallow default bitwise copy construction
+        kEpsilonLopesdaCosta(const kEpsilonLopesdaCosta&) = delete;
+
 
     //- Destructor
     virtual ~kEpsilonLopesdaCosta()
@@ -215,6 +211,12 @@ public:
 
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const kEpsilonLopesdaCosta&) = delete;
 };
 
 

src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.H

@@ -146,19 +146,14 @@ class powerLawLopesdaCosta
             const vectorField& U
         ) const;
 
-        //- Disallow default bitwise copy construction
-        powerLawLopesdaCosta(const powerLawLopesdaCosta&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const powerLawLopesdaCosta&) = delete;
-
 
 public:
 
     //- Runtime type information
     TypeName("powerLawLopesdaCosta");
 
-    //- Constructor
+    // Constructors
+
         powerLawLopesdaCosta
         (
             const word& name,
@@ -168,6 +163,10 @@ public:
             const word& cellZoneName
         );
 
+        //- Disallow default bitwise copy construction
+        powerLawLopesdaCosta(const powerLawLopesdaCosta&) = delete;
+
+
     //- Destructor
     virtual ~powerLawLopesdaCosta();
 
@@ -209,8 +208,15 @@ public:
 
         //- Write
         bool writeData(Ostream& os) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const powerLawLopesdaCosta&) = delete;
 };
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace porosityModels

src/combustionModels/EDC/EDC.H

@@ -149,15 +149,6 @@ class EDC
         volScalarField kappa_;
 
 
-    // Private Member Functions
-
-        //- Disallow copy construct
-        EDC(const EDC&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const EDC&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -175,6 +166,9 @@ public:
             const word& combustionProperties
         );
 
+        //- Disallow default bitwise copy construction
+        EDC(const EDC&);
+
 
     //- Destructor
     virtual ~EDC();
@@ -193,6 +187,12 @@ public:
 
         //- Update properties from given dictionary
         virtual bool read();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const EDC&) = delete;
 };
 
 

src/combustionModels/FSD/FSD.H

@@ -120,12 +120,6 @@ class FSD
         //- Calculate the normalised fuel source term
         void calculateSourceNorm();
 
-        //- Disallow copy construct
-        FSD(const FSD&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const FSD&) = delete;
-
 
 public:
 
@@ -144,6 +138,9 @@ public:
             const word& combustionProperties
         );
 
+        //- Disallow default bitwise copy construction
+        FSD(const FSD&);
+
 
     //- Destructor
     virtual ~FSD();
@@ -156,6 +153,12 @@ public:
 
         //- Update properties
         virtual bool read();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const FSD&) = delete;
 };
 
 

src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.H

@@ -70,12 +70,6 @@ class consumptionSpeed
         //- Return consumption rate
         scalar omega0Sigma(scalar sigma, scalar a) const;
 
-        //- Disallow copy construct
-        consumptionSpeed(const consumptionSpeed&);
-
-         //- Disallow default bitwise assignment
-        void operator=(const consumptionSpeed&) = delete;
-
 
 public:
 
@@ -88,6 +82,9 @@ public:
         //- Construct from dictionary
         consumptionSpeed(const dictionary& dict);
 
+        //- Disallow default bitwise copy construction
+        consumptionSpeed(const consumptionSpeed&);
+
 
     //- Destructor
     virtual ~consumptionSpeed();
@@ -126,6 +123,12 @@ public:
 
         //- Update properties
         void read(const dictionary& dict);
+
+
+    // Member Operators
+
+         //- Disallow default bitwise assignment
+        void operator=(const consumptionSpeed&) = delete;
 };
 
 

src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameArea.H

@@ -75,17 +75,6 @@ protected:
         volScalarField omega_;
 
 
-private:
-
-    // Private Member Functions
-
-         //- Disallow copy construct
-        reactionRateFlameArea(const reactionRateFlameArea&);
-
-         //- Disallow default bitwise assignment
-        void operator=(const reactionRateFlameArea&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -120,6 +109,9 @@ public:
             const combustionModel& combModel
         );
 
+         //- Disallow default bitwise copy construction
+        reactionRateFlameArea(const reactionRateFlameArea&);
+
 
     // Selector
 
@@ -152,6 +144,12 @@ public:
 
         //- Update from dictionary
         virtual bool read(const dictionary& dictProperties);
+
+
+    // Member Operators
+
+         //- Disallow default bitwise assignment
+        void operator=(const reactionRateFlameArea&) = delete;
 };
 
 

src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.H

@@ -65,15 +65,6 @@ class relaxation
         scalar alpha_;
 
 
-     // Private Member Functions
-
-        //- Disallow copy construct
-        relaxation(const relaxation&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const relaxation&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -91,6 +82,9 @@ public:
             const combustionModel& combModel
         );
 
+        //- Disallow default bitwise copy construction
+        relaxation(const relaxation&);
+
 
     // Destructor
 
@@ -107,6 +101,12 @@ public:
 
         //- Update properties from given dictionary
         virtual bool read(const dictionary& dictProperties);
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const relaxation&) = delete;
 };
 
 

src/combustionModels/PaSR/PaSR.H

@@ -66,15 +66,6 @@ class PaSR
         volScalarField kappa_;
 
 
-    // Private Member Functions
-
-        //- Disallow copy construct
-        PaSR(const PaSR&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const PaSR&) = delete;
-
-
 public:
 
     //- Runtime type information
@@ -92,6 +83,9 @@ public:
             const word& combustionProperties
         );
 
+        //- Disallow default bitwise copy construction
+        PaSR(const PaSR&);
+
 
     //- Destructor
     virtual ~PaSR();
@@ -110,6 +104,12 @@ public:
 
         //- Update properties from given dictionary
         virtual bool read();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const PaSR&) = delete;
 };