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

BuildIssues.txt

@@ -118,4 +118,34 @@ your `~/.spack/packages.yaml` file:
 It appears that spack will otherwise ignore any paraview+qt version
 and attempt to install a paraview~qt version instead.
 
+---------------------------
+Building on Darwin (Mac-OS)
+---------------------------
+
+Support for Darwin is incomplete, but has been provisioned for.
+
+The following are typical (as of yet) unresolved issues.
+
+* Scotch, ptscotch:
+  - The librt linkage is required for Linux, but not for Darwin.
+
+  Current resolution:
+  Edit or patch
+      src/parallel/decompose/ptscotchDecomp/Make/options
+      src/parallel/decompose/scotchDecomp/Make/options
+
+  to remove the '-lrt' library
+
+* CGAL:
+  - ThirdParty CGAL will normally need to be compiled without mpfr/gmp.
+    This should be done manually prior to building OpenFOAM or other
+    ThirdParty. Eg,
+
+        cd $WM_THIRD_PARTY_DIR
+        ./makeCGAL gmp-none mpfr-none
+
+  The erroneous references to gmp/mpfr library can be directly removed
+  from the wmake/rules/General/CGAL, but it is more advisable to
+  override them instead in the wmake/rules/darwin64Clang/CGAL file.
+
 --

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

applications/solvers/multiphase/MPPICInterFoam/correctPhi.H

@@ -8,4 +8,4 @@ CorrectPhi
     pimple
 );
 
-#include "continuityErrs.H"
+#include "continuityErrs.H"

applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.H

@@ -56,11 +56,11 @@ class VoFPatchTransfer
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        VoFPatchTransfer(const VoFPatchTransfer&);
+        VoFPatchTransfer(const VoFPatchTransfer&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const VoFPatchTransfer&);
+        void operator=(const VoFPatchTransfer&) = delete;
 
 
 protected:

applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H

@@ -135,11 +135,14 @@ class VoFSolidificationMeltingSource
         template<class RhoFieldType>
         void apply(const RhoFieldType& rho, fvMatrix<scalar>& eqn);
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        VoFSolidificationMeltingSource(const VoFSolidificationMeltingSource&);
+        VoFSolidificationMeltingSource
+        (
+            const VoFSolidificationMeltingSource&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const VoFSolidificationMeltingSource&);
+        void operator=(const VoFSolidificationMeltingSource&) = delete;
 
 
 public:

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

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

applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.H

@@ -55,11 +55,11 @@ class relativeVelocityModel
         //- Return the list of patchFieldTypes for Udm derived from U
         wordList UdmPatchFieldTypes() const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        relativeVelocityModel(const relativeVelocityModel&);
+        relativeVelocityModel(const relativeVelocityModel&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const relativeVelocityModel&);
+        void operator=(const relativeVelocityModel&) = delete;
 
 
 protected:

applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.H

@@ -68,14 +68,14 @@ protected:
 
     // Private Member Functions
 
-        //- Disallow copy construct
+        //- No copy construct
         temperaturePhaseChangeTwoPhaseMixture
         (
             const temperaturePhaseChangeTwoPhaseMixture&
-        );
+        ) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const temperaturePhaseChangeTwoPhaseMixture&);
+        void operator=(const temperaturePhaseChangeTwoPhaseMixture&) = delete;
 
 
 public:

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

@@ -73,9 +73,15 @@ class threePhaseInterfaceProperties
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
+        //- No copy construct
-        threePhaseInterfaceProperties(const threePhaseInterfaceProperties&);
+        threePhaseInterfaceProperties
-        void operator=(const threePhaseInterfaceProperties&);
+        (
+            const threePhaseInterfaceProperties&
+        ) = delete;
+
+        //- No copy assignment
+        void operator=(const threePhaseInterfaceProperties&) = delete;
+
 
         //- Correction for the boundary condition on the unit normal nHat on
         //  walls to produce the correct contact dynamic angle.

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

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

applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H

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

applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H

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

applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H

@@ -78,11 +78,14 @@ class BlendedInterfacialModel
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        BlendedInterfacialModel(const BlendedInterfacialModel<ModelType>&);
+        BlendedInterfacialModel
+        (
+            const BlendedInterfacialModel&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const BlendedInterfacialModel<ModelType>&);
+        void operator=(const BlendedInterfacialModel<ModelType>&) = delete;
 
         //- Correct coeff/value on fixed flux boundary conditions
         template<class GeometricField>

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H

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

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H

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

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H

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

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H

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

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H

@@ -52,11 +52,11 @@ class conductivityModel
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        conductivityModel(const conductivityModel&);
+        conductivityModel(const conductivityModel&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const conductivityModel&);
+        void operator=(const conductivityModel&) = delete;
 
 
 protected:

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H

@@ -53,11 +53,11 @@ class frictionalStressModel
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        frictionalStressModel(const frictionalStressModel&);
+        frictionalStressModel(const frictionalStressModel&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const frictionalStressModel&);
+        void operator=(const frictionalStressModel&) = delete;
 
 
 protected:

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H

@@ -52,11 +52,11 @@ class granularPressureModel
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        granularPressureModel(const granularPressureModel&);
+        granularPressureModel(const granularPressureModel&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const granularPressureModel&);
+        void operator=(const granularPressureModel&) = delete;
 
 
 protected:

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H

@@ -147,11 +147,11 @@ class kineticTheoryModel
         void correctNut()
         {}
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        kineticTheoryModel(const kineticTheoryModel&);
+        kineticTheoryModel(const kineticTheoryModel&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const kineticTheoryModel&);
+        void operator=(const kineticTheoryModel&) = delete;
 
 
 public:

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H

@@ -52,11 +52,11 @@ class radialModel
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        radialModel(const radialModel&);
+        radialModel(const radialModel&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const radialModel&);
+        void operator=(const radialModel&) = delete;
 
 
 protected:

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H

@@ -54,11 +54,11 @@ class viscosityModel
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        viscosityModel(const viscosityModel&);
+        viscosityModel(const viscosityModel&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const viscosityModel&);
+        void operator=(const viscosityModel&) = delete;
 
 
 protected:

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H

@@ -102,11 +102,11 @@ class phasePressureModel
         void correctNut()
         {}
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        phasePressureModel(const phasePressureModel&);
+        phasePressureModel(const phasePressureModel&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const phasePressureModel&);
+        void operator=(const phasePressureModel&) = delete;
 
 
 public:

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H

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

applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H

@@ -52,11 +52,11 @@ class conductivityModel
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        conductivityModel(const conductivityModel&);
+        conductivityModel(const conductivityModel&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const conductivityModel&);
+        void operator=(const conductivityModel&) = delete;
 
 
 protected:

applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H

@@ -53,11 +53,11 @@ class frictionalStressModel
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        frictionalStressModel(const frictionalStressModel&);
+        frictionalStressModel(const frictionalStressModel&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const frictionalStressModel&);
+        void operator=(const frictionalStressModel&) = delete;
 
 
 protected:

applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H

@@ -52,11 +52,11 @@ class granularPressureModel
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        granularPressureModel(const granularPressureModel&);
+        granularPressureModel(const granularPressureModel&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const granularPressureModel&);
+        void operator=(const granularPressureModel&) = delete;
 
 
 protected:

applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H

@@ -147,11 +147,11 @@ class kineticTheoryModel
         void correctNut()
         {}
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        kineticTheoryModel(const kineticTheoryModel&);
+        kineticTheoryModel(const kineticTheoryModel&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const kineticTheoryModel&);
+        void operator=(const kineticTheoryModel&) = delete;
 
 
 public:

applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H

@@ -52,11 +52,11 @@ class radialModel
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        radialModel(const radialModel&);
+        radialModel(const radialModel&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const radialModel&);
+        void operator=(const radialModel&) = delete;
 
 
 protected:

applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H

@@ -54,11 +54,11 @@ class viscosityModel
 {
     // Private member functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        viscosityModel(const viscosityModel&);
+        viscosityModel(const viscosityModel&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const viscosityModel&);
+        void operator=(const viscosityModel&) = delete;
 
 
 protected:

applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H

@@ -106,11 +106,11 @@ class phasePressureModel
         void correctNut()
         {}
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        phasePressureModel(const phasePressureModel&);
+        phasePressureModel(const phasePressureModel&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const phasePressureModel&);
+        void operator=(const phasePressureModel&) = delete;
 
 
 public:

applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H

@@ -81,11 +81,14 @@ class BlendedInterfacialModel
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        BlendedInterfacialModel(const BlendedInterfacialModel<modelType>&);
+        BlendedInterfacialModel
+        (
+            const BlendedInterfacialModel&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const BlendedInterfacialModel<modelType>&);
+        void operator=(const BlendedInterfacialModel<modelType>&) = delete;
 
         //- Correct coeff/value on fixed flux boundary conditions
         template<class GeometricField>

applications/test/HashSet/Test-hashSet.C

@@ -188,10 +188,10 @@ int main(int argc, char *argv[])
     Info<< "setB : " << setB << endl;
 
     labelPair pair(12, 15);
-    setB.setMany(pair);
+    setB.set(pair);
 
     Info<< "setB : " << setB << endl;
-    setB.unsetMany(pair);
+    setB.unset(pair);
 
 
     labelHashSet setC(1);
@@ -257,7 +257,7 @@ int main(int argc, char *argv[])
         someLst[elemI] = elemI*elemI;
     }
 
-    label added = setD.setMany(someLst);
+    label added = setD.set(someLst);
     Info<< "added " << added << " from " << someLst.size() << endl;
     Info<< "setD : " << flatOutput(setD) << endl;
 

applications/test/bitSet2/Test-bitSet2.C

@@ -294,7 +294,7 @@ int main(int argc, char *argv[])
 
     Info<< "\nclear/assign from labelList\n";
     list4.clear();
-    list4.setMany(labelList{0, 1, 2, 3, 12, 13, 14, 19, 20, 21});
+    list4.set(labelList{0, 1, 2, 3, 12, 13, 14, 19, 20, 21});
 
     report(list4, true);
 

applications/test/dictionaryTokens/dictionaryTokens.H

@@ -113,8 +113,10 @@ private:
 
     // Private Member Functions
 
-        //- Disallow bitwise copy/assignment
+        //- No copy construct
         dictionaryTokens(const dictionaryTokens&) = delete;
+
+        //- No copy assignment
         void operator=(const dictionaryTokens&) = delete;
 
 
@@ -181,8 +183,10 @@ class dictionaryTokens::primitive_iterator
 
     // Private Member Functions
 
-        //- Disallow bitwise copy/assignment
+        //- No copy construct
         primitive_iterator(const primitive_iterator&) = delete;
+
+        //- No copy assignment
         void operator=(const primitive_iterator&) = delete;
 
 public:
@@ -251,8 +255,10 @@ class dictionaryTokens::dictionary_iterator
 
     // Private Member Functions
 
-        //- Disallow bitwise copy/assignment
+        //- No copy construct
         dictionary_iterator(const dictionary_iterator&) = delete;
+
+        //- No copy assignment
         void operator=(const dictionary_iterator&) = delete;
 
 

applications/test/edges/Test-edges.C

@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
     e4.start() = e4.end() = -1;
     Info<< "insert from list\n";
     labelHashSet newIndices({2, -1, 2, 1, 4, 1, 2, 3});
-    e4.insertMany(newIndices.toc());
+    e4.insert(newIndices.toc());
     printInfo(e4);
 
     e4.start() = e4.end() = -1;
@@ -105,12 +105,12 @@ int main(int argc, char *argv[])
     FixedList<label, 8> otherIndices{12, 2, -1, 1, 4, 1, 2, 3};
     e4.start() = e4.end() = -1;
     Info<< "insert from list: " << otherIndices << nl;
-    e4.insertMany(otherIndices);
+    e4.insert(otherIndices);
     printInfo(e4);
 
     e4.start() = e4.end();
     Info<< "erase from list: " << otherIndices << nl;
-    Info<< "removed " << e4.eraseMany(otherIndices) << " values" << nl;
+    Info<< "removed " << e4.erase(otherIndices) << " values" << nl;
     printInfo(e4);
 
     for (label i : {-1, 0, 1, 3})

applications/test/router/router.H

@@ -159,11 +159,11 @@ class router
             DynamicList<label>& route
         ) const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        router(const router&);
+        router(const router&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const router&);
+        void operator=(const router&) = delete;
 
 
 public:

applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C

@@ -374,7 +374,7 @@ void Foam::cellSplitter::setRefinement
 
         const cell& cFaces = mesh_.cells()[celli];
 
-        faceUpToDate.unsetMany(cFaces);
+        faceUpToDate.unset(cFaces);
     }
 
     forAll(faceUpToDate, facei)

applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H

@@ -91,11 +91,11 @@ class cellSplitter
             const Map<labelList>& cellToCells
         ) const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        cellSplitter(const cellSplitter&);
+        cellSplitter(const cellSplitter&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const cellSplitter&);
+        void operator=(const cellSplitter&) = delete;
 
 public:
 

applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C

@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
         {
             const labelList& pCells = mesh.pointCells()[meshPointi];
 
-            cutCells.insertMany(pCells);
+            cutCells.insert(pCells);
         }
     }
 
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
         const polyPatch& pp = mesh.boundaryMesh()[patchi];
         const labelList& meshPoints = pp.meshPoints();
 
