Merge remote-tracking branch 'origin/develop' into develop-pre-release

src/combustionModels/CombustionModel/ChemistryCombustion/ChemistryCombustion.H

@@ -53,6 +53,16 @@ class ChemistryCombustion
 :
     public CombustionModel<ReactionThermo>
 {
+    // Private Member Functions
+
+        //- Construct as copy (not implemented)
+        ChemistryCombustion(const ChemistryCombustion<ReactionThermo>&) =
+            delete;
+
+        //- No copy assignment
+        void operator=(const ChemistryCombustion<ReactionThermo>&) = delete;
+
+
 protected:
 
     // Protected data

src/combustionModels/CombustionModel/CombustionModel/CombustionModel.H

@@ -55,6 +55,15 @@ class CombustionModel
 :
     public combustionModel
 {
+    // Private Member Functions
+
+        //- Construct as copy (not implemented)
+        CombustionModel(const CombustionModel&) = delete;
+
+        //- No copy assignment
+        void operator=(const CombustionModel&) = delete;
+
+
 public:
 
     //- Thermo type

src/combustionModels/CombustionModel/ThermoCombustion/ThermoCombustion.H

@@ -52,6 +52,15 @@ class ThermoCombustion
 :
     public CombustionModel<ReactionThermo>
 {
+    // Private Member Functions
+
+        //- Construct as copy (not implemented)
+        ThermoCombustion(const ThermoCombustion&) = delete;
+
+        //- No copy assignment
+        void operator=(const ThermoCombustion&) = delete;
+
+
 protected:
 
     // Protected data

src/combustionModels/EDC/EDC.H

@@ -151,11 +151,11 @@ class EDC
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        EDC(const EDC&);
+        //- No copy construct
+        EDC(const EDC&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const EDC&);
+        //- No copy assignment
+        void operator=(const EDC&) = delete;
 
 
 public:

src/combustionModels/FSD/FSD.H

@@ -123,11 +123,11 @@ class FSD
         //- Calculate the normalised fuel source term
         void calculateSourceNorm();
 
-        //- Disallow copy construct
-        FSD(const FSD&);
+        //- No copy construct
+        FSD(const FSD&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const FSD&);
+        //- No copy assignment
+        void operator=(const FSD&) = delete;
 
 
 public:

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

@@ -69,11 +69,11 @@ class consumptionSpeed
         //- Return consumption rate
         scalar omega0Sigma(scalar sigma, scalar a) const;
 
-        //- Disallow copy construct
-        consumptionSpeed(const consumptionSpeed&);
+        //- No copy construct
+        consumptionSpeed(const consumptionSpeed&) = delete;
 
-         //- Disallow default bitwise assignment
-        void operator=(const consumptionSpeed&);
+         //- No copy assignment
+        void operator=(const consumptionSpeed&) = delete;
 
 
 public:

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

@@ -79,11 +79,11 @@ private:
 
     // Private member functions
 
-         //- Disallow copy construct
-        reactionRateFlameArea(const reactionRateFlameArea&);
+         //- No copy construct
+        reactionRateFlameArea(const reactionRateFlameArea&) = delete;
 
-         //- Disallow default bitwise assignment
-        void operator=(const reactionRateFlameArea&);
+         //- No copy assignment
+        void operator=(const reactionRateFlameArea&) = delete;
 
 
 public:

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

@@ -67,11 +67,11 @@ class relaxation
 
      // Private Member Functions
 
-        //- Disallow copy construct
-        relaxation(const relaxation&);
+        //- No copy construct
+        relaxation(const relaxation&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const relaxation&);
+        //- No copy assignment
+        void operator=(const relaxation&) = delete;
 
 
 public:

src/combustionModels/PaSR/PaSR.H

@@ -71,11 +71,11 @@ class PaSR
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        PaSR(const PaSR&);
+        //- No copy construct
+        PaSR(const PaSR&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const PaSR&);
+        //- No copy assignment
+        void operator=(const PaSR&) = delete;
 
 
 public:

src/combustionModels/combustionModel/combustionModel.H

@@ -56,11 +56,11 @@ class combustionModel
 {
     // Private Member Functions
 
-        //- Disallow copy construct
-        combustionModel(const combustionModel&);
+        //- No copy construct
+        combustionModel(const combustionModel&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const combustionModel&);
+        //- No copy assignment
+        void operator=(const combustionModel&) = delete;
 
         //- Construct the base IO object
         IOobject createIOobject

src/combustionModels/diffusion/diffusion.H

@@ -69,11 +69,11 @@ class diffusion
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        diffusion(const diffusion&);
+        //- No copy construct
+        diffusion(const diffusion&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const diffusion&);
+        //- No copy assignment
+        void operator=(const diffusion&) = delete;
 
 
 public:

src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.H

@@ -152,11 +152,11 @@ class diffusionMulticomponent
         //- Initialize
         void init();
 
-        //- Disallow copy construct
-        diffusionMulticomponent(const diffusionMulticomponent&);
+        //- No copy construct
+        diffusionMulticomponent(const diffusionMulticomponent&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const diffusionMulticomponent&);
+        //- No copy assignment
+        void operator=(const diffusionMulticomponent&) = delete;
 
 
 public:

src/combustionModels/eddyDissipationDiffusionModel/eddyDissipationDiffusionModel.H

@@ -68,11 +68,14 @@ class eddyDissipationDiffusionModel
 
     // Private member functions
 
-        //- Disallow copy construct
-        eddyDissipationDiffusionModel(const eddyDissipationDiffusionModel&);
+        //- No copy construct
+        eddyDissipationDiffusionModel
+        (
+            const eddyDissipationDiffusionModel&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const eddyDissipationDiffusionModel&);
+        //- No copy assignment
+        void operator=(const eddyDissipationDiffusionModel&) = delete;
 
 
 public:

src/combustionModels/eddyDissipationModelBase/eddyDissipationModelBase.H

@@ -64,11 +64,11 @@ class eddyDissipationModelBase
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        eddyDissipationModelBase(const eddyDissipationModelBase&);
+        //- No copy construct
+        eddyDissipationModelBase(const eddyDissipationModelBase&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const eddyDissipationModelBase&);
+        //- No copy assignment
+        void operator=(const eddyDissipationModelBase&) = delete;
 
 
 public:

src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H

@@ -66,11 +66,11 @@ class infinitelyFastChemistry
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        infinitelyFastChemistry(const infinitelyFastChemistry&);
+        //- No copy construct
+        infinitelyFastChemistry(const infinitelyFastChemistry&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const infinitelyFastChemistry&);
+        //- No copy assignment
+        void operator=(const infinitelyFastChemistry&) = delete;
 
 
 public:

src/combustionModels/laminar/laminar.H

@@ -73,11 +73,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow copy construct
-        laminar(const laminar&);
+        //- No copy construct
+        laminar(const laminar&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const laminar&);
+        //- No copy assignment
+        void operator=(const laminar&) = delete;
 
 
 public:

src/combustionModels/noCombustion/noCombustion.H

@@ -57,11 +57,11 @@ class noCombustion
     public ThermoCombustion<ReactionThermo>
 {
 
-    //- Disallow copy construct
-    noCombustion(const noCombustion&);
+    //- No copy construct
+    noCombustion(const noCombustion&) = delete;
 
-    //- Disallow default bitwise assignment
-    void operator=(const noCombustion&);
+    //- No copy assignment
+    void operator=(const noCombustion&) = delete;
 
 
 public:

src/combustionModels/singleStepCombustion/singleStepCombustion.H

@@ -59,11 +59,11 @@ class singleStepCombustion
 {
     // Private Member Functions
 
-        //- Disallow copy construct
-        singleStepCombustion(const singleStepCombustion&);
+        //- No copy construct
+        singleStepCombustion(const singleStepCombustion&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const singleStepCombustion&);
+        //- No copy assignment
+        void operator=(const singleStepCombustion&) = delete;
 
 
 protected:

src/combustionModels/zoneCombustion/zoneCombustion.H

@@ -73,11 +73,11 @@ class zoneCombustion
         //- Filter the given field on the cellZones
         tmp<volScalarField> filter(const tmp<volScalarField>& tS) const;
 
-        //- Disallow copy construct
-        zoneCombustion(const zoneCombustion&);
+        //- No copy construct
+        zoneCombustion(const zoneCombustion&) = delete;
 
-        //- Disallow default bitwise assignment
-        void operator=(const zoneCombustion&);
+        //- No copy assignment
+        void operator=(const zoneCombustion&) = delete;
 
 
 public: