diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H index 14c0732983..142370e64d 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H @@ -92,15 +92,6 @@ class basicSubGrid autoPtr XiEqModel_; - // Private Member Functions - - //- Disallow default bitwise copy construction - basicSubGrid(const basicSubGrid&); - - //- Disallow default bitwise assignment - void operator=(const basicSubGrid&) = delete; - - public: //- Runtime type information @@ -118,6 +109,9 @@ public: const volScalarField& Su ); + //- Disallow default bitwise copy construction + basicSubGrid(const basicSubGrid&); + //- Destructor virtual ~basicSubGrid(); @@ -130,6 +124,12 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& XiEqProperties); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const basicSubGrid&) = delete; }; diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H index 52de3bc7ce..0610b6148d 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H @@ -80,15 +80,6 @@ class basicSubGrid autoPtr XiGModel_; - // Private Member Functions - - //- Disallow default bitwise copy construction - basicSubGrid(const basicSubGrid&); - - //- Disallow default bitwise assignment - void operator=(const basicSubGrid&) = delete; - - public: //- Runtime type information @@ -106,6 +97,9 @@ public: const volScalarField& Su ); + //- Disallow default bitwise copy construction + basicSubGrid(const basicSubGrid&); + //- Destructor virtual ~basicSubGrid(); @@ -121,6 +115,12 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& XiGProperties); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const basicSubGrid&) = delete; }; diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H index 5a9b28686f..2302b96e43 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H @@ -70,17 +70,6 @@ protected: Switch on_; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - PDRDragModel(const PDRDragModel&); - - //- Disallow default bitwise assignment - void operator=(const PDRDragModel&) = delete; - - public: //- Runtime type information @@ -111,10 +100,10 @@ public: ); - // Selectors + // Constructors - //- Return a reference to the selected Xi model - static autoPtr New + //- Construct from components + PDRDragModel ( const dictionary& PDRProperties, const compressible::RASModel& turbulence, @@ -123,11 +112,14 @@ public: const surfaceScalarField& phi ); + //- Disallow default bitwise copy construction + PDRDragModel(const PDRDragModel&); - // Constructors - //- Construct from components - PDRDragModel + // Selectors + + //- Return a reference to the selected Xi model + static autoPtr New ( const dictionary& PDRProperties, const compressible::RASModel& turbulence, @@ -170,6 +162,12 @@ public: { NotImplemented; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const PDRDragModel&) = delete; }; diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H index 11bd6af409..1a9508d0bd 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H @@ -106,15 +106,6 @@ class basic volSymmTensorField CR_; - // Private Member Functions - - //- Disallow default bitwise copy construction - basic(const basic&); - - //- Disallow default bitwise assignment - void operator=(const basic&) = delete; - - public: //- Runtime type information @@ -133,6 +124,9 @@ public: const surfaceScalarField& phi ); + //- Disallow default bitwise copy construction + basic(const basic&); + //- Destructor virtual ~basic(); @@ -151,6 +145,12 @@ public: //- Write fields void writeFields() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const basic&) = delete; }; diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H index 5bcffe1de2..dc696cf1b4 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H @@ -68,15 +68,6 @@ class Gulder bool subGridSchelkin_; - // Private Member Functions - - //- Disallow default bitwise copy construction - Gulder(const Gulder&); - - //- Disallow default bitwise assignment - void operator=(const Gulder&) = delete; - - public: //- Runtime type information @@ -94,6 +85,9 @@ public: const volScalarField& Su ); + //- Disallow default bitwise copy construction + Gulder(const Gulder&); + //- Destructor virtual ~Gulder(); @@ -107,6 +101,11 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& XiEqProperties); + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const Gulder&) = delete; }; diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H index 6a19cc68e5..a457aa5a0d 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H @@ -64,15 +64,6 @@ class SCOPEBlend autoPtr XiEqModelH_; - // Private Member Functions - - //- Disallow default bitwise copy construction - SCOPEBlend(const SCOPEBlend&); - - //- Disallow default bitwise assignment - void operator=(const SCOPEBlend&) = delete; - - public: //- Runtime type information @@ -90,6 +81,9 @@ public: const volScalarField& Su ); + //- Disallow default bitwise copy construction + SCOPEBlend(const SCOPEBlend&); + //- Destructor virtual ~SCOPEBlend(); @@ -106,6 +100,11 @@ public: return true; } + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const SCOPEBlend&) = delete; }; diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H index 01c40e7c08..e6ada0b683 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H @@ -82,15 +82,6 @@ class SCOPEXiEq laminarFlameSpeedModels::SCOPE MaModel; - // Private Member Functions - - //- Disallow default bitwise copy construction - SCOPEXiEq(const SCOPEXiEq&); - - //- Disallow default bitwise assignment - void operator=(const SCOPEXiEq&) = delete; - - public: //- Runtime type information @@ -108,6 +99,9 @@ public: const volScalarField& Su ); + //- Disallow default bitwise copy construction + SCOPEXiEq(const SCOPEXiEq&); + //- Destructor virtual ~SCOPEXiEq(); @@ -120,6 +114,12 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& XiEqProperties); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const SCOPEXiEq&) = delete; }; diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H index e092e06c45..0d8a3afcbb 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H @@ -75,17 +75,6 @@ protected: const volScalarField& Su_; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - XiEqModel(const XiEqModel&); - - //- Disallow default bitwise assignment - void operator=(const XiEqModel&) = delete; - - public: //- Runtime type information @@ -114,10 +103,10 @@ public: ); - // Selectors + // Constructors - //- Return a reference to the selected XiEq model - static autoPtr New + //- Construct from components + XiEqModel ( const dictionary& XiEqProperties, const psiuReactionThermo& thermo, @@ -125,11 +114,14 @@ public: const volScalarField& Su ); + //- Disallow default bitwise copy construction + XiEqModel(const XiEqModel&); - // Constructors - //- Construct from components - XiEqModel + // Selectors + + //- Return a reference to the selected XiEq model + static autoPtr New ( const dictionary& XiEqProperties, const psiuReactionThermo& thermo, @@ -158,6 +150,12 @@ public: //- Write fields void writeFields() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const XiEqModel&) = delete; }; diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H index eea0ccdf7c..7399ea6e8d 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H @@ -63,15 +63,6 @@ class instability autoPtr XiEqModel_; - // Private Member Functions - - //- Disallow default bitwise copy construction - instability(const instability&); - - //- Disallow default bitwise assignment - void operator=(const instability&) = delete; - - public: //- Runtime type information @@ -89,6 +80,9 @@ public: const volScalarField& Su ); + //- Disallow default bitwise copy construction + instability(const instability&); + //- Destructor virtual ~instability(); @@ -102,6 +96,11 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& XiEqProperties); + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const instability&) = delete; }; diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H index 1241155ae1..1a05f7e5c1 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H @@ -58,15 +58,6 @@ class KTS scalar GEtaCoef_; - // Private Member Functions - - //- Disallow default bitwise copy construction - KTS(const KTS&); - - //- Disallow default bitwise assignment - void operator=(const KTS&) = delete; - - public: //- Runtime type information @@ -84,6 +75,9 @@ public: const volScalarField& Su ); + //- Disallow default bitwise copy construction + KTS(const KTS&); + //- Destructor virtual ~KTS(); @@ -96,6 +90,12 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& XiGProperties); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const KTS&) = delete; }; diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H index 2680a60d93..bd398aa991 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H @@ -66,17 +66,6 @@ protected: const volScalarField& Su_; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - XiGModel(const XiGModel&); - - //- Disallow default bitwise assignment - void operator=(const XiGModel&) = delete; - - public: //- Runtime type information @@ -105,10 +94,10 @@ public: ); - // Selectors + // Constructors - //- Return a reference to the selected XiG model - static autoPtr New + //- Construct from components + XiGModel ( const dictionary& XiGProperties, const psiuReactionThermo& thermo, @@ -116,11 +105,14 @@ public: const volScalarField& Su ); + //- Disallow default bitwise copy construction + XiGModel(const XiGModel&); - // Constructors - //- Construct from components - XiGModel + // Selectors + + //- Return a reference to the selected XiG model + static autoPtr New ( const dictionary& XiGProperties, const psiuReactionThermo& thermo, @@ -146,6 +138,12 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& XiGProperties) = 0; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const XiGModel&) = delete; }; diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H index 7adc64378c..67a85fdac1 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H @@ -67,15 +67,6 @@ class instabilityG autoPtr XiGModel_; - // Private Member Functions - - //- Disallow default bitwise copy construction - instabilityG(const instabilityG&); - - //- Disallow default bitwise assignment - void operator=(const instabilityG&) = delete; - - public: //- Runtime type information @@ -93,6 +84,9 @@ public: const volScalarField& Su ); + //- Disallow default bitwise copy construction + instabilityG(const instabilityG&); + //- Destructor virtual ~instabilityG(); @@ -108,6 +102,12 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& XiGProperties); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const instabilityG&) = delete; }; diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H index 85adb1ef7a..d0e3381dd3 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H @@ -126,17 +126,6 @@ protected: volScalarField Xi_; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - XiModel(const XiModel&); - - //- Disallow default bitwise assignment - void operator=(const XiModel&) = delete; - - public: //- Runtime type information @@ -171,10 +160,10 @@ public: ); - // Selectors + // Constructors - //- Return a reference to the selected Xi model - static autoPtr New + //- Construct from components + XiModel ( const dictionary& XiProperties, const psiuReactionThermo& thermo, @@ -185,11 +174,14 @@ public: const surfaceScalarField& phi ); + //- Disallow default bitwise copy construction + XiModel(const XiModel&); - // Constructors - //- Construct from components - XiModel + // Selectors + + //- Return a reference to the selected Xi model + static autoPtr New ( const dictionary& XiProperties, const psiuReactionThermo& thermo, @@ -241,6 +233,12 @@ public: //- Write fields related to Xi model virtual void writeFields() = 0; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const XiModel&) = delete; }; diff --git a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H index 96fb49960a..ec23e5dc31 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H @@ -65,15 +65,6 @@ class algebraic autoPtr XiGModel_; - // Private Member Functions - - //- Disallow default bitwise copy construction - algebraic(const algebraic&); - - //- Disallow default bitwise assignment - void operator=(const algebraic&) = delete; - - public: //- Runtime type information @@ -94,6 +85,9 @@ public: const surfaceScalarField& phi ); + //- Disallow default bitwise copy construction + algebraic(const algebraic&); + //- Destructor virtual ~algebraic(); @@ -116,6 +110,11 @@ public: XiEqModel_().writeFields(); } + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const algebraic&) = delete; }; diff --git a/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H b/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H index 2f48e28289..611aeb488c 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H @@ -53,15 +53,6 @@ class fixed : public XiModel { - // Private Member Functions - - //- Disallow default bitwise copy construction - fixed(const fixed&); - - //- Disallow default bitwise assignment - void operator=(const fixed&) = delete; - - public: //- Runtime type information @@ -82,6 +73,9 @@ public: const surfaceScalarField& phi ); + //- Disallow default bitwise copy construction + fixed(const fixed&); + //- Destructor virtual ~fixed(); @@ -100,6 +94,11 @@ public: virtual void writeFields() {} + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const fixed&) = delete; }; diff --git a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H index c1dae23fad..96d521d5b1 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H @@ -65,15 +65,6 @@ class transport autoPtr XiGModel_; - // Private Member Functions - - //- Disallow default bitwise copy construction - transport(const transport&); - - //- Disallow default bitwise assignment - void operator=(const transport&) = delete; - - public: //- Runtime type information @@ -94,6 +85,9 @@ public: const surfaceScalarField& phi ); + //- Disallow default bitwise copy construction + transport(const transport&); + //- Destructor virtual ~transport(); @@ -130,6 +124,12 @@ public: { XiEqModel_().writeFields(); } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const transport&) = delete; }; diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.H b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.H index 92cf6e9cee..cf724d5cb4 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.H +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.H @@ -96,18 +96,6 @@ class compressibleInterPhaseTransportModel > turbulence2_; - // Private Member Functions - - //- Disallow default bitwise copy construction - compressibleInterPhaseTransportModel - ( - const compressibleInterPhaseTransportModel& - ); - - //- Disallow default bitwise assignment - void operator=(const compressibleInterPhaseTransportModel&) = delete; - - public: // Constructors @@ -123,6 +111,12 @@ public: const twoPhaseMixtureThermo& mixture ); + //- Disallow default bitwise copy construction + compressibleInterPhaseTransportModel + ( + const compressibleInterPhaseTransportModel& + ); + // Member Functions @@ -138,6 +132,12 @@ public: //- Correct the phase or mixture transport models void correct(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const compressibleInterPhaseTransportModel&) = delete; }; diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.H index 81bec83263..b6cca0afc5 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.H +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.H @@ -54,15 +54,6 @@ class VoFPatchTransfer : public transferModel { - // Private Member Functions - - //- Disallow default bitwise copy construction - VoFPatchTransfer(const VoFPatchTransfer&) = delete; - - //- Disallow default bitwise assignment - void operator=(const VoFPatchTransfer&) = delete; - - protected: //- Factor of the cell height above which the film is transferred @@ -100,6 +91,9 @@ public: //- Construct from surface film model VoFPatchTransfer(surfaceFilmRegionModel& film, const dictionary& dict); + //- Disallow default bitwise copy construction + VoFPatchTransfer(const VoFPatchTransfer&) = delete; + //- Destructor virtual ~VoFPatchTransfer(); @@ -128,6 +122,12 @@ public: ( scalarField& patchMasses ) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const VoFPatchTransfer&) = delete; }; diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H index e7b2e77bae..9ac273b862 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H @@ -135,15 +135,6 @@ class VoFSolidificationMeltingSource template void apply(const RhoFieldType& rho, fvMatrix& eqn); - //- Disallow default bitwise copy construction - VoFSolidificationMeltingSource - ( - const VoFSolidificationMeltingSource& - ) = delete; - - //- Disallow default bitwise assignment - void operator=(const VoFSolidificationMeltingSource&) = delete; - public: @@ -162,6 +153,12 @@ public: const fvMesh& mesh ); + //- Disallow default bitwise copy construction + VoFSolidificationMeltingSource + ( + const VoFSolidificationMeltingSource& + ) = delete; + // Member Functions @@ -197,6 +194,12 @@ public: //- Read source dictionary virtual bool read(const dictionary& dict); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const VoFSolidificationMeltingSource&) = delete; }; diff --git a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModel.H b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModel.H index 46b86899a8..2c2be2c30f 100644 --- a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModel.H +++ b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModel.H @@ -71,15 +71,6 @@ protected: const surfaceScalarField& phi_; - // Private Member Functions - - //- Disallow default bitwise copy construction - mixtureViscosityModel(const mixtureViscosityModel&); - - //- Disallow default bitwise assignment - void operator=(const mixtureViscosityModel&) = delete; - - public: //- Runtime type information @@ -103,10 +94,10 @@ public: ); - // Selectors + // Constructors - //- Return a reference to the selected viscosity model - static autoPtr New + //- Construct from components + mixtureViscosityModel ( const word& name, const dictionary& viscosityProperties, @@ -114,11 +105,14 @@ public: const surfaceScalarField& phi ); + //- Disallow default bitwise copy construction + mixtureViscosityModel(const mixtureViscosityModel&); - // Constructors - //- Construct from components - mixtureViscosityModel + // Selectors + + //- Return a reference to the selected viscosity model + static autoPtr New ( const word& name, const dictionary& viscosityProperties, @@ -146,6 +140,12 @@ public: //- Read transportProperties dictionary virtual bool read(const dictionary& viscosityProperties) = 0; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const mixtureViscosityModel&) = delete; }; diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.H b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.H index ff5f11fc49..35f3eabace 100644 --- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.H +++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.H @@ -55,12 +55,6 @@ class relativeVelocityModel //- Return the list of patchFieldTypes for Udm derived from U wordList UdmPatchFieldTypes() const; - //- Disallow default bitwise copy construction - relativeVelocityModel(const relativeVelocityModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const relativeVelocityModel&) = delete; - protected: @@ -114,6 +108,9 @@ public: const incompressibleTwoPhaseInteractingMixture& mixture ); + //- Disallow default bitwise copy construction + relativeVelocityModel(const relativeVelocityModel&) = delete; + // Selector static autoPtr New @@ -149,6 +146,12 @@ public: //- Update the diffusion velocity virtual void correct() = 0; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const relativeVelocityModel&) = delete; }; diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H index ba1f6a5091..cd12c27039 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H @@ -56,7 +56,6 @@ class phaseChangeTwoPhaseMixture : public immiscibleIncompressibleTwoPhaseMixture { - protected: // Protected data @@ -67,15 +66,6 @@ protected: dimensionedScalar pSat_; - // Private Member Functions - - //- Disallow default bitwise copy construction - phaseChangeTwoPhaseMixture(const phaseChangeTwoPhaseMixture&); - - //- Disallow default bitwise assignment - void operator=(const phaseChangeTwoPhaseMixture&) = delete; - - public: //- Runtime type information @@ -97,16 +87,6 @@ public: ); - // Selectors - - //- Return a reference to the selected phaseChange model - static autoPtr New - ( - const volVectorField& U, - const surfaceScalarField& phi - ); - - // Constructors //- Construct from components @@ -117,6 +97,19 @@ public: const surfaceScalarField& phi ); + //- Disallow default bitwise copy construction + phaseChangeTwoPhaseMixture(const phaseChangeTwoPhaseMixture&); + + + // Selectors + + //- Return a reference to the selected phaseChange model + static autoPtr New + ( + const volVectorField& U, + const surfaceScalarField& phi + ); + //- Destructor virtual ~phaseChangeTwoPhaseMixture() @@ -154,6 +147,12 @@ public: //- Read the transportProperties dictionary and update virtual bool read() = 0; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const phaseChangeTwoPhaseMixture&) = delete; }; diff --git a/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H b/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H index 71bc1faaf1..b848745b91 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H @@ -55,15 +55,6 @@ namespace wallBoilingModels class departureDiameterModel { - // Private Member Functions - - //- Disallow default bitwise copy construction - departureDiameterModel(const departureDiameterModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const departureDiameterModel&) = delete; - - public: //- Runtime type information @@ -88,6 +79,9 @@ public: //- Construct null departureDiameterModel(); + //- Disallow default bitwise copy construction + departureDiameterModel(const departureDiameterModel&) = delete; + // Selectors @@ -113,6 +107,12 @@ public: ) const = 0; virtual void write(Ostream& os) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const departureDiameterModel&) = delete; }; diff --git a/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H b/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H index 865b96e8ff..9a093fe6c8 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H @@ -55,15 +55,6 @@ namespace wallBoilingModels class departureFrequencyModel { - // Private Member Functions - - //- Disallow default bitwise copy construction - departureFrequencyModel(const departureFrequencyModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const departureFrequencyModel&) = delete; - - public: //- Runtime type information @@ -88,6 +79,9 @@ public: //- Construct null departureFrequencyModel(); + //- Disallow default bitwise copy construction + departureFrequencyModel(const departureFrequencyModel&) = delete; + // Selectors @@ -111,6 +105,12 @@ public: ) const = 0; virtual void write(Ostream& os) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const departureFrequencyModel&) = delete; }; diff --git a/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H b/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H index 63976cc07e..31eafaaa1d 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H @@ -55,15 +55,6 @@ namespace wallBoilingModels class nucleationSiteModel { - // Private Member Functions - - //- Disallow default bitwise copy construction - nucleationSiteModel(const nucleationSiteModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const nucleationSiteModel&) = delete; - - public: //- Runtime type information @@ -88,6 +79,9 @@ public: //- Construct null nucleationSiteModel(); + //- Disallow default bitwise copy construction + nucleationSiteModel(const nucleationSiteModel&) = delete; + // Selectors @@ -113,6 +107,12 @@ public: ) const = 0; virtual void write(Ostream& os) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const nucleationSiteModel&) = delete; }; diff --git a/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H b/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H index 0a15e5c373..4add5badea 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H @@ -53,15 +53,6 @@ namespace wallBoilingModels class partitioningModel { - // Private Member Functions - - //- Disallow default bitwise copy construction - partitioningModel(const partitioningModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const partitioningModel&) = delete; - - public: //- Runtime type information @@ -86,6 +77,9 @@ public: //- Construct null partitioningModel(); + //- Disallow default bitwise copy construction + partitioningModel(const partitioningModel&) = delete; + // Selectors @@ -106,6 +100,12 @@ public: ) const = 0; virtual void write(Ostream& os) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const partitioningModel&) = delete; }; diff --git a/applications/solvers/multiphase/reactingEulerFoam/functionObjects/phaseForces/phaseForces.H b/applications/solvers/multiphase/reactingEulerFoam/functionObjects/phaseForces/phaseForces.H index 4f8bd8fba9..f51a32f331 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/functionObjects/phaseForces/phaseForces.H +++ b/applications/solvers/multiphase/reactingEulerFoam/functionObjects/phaseForces/phaseForces.H @@ -88,15 +88,6 @@ class phaseForces : public fvMeshFunctionObject { - // Private Member Functions - - //- Disallow default bitwise copy construction - phaseForces(const phaseForces&) = delete; - - //- Disallow default bitwise assignment - void operator=(const phaseForces&) = delete; - - protected: // Protected data @@ -133,6 +124,9 @@ public: const dictionary& ); + //- Disallow default bitwise copy construction + phaseForces(const phaseForces&) = delete; + //- Destructor virtual ~phaseForces(); @@ -148,6 +142,12 @@ public: //- Write the force fields virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const phaseForces&) = delete; }; diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H index 4a2e97c8eb..53a1c38c42 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H @@ -53,15 +53,6 @@ class saturationModel : public IOdictionary { - // Private Member Functions - - //- Disallow default bitwise copy construction - saturationModel(const saturationModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const saturationModel&) = delete; - - public: //- Runtime type information @@ -86,6 +77,9 @@ public: //- Construct null saturationModel(const objectRegistry& db); + //- Disallow default bitwise copy construction + saturationModel(const saturationModel&) = delete; + // Selectors @@ -126,6 +120,12 @@ public: ( const volScalarField& p ) const = 0; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const saturationModel&) = delete; }; diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H index 58cc17e30c..cc5b1cbdea 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H @@ -56,15 +56,6 @@ class wallDependentModel const fvMesh& mesh_; - // Private Member Functions - - //- Disallow default bitwise copy construction - wallDependentModel(const wallDependentModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const wallDependentModel&) = delete; - - public: // Constructors @@ -72,10 +63,14 @@ public: //- Construct from a mesh wallDependentModel(const fvMesh& mesh); + //- Disallow default bitwise copy construction + wallDependentModel(const wallDependentModel&) = delete; + //- Destructor virtual ~wallDependentModel(); + // Member Functions // Return the wall distance, creating and storing it if necessary @@ -83,6 +78,12 @@ public: // Return the wall normal, creating and storing it if necessary const volVectorField& nWall() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const wallDependentModel&) = delete; }; diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H index 3b1f1e4e29..ab112495ed 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H @@ -94,15 +94,6 @@ class BlendedInterfacialModel // Private Member Functions - //- Disallow default bitwise copy construction - BlendedInterfacialModel - ( - const BlendedInterfacialModel& - ) = delete; - - //- Disallow default bitwise assignment - void operator=(const BlendedInterfacialModel&) = delete; - //- Correct coeff/value on fixed flux boundary conditions template void correctFixedFluxBCs(GeoField& field) const; @@ -158,6 +149,12 @@ public: const bool correctFixedFluxBCs = true ); + //- Disallow default bitwise copy construction + BlendedInterfacialModel + ( + const BlendedInterfacialModel& + ) = delete; + //- Destructor ~BlendedInterfacialModel(); @@ -198,6 +195,12 @@ public: //- Dummy write for regIOobject bool writeData(Ostream& os) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const BlendedInterfacialModel&) = delete; }; diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H index c3ca244f11..f78b7297db 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H @@ -50,15 +50,6 @@ namespace kineticTheoryModels class conductivityModel { - // Private Member Functions - - //- Disallow default bitwise copy construction - conductivityModel(const conductivityModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const conductivityModel&) = delete; - - protected: // Protected data @@ -89,6 +80,9 @@ public: //- Construct from components conductivityModel(const dictionary& dict); + //- Disallow default bitwise copy construction + conductivityModel(const conductivityModel&) = delete; + // Selectors @@ -118,6 +112,12 @@ public: { return true; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const conductivityModel&) = delete; }; diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H index c7e1dcffa7..27e21f1f37 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H @@ -51,15 +51,6 @@ namespace kineticTheoryModels class frictionalStressModel { - // Private Member Functions - - //- Disallow default bitwise copy construction - frictionalStressModel(const frictionalStressModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const frictionalStressModel&) = delete; - - protected: // Protected data @@ -91,6 +82,9 @@ public: //- Construct from components frictionalStressModel(const dictionary& dict); + //- Disallow default bitwise copy construction + frictionalStressModel(const frictionalStressModel&) = delete; + // Selectors @@ -130,6 +124,12 @@ public: ) const = 0; virtual bool read() = 0; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const frictionalStressModel&) = delete; }; diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H index 1124f55e7b..7989e8ed4a 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H @@ -50,15 +50,6 @@ namespace kineticTheoryModels class granularPressureModel { - // Private Member Functions - - //- Disallow default bitwise copy construction - granularPressureModel(const granularPressureModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const granularPressureModel&) = delete; - - protected: // Protected data @@ -89,6 +80,9 @@ public: //- Construct from components granularPressureModel(const dictionary& dict); + //- Disallow default bitwise copy construction + granularPressureModel(const granularPressureModel&) = delete; + // Selectors @@ -127,6 +121,12 @@ public: { return true; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const granularPressureModel&) = delete; }; diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H index 6162ef12f9..880292cd67 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H @@ -147,12 +147,6 @@ class kineticTheoryModel void correctNut() {} - //- Disallow default bitwise copy construction - kineticTheoryModel(const kineticTheoryModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const kineticTheoryModel&) = delete; - public: @@ -175,6 +169,9 @@ public: const word& type = typeName ); + //- Disallow default bitwise copy construction + kineticTheoryModel(const kineticTheoryModel&) = delete; + //- Destructor virtual ~kineticTheoryModel(); @@ -222,6 +219,12 @@ public: //- Solve the kinetic theory equations and correct the viscosity virtual void correct(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const kineticTheoryModel&) = delete; }; diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H index 9429d69ea4..c69406ec44 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H @@ -50,15 +50,6 @@ namespace kineticTheoryModels class radialModel { - // Private Member Functions - - //- Disallow default bitwise copy construction - radialModel(const radialModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const radialModel&) = delete; - - protected: // Protected data @@ -89,6 +80,9 @@ public: //- Construct from components radialModel(const dictionary& dict); + //- Disallow default bitwise copy construction + radialModel(const radialModel&) = delete; + // Selectors @@ -124,6 +118,12 @@ public: { return true; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const radialModel&) = delete; }; diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H index f47250e0ba..76f731ba8a 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H @@ -52,15 +52,6 @@ namespace kineticTheoryModels class viscosityModel { - // Private Member Functions - - //- Disallow default bitwise copy construction - viscosityModel(const viscosityModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const viscosityModel&) = delete; - - protected: // Protected data @@ -91,6 +82,9 @@ public: //- Construct from components viscosityModel(const dictionary& dict); + //- Disallow default bitwise copy construction + viscosityModel(const viscosityModel&) = delete; + // Selectors @@ -120,6 +114,12 @@ public: { return true; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const viscosityModel&) = delete; }; diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H index 28e10f393d..b31cea90ed 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H @@ -102,12 +102,6 @@ class phasePressureModel void correctNut() {} - //- Disallow default bitwise copy construction - phasePressureModel(const phasePressureModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const phasePressureModel&) = delete; - public: @@ -130,6 +124,9 @@ public: const word& type = typeName ); + //- Disallow default bitwise copy construction + phasePressureModel(const phasePressureModel&) = delete; + //- Destructor virtual ~phasePressureModel(); @@ -177,6 +174,12 @@ public: //- Solve the kinetic theory equations and correct the viscosity virtual void correct(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const phasePressureModel&) = delete; }; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H index 58cc17e30c..f4f3de5ba4 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H @@ -56,15 +56,6 @@ class wallDependentModel const fvMesh& mesh_; - // Private Member Functions - - //- Disallow default bitwise copy construction - wallDependentModel(const wallDependentModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const wallDependentModel&) = delete; - - public: // Constructors @@ -72,6 +63,9 @@ public: //- Construct from a mesh wallDependentModel(const fvMesh& mesh); + //- Disallow default bitwise copy construction + wallDependentModel(const wallDependentModel&) = delete; + //- Destructor virtual ~wallDependentModel(); @@ -83,6 +77,12 @@ public: // Return the wall normal, creating and storing it if necessary const volVectorField& nWall() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const wallDependentModel&) = delete; }; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H index c3ca244f11..f78b7297db 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H @@ -50,15 +50,6 @@ namespace kineticTheoryModels class conductivityModel { - // Private Member Functions - - //- Disallow default bitwise copy construction - conductivityModel(const conductivityModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const conductivityModel&) = delete; - - protected: // Protected data @@ -89,6 +80,9 @@ public: //- Construct from components conductivityModel(const dictionary& dict); + //- Disallow default bitwise copy construction + conductivityModel(const conductivityModel&) = delete; + // Selectors @@ -118,6 +112,12 @@ public: { return true; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const conductivityModel&) = delete; }; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H index c7e1dcffa7..27e21f1f37 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H @@ -51,15 +51,6 @@ namespace kineticTheoryModels class frictionalStressModel { - // Private Member Functions - - //- Disallow default bitwise copy construction - frictionalStressModel(const frictionalStressModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const frictionalStressModel&) = delete; - - protected: // Protected data @@ -91,6 +82,9 @@ public: //- Construct from components frictionalStressModel(const dictionary& dict); + //- Disallow default bitwise copy construction + frictionalStressModel(const frictionalStressModel&) = delete; + // Selectors @@ -130,6 +124,12 @@ public: ) const = 0; virtual bool read() = 0; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const frictionalStressModel&) = delete; }; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H index 1124f55e7b..7989e8ed4a 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H @@ -50,15 +50,6 @@ namespace kineticTheoryModels class granularPressureModel { - // Private Member Functions - - //- Disallow default bitwise copy construction - granularPressureModel(const granularPressureModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const granularPressureModel&) = delete; - - protected: // Protected data @@ -89,6 +80,9 @@ public: //- Construct from components granularPressureModel(const dictionary& dict); + //- Disallow default bitwise copy construction + granularPressureModel(const granularPressureModel&) = delete; + // Selectors @@ -127,6 +121,12 @@ public: { return true; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const granularPressureModel&) = delete; }; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H index 9b37f516b1..1b815c5bfa 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H @@ -147,12 +147,6 @@ class kineticTheoryModel void correctNut() {} - //- Disallow default bitwise copy construction - kineticTheoryModel(const kineticTheoryModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const kineticTheoryModel&) = delete; - public: @@ -175,6 +169,9 @@ public: const word& type = typeName ); + //- Disallow default bitwise copy construction + kineticTheoryModel(const kineticTheoryModel&) = delete; + //- Destructor virtual ~kineticTheoryModel(); @@ -222,6 +219,12 @@ public: //- Solve the kinetic theory equations and correct the viscosity virtual void correct(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const kineticTheoryModel&) = delete; }; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H index 9429d69ea4..c69406ec44 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H @@ -50,15 +50,6 @@ namespace kineticTheoryModels class radialModel { - // Private Member Functions - - //- Disallow default bitwise copy construction - radialModel(const radialModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const radialModel&) = delete; - - protected: // Protected data @@ -89,6 +80,9 @@ public: //- Construct from components radialModel(const dictionary& dict); + //- Disallow default bitwise copy construction + radialModel(const radialModel&) = delete; + // Selectors @@ -124,6 +118,12 @@ public: { return true; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const radialModel&) = delete; }; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H index f47250e0ba..76f731ba8a 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H @@ -52,15 +52,6 @@ namespace kineticTheoryModels class viscosityModel { - // Private Member Functions - - //- Disallow default bitwise copy construction - viscosityModel(const viscosityModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const viscosityModel&) = delete; - - protected: // Protected data @@ -91,6 +82,9 @@ public: //- Construct from components viscosityModel(const dictionary& dict); + //- Disallow default bitwise copy construction + viscosityModel(const viscosityModel&) = delete; + // Selectors @@ -120,6 +114,12 @@ public: { return true; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const viscosityModel&) = delete; }; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H index e8ff606949..243fd1c8ff 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H @@ -106,12 +106,6 @@ class phasePressureModel void correctNut() {} - //- Disallow default bitwise copy construction - phasePressureModel(const phasePressureModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const phasePressureModel&) = delete; - public: @@ -134,6 +128,9 @@ public: const word& type = typeName ); + //- Disallow default bitwise copy construction + phasePressureModel(const phasePressureModel&) = delete; + //- Destructor virtual ~phasePressureModel(); @@ -181,6 +178,12 @@ public: //- Solve the kinetic theory equations and correct the viscosity virtual void correct(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const phasePressureModel&) = delete; }; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H index d03880764e..7eb5012e97 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H @@ -81,15 +81,6 @@ class BlendedInterfacialModel // Private Member Functions - //- Disallow default bitwise copy construction - BlendedInterfacialModel - ( - const BlendedInterfacialModel& - ) = delete; - - //- Disallow default bitwise assignment - void operator=(const BlendedInterfacialModel&) = delete; - //- Correct coeff/value on fixed flux boundary conditions template void correctFixedFluxBCs(GeometricField& field) const; @@ -110,6 +101,12 @@ public: const bool correctFixedFluxBCs = true ); + //- Disallow default bitwise copy construction + BlendedInterfacialModel + ( + const BlendedInterfacialModel& + ) = delete; + //- Destructor ~BlendedInterfacialModel(); @@ -138,6 +135,12 @@ public: //- Return the blended diffusivity tmp D() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const BlendedInterfacialModel&) = delete; };