-        vertOnPatch.setMany(meshPoints);
+        vertOnPatch.set(meshPoints);
     }
 
     for (const label patchi : patchSet)

applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C

@@ -184,7 +184,7 @@ int main(int argc, char *argv[])
         const DynamicList<label>& bin = bins[binI];
 
         cellSet cells(mesh, "vol" + name(binI), bin.size());
-        cells.insertMany(bin);
+        cells.insert(bin);
 
         Info<< "    " << lowerLimits[binI] << " .. " << upperLimits[binI]
             << "  : writing " << bin.size() << " cells to cellSet "

applications/utilities/mesh/advanced/selectCells/edgeStats.H

@@ -68,11 +68,11 @@ class edgeStats
         direction getNormalDir(const twoDPointCorrector*) const;
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        edgeStats(const edgeStats&);
+        edgeStats(const edgeStats&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const edgeStats&);
+        void operator=(const edgeStats&) = delete;
 
 
 public:

applications/utilities/mesh/advanced/splitCells/splitCells.C

@@ -633,7 +633,7 @@ int main(int argc, char *argv[])
         );
 
         cellSet cutSet(mesh, "cutSet", cutCells.size());
-        cutSet.insertMany(cutCells);
+        cutSet.insert(cutCells);
 
         // Gets cuts across cells from cuts through edges.
         Info<< "Writing " << cutSet.size() << " cells to cut to cellSet "

applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.H

@@ -74,11 +74,11 @@ class hexBlock
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        hexBlock(const hexBlock&);
+        hexBlock(const hexBlock&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const hexBlock&);
+        void operator=(const hexBlock&) = delete;
 
         //- Vertex addressing inside the block
         inline label vtxLabel(label i, label j, label k) const;

applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C

@@ -961,7 +961,7 @@ int main(int argc, char *argv[])
         forAll(dofVertIndices, patchi)
         {
             const labelList& foamVerts = dofVertIndices[patchi];
-            dofGroups[patchi].insertMany(foamVerts);
+            dofGroups[patchi].insert(foamVerts);
         }
 
         List<DynamicList<face>> dynPatchFaces(dofVertIndices.size());

applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.H

@@ -67,11 +67,11 @@ class hexBlock
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        hexBlock(const hexBlock&);
+        hexBlock(const hexBlock&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const hexBlock&);
+        void operator=(const hexBlock&) = delete;
 
         //- Vertex addressing inside the block
         inline label vtxLabel(label i, label j, label k) const;

applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C

@@ -344,7 +344,7 @@ void writePointCells
     {
         const labelList& cEdges = mesh.cellEdges()[pCells[i]];
 
-        allEdges.insertMany(cEdges);
+        allEdges.insert(cEdges);
     }
 
 

applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C

@@ -795,7 +795,7 @@ int main(int argc, char *argv[])
             forAll(addedCells, facei)
             {
                 const labelList& aCells = addedCells[facei];
-                addedCellsSet.insertMany(aCells);
+                addedCellsSet.insert(aCells);
             }
         }
     }

applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.H

@@ -86,10 +86,10 @@ class extrudedMesh
         );
 
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
         extrudedMesh(const extrudedMesh&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
         void operator=(const extrudedMesh&) = delete;
 
 

applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C

@@ -527,7 +527,7 @@ label findUncoveredPatchFace
 {
     // Make set of extruded faces.
     labelHashSet extrudeFaceSet(extrudeMeshFaces.size());
-    extrudeFaceSet.insertMany(extrudeMeshFaces);
+    extrudeFaceSet.insert(extrudeMeshFaces);
 
     const polyBoundaryMesh& pbm = mesh.boundaryMesh();
     const labelList& eFaces = mesh.edgeFaces()[meshEdgeI];
@@ -561,7 +561,7 @@ label findUncoveredCyclicPatchFace
 {
     // Make set of extruded faces.
     labelHashSet extrudeFaceSet(extrudeMeshFaces.size());
-    extrudeFaceSet.insertMany(extrudeMeshFaces);
+    extrudeFaceSet.insert(extrudeMeshFaces);
 
     const polyBoundaryMesh& pbm = mesh.boundaryMesh();
     const labelList& eFaces = mesh.edgeFaces()[meshEdgeI];

applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H

@@ -87,11 +87,11 @@ class extrude2DMesh
         //- Find extrusion direction
         //void findExtrudeDirection();
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        extrude2DMesh(const extrude2DMesh&);
+        extrude2DMesh(const extrude2DMesh&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const extrude2DMesh&);
+        void operator=(const extrude2DMesh&) = delete;
 
 public:
 

applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/patchToPoly2DMesh/patchToPoly2DMesh.H

@@ -85,11 +85,11 @@ class patchToPoly2DMesh
 
         void createPolyMeshComponents();
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        patchToPoly2DMesh(const patchToPoly2DMesh&);
+        patchToPoly2DMesh(const patchToPoly2DMesh&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const patchToPoly2DMesh&);
+        void operator=(const patchToPoly2DMesh&) = delete;
 
 
 public:

applications/utilities/mesh/generation/foamyMesh/conformalVoronoi2DMesh/cv2DControls/cv2DControls.H

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

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H

@@ -142,11 +142,11 @@ private:
             const List<DynamicList<label>>& patchOwners
         ) const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        DelaunayMesh(const DelaunayMesh<Triangulation>&);
+        DelaunayMesh(const DelaunayMesh<Triangulation>&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const DelaunayMesh<Triangulation>&);
+        void operator=(const DelaunayMesh<Triangulation>&) = delete;
 
 
 public:

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H

@@ -119,11 +119,14 @@ private:
             labelPairHashSet& receivedVertices
         );
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        DistributedDelaunayMesh(const DistributedDelaunayMesh<Triangulation>&);
+        DistributedDelaunayMesh
+        (
+            const DistributedDelaunayMesh&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const DistributedDelaunayMesh<Triangulation>&);
+        void operator=(const DistributedDelaunayMesh<Triangulation>&) = delete;
 
 
 public:

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.C

@@ -193,22 +193,4 @@ void Foam::PrintTable<KeyType, DataType>::print
 }
 
 
-// * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
-
-template<class KeyType, class DataType>
-void Foam::PrintTable<KeyType, DataType>::operator=
-(
-    const PrintTable<KeyType, DataType>& rhs
-)
-{
-    // Check for assignment to self
-    if (this == &rhs)
-    {
-        FatalErrorInFunction
-            << "Attempted assignment to self"
-            << abort(FatalError);
-    }
-}
-
-
 // ************************************************************************* //

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.H

@@ -82,8 +82,8 @@ class PrintTable
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const PrintTable<KeyType, DataType>&);
+        void operator=(const PrintTable<KeyType, DataType>&) = delete;
 
 
 public:
@@ -107,7 +107,7 @@ public:
     // Member Functions
 
         //- Add an entry (D) to the given key(K)
-        void add(const KeyType& K, const DataType& D);
+        inline void add(const KeyType& K, const DataType& D);
 
         //- Print the table
         void print

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTableI.H

@@ -26,7 +26,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class KeyType, class DataType>
-void Foam::PrintTable<KeyType, DataType>::add
+inline void Foam::PrintTable<KeyType, DataType>::add
 (
     const KeyType& K,
     const DataType& D
@@ -35,8 +35,4 @@ void Foam::PrintTable<KeyType, DataType>::add
     table_.set(K, D);
 }
 
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
 // ************************************************************************* //

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H

@@ -177,11 +177,14 @@ class backgroundMeshDecomposition
         //- Build the surface patch and search tree
         void buildPatchAndTree();
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        backgroundMeshDecomposition(const backgroundMeshDecomposition&);
+        backgroundMeshDecomposition
+        (
+            const backgroundMeshDecomposition&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const backgroundMeshDecomposition&);
+        void operator=(const backgroundMeshDecomposition&) = delete;
 
 
 public:

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.H

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

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.H

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

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.H

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

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.H

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

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControls.H

@@ -68,11 +68,14 @@ class cellSizeAndAlignmentControls
             label& maxPriority
         ) const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        cellSizeAndAlignmentControls(const cellSizeAndAlignmentControls&);
+        cellSizeAndAlignmentControls
+        (
+            const cellSizeAndAlignmentControls&
+        ) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const cellSizeAndAlignmentControls&);
+        void operator=(const cellSizeAndAlignmentControls&) = delete;
 
 
 public:

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.H

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

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.H

@@ -88,11 +88,11 @@ class searchableSurfaceControl
 //            const vectorField& ptNormals
 //        ) const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        searchableSurfaceControl(const searchableSurfaceControl&);
+        searchableSurfaceControl(const searchableSurfaceControl&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const searchableSurfaceControl&);
+        void operator=(const searchableSurfaceControl&) = delete;
 
 
 public:

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.H

@@ -99,11 +99,11 @@ class controlMeshRefinement
 
         pointHit findDiscontinuities(const linePointRef& l) const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        controlMeshRefinement(const controlMeshRefinement&);
+        controlMeshRefinement(const controlMeshRefinement&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const controlMeshRefinement&);
+        void operator=(const controlMeshRefinement&) = delete;
 
 
 public:

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H

@@ -91,11 +91,11 @@ class smoothAlignmentSolver
             triad& t
         ) const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        smoothAlignmentSolver(const smoothAlignmentSolver&);
+        smoothAlignmentSolver(const smoothAlignmentSolver&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const smoothAlignmentSolver&);
+        void operator=(const smoothAlignmentSolver&) = delete;
 
 
 public:

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H

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

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/cellSizeCalculationType/cellSizeCalculationType.H

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

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/surfaceCellSizeFunction/surfaceCellSizeFunction.H

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

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H

@@ -850,11 +850,11 @@ private:
 
         void writePointPairs(const fileName& fName) const;
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        conformalVoronoiMesh(const conformalVoronoiMesh&);
+        conformalVoronoiMesh(const conformalVoronoiMesh&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const conformalVoronoiMesh&);
+        void operator=(const conformalVoronoiMesh&) = delete;
 
 
 public:

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C

@@ -1053,7 +1053,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
 
                 nInvalidPolyhedra++;
 
-                wrongFaces.insertMany(cells[cI]);
+                wrongFaces.insert(cells[cI]);
             }
         }
 
@@ -1093,7 +1093,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
             if (nInternalFaces[cI] <= 1)
             {
                 oneInternalFaceCells++;
-                wrongFaces.insertMany(cells[cI]);
+                wrongFaces.insert(cells[cI]);
             }
         }
 
@@ -1109,7 +1109,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
     {
         const face f = pMesh.faces()[facei];
 
-        ptToBeLimited.setMany(f);
+        ptToBeLimited.set(f);
     }
 
     // // Limit connected cells
@@ -1126,7 +1126,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
     //     {
     //         label ptI = f[fPtI];
     //         const labelList& pC = ptCells[ptI];
-    //         limitCells.insertMany(pC);
+    //         limitCells.insert(pC);
     //     }
     // }
 
@@ -1136,7 +1136,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
     // {
     //     const labelList& cP = cellPts[celli];
 
-    //     ptToBeLimited.setMany(cP);
+    //     ptToBeLimited.set(cP);
     // }
 
 
@@ -2542,7 +2542,7 @@ void Foam::conformalVoronoiMesh::removeUnusedPoints
     {
         const face& f = faces[fI];
 
-        ptUsed.setMany(f);
+        ptUsed.set(f);
     }
 
     label pointi = 0;
@@ -2592,8 +2592,8 @@ Foam::labelList Foam::conformalVoronoiMesh::removeUnusedCells
 
     // Scan all faces to find all of the cells that are used
 
-    cellUsed.setMany(owner);
+    cellUsed.set(owner);
-    cellUsed.setMany(neighbour);
+    cellUsed.set(neighbour);
 
     label celli = 0;
 

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C

@@ -1351,7 +1351,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::findRemainingProtrusionSet
     for (const label pointi : protrudingBoundaryPoints)
     {
         const labelList& pCells = mesh.pointCells()[pointi];
-        protrudingCells.insertMany(pCells);
+        protrudingCells.insert(pCells);
     }
 
     label protrudingCellsSize = protrudingCells.size();

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H

@@ -133,11 +133,11 @@ class featurePointConformer
         //- Create the points that will conform to the feature
         void createFeaturePoints(DynamicList<Vb>& pts);
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        featurePointConformer(const featurePointConformer&);
+        featurePointConformer(const featurePointConformer&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const featurePointConformer&);
+        void operator=(const featurePointConformer&) = delete;
 
 
 public:

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H

@@ -125,11 +125,11 @@ class conformationSurfaces
             label& featureIndex
         );
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        conformationSurfaces(const conformationSurfaces&);
+        conformationSurfaces(const conformationSurfaces&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const conformationSurfaces&);
+        void operator=(const conformationSurfaces&) = delete;
 
 
 public:

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cvControls/cvControls.H

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

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/faceAreaWeightModel/faceAreaWeightModel/faceAreaWeightModel.H

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

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H

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

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/relaxationModel/relaxationModel.H

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

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.H

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

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchablePlateFeatures.H

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

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableSurfaceFeatures.H

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

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/triSurfaceMeshFeatures.H

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