diff --git a/src/ODE/ODESolvers/ODESolver/ODESolver.H b/src/ODE/ODESolvers/ODESolver/ODESolver.H index 6dd6867884..cdf54061d0 100644 --- a/src/ODE/ODESolvers/ODESolver/ODESolver.H +++ b/src/ODE/ODESolvers/ODESolver/ODESolver.H @@ -84,12 +84,6 @@ protected: const scalarField& err ) const; - //- Disallow default bitwise copy construction - ODESolver(const ODESolver&) = delete; - - //- Disallow default bitwise assignment - void operator=(const ODESolver&) = delete; - public: @@ -148,6 +142,9 @@ public: const scalarField& relTol ); + //- Disallow default bitwise copy construction + ODESolver(const ODESolver&) = delete; + // Selectors @@ -217,6 +214,12 @@ public: scalarField& y, scalar& dxEst ) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const ODESolver&) = delete; }; diff --git a/src/OSspecific/POSIX/fileMonitor.H b/src/OSspecific/POSIX/fileMonitor.H index 203a85be6a..99df9e69e7 100644 --- a/src/OSspecific/POSIX/fileMonitor.H +++ b/src/OSspecific/POSIX/fileMonitor.H @@ -105,12 +105,6 @@ private: //- Update localState_ from any events. void checkFiles() const; - //- Disallow default bitwise copy construction - fileMonitor(const fileMonitor&) = delete; - - //- Disallow default bitwise assignment - void operator=(const fileMonitor&) = delete; - public: @@ -122,6 +116,9 @@ public: //- Construct null fileMonitor(const bool useInotify); + //- Disallow default bitwise copy construction + fileMonitor(const fileMonitor&) = delete; + //- Destructor ~fileMonitor(); @@ -150,6 +147,12 @@ public: //- Reset state (e.g. after having read it) using handle void setUnmodified(const label watchFd); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const fileMonitor&) = delete; }; diff --git a/src/OSspecific/POSIX/regExp.H b/src/OSspecific/POSIX/regExp.H index 3cf8bf7e57..98834aae4a 100644 --- a/src/OSspecific/POSIX/regExp.H +++ b/src/OSspecific/POSIX/regExp.H @@ -69,12 +69,6 @@ class regExp // Private Member Functions - //- Disallow default bitwise copy construction - regExp(const regExp&) = delete; - - //- Disallow default bitwise assignment - void operator=(const regExp&) = delete; - //- Return true if it matches and sets the sub-groups matched. // Templated to support both std::string and Foam::string template @@ -119,6 +113,9 @@ public: //- Construct from std::string (or string), optionally ignoring case regExp(const std::string&, const bool ignoreCase=false); + //- Disallow default bitwise copy construction + regExp(const regExp&) = delete; + //- Destructor ~regExp(); @@ -189,6 +186,9 @@ public: // Member Operators + //- Disallow default bitwise assignment + void operator=(const regExp&) = delete; + //- Assign and compile pattern from a character array // Always case sensitive void operator=(const char*); diff --git a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H index b8f1ae2882..09f7e1a58e 100644 --- a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H +++ b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H @@ -69,20 +69,6 @@ protected: {} -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - compressibleTurbulenceModel - ( - const compressibleTurbulenceModel& - ) = delete; - - //- Disallow default bitwise assignment - void operator=(const compressibleTurbulenceModel&) = delete; - - public: //- Runtime type information @@ -101,6 +87,12 @@ public: const word& propertiesName ); + //- Disallow default bitwise copy construction + compressibleTurbulenceModel + ( + const compressibleTurbulenceModel& + ) = delete; + //- Destructor virtual ~compressibleTurbulenceModel() @@ -126,6 +118,12 @@ public: //- Correct the turbulence thermal diffusivity for energy transport virtual void correctEnergyTransport(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const compressibleTurbulenceModel&) = delete; }; diff --git a/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.H b/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.H index 6a5424b6b5..25ca38f2f3 100644 --- a/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.H +++ b/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.H @@ -54,7 +54,6 @@ class incompressibleTurbulenceModel : public turbulenceModel { - protected: // Protected data @@ -70,20 +69,6 @@ protected: {} -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - incompressibleTurbulenceModel - ( - const incompressibleTurbulenceModel& - ) = delete; - - //- Disallow default bitwise assignment - void operator=(const incompressibleTurbulenceModel&) = delete; - - public: //- Runtime type information @@ -102,6 +87,12 @@ public: const word& propertiesName ); + //- Disallow default bitwise copy construction + incompressibleTurbulenceModel + ( + const incompressibleTurbulenceModel& + ) = delete; + //- Destructor virtual ~incompressibleTurbulenceModel() @@ -133,6 +124,12 @@ public: //- Return the source term for the momentum equation virtual tmp divDevReff(volVectorField& U) const = 0; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const incompressibleTurbulenceModel&) = delete; }; diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H index c3f1172fb6..1d3578e9bc 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H +++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H @@ -94,17 +94,6 @@ protected: virtual void printCoeffs(const word& type); -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - LESModel(const LESModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const LESModel&) = delete; - - public: typedef typename BasicTurbulenceModel::alphaField alphaField; @@ -151,6 +140,9 @@ public: const word& propertiesName ); + //- Disallow default bitwise copy construction + LESModel(const LESModel&) = delete; + // Selectors @@ -223,6 +215,12 @@ public: //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const LESModel&) = delete; }; diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H index 67f2b98e81..e45a170b1e 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H @@ -84,17 +84,6 @@ protected: virtual void printCoeffs(const word& type); -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - RASModel(const RASModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const RASModel&) = delete; - - public: typedef typename BasicTurbulenceModel::alphaField alphaField; @@ -141,6 +130,9 @@ public: const word& propertiesName ); + //- Disallow default bitwise copy construction + RASModel(const RASModel&) = delete; + // Selectors @@ -231,6 +223,12 @@ public: //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const RASModel&) = delete; }; diff --git a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H index cfaa69c405..41e6a47c7e 100644 --- a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H +++ b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H @@ -75,17 +75,6 @@ protected: const transportModel& transport_; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - TurbulenceModel(const TurbulenceModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const TurbulenceModel&) = delete; - - public: // Declare run-time constructor selection table @@ -122,6 +111,9 @@ public: const word& propertiesName ); + //- Disallow default bitwise copy construction + TurbulenceModel(const TurbulenceModel&) = delete; + // Selectors @@ -168,6 +160,12 @@ public: { return transport_.nu(patchi); } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const TurbulenceModel&) = delete; }; diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.H b/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.H index 12a603ee34..63922224fb 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.H +++ b/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.H @@ -60,7 +60,6 @@ namespace laminarModels class generalizedNewtonianViscosityModel { - protected: // Protected data @@ -68,18 +67,6 @@ protected: dictionary viscosityProperties_; - // Private Member Functions - - //- Disallow default bitwise copy construction - generalizedNewtonianViscosityModel - ( - const generalizedNewtonianViscosityModel& - ); - - //- Disallow default bitwise assignment - void operator=(const generalizedNewtonianViscosityModel&) = delete; - - public: //- Runtime type information @@ -117,6 +104,12 @@ public: const dictionary& viscosityProperties ); + //- Disallow default bitwise copy construction + generalizedNewtonianViscosityModel + ( + const generalizedNewtonianViscosityModel& + ); + //- Destructor virtual ~generalizedNewtonianViscosityModel() @@ -140,6 +133,12 @@ public: //- Read transportProperties dictionary virtual bool read(const dictionary& viscosityProperties) = 0; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const generalizedNewtonianViscosityModel&) = delete; }; diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H index 2ce77054af..42057367ec 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H +++ b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H @@ -72,17 +72,6 @@ protected: virtual void printCoeffs(const word& type); -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - laminarModel(const laminarModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const laminarModel&) = delete; - - public: typedef typename BasicTurbulenceModel::alphaField alphaField; @@ -129,6 +118,9 @@ public: const word& propertiesName ); + //- Disallow default bitwise copy construction + laminarModel(const laminarModel&) = delete; + // Selectors @@ -188,6 +180,12 @@ public: //- Correct the laminar transport virtual void correct(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const laminarModel&) = delete; }; diff --git a/src/TurbulenceModels/turbulenceModels/turbulenceModel.H b/src/TurbulenceModels/turbulenceModels/turbulenceModel.H index 8b67630bda..d5874d2c3e 100644 --- a/src/TurbulenceModels/turbulenceModels/turbulenceModel.H +++ b/src/TurbulenceModels/turbulenceModels/turbulenceModel.H @@ -59,7 +59,6 @@ class turbulenceModel : public IOdictionary { - protected: // Protected data @@ -75,17 +74,6 @@ protected: nearWallDist y_; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - turbulenceModel(const turbulenceModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const turbulenceModel&) = delete; - - public: //- Runtime type information @@ -106,6 +94,9 @@ public: const word& propertiesName ); + //- Disallow default bitwise copy construction + turbulenceModel(const turbulenceModel&) = delete; + //- Destructor virtual ~turbulenceModel() @@ -208,6 +199,12 @@ public: //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct() = 0; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const turbulenceModel&) = delete; }; diff --git a/src/engine/engineMesh/engineMesh/engineMesh.H b/src/engine/engineMesh/engineMesh/engineMesh.H index a850009bbd..87aaa36f0b 100644 --- a/src/engine/engineMesh/engineMesh/engineMesh.H +++ b/src/engine/engineMesh/engineMesh/engineMesh.H @@ -53,15 +53,6 @@ class engineMesh : public fvMesh { - // Private Member Functions - - //- Disallow default bitwise copy construction - engineMesh(const engineMesh&) = delete; - - //- Disallow default bitwise assignment - void operator=(const engineMesh&) = delete; - - protected: // Protected data @@ -99,6 +90,9 @@ public: //- Construct from objectRegistry, and read/write options explicit engineMesh(const IOobject& io); + //- Disallow default bitwise copy construction + engineMesh(const engineMesh&) = delete; + // Selectors @@ -115,6 +109,12 @@ public: // Edit virtual void move() = 0; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const engineMesh&) = delete; }; diff --git a/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.H b/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.H index 03a7038085..e9bffb1918 100644 --- a/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.H +++ b/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.H @@ -61,15 +61,6 @@ class fvMotionSolverEngineMesh velocityComponentLaplacianFvMotionSolver motionSolver_; - // Private Member Functions - - //- Disallow default bitwise copy construction - fvMotionSolverEngineMesh(const fvMotionSolverEngineMesh&) = delete; - - //- Disallow default bitwise assignment - void operator=(const fvMotionSolverEngineMesh&) = delete; - - public: //- Runtime type information @@ -81,6 +72,9 @@ public: //- Construct from IOobject fvMotionSolverEngineMesh(const IOobject& io); + //- Disallow default bitwise copy construction + fvMotionSolverEngineMesh(const fvMotionSolverEngineMesh&) = delete; + //- Destructor ~fvMotionSolverEngineMesh(); @@ -91,6 +85,12 @@ public: // Edit void move(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const fvMotionSolverEngineMesh&) = delete; }; diff --git a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.H b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.H index 0a150d77b1..cacb1b36b7 100644 --- a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.H +++ b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.H @@ -56,15 +56,6 @@ class layeredEngineMesh dimensionedScalar pistonLayers_; - // Private Member Functions - - //- Disallow default bitwise copy construction - layeredEngineMesh(const layeredEngineMesh&) = delete; - - //- Disallow default bitwise assignment - void operator=(const layeredEngineMesh&) = delete; - - public: //- Runtime type information @@ -76,6 +67,9 @@ public: //- Construct from IOobject layeredEngineMesh(const IOobject& io); + //- Disallow default bitwise copy construction + layeredEngineMesh(const layeredEngineMesh&) = delete; + //- Destructor ~layeredEngineMesh(); @@ -86,6 +80,12 @@ public: // Edit void move(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const layeredEngineMesh&) = delete; }; diff --git a/src/engine/engineMesh/staticEngineMesh/staticEngineMesh.H b/src/engine/engineMesh/staticEngineMesh/staticEngineMesh.H index 129197c765..f39016f578 100644 --- a/src/engine/engineMesh/staticEngineMesh/staticEngineMesh.H +++ b/src/engine/engineMesh/staticEngineMesh/staticEngineMesh.H @@ -50,15 +50,6 @@ class staticEngineMesh : public engineMesh { - // Private Member Functions - - //- Disallow default bitwise copy construction - staticEngineMesh(const staticEngineMesh&) = delete; - - //- Disallow default bitwise assignment - void operator=(const staticEngineMesh&) = delete; - - public: //- Runtime type information @@ -70,6 +61,9 @@ public: //- Construct from IOobject staticEngineMesh(const IOobject& io); + //- Disallow default bitwise copy construction + staticEngineMesh(const staticEngineMesh&) = delete; + //- Destructor ~staticEngineMesh(); @@ -80,6 +74,12 @@ public: // Edit void move(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const staticEngineMesh&) = delete; }; diff --git a/src/engine/enginePiston/enginePiston.H b/src/engine/enginePiston/enginePiston.H index 307b7efeca..fa944644da 100644 --- a/src/engine/enginePiston/enginePiston.H +++ b/src/engine/enginePiston/enginePiston.H @@ -77,15 +77,6 @@ class enginePiston const scalar maxLayer_; - // Private Member Functions - - //- Disallow default bitwise copy construction - enginePiston(const enginePiston&) = delete; - - //- Disallow default bitwise assignment - void operator=(const enginePiston&) = delete; - - public: // Static Data Members @@ -111,8 +102,8 @@ public: const dictionary& dict ); - - // Destructor - default + //- Disallow default bitwise copy construction + enginePiston(const enginePiston&) = delete; // Member Functions @@ -144,6 +135,12 @@ public: //- Write dictionary void writeDict(Ostream&) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const enginePiston&) = delete; }; diff --git a/src/engine/engineTime/crankConRod/crankConRod.H b/src/engine/engineTime/crankConRod/crankConRod.H index cb3c61ef84..daf76eb12e 100644 --- a/src/engine/engineTime/crankConRod/crankConRod.H +++ b/src/engine/engineTime/crankConRod/crankConRod.H @@ -81,15 +81,10 @@ class crankConRod // Private Member Functions - //- Disallow default bitwise copy construction - crankConRod(const crankConRod&) = delete; - - //- Disallow default bitwise assignment - void operator=(const crankConRod&) = delete; - //- Adjust read time values void timeAdjustment(); + public: //- Runtime type information @@ -109,6 +104,10 @@ public: const fileName& dictName = "engineGeometry" ); + //- Disallow default bitwise copy construction + crankConRod(const crankConRod&) = delete; + + //- Destructor virtual ~crankConRod() {} @@ -192,6 +191,12 @@ public: //- Read the controlDict and set all the parameters virtual bool read(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const crankConRod&) = delete; }; diff --git a/src/engine/engineTime/freePiston/freePiston.H b/src/engine/engineTime/freePiston/freePiston.H index 8d6be18560..65ad2f264f 100644 --- a/src/engine/engineTime/freePiston/freePiston.H +++ b/src/engine/engineTime/freePiston/freePiston.H @@ -79,15 +79,6 @@ class freePiston autoPtr> pistonPositionTime_; - // Private Member Functions - - //- Disallow default bitwise copy construction - freePiston(const freePiston&) = delete; - - //- Disallow default bitwise assignment - void operator=(const freePiston&) = delete; - - public: //- Runtime type information @@ -107,6 +98,10 @@ public: const fileName& dictName = "engineGeometry" ); + //- Disallow default bitwise copy construction + freePiston(const freePiston&) = delete; + + //- Destructor virtual ~freePiston() {} @@ -131,6 +126,12 @@ public: //- Return engine time increment virtual scalar deltaTheta() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const freePiston&) = delete; }; diff --git a/src/engine/engineValve/engineValve.H b/src/engine/engineValve/engineValve.H index aa8e1de776..ea65160542 100644 --- a/src/engine/engineValve/engineValve.H +++ b/src/engine/engineValve/engineValve.H @@ -133,21 +133,12 @@ class engineValve // Private Member Functions - //- Disallow default bitwise copy construction - engineValve(const engineValve&) = delete; - - //- Disallow default bitwise assignment - void operator=(const engineValve&) = delete; - - //- Adjust crank angle to drop within the limits of the lift profile scalar adjustCrankAngle(const scalar theta) const; + public: - // Static Data Members - - // Constructors //- Construct from components @@ -182,8 +173,8 @@ public: const dictionary& dict ); - - // Destructor - default + //- Disallow default bitwise copy construction + engineValve(const engineValve&) = delete; // Member Functions @@ -309,6 +300,12 @@ public: //- Write dictionary void writeDict(Ostream&) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const engineValve&) = delete; }; diff --git a/src/engine/engineValve/valveBank.H b/src/engine/engineValve/valveBank.H index 2c23715837..f2db373bf2 100644 --- a/src/engine/engineValve/valveBank.H +++ b/src/engine/engineValve/valveBank.H @@ -48,15 +48,6 @@ class valveBank : public PtrList { - // Private Member Functions - - //- Disallow default bitwise copy construction - valveBank(const valveBank&) = delete; - - //- Disallow default bitwise assignment - void operator=(const valveBank&) = delete; - - public: // Constructors @@ -87,11 +78,14 @@ public: } } - - // Destructor - default + //- Disallow default bitwise copy construction + valveBank(const valveBank&) = delete; - // Member Functions + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const valveBank&) = delete; }; diff --git a/src/engine/ignition/ignition.H b/src/engine/ignition/ignition.H index 09d4d4a1bd..aba5db21fb 100644 --- a/src/engine/ignition/ignition.H +++ b/src/engine/ignition/ignition.H @@ -61,15 +61,6 @@ class ignition PtrList ignSites_; - // Private Member Functions - - //- Disallow default bitwise copy construction - ignition(const ignition&) = delete; - - //- Disallow default bitwise assignment - void operator=(const ignition&) = delete; - - public: // Constructors @@ -80,6 +71,9 @@ public: //- Construct from Istream and engineTime ignition(const dictionary&, const engineTime&, const fvMesh&); + //- Disallow default bitwise copy construction + ignition(const ignition&) = delete; + // Member Functions @@ -102,6 +96,12 @@ public: //- Has the mixture been ignited? bool ignited() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const ignition&) = delete; }; diff --git a/src/functionObjects/field/XiReactionRate/XiReactionRate.H b/src/functionObjects/field/XiReactionRate/XiReactionRate.H index b27bade7cb..6a56d91571 100644 --- a/src/functionObjects/field/XiReactionRate/XiReactionRate.H +++ b/src/functionObjects/field/XiReactionRate/XiReactionRate.H @@ -72,15 +72,6 @@ class XiReactionRate : public fvMeshFunctionObject { - // Private Member Functions - - //- Disallow default bitwise copy construction - XiReactionRate(const XiReactionRate&) = delete; - - //- Disallow default bitwise assignment - void operator=(const XiReactionRate&) = delete; - - public: //- Runtime type information @@ -97,6 +88,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + XiReactionRate(const XiReactionRate&) = delete; + //- Destructor virtual ~XiReactionRate(); @@ -109,6 +103,12 @@ public: //- Write the cell-centre fields virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const XiReactionRate&) = delete; }; diff --git a/src/functionObjects/field/fieldAverage/fieldAverage.H b/src/functionObjects/field/fieldAverage/fieldAverage.H index 960d90f681..cc9ef558c6 100644 --- a/src/functionObjects/field/fieldAverage/fieldAverage.H +++ b/src/functionObjects/field/fieldAverage/fieldAverage.H @@ -257,13 +257,6 @@ protected: void readAveragingProperties(); - //- Disallow default bitwise copy construction - fieldAverage(const fieldAverage&) = delete; - - //- Disallow default bitwise assignment - void operator=(const fieldAverage&) = delete; - - public: //- Runtime type information @@ -280,6 +273,9 @@ public: const dictionary& ); + //- Disallow default bitwise copy construction + fieldAverage(const fieldAverage&) = delete; + //- Destructor virtual ~fieldAverage(); @@ -295,6 +291,12 @@ public: //- Write the field averages virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const fieldAverage&) = delete; }; diff --git a/src/functionObjects/field/fieldExpression/fieldExpression.H b/src/functionObjects/field/fieldExpression/fieldExpression.H index d091573c2d..4216886c17 100644 --- a/src/functionObjects/field/fieldExpression/fieldExpression.H +++ b/src/functionObjects/field/fieldExpression/fieldExpression.H @@ -76,17 +76,6 @@ protected: bool foundObject(const word& name); -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - fieldExpression(const fieldExpression&) = delete; - - //- Disallow default bitwise assignment - void operator=(const fieldExpression&) = delete; - - public: //- Runtime type information @@ -105,6 +94,9 @@ public: const word& resultName = word::null ); + //- Disallow default bitwise copy construction + fieldExpression(const fieldExpression&) = delete; + //- Destructor virtual ~fieldExpression(); @@ -123,6 +115,12 @@ public: //- Clear the result field from the objectRegistry virtual bool clear(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const fieldExpression&) = delete; }; diff --git a/src/functionObjects/field/fieldMinMax/fieldMinMax.H b/src/functionObjects/field/fieldMinMax/fieldMinMax.H index 121a64eb4c..f528c4c9c6 100644 --- a/src/functionObjects/field/fieldMinMax/fieldMinMax.H +++ b/src/functionObjects/field/fieldMinMax/fieldMinMax.H @@ -138,12 +138,6 @@ protected: const Type& maxValue ); - //- Disallow default bitwise copy construction - fieldMinMax(const fieldMinMax&) = delete; - - //- Disallow default bitwise assignment - void operator=(const fieldMinMax&) = delete; - //- Calculate the field min/max template void calcMinMaxFields @@ -172,6 +166,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + fieldMinMax(const fieldMinMax&) = delete; + //- Destructor virtual ~fieldMinMax(); @@ -187,6 +184,12 @@ public: //- Write the fieldMinMax virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const fieldMinMax&) = delete; }; diff --git a/src/functionObjects/field/fieldsExpression/fieldsExpression.H b/src/functionObjects/field/fieldsExpression/fieldsExpression.H index f48a2ca7a8..103df3e758 100644 --- a/src/functionObjects/field/fieldsExpression/fieldsExpression.H +++ b/src/functionObjects/field/fieldsExpression/fieldsExpression.H @@ -91,17 +91,6 @@ protected: virtual bool calc() = 0; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - fieldsExpression(const fieldsExpression&) = delete; - - //- Disallow default bitwise assignment - void operator=(const fieldsExpression&) = delete; - - public: //- Runtime type information @@ -120,6 +109,9 @@ public: const word& resultName = word::null ); + //- Disallow default bitwise copy construction + fieldsExpression(const fieldsExpression&) = delete; + //- Destructor virtual ~fieldsExpression(); @@ -138,6 +130,12 @@ public: //- Clear the result fields from the objectRegistry virtual bool clear(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const fieldsExpression&) = delete; }; diff --git a/src/functionObjects/field/histogram/histogram.H b/src/functionObjects/field/histogram/histogram.H index 8a981a5698..253bde6de6 100644 --- a/src/functionObjects/field/histogram/histogram.H +++ b/src/functionObjects/field/histogram/histogram.H @@ -115,12 +115,6 @@ class histogram const scalarField& values ) const; - //- Disallow default bitwise copy construction - histogram(const histogram&) = delete; - - //- Disallow default bitwise assignment - void operator=(const histogram&) = delete; - public: @@ -138,6 +132,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + histogram(const histogram&) = delete; + // Destructor virtual ~histogram(); @@ -155,6 +152,12 @@ public: // postProcess overrides the usual writeControl behaviour and // forces writing always (used in post-processing mode) virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const histogram&) = delete; }; diff --git a/src/functionObjects/field/nearWallFields/nearWallFields.H b/src/functionObjects/field/nearWallFields/nearWallFields.H index 0e42b10147..ec4fc5b866 100644 --- a/src/functionObjects/field/nearWallFields/nearWallFields.H +++ b/src/functionObjects/field/nearWallFields/nearWallFields.H @@ -165,14 +165,6 @@ protected: ) const; -private: - - //- Disallow default bitwise copy construction - nearWallFields(const nearWallFields&) = delete; - - //- Disallow default bitwise assignment - void operator=(const nearWallFields&) = delete; - public: //- Runtime type information @@ -190,6 +182,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + nearWallFields(const nearWallFields&) = delete; + //- Destructor virtual ~nearWallFields(); @@ -205,6 +200,12 @@ public: //- Write the near-wall fields virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const nearWallFields&) = delete; }; diff --git a/src/functionObjects/field/processorField/processorField.H b/src/functionObjects/field/processorField/processorField.H index 2c1991c55c..f048d79c13 100644 --- a/src/functionObjects/field/processorField/processorField.H +++ b/src/functionObjects/field/processorField/processorField.H @@ -72,15 +72,6 @@ class processorField : public fvMeshFunctionObject { - // Private Member Functions - - //- Disallow default bitwise copy construction - processorField(const processorField&) = delete; - - //- Disallow default bitwise assignment - void operator=(const processorField&) = delete; - - public: //- Runtime type information @@ -97,6 +88,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + processorField(const processorField&) = delete; + //- Destructor virtual ~processorField(); @@ -112,6 +106,12 @@ public: //- Write the processorID field virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const processorField&) = delete; }; diff --git a/src/functionObjects/field/readFields/readFields.H b/src/functionObjects/field/readFields/readFields.H index c23c85c354..a8232796bb 100644 --- a/src/functionObjects/field/readFields/readFields.H +++ b/src/functionObjects/field/readFields/readFields.H @@ -112,17 +112,6 @@ protected: ) const; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - readFields(const readFields&) = delete; - - //- Disallow default bitwise assignment - void operator=(const readFields&) = delete; - - public: //- Runtime type information @@ -140,6 +129,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + readFields(const readFields&) = delete; + //- Destructor virtual ~readFields(); @@ -155,6 +147,12 @@ public: //- Do nothing virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const readFields&) = delete; }; diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H index 84113bf199..df65aa2895 100644 --- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H +++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H @@ -221,12 +221,6 @@ class regionSizeDistribution const coordSet& coords // graph data for bins ) const; - //- Disallow default bitwise copy construction - regionSizeDistribution(const regionSizeDistribution&) = delete; - - //- Disallow default bitwise assignment - void operator=(const regionSizeDistribution&) = delete; - public: @@ -245,6 +239,9 @@ public: const dictionary& ); + //- Disallow default bitwise copy construction + regionSizeDistribution(const regionSizeDistribution&) = delete; + // Destructor @@ -261,6 +258,12 @@ public: //- Calculate the regionSizeDistribution and write virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const regionSizeDistribution&) = delete; }; diff --git a/src/functionObjects/field/streamLine/streamLine.H b/src/functionObjects/field/streamLine/streamLine.H index 07ec9a32e8..3622794e2f 100644 --- a/src/functionObjects/field/streamLine/streamLine.H +++ b/src/functionObjects/field/streamLine/streamLine.H @@ -224,12 +224,6 @@ private: //- Do all seeding and tracking void track(); - //- Disallow default bitwise copy construction - streamLine(const streamLine&) = delete; - - //- Disallow default bitwise assignment - void operator=(const streamLine&) = delete; - public: @@ -247,6 +241,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + streamLine(const streamLine&) = delete; + //- Destructor virtual ~streamLine(); @@ -268,6 +265,12 @@ public: //- Update for mesh point-motion virtual void movePoints(const polyMesh&); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const streamLine&) = delete; }; diff --git a/src/functionObjects/field/streamLine/streamLineParticleCloud.H b/src/functionObjects/field/streamLine/streamLineParticleCloud.H index aedb212da7..65fb4b9d4d 100644 --- a/src/functionObjects/field/streamLine/streamLineParticleCloud.H +++ b/src/functionObjects/field/streamLine/streamLineParticleCloud.H @@ -51,15 +51,6 @@ class streamLineParticleCloud : public Cloud { - // Private Member Functions - - //- Disallow default bitwise copy construction - streamLineParticleCloud(const streamLineParticleCloud&) = delete; - - //- Disallow default bitwise assignment - void operator=(const streamLineParticleCloud&) = delete; - - public: //- Type of parcel the cloud was instantiated for @@ -82,6 +73,15 @@ public: const word& cloudName, const IDLList& particles ); + + //- Disallow default bitwise copy construction + streamLineParticleCloud(const streamLineParticleCloud&) = delete; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const streamLineParticleCloud&) = delete; }; diff --git a/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.H b/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.H index 63e7881f4e..01fed17713 100644 --- a/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.H +++ b/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.H @@ -115,17 +115,6 @@ protected: ) const; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - surfaceInterpolate(const surfaceInterpolate&) = delete; - - //- Disallow default bitwise assignment - void operator=(const surfaceInterpolate&) = delete; - - public: //- Runtime type information @@ -143,6 +132,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + surfaceInterpolate(const surfaceInterpolate&) = delete; + //- Destructor virtual ~surfaceInterpolate(); @@ -158,6 +150,12 @@ public: //- Write the interpolated fields virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const surfaceInterpolate&) = delete; }; diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFields.H b/src/functionObjects/field/turbulenceFields/turbulenceFields.H index 6c1aca6ee4..8f5be6aa1f 100644 --- a/src/functionObjects/field/turbulenceFields/turbulenceFields.H +++ b/src/functionObjects/field/turbulenceFields/turbulenceFields.H @@ -163,17 +163,6 @@ protected: tmp omega(const Model& model) const; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - turbulenceFields(const turbulenceFields&) = delete; - - //- Disallow default bitwise assignment - void operator=(const turbulenceFields&) = delete; - - public: //- Runtime type information @@ -190,6 +179,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + turbulenceFields(const turbulenceFields&) = delete; + //- Destructor virtual ~turbulenceFields(); @@ -206,6 +198,12 @@ public: //- Do nothing. // The turbulence fields are registered and written automatically virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const turbulenceFields&) = delete; }; diff --git a/src/functionObjects/field/turbulenceIntensity/turbulenceIntensity.H b/src/functionObjects/field/turbulenceIntensity/turbulenceIntensity.H index d6c3b0d64b..2332e9950c 100644 --- a/src/functionObjects/field/turbulenceIntensity/turbulenceIntensity.H +++ b/src/functionObjects/field/turbulenceIntensity/turbulenceIntensity.H @@ -108,12 +108,6 @@ class turbulenceIntensity //- File header information virtual void writeFileHeader(const label i); - //- Disallow default bitwise copy construction - turbulenceIntensity(const turbulenceIntensity&) = delete; - - //- Disallow default bitwise assignment - void operator=(const turbulenceIntensity&) = delete; - public: @@ -131,6 +125,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + turbulenceIntensity(const turbulenceIntensity&) = delete; + //- Destructor virtual ~turbulenceIntensity(); @@ -146,6 +143,12 @@ public: //- Write the turbulenceIntensity field virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const turbulenceIntensity&) = delete; }; diff --git a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.H b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.H index 185ebc48d8..172952fb52 100644 --- a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.H +++ b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.H @@ -115,17 +115,6 @@ protected: ); -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - wallHeatFlux(const wallHeatFlux&) = delete; - - //- Disallow default bitwise assignment - void operator=(const wallHeatFlux&) = delete; - - public: //- Runtime type information @@ -142,6 +131,9 @@ public: const dictionary& ); + //- Disallow default bitwise copy construction + wallHeatFlux(const wallHeatFlux&) = delete; + //- Destructor virtual ~wallHeatFlux(); @@ -157,6 +149,12 @@ public: //- Write the wall heat-flux virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const wallHeatFlux&) = delete; }; diff --git a/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.H b/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.H index 3169441b01..404d7c11d9 100644 --- a/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.H +++ b/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.H @@ -137,17 +137,6 @@ protected: ); -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - wallHeatTransferCoeff(const wallHeatTransferCoeff&) = delete; - - //- Disallow default bitwise assignment - void operator=(const wallHeatTransferCoeff&) = delete; - - public: //- Runtime type information @@ -164,6 +153,9 @@ public: const dictionary& ); + //- Disallow default bitwise copy construction + wallHeatTransferCoeff(const wallHeatTransferCoeff&) = delete; + //- Destructor virtual ~wallHeatTransferCoeff(); @@ -179,6 +171,12 @@ public: //- Write the wall heat transfer coefficient virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const wallHeatTransferCoeff&) = delete; }; diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.H b/src/functionObjects/field/wallShearStress/wallShearStress.H index 4fb735e0d8..6baacf6eb2 100644 --- a/src/functionObjects/field/wallShearStress/wallShearStress.H +++ b/src/functionObjects/field/wallShearStress/wallShearStress.H @@ -123,17 +123,6 @@ protected: ); -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - wallShearStress(const wallShearStress&) = delete; - - //- Disallow default bitwise assignment - void operator=(const wallShearStress&) = delete; - - public: //- Runtime type information @@ -150,6 +139,9 @@ public: const dictionary& ); + //- Disallow default bitwise copy construction + wallShearStress(const wallShearStress&) = delete; + //- Destructor virtual ~wallShearStress(); @@ -165,6 +157,12 @@ public: //- Write the wall shear-stress virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const wallShearStress&) = delete; }; diff --git a/src/functionObjects/field/writeCellCentres/writeCellCentres.H b/src/functionObjects/field/writeCellCentres/writeCellCentres.H index f121a88a94..283c583751 100644 --- a/src/functionObjects/field/writeCellCentres/writeCellCentres.H +++ b/src/functionObjects/field/writeCellCentres/writeCellCentres.H @@ -72,15 +72,6 @@ class writeCellCentres : public fvMeshFunctionObject { - // Private Member Functions - - //- Disallow default bitwise copy construction - writeCellCentres(const writeCellCentres&) = delete; - - //- Disallow default bitwise assignment - void operator=(const writeCellCentres&) = delete; - - public: //- Runtime type information @@ -97,6 +88,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + writeCellCentres(const writeCellCentres&) = delete; + //- Destructor virtual ~writeCellCentres(); @@ -109,6 +103,12 @@ public: //- Write the cell-centre fields virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const writeCellCentres&) = delete; }; diff --git a/src/functionObjects/field/writeCellVolumes/writeCellVolumes.H b/src/functionObjects/field/writeCellVolumes/writeCellVolumes.H index 3af40dad78..2e55d9384a 100644 --- a/src/functionObjects/field/writeCellVolumes/writeCellVolumes.H +++ b/src/functionObjects/field/writeCellVolumes/writeCellVolumes.H @@ -71,15 +71,6 @@ class writeCellVolumes : public fvMeshFunctionObject { - // Private Member Functions - - //- Disallow default bitwise copy construction - writeCellVolumes(const writeCellVolumes&) = delete; - - //- Disallow default bitwise assignment - void operator=(const writeCellVolumes&) = delete; - - public: //- Runtime type information @@ -96,6 +87,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + writeCellVolumes(const writeCellVolumes&) = delete; + //- Destructor virtual ~writeCellVolumes(); @@ -108,6 +102,12 @@ public: //- Write the cell-centre fields virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const writeCellVolumes&) = delete; }; diff --git a/src/functionObjects/field/yPlus/yPlus.H b/src/functionObjects/field/yPlus/yPlus.H index 4fa21dd9b3..dfdd7c26e1 100644 --- a/src/functionObjects/field/yPlus/yPlus.H +++ b/src/functionObjects/field/yPlus/yPlus.H @@ -100,12 +100,6 @@ class yPlus const turbulenceModel& turbModel ); - //- Disallow default bitwise copy construction - yPlus(const yPlus&) = delete; - - //- Disallow default bitwise assignment - void operator=(const yPlus&) = delete; - public: @@ -123,6 +117,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + yPlus(const yPlus&) = delete; + //- Destructor virtual ~yPlus(); @@ -138,6 +135,12 @@ public: //- Write the yPlus field virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const yPlus&) = delete; }; diff --git a/src/functionObjects/forces/forceCoeffs/forceCoeffs.H b/src/functionObjects/forces/forceCoeffs/forceCoeffs.H index ba7e501fd9..a2aeb5a103 100644 --- a/src/functionObjects/forces/forceCoeffs/forceCoeffs.H +++ b/src/functionObjects/forces/forceCoeffs/forceCoeffs.H @@ -135,15 +135,6 @@ class forceCoeffs scalar Aref_; - // Private Member Functions - - //- Disallow default bitwise copy construction - forceCoeffs(const forceCoeffs&) = delete; - - //- Disallow default bitwise assignment - void operator=(const forceCoeffs&) = delete; - - protected: //- Output file header information @@ -166,6 +157,9 @@ public: const dictionary& ); + //- Disallow default bitwise copy construction + forceCoeffs(const forceCoeffs&) = delete; + //- Destructor virtual ~forceCoeffs(); @@ -181,6 +175,12 @@ public: //- Write the forces virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const forceCoeffs&) = delete; }; diff --git a/src/functionObjects/forces/forces/forces.H b/src/functionObjects/forces/forces/forces.H index d54296f58c..15f98f90ef 100644 --- a/src/functionObjects/forces/forces/forces.H +++ b/src/functionObjects/forces/forces/forces.H @@ -260,12 +260,6 @@ protected: //- Helper function to write bin data void writeBins(); - //- Disallow default bitwise copy construction - forces(const forces&) = delete; - - //- Disallow default bitwise assignment - void operator=(const forces&) = delete; - public: @@ -291,6 +285,9 @@ public: const dictionary& ); + //- Disallow default bitwise copy construction + forces(const forces&) = delete; + //- Destructor virtual ~forces(); @@ -315,6 +312,12 @@ public: //- Write the forces virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const forces&) = delete; }; diff --git a/src/functionObjects/lagrangian/cloudInfo/cloudInfo.H b/src/functionObjects/lagrangian/cloudInfo/cloudInfo.H index e923f2b4c8..a114c98a64 100644 --- a/src/functionObjects/lagrangian/cloudInfo/cloudInfo.H +++ b/src/functionObjects/lagrangian/cloudInfo/cloudInfo.H @@ -96,17 +96,6 @@ protected: virtual void writeFileHeader(const label i); -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - cloudInfo(const cloudInfo&) = delete; - - //- Disallow default bitwise assignment - void operator=(const cloudInfo&) = delete; - - public: //- Runtime type information @@ -123,6 +112,9 @@ public: const dictionary& ); + //- Disallow default bitwise copy construction + cloudInfo(const cloudInfo&) = delete; + //- Destructor virtual ~cloudInfo(); @@ -138,6 +130,12 @@ public: //- Write virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const cloudInfo&) = delete; }; diff --git a/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H b/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H index c749be597b..0082585272 100644 --- a/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H +++ b/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H @@ -60,15 +60,6 @@ class dsmcFields : public fvMeshFunctionObject { - // Private Member Functions - - //- Disallow default bitwise copy construction - dsmcFields(const dsmcFields&) = delete; - - //- Disallow default bitwise assignment - void operator=(const dsmcFields&) = delete; - - public: //- Runtime type information @@ -85,6 +76,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + dsmcFields(const dsmcFields&) = delete; + //- Destructor virtual ~dsmcFields(); @@ -100,6 +94,12 @@ public: //- Calculate and write the DSMC fields virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const dsmcFields&) = delete; }; diff --git a/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.H b/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.H index 1626484496..9d53654b75 100644 --- a/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.H +++ b/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.H @@ -118,15 +118,6 @@ class icoUncoupledKinematicCloud basicKinematicCollidingCloud kinematicCloud_; - // Private Member Functions - - //- Disallow default bitwise copy construction - icoUncoupledKinematicCloud(const icoUncoupledKinematicCloud&) = delete; - - //- Disallow default bitwise assignment - void operator==(const icoUncoupledKinematicCloud&) = delete; - - public: //- Runtime type information @@ -144,6 +135,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + icoUncoupledKinematicCloud(const icoUncoupledKinematicCloud&) = delete; + //- Destructor virtual ~icoUncoupledKinematicCloud(); @@ -159,6 +153,12 @@ public: //- Write the cloud virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator==(const icoUncoupledKinematicCloud&) = delete; }; diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.H b/src/functionObjects/solvers/scalarTransport/scalarTransport.H index c74a1f5acc..a1bd1faee2 100644 --- a/src/functionObjects/solvers/scalarTransport/scalarTransport.H +++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.H @@ -111,12 +111,6 @@ class scalarTransport //- Return the diffusivity field tmp D(const surfaceScalarField& phi) const; - //- Disallow default bitwise copy construction - scalarTransport(const scalarTransport&) = delete; - - //- Disallow default bitwise assignment - void operator=(const scalarTransport&) = delete; - public: @@ -134,6 +128,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + scalarTransport(const scalarTransport&) = delete; + //- Destructor virtual ~scalarTransport(); @@ -150,6 +147,12 @@ public: //- Do nothing. // The volScalarField is registered and written automatically virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const scalarTransport&) = delete; }; diff --git a/src/functionObjects/utilities/abort/abort.H b/src/functionObjects/utilities/abort/abort.H index 3ead2d1410..5e50edde20 100644 --- a/src/functionObjects/utilities/abort/abort.H +++ b/src/functionObjects/utilities/abort/abort.H @@ -93,12 +93,6 @@ private: //- Remove abort file. void removeFile() const; - //- Disallow default bitwise copy construction - abort(const abort&) = delete; - - //- Disallow default bitwise assignment - void operator=(const abort&) = delete; - public: @@ -116,6 +110,9 @@ public: const dictionary& ); + //- Disallow default bitwise copy construction + abort(const abort&) = delete; + //- Destructor virtual ~abort(); @@ -134,6 +131,12 @@ public: //- Execute at the final time-loop, used for cleanup virtual bool end(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const abort&) = delete; }; diff --git a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H index d79ee10ef2..156394cd07 100644 --- a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H +++ b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H @@ -132,15 +132,6 @@ protected: virtual const wordList& codeKeys() const; -private: - - //- Disallow default bitwise copy construction - codedFunctionObject(const codedFunctionObject&) = delete; - - //- Disallow default bitwise assignment - void operator=(const codedFunctionObject&) = delete; - - public: //- Runtime type information @@ -157,6 +148,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + codedFunctionObject(const codedFunctionObject&) = delete; + //- Destructor virtual ~codedFunctionObject(); @@ -183,6 +177,12 @@ public: //- Read and set the function object if its data have changed virtual bool read(const dictionary&); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const codedFunctionObject&) = delete; }; diff --git a/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H b/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H index 731c3ecea4..b1d50ccb64 100644 --- a/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H +++ b/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H @@ -87,15 +87,6 @@ class removeRegisteredObject wordList objectNames_; - // Private Member Functions - - //- Disallow default bitwise copy construction - removeRegisteredObject(const removeRegisteredObject&) = delete; - - //- Disallow default bitwise assignment - void operator=(const removeRegisteredObject&) = delete; - - public: //- Runtime type information @@ -112,6 +103,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + removeRegisteredObject(const removeRegisteredObject&) = delete; + //- Destructor virtual ~removeRegisteredObject(); @@ -127,6 +121,12 @@ public: //- Do nothing virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const removeRegisteredObject&) = delete; }; diff --git a/src/functionObjects/utilities/residuals/residuals.H b/src/functionObjects/utilities/residuals/residuals.H index 2bf8c84db3..86e7c68fab 100644 --- a/src/functionObjects/utilities/residuals/residuals.H +++ b/src/functionObjects/utilities/residuals/residuals.H @@ -101,17 +101,6 @@ protected: void writeResidual(const word& fieldName); -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - residuals(const residuals&) = delete; - - //- Disallow default bitwise assignment - void operator=(const residuals&) = delete; - - public: //- Runtime type information @@ -128,6 +117,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + residuals(const residuals&) = delete; + //- Destructor virtual ~residuals(); @@ -143,6 +135,12 @@ public: //- Write the residuals virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const residuals&) = delete; }; diff --git a/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H b/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H index 3e87a19122..519aeaa694 100644 --- a/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H +++ b/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H @@ -66,15 +66,6 @@ class setTimeStepFunctionObject autoPtr> timeStepPtr_; - // Private Member Functions - - //- Disallow default bitwise copy construction - setTimeStepFunctionObject(const setTimeStepFunctionObject&) = delete; - - //- Disallow default bitwise assignment - void operator=(const setTimeStepFunctionObject&) = delete; - - public: //- Runtime type information @@ -91,6 +82,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + setTimeStepFunctionObject(const setTimeStepFunctionObject&) = delete; + // Destructor virtual ~setTimeStepFunctionObject(); @@ -116,6 +110,12 @@ public: // postProcess overrides the usual writeControl behaviour and // forces writing always (used in post-processing mode) virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const setTimeStepFunctionObject&) = delete; }; diff --git a/src/functionObjects/utilities/systemCall/systemCall.H b/src/functionObjects/utilities/systemCall/systemCall.H index 2a3faf66f6..135bd8ab31 100644 --- a/src/functionObjects/utilities/systemCall/systemCall.H +++ b/src/functionObjects/utilities/systemCall/systemCall.H @@ -115,17 +115,6 @@ protected: stringList writeCalls_; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - systemCall(const systemCall&) = delete; - - //- Disallow default bitwise assignment - void operator=(const systemCall&) = delete; - - public: //- Runtime type information @@ -142,6 +131,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + systemCall(const systemCall&) = delete; + //- Destructor virtual ~systemCall(); @@ -160,6 +152,12 @@ public: //- Write, execute the "writeCalls" virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const systemCall&) = delete; }; diff --git a/src/functionObjects/utilities/time/timeFunctionObject.H b/src/functionObjects/utilities/time/timeFunctionObject.H index 9365f0c461..663087a751 100644 --- a/src/functionObjects/utilities/time/timeFunctionObject.H +++ b/src/functionObjects/utilities/time/timeFunctionObject.H @@ -87,15 +87,6 @@ class time scalar clockTime0_; - // Private Member Functions - - //- Disallow default bitwise copy construction - time(const time&) = delete; - - //- Disallow default bitwise assignment - void operator=(const time&) = delete; - - protected: // Protected Member Functions @@ -120,6 +111,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + time(const time&) = delete; + //- Destructor virtual ~time(); @@ -135,6 +129,12 @@ public: //- Write the time virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const time&) = delete; }; diff --git a/src/functionObjects/utilities/writeDictionary/writeDictionary.H b/src/functionObjects/utilities/writeDictionary/writeDictionary.H index f614fe5af3..47bc64b8cc 100644 --- a/src/functionObjects/utilities/writeDictionary/writeDictionary.H +++ b/src/functionObjects/utilities/writeDictionary/writeDictionary.H @@ -81,17 +81,6 @@ class writeDictionary ); -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - writeDictionary(const writeDictionary&) = delete; - - //- Disallow default bitwise assignment - void operator=(const writeDictionary&) = delete; - - public: //- Runtime type information @@ -108,6 +97,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + writeDictionary(const writeDictionary&) = delete; + //- Destructor virtual ~writeDictionary(); @@ -123,6 +115,12 @@ public: //- Write the selected dictionaries virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const writeDictionary&) = delete; }; diff --git a/src/functionObjects/utilities/writeObjects/writeObjects.H b/src/functionObjects/utilities/writeObjects/writeObjects.H index e6eb0db03b..2721401b77 100644 --- a/src/functionObjects/utilities/writeObjects/writeObjects.H +++ b/src/functionObjects/utilities/writeObjects/writeObjects.H @@ -129,12 +129,6 @@ private: //- Write the requested registered IO object virtual void writeObject(const regIOobject& obj); - //- Disallow default bitwise copy construction - writeObjects(const writeObjects&) = delete; - - //- Disallow default bitwise assignment - void operator=(const writeObjects&) = delete; - public: @@ -152,6 +146,9 @@ public: const dictionary& dict ); + //- Disallow default bitwise copy construction + writeObjects(const writeObjects&) = delete; + //- Destructor virtual ~writeObjects(); @@ -167,6 +164,12 @@ public: //- Write the registered objects virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const writeObjects&) = delete; }; diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H index 1d20469b4e..21ed137bc9 100644 --- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H +++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H @@ -113,13 +113,6 @@ class MGridGenGAMGAgglomeration ); - //- Disallow default bitwise copy construction - MGridGenGAMGAgglomeration(const MGridGenGAMGAgglomeration&) = delete; - - //- Disallow default bitwise assignment - void operator=(const MGridGenGAMGAgglomeration&) = delete; - - public: //- Runtime type information @@ -134,6 +127,15 @@ public: const lduMesh& mesh, const dictionary& controlDict ); + + //- Disallow default bitwise copy construction + MGridGenGAMGAgglomeration(const MGridGenGAMGAgglomeration&) = delete; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const MGridGenGAMGAgglomeration&) = delete; }; diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.H b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.H index d2e1d6b468..20de454571 100644 --- a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.H +++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.H @@ -127,12 +127,6 @@ private: //- Maps current level with base patch void mapBaseToTopAgglom(const label fineLevelIndex); - //- Disallow default bitwise copy construction - pairPatchAgglomeration(const pairPatchAgglomeration&) = delete; - - //- Disallow default bitwise assignment - void operator=(const pairPatchAgglomeration&) = delete; - public: @@ -146,6 +140,9 @@ public: const bool additionalWeights = false ); + //- Disallow default bitwise copy construction + pairPatchAgglomeration(const pairPatchAgglomeration&) = delete; + // Destructor ~pairPatchAgglomeration(); @@ -200,6 +197,12 @@ public: const Field& cf, const label coarseLevelIndex ) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const pairPatchAgglomeration&) = delete; }; diff --git a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H index 90cfcc6e97..753dc940b0 100644 --- a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H +++ b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H @@ -75,18 +75,6 @@ class displacementComponentLaplacianFvMotionSolver // Private Member Functions - //- Disallow default bitwise copy construction - displacementComponentLaplacianFvMotionSolver - ( - const displacementComponentLaplacianFvMotionSolver& - ) = delete; - - //- Disallow default bitwise assignment - void operator= - ( - const displacementComponentLaplacianFvMotionSolver& - ) = delete; - //- Return the component corresponding to the given component name direction cmpt(const word& cmptName) const; @@ -106,6 +94,12 @@ public: const dictionary& ); + //- Disallow default bitwise copy construction + displacementComponentLaplacianFvMotionSolver + ( + const displacementComponentLaplacianFvMotionSolver& + ) = delete; + //- Destructor ~displacementComponentLaplacianFvMotionSolver(); @@ -129,6 +123,14 @@ public: //- Update topology virtual void updateMesh(const mapPolyMesh&); + + // Member Operators + + //- Disallow default bitwise assignment + void operator= + ( + const displacementComponentLaplacianFvMotionSolver& + ) = delete; }; diff --git a/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H index d6d2368af0..98922209ee 100644 --- a/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H +++ b/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H @@ -65,21 +65,6 @@ class velocityComponentLaplacianFvMotionSolver autoPtr diffusivityPtr_; - // Private Member Functions - - //- Disallow default bitwise copy construction - velocityComponentLaplacianFvMotionSolver - ( - const velocityComponentLaplacianFvMotionSolver& - ) = delete; - - //- Disallow default bitwise assignment - void operator= - ( - const velocityComponentLaplacianFvMotionSolver& - ) = delete; - - public: //- Runtime type information @@ -95,6 +80,12 @@ public: const dictionary& ); + //- Disallow default bitwise copy construction + velocityComponentLaplacianFvMotionSolver + ( + const velocityComponentLaplacianFvMotionSolver& + ) = delete; + //- Destructor ~velocityComponentLaplacianFvMotionSolver(); @@ -117,6 +108,15 @@ public: //- Update topology virtual void updateMesh(const mapPolyMesh&); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator= + ( + const velocityComponentLaplacianFvMotionSolver& + ) = delete; }; diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H index 15fb2bd625..0faac69e6f 100644 --- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H +++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H @@ -65,18 +65,6 @@ class displacementSBRStressFvMotionSolver autoPtr diffusivityPtr_; - // Private Member Functions - - //- Disallow default bitwise copy construction - displacementSBRStressFvMotionSolver - ( - const displacementSBRStressFvMotionSolver& - ); - - //- Disallow default bitwise assignment - void operator=(const displacementSBRStressFvMotionSolver&) = delete; - - public: //- Runtime type information @@ -92,6 +80,12 @@ public: const dictionary& ); + //- Disallow default bitwise copy construction + displacementSBRStressFvMotionSolver + ( + const displacementSBRStressFvMotionSolver& + ); + //- Destructor ~displacementSBRStressFvMotionSolver(); @@ -125,6 +119,12 @@ public: //- Update topology virtual void updateMesh(const mapPolyMesh&); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const displacementSBRStressFvMotionSolver&) = delete; }; diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H index dd17e1655f..b6d0b3b3a0 100644 --- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H +++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H @@ -73,18 +73,6 @@ class displacementLaplacianFvMotionSolver label frozenPointsZone_; - // Private Member Functions - - //- Disallow default bitwise copy construction - displacementLaplacianFvMotionSolver - ( - const displacementLaplacianFvMotionSolver& - ); - - //- Disallow default bitwise assignment - void operator=(const displacementLaplacianFvMotionSolver&) = delete; - - public: //- Runtime type information @@ -100,6 +88,12 @@ public: const dictionary& ); + //- Disallow default bitwise copy construction + displacementLaplacianFvMotionSolver + ( + const displacementLaplacianFvMotionSolver& + ); + //- Destructor ~displacementLaplacianFvMotionSolver(); @@ -130,6 +124,12 @@ public: //- Update topology virtual void updateMesh(const mapPolyMesh&); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const displacementLaplacianFvMotionSolver&) = delete; }; diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H index f2e150fb2a..59d78cf8da 100644 --- a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H +++ b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H @@ -65,18 +65,6 @@ class velocityLaplacianFvMotionSolver autoPtr diffusivityPtr_; - // Private Member Functions - - //- Disallow default bitwise copy construction - velocityLaplacianFvMotionSolver - ( - const velocityLaplacianFvMotionSolver& - ); - - //- Disallow default bitwise assignment - void operator=(const velocityLaplacianFvMotionSolver&) = delete; - - public: //- Runtime type information @@ -92,6 +80,12 @@ public: const dictionary& ); + //- Disallow default bitwise copy construction + velocityLaplacianFvMotionSolver + ( + const velocityLaplacianFvMotionSolver& + ); + //- Destructor ~velocityLaplacianFvMotionSolver(); @@ -119,6 +113,12 @@ public: //- Update topology virtual void updateMesh(const mapPolyMesh&); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const velocityLaplacianFvMotionSolver&) = delete; }; diff --git a/src/fvMotionSolver/motionDiffusivity/directional/directionalDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/directional/directionalDiffusivity.H index 41725c38c7..72a00a00f4 100644 --- a/src/fvMotionSolver/motionDiffusivity/directional/directionalDiffusivity.H +++ b/src/fvMotionSolver/motionDiffusivity/directional/directionalDiffusivity.H @@ -55,15 +55,6 @@ class directionalDiffusivity vector diffusivityVector_; - // Private Member Functions - - //- Disallow default bitwise copy construction - directionalDiffusivity(const directionalDiffusivity&) = delete; - - //- Disallow default bitwise assignment - void operator=(const directionalDiffusivity&) = delete; - - public: //- Runtime type information @@ -75,6 +66,9 @@ public: //- Construct for the given fvMesh and data Istream directionalDiffusivity(const fvMesh& mesh, Istream& mdData); + //- Disallow default bitwise copy construction + directionalDiffusivity(const directionalDiffusivity&) = delete; + //- Destructor virtual ~directionalDiffusivity(); @@ -82,6 +76,9 @@ public: // Member Operators + //- Disallow default bitwise assignment + void operator=(const directionalDiffusivity&) = delete; + //- Return diffusivity field virtual tmp operator()() const; }; diff --git a/src/fvMotionSolver/motionDiffusivity/file/fileDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/file/fileDiffusivity.H index 1c1eec6c7a..c814f8819e 100644 --- a/src/fvMotionSolver/motionDiffusivity/file/fileDiffusivity.H +++ b/src/fvMotionSolver/motionDiffusivity/file/fileDiffusivity.H @@ -51,7 +51,6 @@ class fileDiffusivity : public motionDiffusivity { - protected: // Protected data @@ -59,17 +58,6 @@ protected: surfaceScalarField faceDiffusivity_; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - fileDiffusivity(const fileDiffusivity&) = delete; - - //- Disallow default bitwise assignment - void operator=(const fileDiffusivity&) = delete; - - public: //- Runtime type information @@ -81,6 +69,9 @@ public: //- Construct for the given fvMesh and data Istream fileDiffusivity(const fvMesh& mesh, Istream& mdData); + //- Disallow default bitwise copy construction + fileDiffusivity(const fileDiffusivity&) = delete; + //- Destructor virtual ~fileDiffusivity(); @@ -88,15 +79,21 @@ public: // Member Functions + //- Do not correct the motion diffusivity + virtual void correct() + {} + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const fileDiffusivity&) = delete; + //- Return diffusivity field virtual tmp operator()() const { return faceDiffusivity_; } - - //- Do not correct the motion diffusivity - virtual void correct() - {} }; diff --git a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H index 617334682b..23f59325fc 100644 --- a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H +++ b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H @@ -63,12 +63,6 @@ class inverseDistanceDiffusivity //- Return patch-cell-centre distance field tmp y() const; - //- Disallow default bitwise copy construction - inverseDistanceDiffusivity(const inverseDistanceDiffusivity&) = delete; - - //- Disallow default bitwise assignment - void operator=(const inverseDistanceDiffusivity&) = delete; - public: @@ -81,6 +75,9 @@ public: //- Construct for the given fvMesh and data Istream inverseDistanceDiffusivity(const fvMesh& mesh, Istream& mdData); + //- Disallow default bitwise copy construction + inverseDistanceDiffusivity(const inverseDistanceDiffusivity&) = delete; + //- Destructor virtual ~inverseDistanceDiffusivity(); @@ -88,6 +85,9 @@ public: // Member Operators + //- Disallow default bitwise assignment + void operator=(const inverseDistanceDiffusivity&) = delete; + //- Return diffusivity field virtual tmp operator()() const; }; diff --git a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.H index 348f3dc650..f0ba68a7af 100644 --- a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.H +++ b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.H @@ -56,18 +56,6 @@ class inverseFaceDistanceDiffusivity wordList patchNames_; - // Private Member Functions - - //- Disallow default bitwise copy construction - inverseFaceDistanceDiffusivity - ( - const inverseFaceDistanceDiffusivity& - ) = delete; - - //- Disallow default bitwise assignment - void operator=(const inverseFaceDistanceDiffusivity&) = delete; - - public: //- Runtime type information @@ -79,6 +67,12 @@ public: //- Construct for the given fvMesh and data Istream inverseFaceDistanceDiffusivity(const fvMesh& mesh, Istream& mdData); + //- Disallow default bitwise copy construction + inverseFaceDistanceDiffusivity + ( + const inverseFaceDistanceDiffusivity& + ) = delete; + //- Destructor virtual ~inverseFaceDistanceDiffusivity(); @@ -86,6 +80,9 @@ public: // Member Operators + //- Disallow default bitwise assignment + void operator=(const inverseFaceDistanceDiffusivity&) = delete; + //- Return diffusivity field virtual tmp operator()() const; }; diff --git a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.H index 2771f46371..e61e09f812 100644 --- a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.H +++ b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.H @@ -56,18 +56,6 @@ class inversePointDistanceDiffusivity wordReList patchNames_; - // Private Member Functions - - //- Disallow default bitwise copy construction - inversePointDistanceDiffusivity - ( - const inversePointDistanceDiffusivity& - ) = delete; - - //- Disallow default bitwise assignment - void operator=(const inversePointDistanceDiffusivity&) = delete; - - public: //- Runtime type information @@ -79,6 +67,12 @@ public: //- Construct for the given fvMesh and data Istream inversePointDistanceDiffusivity(const fvMesh& mesh, Istream& mdData); + //- Disallow default bitwise copy construction + inversePointDistanceDiffusivity + ( + const inversePointDistanceDiffusivity& + ) = delete; + //- Destructor virtual ~inversePointDistanceDiffusivity(); @@ -86,6 +80,9 @@ public: // Member Operators + //- Disallow default bitwise assignment + void operator=(const inversePointDistanceDiffusivity&) = delete; + //- Return diffusivity field virtual tmp operator()() const; }; diff --git a/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.H index 96df9b5a19..70e032d2ff 100644 --- a/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.H +++ b/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.H @@ -50,15 +50,6 @@ class inverseVolumeDiffusivity : public motionDiffusivity { - // Private Member Functions - - //- Disallow default bitwise copy construction - inverseVolumeDiffusivity(const inverseVolumeDiffusivity&) = delete; - - //- Disallow default bitwise assignment - void operator=(const inverseVolumeDiffusivity&) = delete; - - public: //- Runtime type information @@ -70,6 +61,9 @@ public: //- Construct for the given fvMesh and data Istream inverseVolumeDiffusivity(const fvMesh& mesh, Istream& mdData); + //- Disallow default bitwise copy construction + inverseVolumeDiffusivity(const inverseVolumeDiffusivity&) = delete; + //- Destructor virtual ~inverseVolumeDiffusivity(); @@ -77,6 +71,9 @@ public: // Member Operators + //- Disallow default bitwise assignment + void operator=(const inverseVolumeDiffusivity&) = delete; + //- Return diffusivity field virtual tmp operator()() const; }; diff --git a/src/fvMotionSolver/motionDiffusivity/manipulators/exponential/exponentialDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/manipulators/exponential/exponentialDiffusivity.H index c25112fb79..556f93856c 100644 --- a/src/fvMotionSolver/motionDiffusivity/manipulators/exponential/exponentialDiffusivity.H +++ b/src/fvMotionSolver/motionDiffusivity/manipulators/exponential/exponentialDiffusivity.H @@ -57,15 +57,6 @@ class exponentialDiffusivity autoPtr basicDiffusivityPtr_; - // Private Member Functions - - //- Disallow default bitwise copy construction - exponentialDiffusivity(const exponentialDiffusivity&) = delete; - - //- Disallow default bitwise assignment - void operator=(const exponentialDiffusivity&) = delete; - - public: //- Runtime type information @@ -77,6 +68,9 @@ public: //- Construct for the given fvMesh and data Istream exponentialDiffusivity(const fvMesh& mesh, Istream& mdData); + //- Disallow default bitwise copy construction + exponentialDiffusivity(const exponentialDiffusivity&) = delete; + //- Destructor virtual ~exponentialDiffusivity(); @@ -84,11 +78,17 @@ public: // Member Functions - //- Return diffusivity field - virtual tmp operator()() const; - //- Correct the motion diffusivity virtual void correct(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const exponentialDiffusivity&) = delete; + + //- Return diffusivity field + virtual tmp operator()() const; }; diff --git a/src/fvMotionSolver/motionDiffusivity/manipulators/quadratic/quadraticDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/manipulators/quadratic/quadraticDiffusivity.H index fff2cd8c24..283ed68d33 100644 --- a/src/fvMotionSolver/motionDiffusivity/manipulators/quadratic/quadraticDiffusivity.H +++ b/src/fvMotionSolver/motionDiffusivity/manipulators/quadratic/quadraticDiffusivity.H @@ -56,15 +56,6 @@ class quadraticDiffusivity autoPtr basicDiffusivityPtr_; - // Private Member Functions - - //- Disallow default bitwise copy construction - quadraticDiffusivity(const quadraticDiffusivity&) = delete; - - //- Disallow default bitwise assignment - void operator=(const quadraticDiffusivity&) = delete; - - public: //- Runtime type information @@ -76,6 +67,9 @@ public: //- Construct for the given fvMesh and data Istream quadraticDiffusivity(const fvMesh& mesh, Istream& mdData); + //- Disallow default bitwise copy construction + quadraticDiffusivity(const quadraticDiffusivity&) = delete; + //- Destructor virtual ~quadraticDiffusivity(); @@ -83,11 +77,17 @@ public: // Member Functions - //- Return diffusivity field - virtual tmp operator()() const; - //- Correct the motion diffusivity virtual void correct(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const quadraticDiffusivity&) = delete; + + //- Return diffusivity field + virtual tmp operator()() const; }; diff --git a/src/fvMotionSolver/motionDiffusivity/motionDirectional/motionDirectionalDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/motionDirectional/motionDirectionalDiffusivity.H index b194f1d420..f751d90a1a 100644 --- a/src/fvMotionSolver/motionDiffusivity/motionDirectional/motionDirectionalDiffusivity.H +++ b/src/fvMotionSolver/motionDiffusivity/motionDirectional/motionDirectionalDiffusivity.H @@ -55,18 +55,6 @@ class motionDirectionalDiffusivity vector diffusivityVector_; - // Private Member Functions - - //- Disallow default bitwise copy construction - motionDirectionalDiffusivity - ( - const motionDirectionalDiffusivity& - ) = delete; - - //- Disallow default bitwise assignment - void operator=(const motionDirectionalDiffusivity&) = delete; - - public: //- Runtime type information @@ -78,6 +66,12 @@ public: //- Construct for the given fvMesh and data Istream motionDirectionalDiffusivity(const fvMesh& mesh, Istream& mdData); + //- Disallow default bitwise copy construction + motionDirectionalDiffusivity + ( + const motionDirectionalDiffusivity& + ) = delete; + //- Destructor virtual ~motionDirectionalDiffusivity(); @@ -85,6 +79,9 @@ public: // Member Operators + //- Disallow default bitwise assignment + void operator=(const motionDirectionalDiffusivity&) = delete; + //- Return diffusivity field virtual tmp operator()() const; }; diff --git a/src/fvMotionSolver/motionDiffusivity/uniform/uniformDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/uniform/uniformDiffusivity.H index 95e617e144..192d78afc1 100644 --- a/src/fvMotionSolver/motionDiffusivity/uniform/uniformDiffusivity.H +++ b/src/fvMotionSolver/motionDiffusivity/uniform/uniformDiffusivity.H @@ -50,15 +50,6 @@ class uniformDiffusivity : public motionDiffusivity { - // Private Member Functions - - //- Disallow default bitwise copy construction - uniformDiffusivity(const uniformDiffusivity&) = delete; - - //- Disallow default bitwise assignment - void operator=(const uniformDiffusivity&) = delete; - - public: //- Runtime type information @@ -70,6 +61,9 @@ public: //- Construct for the given fvMesh and data Istream uniformDiffusivity(const fvMesh& mesh, Istream& mdData); + //- Disallow default bitwise copy construction + uniformDiffusivity(const uniformDiffusivity&) = delete; + //- Destructor virtual ~uniformDiffusivity(); @@ -77,6 +71,9 @@ public: // Member Operators + //- Disallow default bitwise assignment + void operator=(const uniformDiffusivity&) = delete; + //- Return diffusivity field virtual tmp operator()() const; }; diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H index f904c8e347..846defd634 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H @@ -75,7 +75,6 @@ class surfaceDisplacementPointPatchVectorField : public fixedValuePointPatchVectorField { - public: // Public data types @@ -122,12 +121,6 @@ private: void calcProjection(vectorField& displacement) const; - //- Disallow default bitwise assignment - void operator= - ( - const surfaceDisplacementPointPatchVectorField& - ) = delete; - public: //- Runtime type information @@ -211,6 +204,15 @@ public: //- Write virtual void write(Ostream&) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator= + ( + const surfaceDisplacementPointPatchVectorField& + ) = delete; }; diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H index 28d8335110..d7a2bc05df 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H @@ -69,7 +69,6 @@ class surfaceSlipDisplacementPointPatchVectorField : public pointPatchVectorField { - public: // Public data types @@ -112,12 +111,6 @@ private: //- Calculate displacement (w.r.t. points0()) to project onto surface void calcProjection(vectorField& displacement) const; - //- Disallow default bitwise assignment - void operator= - ( - const surfaceSlipDisplacementPointPatchVectorField& - ) = delete; - public: @@ -205,6 +198,15 @@ public: //- Write virtual void write(Ostream&) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator= + ( + const surfaceSlipDisplacementPointPatchVectorField& + ) = delete; }; diff --git a/src/fvOptions/constraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H b/src/fvOptions/constraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H index bf6a8c36dd..5026e6ac53 100644 --- a/src/fvOptions/constraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H +++ b/src/fvOptions/constraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H @@ -78,7 +78,6 @@ class fixedTemperatureConstraint : public cellSetOption { - public: //- Temperature mode @@ -107,17 +106,6 @@ protected: word TName_; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - fixedTemperatureConstraint(const fixedTemperatureConstraint&) = delete; - - //- Disallow default bitwise assignment - void operator=(const fixedTemperatureConstraint&) = delete; - - public: //- Runtime type information @@ -135,6 +123,9 @@ public: const fvMesh& mesh ); + //- Disallow default bitwise copy construction + fixedTemperatureConstraint(const fixedTemperatureConstraint&) = delete; + //- Destructor virtual ~fixedTemperatureConstraint() @@ -146,11 +137,14 @@ public: //- Constrain energy equation to fix the temperature virtual void constrain(fvMatrix& eqn, const label fieldi); + //- Read dictionary + virtual bool read(const dictionary& dict); - // IO - //- Read dictionary - virtual bool read(const dictionary& dict); + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const fixedTemperatureConstraint&) = delete; }; diff --git a/src/fvOptions/corrections/limitTemperature/limitTemperature.H b/src/fvOptions/corrections/limitTemperature/limitTemperature.H index 3b48bb72d5..544ae28fa7 100644 --- a/src/fvOptions/corrections/limitTemperature/limitTemperature.H +++ b/src/fvOptions/corrections/limitTemperature/limitTemperature.H @@ -68,7 +68,6 @@ class limitTemperature : public cellSetOption { - protected: // Protected data @@ -83,17 +82,6 @@ protected: word phase_; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - limitTemperature(const limitTemperature&) = delete; - - //- Disallow default bitwise assignment - void operator=(const limitTemperature&) = delete; - - public: //- Runtime type information @@ -111,6 +99,9 @@ public: const fvMesh& mesh ); + //- Disallow default bitwise copy construction + limitTemperature(const limitTemperature&) = delete; + //- Destructor virtual ~limitTemperature() @@ -124,6 +115,12 @@ public: //- Correct the energy field virtual void correct(volScalarField& he); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const limitTemperature&) = delete; }; diff --git a/src/fvOptions/corrections/limitVelocity/limitVelocity.H b/src/fvOptions/corrections/limitVelocity/limitVelocity.H index e4c7a385e8..25666babc8 100644 --- a/src/fvOptions/corrections/limitVelocity/limitVelocity.H +++ b/src/fvOptions/corrections/limitVelocity/limitVelocity.H @@ -65,7 +65,6 @@ class limitVelocity : public cellSetOption { - protected: // Protected data @@ -77,17 +76,6 @@ protected: scalar max_; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - limitVelocity(const limitVelocity&) = delete; - - //- Disallow default bitwise assignment - void operator=(const limitVelocity&) = delete; - - public: //- Runtime type information @@ -105,6 +93,9 @@ public: const fvMesh& mesh ); + //- Disallow default bitwise copy construction + limitVelocity(const limitVelocity&) = delete; + //- Destructor virtual ~limitVelocity() @@ -118,6 +109,12 @@ public: //- Correct the energy field virtual void correct(volVectorField& U); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const limitVelocity&) = delete; }; diff --git a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H index 0af2df1811..6510463536 100644 --- a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H +++ b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H @@ -124,12 +124,6 @@ private: const vectorField& U ) const; - //- Disallow default bitwise copy construction - actuationDiskSource(const actuationDiskSource&) = delete; - - //- Disallow default bitwise assignment - void operator=(const actuationDiskSource&) = delete; - public: @@ -148,6 +142,9 @@ public: const fvMesh& mesh ); + //- Disallow default bitwise copy construction + actuationDiskSource(const actuationDiskSource&) = delete; + //- Destructor virtual ~actuationDiskSource() @@ -205,6 +202,12 @@ public: //- Read dictionary virtual bool read(const dictionary& dict); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const actuationDiskSource&) = delete; }; diff --git a/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.H b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.H index dde860e044..3a38721bbc 100644 --- a/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.H +++ b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.H @@ -66,15 +66,6 @@ class buoyancyEnergy word UName_; - // Private Member Functions - - //- Disallow default bitwise copy construction - buoyancyEnergy(const buoyancyEnergy&) = delete; - - //- Disallow default bitwise assignment - void operator=(const buoyancyEnergy&) = delete; - - public: //- Runtime type information @@ -92,6 +83,9 @@ public: const fvMesh& mesh ); + //- Disallow default bitwise copy construction + buoyancyEnergy(const buoyancyEnergy&) = delete; + // Member Functions @@ -110,6 +104,12 @@ public: //- Read source dictionary virtual bool read(const dictionary& dict); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const buoyancyEnergy&) = delete; }; diff --git a/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.H b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.H index 7c9eb97f24..d76141ddae 100644 --- a/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.H +++ b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.H @@ -65,15 +65,6 @@ class buoyancyForce uniformDimensionedVectorField g_; - // Private Member Functions - - //- Disallow default bitwise copy construction - buoyancyForce(const buoyancyForce&) = delete; - - //- Disallow default bitwise assignment - void operator=(const buoyancyForce&) = delete; - - public: //- Runtime type information @@ -91,6 +82,9 @@ public: const fvMesh& mesh ); + //- Disallow default bitwise copy construction + buoyancyForce(const buoyancyForce&) = delete; + // Member Functions @@ -116,6 +110,12 @@ public: //- Read source dictionary virtual bool read(const dictionary& dict); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const buoyancyForce&) = delete; }; diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H index a86566fda9..2f7a924f74 100644 --- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H +++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H @@ -197,15 +197,6 @@ private: // Private Member Functions - //- Disallow default bitwise copy construction - effectivenessHeatExchangerSource - ( - const effectivenessHeatExchangerSource& - ); - - //- Disallow default bitwise assignment - void operator=(const effectivenessHeatExchangerSource&) = delete; - //- Initialise heat exchanger source model void initialise(); @@ -230,6 +221,12 @@ public: const fvMesh& mesh ); + //- Disallow default bitwise copy construction + effectivenessHeatExchangerSource + ( + const effectivenessHeatExchangerSource& + ); + //- Destructor virtual ~effectivenessHeatExchangerSource() @@ -266,6 +263,12 @@ public: //- Read dictionary virtual bool read(const dictionary& dict); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const effectivenessHeatExchangerSource&) = delete; }; diff --git a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H index d9e0609c99..486b6dbdd8 100644 --- a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H +++ b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H @@ -86,7 +86,6 @@ class explicitPorositySource : public cellSetOption { - protected: // Protected data @@ -95,17 +94,6 @@ protected: autoPtr porosityPtr_; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - explicitPorositySource(const explicitPorositySource&) = delete; - - //- Disallow default bitwise assignment - void operator=(const explicitPorositySource&) = delete; - - public: //- Runtime type information @@ -123,6 +111,9 @@ public: const fvMesh& mesh ); + //- Disallow default bitwise copy construction + explicitPorositySource(const explicitPorositySource&) = delete; + //- Destructor virtual ~explicitPorositySource() @@ -167,6 +158,12 @@ public: //- Read dictionary virtual bool read(const dictionary& dict); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const explicitPorositySource&) = delete; }; diff --git a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H index 3afa0a167b..8cc64818b9 100644 --- a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H +++ b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.H @@ -105,17 +105,6 @@ protected: void update(fvMatrix& eqn); -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - meanVelocityForce(const meanVelocityForce&) = delete; - - //- Disallow default bitwise assignment - void operator=(const meanVelocityForce&) = delete; - - public: //- Runtime type information @@ -133,6 +122,9 @@ public: const fvMesh& mesh ); + //- Disallow default bitwise copy construction + meanVelocityForce(const meanVelocityForce&) = delete; + // Member Functions @@ -168,6 +160,12 @@ public: //- Read source dictionary virtual bool read(const dictionary& dict); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const meanVelocityForce&) = delete; }; diff --git a/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H b/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H index 40742f3378..9f7adc9cdd 100644 --- a/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H +++ b/src/fvOptions/sources/derived/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H @@ -83,17 +83,6 @@ protected: virtual scalar magUbarAve(const volVectorField& U) const; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - patchMeanVelocityForce(const patchMeanVelocityForce&) = delete; - - //- Disallow default bitwise assignment - void operator=(const patchMeanVelocityForce&) = delete; - - public: //- Runtime type information @@ -110,6 +99,15 @@ public: const dictionary& dict, const fvMesh& mesh ); + + //- Disallow default bitwise copy construction + patchMeanVelocityForce(const patchMeanVelocityForce&) = delete; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const patchMeanVelocityForce&) = delete; }; diff --git a/src/fvOptions/sources/derived/phaseLimitStabilization/PhaseLimitStabilization.H b/src/fvOptions/sources/derived/phaseLimitStabilization/PhaseLimitStabilization.H index f3c1182f97..b966fe1f73 100644 --- a/src/fvOptions/sources/derived/phaseLimitStabilization/PhaseLimitStabilization.H +++ b/src/fvOptions/sources/derived/phaseLimitStabilization/PhaseLimitStabilization.H @@ -87,15 +87,6 @@ class PhaseLimitStabilization scalar residualAlpha_; - // Private Member Functions - - //- Disallow default bitwise copy construction - PhaseLimitStabilization(const PhaseLimitStabilization&) = delete; - - //- Disallow default bitwise assignment - void operator=(const PhaseLimitStabilization&) = delete; - - public: //- Runtime type information @@ -113,6 +104,9 @@ public: const fvMesh& mesh ); + //- Disallow default bitwise copy construction + PhaseLimitStabilization(const PhaseLimitStabilization&) = delete; + //- Destructor virtual ~PhaseLimitStabilization() @@ -132,6 +126,12 @@ public: //- Read dictionary virtual bool read(const dictionary& dict); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const PhaseLimitStabilization&) = delete; }; diff --git a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H index 7f7834b440..fb5f99f0c1 100644 --- a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H +++ b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H @@ -109,12 +109,6 @@ class radialActuationDiskSource const vectorField& U ) const; - //- Disallow default bitwise copy construction - radialActuationDiskSource(const radialActuationDiskSource&) = delete; - - //- Disallow default bitwise assignment - void operator=(const radialActuationDiskSource&) = delete; - public: @@ -133,6 +127,9 @@ public: const fvMesh& mesh ); + //- Disallow default bitwise copy construction + radialActuationDiskSource(const radialActuationDiskSource&) = delete; + //- Destructor virtual ~radialActuationDiskSource() @@ -161,6 +158,12 @@ public: //- Read dictionary virtual bool read(const dictionary& dict); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const radialActuationDiskSource&) = delete; }; diff --git a/src/fvOptions/sources/derived/solidEqulibriumEnergySource/solidEqulibriumEnergySource.H b/src/fvOptions/sources/derived/solidEqulibriumEnergySource/solidEqulibriumEnergySource.H index e1fe83379e..5c83e0046f 100644 --- a/src/fvOptions/sources/derived/solidEqulibriumEnergySource/solidEqulibriumEnergySource.H +++ b/src/fvOptions/sources/derived/solidEqulibriumEnergySource/solidEqulibriumEnergySource.H @@ -87,18 +87,6 @@ class solidEqulibriumEnergySource const solidThermo& thermo() const; - // Private Member Functions - - //- Disallow default bitwise copy construction - solidEqulibriumEnergySource - ( - const solidEqulibriumEnergySource& - ) = delete; - - //- Disallow default bitwise assignment - void operator=(const solidEqulibriumEnergySource&) = delete; - - public: //- Runtime type information @@ -116,6 +104,12 @@ public: const fvMesh& mesh ); + //- Disallow default bitwise copy construction + solidEqulibriumEnergySource + ( + const solidEqulibriumEnergySource& + ) = delete; + //- Destructor virtual ~solidEqulibriumEnergySource(); @@ -147,6 +141,12 @@ public: //- Read dictionary virtual bool read(const dictionary& dict); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const solidEqulibriumEnergySource&) = delete; }; diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H index c5dbd9c8cc..d3e95768d7 100644 --- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H +++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H @@ -227,15 +227,6 @@ private: template void apply(const RhoFieldType& rho, fvMatrix& eqn); - //- Disallow default bitwise copy construction - solidificationMeltingSource - ( - const solidificationMeltingSource& - ) = delete; - - //- Disallow default bitwise assignment - void operator=(const solidificationMeltingSource&) = delete; - public: @@ -254,6 +245,12 @@ public: const fvMesh& mesh ); + //- Disallow default bitwise copy construction + solidificationMeltingSource + ( + const solidificationMeltingSource& + ) = delete; + // Member Functions @@ -289,6 +286,12 @@ public: //- Read source dictionary virtual bool read(const dictionary& dict); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const solidificationMeltingSource&) = delete; }; diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.H b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.H index 74d3d50eb3..27ce6d4255 100644 --- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.H +++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.H @@ -72,15 +72,6 @@ class tabulated6DoFAcceleration Field values_; - // Private Member Functions - - //- Disallow default bitwise copy construction - tabulated6DoFAcceleration(const tabulated6DoFAcceleration&); - - //- Disallow default bitwise assignment - void operator=(const tabulated6DoFAcceleration&) = delete; - - public: //- Runtime type information @@ -96,6 +87,9 @@ public: const Time& runTime ); + //- Disallow default bitwise copy construction + tabulated6DoFAcceleration(const tabulated6DoFAcceleration&); + //- Destructor virtual ~tabulated6DoFAcceleration(); @@ -108,6 +102,12 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& accelerationCoeffs); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const tabulated6DoFAcceleration&) = delete; }; diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.H b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.H index 7d56e16176..0d90ed99a1 100644 --- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.H +++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.H @@ -83,16 +83,6 @@ private: // Private Member Functions - //- Disallow default bitwise copy construction - tabulatedAccelerationSource - ( - const tabulatedAccelerationSource& - ) = delete; - - //- Disallow default bitwise assignment - void operator=(const tabulatedAccelerationSource&) = delete; - - //- Source term to momentum equation template void addSup @@ -120,6 +110,12 @@ public: const fvMesh& mesh ); + //- Disallow default bitwise copy construction + tabulatedAccelerationSource + ( + const tabulatedAccelerationSource& + ) = delete; + //- Destructor virtual ~tabulatedAccelerationSource() @@ -145,6 +141,12 @@ public: //- Read dictionary virtual bool read(const dictionary& dict); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const tabulatedAccelerationSource&) = delete; }; diff --git a/src/fvOptions/sources/derived/volumeFractionSource/volumeFractionSource.H b/src/fvOptions/sources/derived/volumeFractionSource/volumeFractionSource.H index ba336e65b3..af2ab0eb0b 100644 --- a/src/fvOptions/sources/derived/volumeFractionSource/volumeFractionSource.H +++ b/src/fvOptions/sources/derived/volumeFractionSource/volumeFractionSource.H @@ -150,11 +150,6 @@ class volumeFractionSource const label fieldi ); - //- Disallow default bitwise copy construction - volumeFractionSource(const volumeFractionSource&) = delete; - - //- Disallow default bitwise assignment - void operator=(const volumeFractionSource&) = delete; public: @@ -173,6 +168,9 @@ public: const fvMesh& mesh ); + //- Disallow default bitwise copy construction + volumeFractionSource(const volumeFractionSource&) = delete; + //- Destructor virtual ~volumeFractionSource(); @@ -280,6 +278,12 @@ public: //- Read dictionary virtual bool read(const dictionary& dict); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const volumeFractionSource&) = delete; }; diff --git a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H index 8f09f6cc1d..ca44a5b706 100644 --- a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H +++ b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H @@ -104,20 +104,6 @@ protected: void initialise(); -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - interRegionExplicitPorositySource - ( - const interRegionExplicitPorositySource& - ); - - //- Disallow default bitwise assignment - void operator=(const interRegionExplicitPorositySource&) = delete; - - public: //- Runtime type information @@ -135,6 +121,12 @@ public: const fvMesh& mesh ); + //- Disallow default bitwise copy construction + interRegionExplicitPorositySource + ( + const interRegionExplicitPorositySource& + ); + //- Destructor virtual ~interRegionExplicitPorositySource() @@ -168,6 +160,12 @@ public: //- Read dictionary virtual bool read(const dictionary& dict); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const interRegionExplicitPorositySource&) = delete; }; diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H index 031606308c..35a2e84842 100644 --- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H +++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H @@ -182,12 +182,6 @@ class DSMCCloud //- Calculate the volume field data void calculateFields(); - //- Disallow default bitwise copy construction - DSMCCloud(const DSMCCloud&) = delete; - - //- Disallow default bitwise assignment - void operator=(const DSMCCloud&) = delete; - public: @@ -210,6 +204,9 @@ public: const IOdictionary& dsmcInitialiseDict ); + //- Disallow default bitwise copy construction + DSMCCloud(const DSMCCloud&) = delete; + //- Destructor virtual ~DSMCCloud(); @@ -469,6 +466,12 @@ public: //- Remap the particles to the correct cells following mesh change virtual void autoMap(const mapPolyMesh&); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const DSMCCloud&) = delete; }; diff --git a/src/lagrangian/DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.H b/src/lagrangian/DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.H index bd0e3020fc..97cdbe978d 100644 --- a/src/lagrangian/DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.H +++ b/src/lagrangian/DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.H @@ -48,15 +48,6 @@ namespace Foam class DSMCBaseCloud { - // Private Member Functions - - //- Disallow default bitwise copy construction - DSMCBaseCloud(const DSMCBaseCloud&) = delete; - - //- Disallow default bitwise assignment - void operator=(const DSMCBaseCloud&) = delete; - - public: //- Runtime type information @@ -67,8 +58,18 @@ public: //- Null constructor DSMCBaseCloud(); + //- Disallow default bitwise copy construction + DSMCBaseCloud(const DSMCBaseCloud&) = delete; + + //- Destructor virtual ~DSMCBaseCloud(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const DSMCBaseCloud&) = delete; }; diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.H b/src/lagrangian/basic/InteractionLists/InteractionLists.H index 55fbd80087..381fab42e2 100644 --- a/src/lagrangian/basic/InteractionLists/InteractionLists.H +++ b/src/lagrangian/basic/InteractionLists/InteractionLists.H @@ -198,12 +198,6 @@ class InteractionLists //- Write the referred wall faces out for debug void writeReferredWallFaces() const; - //- Disallow default bitwise copy construction - InteractionLists(const InteractionLists&) = delete; - - //- Disallow default bitwise assignment - void operator=(const InteractionLists&) = delete; - public: @@ -222,6 +216,10 @@ public: const word& UName = "U" ); + //- Disallow default bitwise copy construction + InteractionLists(const InteractionLists&) = delete; + + // Destructor ~InteractionLists(); @@ -298,6 +296,12 @@ public: //- Return non-const access to the referred particle container inline List>& referredParticles(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const InteractionLists&) = delete; }; diff --git a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H index ff4163910d..1ae6cd4d47 100644 --- a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H +++ b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H @@ -51,15 +51,6 @@ class indexedParticleCloud : public Cloud { - // Private Member Functions - - //- Disallow default bitwise copy construction - indexedParticleCloud(const indexedParticleCloud&) = delete; - - //- Disallow default bitwise assignment - void operator=(const indexedParticleCloud&) = delete; - - public: // Constructors @@ -71,6 +62,15 @@ public: const word& cloudName = "defaultCloud", bool readFields = true ); + + //- Disallow default bitwise copy construction + indexedParticleCloud(const indexedParticleCloud&) = delete; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const indexedParticleCloud&) = delete; }; diff --git a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H index b559aec72e..b9e6ea89c5 100644 --- a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H +++ b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H @@ -51,15 +51,6 @@ class passiveParticleCloud : public Cloud { - // Private Member Functions - - //- Disallow default bitwise copy construction - passiveParticleCloud(const passiveParticleCloud&) = delete; - - //- Disallow default bitwise assignment - void operator=(const passiveParticleCloud&) = delete; - - public: // Constructors @@ -79,6 +70,15 @@ public: const word& cloudName, const IDLList& particles ); + + //- Disallow default bitwise copy construction + passiveParticleCloud(const passiveParticleCloud&) = delete; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const passiveParticleCloud&) = delete; }; diff --git a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H index 9b6aa221c7..1d85f2eac0 100644 --- a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H @@ -84,15 +84,6 @@ private: autoPtr> cloudCopyPtr_; - // Private Member Functions - - //- Disallow default bitwise copy construction - CollidingCloud(const CollidingCloud&) = delete; - - //- Disallow default bitwise assignment - void operator=(const CollidingCloud&) = delete; - - protected: // Protected data @@ -159,6 +150,9 @@ public: const CollidingCloud& c ); + //- Disallow default bitwise copy construction + CollidingCloud(const CollidingCloud&) = delete; + //- Construct and return clone based on (this) with new name virtual autoPtr> clone(const word& name) { @@ -234,6 +228,12 @@ public: //- Print cloud information void info(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const CollidingCloud&) = delete; }; diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H index b835619b8c..c2b68580a5 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H @@ -129,15 +129,6 @@ private: autoPtr> cloudCopyPtr_; - // Private Member Functions - - //- Disallow default bitwise copy construction - KinematicCloud(const KinematicCloud&) = delete; - - //- Disallow default bitwise assignment - void operator=(const KinematicCloud&) = delete; - - protected: // Protected data @@ -303,6 +294,9 @@ public: const KinematicCloud& c ); + //- Disallow default bitwise copy construction + KinematicCloud(const KinematicCloud&) = delete; + //- Construct and return clone based on (this) with new name virtual autoPtr> clone(const word& name) { @@ -616,6 +610,12 @@ public: //- Print cloud information void info(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const KinematicCloud&) = delete; }; diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H index 713ff66c02..2a0fed1435 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H @@ -103,12 +103,6 @@ class cloudSolution List>> schemes_; - // Private Member Functions - - //- Disallow default bitwise assignment - void operator=(const cloudSolution&) = delete; - - public: // Constructors @@ -207,6 +201,12 @@ public: //- Returns true if writing this step bool output() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const cloudSolution&) = delete; }; diff --git a/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.H b/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.H index 41f4c6770f..ca21cc8645 100644 --- a/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/MPPICCloud/MPPICCloud.H @@ -90,15 +90,6 @@ private: autoPtr> cloudCopyPtr_; - // Private Member Functions - - //- Disallow default bitwise copy construction - MPPICCloud(const MPPICCloud&) = delete; - - //- Disallow default bitwise assignment - void operator=(const MPPICCloud&) = delete; - - protected: // Protected data @@ -153,6 +144,9 @@ public: const MPPICCloud& c ); + //- Disallow default bitwise copy construction + MPPICCloud(const MPPICCloud&) = delete; + //- Construct and return clone based on (this) with new name virtual autoPtr> clone(const word& name) { @@ -229,6 +223,12 @@ public: //- Print cloud information void info(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const MPPICCloud&) = delete; }; diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H index 0afb9e30a9..82dbed5811 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H @@ -87,14 +87,6 @@ private: autoPtr> cloudCopyPtr_; - // Private Member Functions - - //- Disallow default bitwise copy construction - ReactingCloud(const ReactingCloud&) = delete; - - //- Disallow default bitwise assignment - void operator=(const ReactingCloud&) = delete; - protected: @@ -172,6 +164,9 @@ public: const ReactingCloud& c ); + //- Disallow default bitwise copy construction + ReactingCloud(const ReactingCloud&) = delete; + //- Construct and return clone based on (this) with new name virtual autoPtr> clone(const word& name) { @@ -310,6 +305,12 @@ public: //- Write the field data for the cloud virtual void writeFields() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const ReactingCloud&) = delete; }; diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H index 6db6791e05..d6a265bffd 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H @@ -88,15 +88,6 @@ private: autoPtr> cloudCopyPtr_; - // Private Member Functions - - //- Disallow default bitwise copy construction - ReactingMultiphaseCloud(const ReactingMultiphaseCloud&) = delete; - - //- Disallow default bitwise assignment - void operator=(const ReactingMultiphaseCloud&) = delete; - - protected: // Protected data @@ -177,6 +168,9 @@ public: const ReactingMultiphaseCloud& c ); + //- Disallow default bitwise copy construction + ReactingMultiphaseCloud(const ReactingMultiphaseCloud&) = delete; + //- Construct and return clone based on (this) with new name virtual autoPtr> clone(const word& name) { @@ -290,6 +284,12 @@ public: //- Write the field data for the cloud virtual void writeFields() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const ReactingMultiphaseCloud&) = delete; }; diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H index d91a7de2db..f36264c433 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H @@ -85,15 +85,6 @@ private: autoPtr> cloudCopyPtr_; - // Private Member Functions - - //- Disallow default bitwise copy construction - ThermoCloud(const ThermoCloud&) = delete; - - //- Disallow default bitwise assignment - void operator=(const ThermoCloud&) = delete; - - protected: // Protected data @@ -191,6 +182,9 @@ public: const ThermoCloud& c ); + //- Disallow default bitwise copy construction + ThermoCloud(const ThermoCloud&) = delete; + //- Construct and return clone based on (this) with new name virtual autoPtr> clone(const word& name) { @@ -370,6 +364,12 @@ public: //- Print cloud information void info(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const ThermoCloud&) = delete; }; diff --git a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H index 97d84242bd..c08ebb30f5 100644 --- a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H +++ b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H @@ -49,15 +49,6 @@ namespace Foam class kinematicCloud { - // Private Member Functions - - //- Disallow default bitwise copy construction - kinematicCloud(const kinematicCloud&) = delete; - - //- Disallow default bitwise assignment - void operator=(const kinematicCloud&) = delete; - - public: //- Runtime type information @@ -68,6 +59,13 @@ public: //- Null constructor kinematicCloud(); + //- Disallow default bitwise copy construction + kinematicCloud(const kinematicCloud&) = delete; + + + //- Destructor + virtual ~kinematicCloud(); + // Member Functions @@ -110,8 +108,10 @@ public: virtual const tmp rhoEff() const = 0; - //- Destructor - virtual ~kinematicCloud(); + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const kinematicCloud&) = delete; }; diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H index 31b0833ef1..ed571fdfa2 100644 --- a/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H +++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H @@ -48,15 +48,6 @@ namespace Foam class reactingCloud { - // Private Member Functions - - //- Disallow default bitwise copy construction - reactingCloud(const reactingCloud&) = delete; - - //- Disallow default bitwise assignment - void operator=(const reactingCloud&) = delete; - - public: //- Runtime type information @@ -67,9 +58,18 @@ public: //- Null constructor reactingCloud(); + //- Disallow default bitwise copy construction + reactingCloud(const reactingCloud&) = delete; + //- Destructor virtual ~reactingCloud(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const reactingCloud&) = delete; }; diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H index e63aa96eca..f3528b17dd 100644 --- a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H +++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H @@ -48,15 +48,6 @@ namespace Foam class reactingMultiphaseCloud { - // Private Member Functions - - //- Disallow default bitwise copy construction - reactingMultiphaseCloud(const reactingMultiphaseCloud&) = delete; - - //- Disallow default bitwise assignment - void operator=(const reactingMultiphaseCloud&) = delete; - - public: //- Runtime type information @@ -67,9 +58,18 @@ public: //- Null constructor reactingMultiphaseCloud(); + //- Disallow default bitwise copy construction + reactingMultiphaseCloud(const reactingMultiphaseCloud&) = delete; + //- Destructor virtual ~reactingMultiphaseCloud(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const reactingMultiphaseCloud&) = delete; }; diff --git a/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H index c2e08f0502..5cdfbd6dbd 100644 --- a/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H +++ b/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H @@ -48,15 +48,6 @@ namespace Foam class thermoCloud { - // Private Member Functions - - //- Disallow default bitwise copy construction - thermoCloud(const thermoCloud&) = delete; - - //- Disallow default bitwise assignment - void operator=(const thermoCloud&) = delete; - - public: //- Runtime type information @@ -67,6 +58,9 @@ public: //- Null constructor thermoCloud(); + //- Disallow default bitwise copy construction + thermoCloud(const thermoCloud&) = delete; + //- Destructor virtual ~thermoCloud(); @@ -74,18 +68,20 @@ public: // Member Functions - // Access + //- Return tmp equivalent particulate emission + virtual tmp Ep() const = 0; - // Radiation + //- Return tmp equivalent particulate absorption + virtual tmp ap() const = 0; - //- Return tmp equivalent particulate emission - virtual tmp Ep() const = 0; + //- Return tmp equivalent particulate scattering factor + virtual tmp sigmap() const = 0; - //- Return tmp equivalent particulate absorption - virtual tmp ap() const = 0; - //- Return tmp equivalent particulate scattering factor - virtual tmp sigmap() const = 0; + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const thermoCloud&) = delete; }; diff --git a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.H b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.H index 93d6f04b0a..ed83760f80 100644 --- a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.H +++ b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.H @@ -50,12 +50,6 @@ namespace Foam class CorrectionLimitingMethod { - // Private Member Functions - - //- Disallow default bitwise assignment - void operator=(const CorrectionLimitingMethod&) = delete; - - public: //- Runtime type information @@ -104,6 +98,12 @@ public: const vector dU, const vector uMean ) const = 0; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const CorrectionLimitingMethod&) = delete; }; diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H index 532b49d06a..861149e53a 100644 --- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H +++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H @@ -131,12 +131,6 @@ class moleculeCloud const molecule::constantProperties& cP ); - //- Disallow default bitwise copy construction - moleculeCloud(const moleculeCloud&) = delete; - - //- Disallow default bitwise assignment - void operator=(const moleculeCloud&) = delete; - public: @@ -159,6 +153,9 @@ public: bool readFields = true ); + //- Disallow default bitwise copy construction + moleculeCloud(const moleculeCloud&) = delete; + // Member Functions @@ -192,10 +189,16 @@ public: inline Random& rndGen(); - // Member Operators + // Member Functions //- Write molecule sites in XYZ format void writeXYZ(const fileName& fName) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const moleculeCloud&) = delete; }; diff --git a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H index b7aae752ca..ebc3576936 100644 --- a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H +++ b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H @@ -92,12 +92,6 @@ class reducedUnits void calcRefValues(); - //- Disallow default bitwise copy construction - reducedUnits(const reducedUnits&) = delete; - - //- Disallow default bitwise assignment - void operator=(const reducedUnits&) = delete; - public: @@ -126,6 +120,9 @@ public: //- Construct from dictionary reducedUnits(const IOdictionary& reducedUnitsDict); + //- Disallow default bitwise copy construction + reducedUnits(const reducedUnits&) = delete; + //- Destructor ~reducedUnits(); @@ -168,6 +165,12 @@ public: inline scalar refNumberDensity() const; + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const reducedUnits&) = delete; + + // IOstream Operators friend Ostream& operator<<(Ostream&, const reducedUnits&); diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H index d9cd80dda4..f835284c6c 100644 --- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H +++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H @@ -64,15 +64,6 @@ protected: const pairPotential& pairPot_; - // Private Member Functions - - //- Disallow default bitwise copy construction - energyScalingFunction(const energyScalingFunction&); - - //- Disallow default bitwise assignment - void operator=(const energyScalingFunction&) = delete; - - public: //- Runtime type information @@ -116,6 +107,9 @@ public: const pairPotential& pairPot ); + //- Disallow default bitwise copy construction + energyScalingFunction(const energyScalingFunction&); + //- Destructor virtual ~energyScalingFunction() @@ -136,6 +130,12 @@ public: ( const dictionary& energyScalingFunctionProperties ) = 0; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const energyScalingFunction&) = delete; }; diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H index 2ebe624bb7..f88d220d08 100644 --- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H +++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H @@ -83,12 +83,6 @@ protected: void scaleEnergy(scalar& e, const scalar r) const; - //- Disallow default bitwise copy construction - pairPotential(const pairPotential&); - - //- Disallow default bitwise assignment - void operator=(const pairPotential&) = delete; - public: @@ -130,6 +124,9 @@ public: const dictionary& pairPotentialProperties ); + //- Disallow default bitwise copy construction + pairPotential(const pairPotential&); + //- Destructor virtual ~pairPotential() @@ -177,6 +174,12 @@ public: //- Read pairPotential dictionary virtual bool read(const dictionary& pairPotentialProperties) = 0; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const pairPotential&) = delete; }; diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H index 3b05ca9eb7..bcc71f1f62 100644 --- a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H +++ b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H @@ -79,12 +79,6 @@ class pairPotentialList const polyMesh& mesh ); - //- Disallow default bitwise assignment - void operator=(const pairPotentialList&) = delete; - - //- Disallow default bitwise copy construction - pairPotentialList(const pairPotentialList&) = delete; - public: @@ -100,6 +94,9 @@ public: const polyMesh& mesh ); + //- Disallow default bitwise assignment + void operator=(const pairPotentialList&) = delete; + //- Destructor ~pairPotentialList(); @@ -160,6 +157,12 @@ public: ) const; inline const pairPotential& electrostatic() const; + + + // Member Operators + + //- Disallow default bitwise copy construction + pairPotentialList(const pairPotentialList&) = delete; }; diff --git a/src/lagrangian/molecularDynamics/potential/potential/potential.H b/src/lagrangian/molecularDynamics/potential/potential/potential.H index 1bcef698de..0ca21b5800 100644 --- a/src/lagrangian/molecularDynamics/potential/potential/potential.H +++ b/src/lagrangian/molecularDynamics/potential/potential/potential.H @@ -86,12 +86,6 @@ class potential IOdictionary& idListDict ); - //- Disallow default bitwise copy construction - potential(const potential&) = delete; - - //- Disallow default bitwise assignment - void operator=(const potential&) = delete; - public: @@ -108,6 +102,9 @@ public: IOdictionary& idListDict ); + //- Disallow default bitwise copy construction + potential(const potential&) = delete; + //- Destructor ~potential(); @@ -134,6 +131,12 @@ public: inline const tetherPotentialList& tetherPotentials() const; inline const vector& gravity() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const potential&) = delete; }; diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H index ad366e26d8..fc0ab11da4 100644 --- a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H +++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H @@ -61,15 +61,6 @@ protected: dictionary tetherPotentialProperties_; - // Private Member Functions - - //- Disallow default bitwise copy construction - tetherPotential(const tetherPotential&); - - //- Disallow default bitwise assignment - void operator=(const tetherPotential&) = delete; - - public: //- Runtime type information @@ -91,20 +82,23 @@ public: ); - // Selectors + // Constructors - //- Return a reference to the selected viscosity model - static autoPtr New + //- Construct from components + tetherPotential ( const word& name, const dictionary& tetherPotentialProperties ); + //- Disallow default bitwise copy construction + tetherPotential(const tetherPotential&); - // Constructors - //- Construct from components - tetherPotential + // Selectors + + //- Return a reference to the selected viscosity model + static autoPtr New ( const word& name, const dictionary& tetherPotentialProperties @@ -129,6 +123,12 @@ public: //- Read tetherPotential dictionary virtual bool read(const dictionary& tetherPotentialProperties) = 0; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const tetherPotential&) = delete; }; diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H index 941b447d36..420ad69aeb 100644 --- a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H +++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H @@ -71,12 +71,6 @@ class tetherPotentialList const List& tetherSiteIdList ); - //- Disallow default bitwise assignment - void operator=(const tetherPotentialList&) = delete; - - //- Disallow default bitwise copy construction - tetherPotentialList(const tetherPotentialList&) = delete; - public: @@ -92,6 +86,9 @@ public: const List& tetherSiteIdList ); + //- Disallow default bitwise assignment + void operator=(const tetherPotentialList&) = delete; + //- Destructor ~tetherPotentialList(); @@ -115,6 +112,12 @@ public: vector force(const label a, const vector rIT) const; scalar energy (const label a, const vector rIT) const; + + + // Member Operators + + //- Disallow default bitwise copy construction + tetherPotentialList(const tetherPotentialList&) = delete; }; diff --git a/src/lagrangian/solidParticle/solidParticleCloud.H b/src/lagrangian/solidParticle/solidParticleCloud.H index fb298da61e..491dec911f 100644 --- a/src/lagrangian/solidParticle/solidParticleCloud.H +++ b/src/lagrangian/solidParticle/solidParticleCloud.H @@ -68,15 +68,6 @@ class solidParticleCloud scalar mu_; - // Private Member Functions - - //- Disallow default bitwise copy construction - solidParticleCloud(const solidParticleCloud&) = delete; - - //- Disallow default bitwise assignment - void operator=(const solidParticleCloud&) = delete; - - public: // Constructors @@ -89,6 +80,9 @@ public: bool readFields = true ); + //- Disallow default bitwise copy construction + solidParticleCloud(const solidParticleCloud&) = delete; + // Member Functions @@ -106,6 +100,12 @@ public: //- Move the particles under the influence of the given // gravitational acceleration void move(const dimensionedVector& g); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const solidParticleCloud&) = delete; }; diff --git a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H index a987d01c55..c484d6c58a 100644 --- a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H +++ b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloud.H @@ -85,15 +85,6 @@ private: scalar averageParcelMass_; - // Private Member Functions - - //- Disallow default bitwise copy construction - SprayCloud(const SprayCloud&) = delete; - - //- Disallow default bitwise assignment - void operator=(const SprayCloud&) = delete; - - protected: // Protected data @@ -148,6 +139,8 @@ public: const SprayCloud& c ); + //- Disallow default bitwise copy construction + SprayCloud(const SprayCloud&) = delete; //- Construct and return clone based on (this) with new name virtual autoPtr> clone(const word& name) @@ -237,6 +230,12 @@ public: //- Print cloud information void info(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const SprayCloud&) = delete; }; diff --git a/src/lagrangian/spray/clouds/baseClasses/sprayCloud/sprayCloud.H b/src/lagrangian/spray/clouds/baseClasses/sprayCloud/sprayCloud.H index f90dd9dedf..b25a0fa955 100644 --- a/src/lagrangian/spray/clouds/baseClasses/sprayCloud/sprayCloud.H +++ b/src/lagrangian/spray/clouds/baseClasses/sprayCloud/sprayCloud.H @@ -48,15 +48,6 @@ namespace Foam class sprayCloud { - // Private Member Functions - - //- Disallow default bitwise copy construction - sprayCloud(const sprayCloud&) = delete; - - //- Disallow default bitwise assignment - void operator=(const sprayCloud&) = delete; - - public: //- Runtime type information @@ -67,9 +58,18 @@ public: //- Null constructor sprayCloud(); + //- Disallow default bitwise copy construction + sprayCloud(const sprayCloud&) = delete; + //- Destructor virtual ~sprayCloud(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const sprayCloud&) = delete; }; diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H index c757bbd453..483fbf3bed 100644 --- a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H +++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H @@ -130,12 +130,6 @@ class blockDescriptor void findCurvedFaces(); - // Private Member Functions - - //- Disallow default bitwise assignment - void operator=(const blockDescriptor&) = delete; - - public: // Constructors @@ -245,6 +239,12 @@ public: static void write(Ostream&, const label blocki, const dictionary&); + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const blockDescriptor&) = delete; + + // IOstream Operators friend Ostream& operator<<(Ostream&, const blockDescriptor&); diff --git a/src/mesh/blockMesh/blockEdges/BSplineEdge/BSpline.H b/src/mesh/blockMesh/blockEdges/BSplineEdge/BSpline.H index 8028bf2c6f..3da5a8f6bf 100644 --- a/src/mesh/blockMesh/blockEdges/BSplineEdge/BSpline.H +++ b/src/mesh/blockMesh/blockEdges/BSplineEdge/BSpline.H @@ -75,15 +75,6 @@ class BSpline : public polyLine { - // Private Member Functions - - //- Disallow default bitwise copy construction - BSpline(const BSpline&) = delete; - - //- Disallow default bitwise assignment - void operator=(const BSpline&) = delete; - - public: // Constructors @@ -95,6 +86,9 @@ public: const bool notImplementedClosed = false ); + //- Disallow default bitwise copy construction + BSpline(const BSpline&) = delete; + // Member Functions @@ -108,6 +102,12 @@ public: //- Return the length of the curve scalar length() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const BSpline&) = delete; }; diff --git a/src/mesh/blockMesh/blockEdges/BSplineEdge/BSplineEdge.H b/src/mesh/blockMesh/blockEdges/BSplineEdge/BSplineEdge.H index b959dd78de..983490783d 100644 --- a/src/mesh/blockMesh/blockEdges/BSplineEdge/BSplineEdge.H +++ b/src/mesh/blockMesh/blockEdges/BSplineEdge/BSplineEdge.H @@ -54,15 +54,6 @@ class BSplineEdge public blockEdge, public BSpline { - // Private Member Functions - - //- Disallow default bitwise copy construction - BSplineEdge(const BSplineEdge&) = delete; - - //- Disallow default bitwise assignment - void operator=(const BSplineEdge&) = delete; - - public: //- Runtime type information @@ -90,6 +81,9 @@ public: Istream& ); + //- Disallow default bitwise copy construction + BSplineEdge(const BSplineEdge&) = delete; + //- Destructor virtual ~BSplineEdge(); @@ -103,6 +97,12 @@ public: //- Return the length of the spline curve (not implemented) virtual scalar length() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const BSplineEdge&) = delete; }; diff --git a/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H b/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H index f8bbb1e76f..9cfdaed3fc 100644 --- a/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H +++ b/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H @@ -65,12 +65,6 @@ class arcEdge //- Calculate the coordinate system, angle and radius cylindricalCS calcAngle(); - //- Disallow default bitwise copy construction - arcEdge(const arcEdge&) = delete; - - //- Disallow default bitwise assignment - void operator=(const arcEdge&) = delete; - public: @@ -98,6 +92,9 @@ public: Istream& ); + //- Disallow default bitwise copy construction + arcEdge(const arcEdge&) = delete; + //- Destructor virtual ~arcEdge() @@ -112,6 +109,12 @@ public: //- Return the length of the curve scalar length() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const arcEdge&) = delete; }; diff --git a/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLine.H b/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLine.H index fbd56a46bf..7f03780ace 100644 --- a/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLine.H +++ b/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLine.H @@ -53,15 +53,6 @@ namespace Foam class polyLine { - // Private Member Functions - - //- Disallow default bitwise copy construction - polyLine(const polyLine&) = delete; - - //- Disallow default bitwise assignment - void operator=(const polyLine&) = delete; - - protected: // Protected data @@ -98,6 +89,9 @@ public: const bool notImplementedClosed = false ); + //- Disallow default bitwise copy construction + polyLine(const polyLine&) = delete; + // Member Functions @@ -117,6 +111,12 @@ public: //- Return the length of the curve scalar length() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const polyLine&) = delete; }; diff --git a/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLineEdge.H b/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLineEdge.H index d5836e76f3..b066b27d90 100644 --- a/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLineEdge.H +++ b/src/mesh/blockMesh/blockEdges/polyLineEdge/polyLineEdge.H @@ -54,15 +54,6 @@ class polyLineEdge public blockEdge, public polyLine { - // Private Member Functions - - //- Disallow default bitwise copy construction - polyLineEdge(const polyLineEdge&) = delete; - - //- Disallow default bitwise assignment - void operator=(const polyLineEdge&) = delete; - - public: // Static Data Members @@ -90,6 +81,9 @@ public: Istream& ); + //- Disallow default bitwise copy construction + polyLineEdge(const polyLineEdge&) = delete; + //- Destructor virtual ~polyLineEdge(); @@ -103,6 +97,12 @@ public: //- Return the length of the curve scalar length() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const polyLineEdge&) = delete; }; diff --git a/src/mesh/blockMesh/blockEdges/projectCurveEdge/projectCurveEdge.H b/src/mesh/blockMesh/blockEdges/projectCurveEdge/projectCurveEdge.H index 1906428060..61c75bcf8c 100644 --- a/src/mesh/blockMesh/blockEdges/projectCurveEdge/projectCurveEdge.H +++ b/src/mesh/blockMesh/blockEdges/projectCurveEdge/projectCurveEdge.H @@ -61,15 +61,6 @@ class projectCurveEdge labelList surfaces_; - // Private Member Functions - - //- Disallow default bitwise copy construction - projectCurveEdge(const projectCurveEdge&) = delete; - - //- Disallow default bitwise assignment - void operator=(const projectCurveEdge&) = delete; - - public: //- Runtime type information @@ -88,6 +79,9 @@ public: Istream& ); + //- Disallow default bitwise copy construction + projectCurveEdge(const projectCurveEdge&) = delete; + //- Destructor virtual ~projectCurveEdge() @@ -114,6 +108,12 @@ public: NotImplemented; return 1; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const projectCurveEdge&) = delete; }; diff --git a/src/mesh/blockMesh/blockEdges/projectEdge/projectEdge.H b/src/mesh/blockMesh/blockEdges/projectEdge/projectEdge.H index 168b53e5c2..f696c9d58a 100644 --- a/src/mesh/blockMesh/blockEdges/projectEdge/projectEdge.H +++ b/src/mesh/blockMesh/blockEdges/projectEdge/projectEdge.H @@ -66,12 +66,6 @@ class projectEdge //- Single point find nearest void findNearest(const point&, point& near, pointConstraint&) const; - //- Disallow default bitwise copy construction - projectEdge(const projectEdge&) = delete; - - //- Disallow default bitwise assignment - void operator=(const projectEdge&) = delete; - public: @@ -91,6 +85,9 @@ public: Istream& ); + //- Disallow default bitwise copy construction + projectEdge(const projectEdge&) = delete; + //- Destructor virtual ~projectEdge() @@ -113,6 +110,12 @@ public: NotImplemented; return 1; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const projectEdge&) = delete; }; diff --git a/src/mesh/blockMesh/blockEdges/splineEdge/CatmullRomSpline.H b/src/mesh/blockMesh/blockEdges/splineEdge/CatmullRomSpline.H index 5a3075d1e1..99ce454469 100644 --- a/src/mesh/blockMesh/blockEdges/splineEdge/CatmullRomSpline.H +++ b/src/mesh/blockMesh/blockEdges/splineEdge/CatmullRomSpline.H @@ -77,15 +77,6 @@ class CatmullRomSpline : public polyLine { - // Private Member Functions - - //- Disallow default bitwise copy construction - CatmullRomSpline(const CatmullRomSpline&) = delete; - - //- Disallow default bitwise assignment - void operator=(const CatmullRomSpline&) = delete; - - public: // Constructors @@ -97,6 +88,9 @@ public: const bool notImplementedClosed = false ); + //- Disallow default bitwise copy construction + CatmullRomSpline(const CatmullRomSpline&) = delete; + // Member Functions @@ -110,6 +104,12 @@ public: //- Return the length of the curve scalar length() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const CatmullRomSpline&) = delete; }; diff --git a/src/mesh/blockMesh/blockEdges/splineEdge/splineEdge.H b/src/mesh/blockMesh/blockEdges/splineEdge/splineEdge.H index e6f2e57d1e..d96ff136a7 100644 --- a/src/mesh/blockMesh/blockEdges/splineEdge/splineEdge.H +++ b/src/mesh/blockMesh/blockEdges/splineEdge/splineEdge.H @@ -54,15 +54,6 @@ class splineEdge public blockEdge, public CatmullRomSpline { - // Private Member Functions - - //- Disallow default bitwise copy construction - splineEdge(const splineEdge&) = delete; - - //- Disallow default bitwise assignment - void operator=(const splineEdge&) = delete; - - public: //- Runtime type information @@ -90,6 +81,9 @@ public: Istream& ); + //- Disallow default bitwise copy construction + splineEdge(const splineEdge&) = delete; + //- Destructor virtual ~splineEdge(); @@ -103,6 +97,12 @@ public: //- Return the length of the spline curve (not implemented) virtual scalar length() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const splineEdge&) = delete; }; diff --git a/src/mesh/blockMesh/blockFaces/projectFace/projectFace.H b/src/mesh/blockMesh/blockFaces/projectFace/projectFace.H index 7a5011fff0..962baf0b58 100644 --- a/src/mesh/blockMesh/blockFaces/projectFace/projectFace.H +++ b/src/mesh/blockMesh/blockFaces/projectFace/projectFace.H @@ -83,12 +83,6 @@ class projectFace scalarField& lambdaJ ) const; - //- Disallow default bitwise copy construction - projectFace(const projectFace&) = delete; - - //- Disallow default bitwise assignment - void operator=(const projectFace&) = delete; - public: @@ -107,6 +101,9 @@ public: Istream& ); + //- Disallow default bitwise copy construction + projectFace(const projectFace&) = delete; + //- Destructor virtual ~projectFace() @@ -122,6 +119,12 @@ public: const label blockFacei, pointField& points ) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const projectFace&) = delete; }; diff --git a/src/mesh/blockMesh/blockVertices/projectVertex/projectVertex.H b/src/mesh/blockMesh/blockVertices/projectVertex/projectVertex.H index 6615100f0f..370e9ba5a3 100644 --- a/src/mesh/blockMesh/blockVertices/projectVertex/projectVertex.H +++ b/src/mesh/blockMesh/blockVertices/projectVertex/projectVertex.H @@ -61,15 +61,6 @@ class projectVertex labelList surfaces_; - // Private Member Functions - - //- Disallow default bitwise copy construction - projectVertex(const projectVertex&) = delete; - - //- Disallow default bitwise assignment - void operator=(const projectVertex&) = delete; - - public: //- Runtime type information @@ -87,6 +78,9 @@ public: Istream& ); + //- Disallow default bitwise copy construction + projectVertex(const projectVertex&) = delete; + //- Destructor virtual ~projectVertex() @@ -97,6 +91,12 @@ public: //- Project the given points onto the surface virtual operator point() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const projectVertex&) = delete; }; diff --git a/src/mesh/blockMesh/blocks/block/block.H b/src/mesh/blockMesh/blocks/block/block.H index 0f541654ad..4f45b482a5 100644 --- a/src/mesh/blockMesh/blocks/block/block.H +++ b/src/mesh/blockMesh/blocks/block/block.H @@ -82,12 +82,6 @@ class block //- Creates boundary patch faces for the block void createBoundary(); - //- Disallow default bitwise copy construction - block(const block&) = delete; - - //- Disallow default bitwise assignment - void operator=(const block&) = delete; - public: @@ -130,6 +124,9 @@ public: //- Construct from a block definition block(const blockDescriptor&); + //- Disallow default bitwise copy construction + block(const block&) = delete; + //- Clone autoPtr clone() const { @@ -202,11 +199,18 @@ public: boundaryPatches() const; + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const block&) = delete; + + // Ostream Operator friend Ostream& operator<<(Ostream&, const block&); }; + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace Foam diff --git a/src/mesh/extrudeModel/extrudeModel/extrudeModel.H b/src/mesh/extrudeModel/extrudeModel/extrudeModel.H index b1be2350c4..d708b05add 100644 --- a/src/mesh/extrudeModel/extrudeModel/extrudeModel.H +++ b/src/mesh/extrudeModel/extrudeModel/extrudeModel.H @@ -64,15 +64,6 @@ protected: const dictionary& coeffDict_; - // Private Member Functions - - //- Disallow default bitwise copy construction - extrudeModel(const extrudeModel&) = delete; - - //- Disallow default bitwise assignment - void operator=(const extrudeModel&) = delete; - - public: //- Runtime type information @@ -97,6 +88,9 @@ public: //- Construct from dictionary extrudeModel(const word& modelType, const dictionary&); + //- Disallow default bitwise copy construction + extrudeModel(const extrudeModel&) = delete; + // Selectors @@ -119,6 +113,9 @@ public: // Member Operators + //- Disallow default bitwise assignment + void operator=(const extrudeModel&) = delete; + //- Helper: calculate cumulative relative thickness for layer. // (layer=0 -> 0; layer=nLayers -> 1) scalar sumThickness(const label layer) const; diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H index 4ac4318861..38d0ac7800 100644 --- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H +++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMeshMoverMotionSolver.H @@ -57,18 +57,6 @@ class displacementMeshMoverMotionSolver mutable autoPtr meshMoverPtr_; - // Private Member Functions - - //- Disallow default bitwise copy construction - displacementMeshMoverMotionSolver - ( - const displacementMeshMoverMotionSolver& - ); - - //- Disallow default bitwise assignment - void operator=(const displacementMeshMoverMotionSolver&) = delete; - - public: //- Runtime type information @@ -80,6 +68,12 @@ public: //- Construct from polyMesh and dictionary displacementMeshMoverMotionSolver(const polyMesh&, const dictionary&); + //- Disallow default bitwise copy construction + displacementMeshMoverMotionSolver + ( + const displacementMeshMoverMotionSolver& + ); + //- Destructor ~displacementMeshMoverMotionSolver(); @@ -100,6 +94,12 @@ public: //- Update topology virtual void updateMesh(const mapPolyMesh&); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const displacementMeshMoverMotionSolver&) = delete; }; diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H index 2176a8aa7b..39d6c59d62 100644 --- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H +++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.H @@ -67,20 +67,6 @@ protected: pointVectorField& pointDisplacement_; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - externalDisplacementMeshMover - ( - const externalDisplacementMeshMover& - ); - - //- Disallow default bitwise assignment - void operator=(const externalDisplacementMeshMover&) = delete; - - public: //- Runtime type information @@ -114,6 +100,12 @@ public: pointVectorField& pointDisplacement ); + //- Disallow default bitwise copy construction + externalDisplacementMeshMover + ( + const externalDisplacementMeshMover& + ); + // Selectors @@ -176,6 +168,12 @@ public: //- Update local data for topology changes virtual void updateMesh(const mapPolyMesh&); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const externalDisplacementMeshMover&) = delete; }; diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H index 4e9ab606ef..572f524a9e 100644 --- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H +++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H @@ -224,12 +224,6 @@ class medialAxisMeshMover labelList& checkFaces ); - //- Disallow default bitwise copy construction - medialAxisMeshMover(const medialAxisMeshMover&) = delete; - - //- Disallow default bitwise assignment - void operator=(const medialAxisMeshMover&) = delete; - public: @@ -247,6 +241,9 @@ public: pointVectorField& pointDisplacement ); + //- Disallow default bitwise copy construction + medialAxisMeshMover(const medialAxisMeshMover&) = delete; + // Destructor @@ -274,6 +271,11 @@ public: NotImplemented; } + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const medialAxisMeshMover&) = delete; }; diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H index d12b1ce105..15c93f922b 100644 --- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H +++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H @@ -572,12 +572,6 @@ private: ) const; - //- Disallow default bitwise copy construction - meshRefinement(const meshRefinement&) = delete; - - //- Disallow default bitwise assignment - void operator=(const meshRefinement&) = delete; - public: //- Runtime type information @@ -597,6 +591,9 @@ public: const shellSurfaces& ); + //- Disallow default bitwise copy construction + meshRefinement(const meshRefinement&) = delete; + // Member Functions @@ -1116,6 +1113,11 @@ public: template static int readFlags(const Enum& namedEnum, const wordList&); + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const meshRefinement&) = delete; }; diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.H b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.H index 4abac09417..4e0b36983e 100644 --- a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.H +++ b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.H @@ -93,15 +93,6 @@ class refinementSurfaces PtrList patchInfo_; - // Private Member Functions - - //- Disallow default bitwise copy construction - refinementSurfaces(const refinementSurfaces&) = delete; - - //- Disallow default bitwise assignment - void operator=(const refinementSurfaces&) = delete; - - public: // Constructors @@ -129,6 +120,9 @@ public: PtrList& patchInfo ); + //- Disallow default bitwise copy construction + refinementSurfaces(const refinementSurfaces&) = delete; + // Member Functions @@ -354,6 +348,12 @@ public: const pointField& pt, labelList& insideSurfaces ) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const refinementSurfaces&) = delete; }; diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H index fb2d9eab38..ca10410f85 100644 --- a/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H +++ b/src/mesh/snappyHexMesh/refinementSurfaces/surfaceZonesInfo.H @@ -103,12 +103,6 @@ private: faceZoneType faceType_; - // Private Member Functions - - //- Disallow default bitwise assignment - void operator=(const surfaceZonesInfo&) = delete; - - public: // Constructors @@ -235,6 +229,12 @@ public: const labelList& namedSurfaces, polyMesh& mesh ); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const surfaceZonesInfo&) = delete; }; diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.H index 86816bb37a8..a933a3d8af 100644 --- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.H +++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.H @@ -155,12 +155,6 @@ private: const scalar totalOverFirst ) const; - //- Disallow default bitwise copy construction - layerParameters(const layerParameters&) = delete; - - //- Disallow default bitwise assignment - void operator=(const layerParameters&) = delete; - public: @@ -169,6 +163,9 @@ public: //- Construct from dictionary layerParameters(const dictionary& dict, const polyBoundaryMesh&); + //- Disallow default bitwise copy construction + layerParameters(const layerParameters&) = delete; + // Member Functions @@ -347,6 +344,12 @@ public: const label nLayers, const scalar expansionRatio ) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const layerParameters&) = delete; }; diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.H index c6d10d3cb7..f4516bf8fd 100644 --- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.H +++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.H @@ -89,14 +89,6 @@ class refinementParameters Switch handleSnapProblems_; - // Private Member Functions - - //- Disallow default bitwise copy construction - refinementParameters(const refinementParameters&) = delete; - - //- Disallow default bitwise assignment - void operator=(const refinementParameters&) = delete; - public: @@ -105,6 +97,9 @@ public: //- Construct from dictionary - new syntax refinementParameters(const dictionary& dict); + //- Disallow default bitwise copy construction + refinementParameters(const refinementParameters&) = delete; + // Member Functions @@ -183,6 +178,11 @@ public: //- Checks that cells are in mesh. Returns cells they are in. labelList findCells(const polyMesh&) const; + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const refinementParameters&) = delete; }; diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.H index b04360c6e6..36b9598fd1 100644 --- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.H +++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.H @@ -73,15 +73,6 @@ class snapParameters const Switch detectNearSurfacesSnap_; - // Private Member Functions - - //- Disallow default bitwise copy construction - snapParameters(const snapParameters&) = delete; - - //- Disallow default bitwise assignment - void operator=(const snapParameters&) = delete; - - public: // Constructors @@ -89,6 +80,9 @@ public: //- Construct from dictionary snapParameters(const dictionary& dict); + //- Disallow default bitwise copy construction + snapParameters(const snapParameters&) = delete; + // Member Functions @@ -148,6 +142,11 @@ public: return detectNearSurfacesSnap_; } + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const snapParameters&) = delete; }; diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H index 39b626a264..325f87ee9f 100644 --- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H +++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H @@ -545,14 +545,6 @@ private: ) const; - - //- Disallow default bitwise copy construction - snappyLayerDriver(const snappyLayerDriver&) = delete; - - //- Disallow default bitwise assignment - void operator=(const snappyLayerDriver&) = delete; - - public: //- Runtime type information @@ -568,6 +560,9 @@ public: const labelList& globalToSlavePatch ); + //- Disallow default bitwise copy construction + snappyLayerDriver(const snappyLayerDriver&) = delete; + // Member Functions @@ -600,6 +595,11 @@ public: fvMeshDistribute& distributor ); + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const snappyLayerDriver&) = delete; }; diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.H index 9b27482ad6..b7b7d90684 100644 --- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.H +++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.H @@ -147,13 +147,6 @@ class snappyRefineDriver ); - //- Disallow default bitwise copy construction - snappyRefineDriver(const snappyRefineDriver&) = delete; - - //- Disallow default bitwise assignment - void operator=(const snappyRefineDriver&) = delete; - - public: //- Runtime type information @@ -172,6 +165,9 @@ public: const labelList& globalToSlavePatch ); + //- Disallow default bitwise copy construction + snappyRefineDriver(const snappyRefineDriver&) = delete; + // Member Functions @@ -184,6 +180,12 @@ public: const bool prepareForSnapping, const dictionary& motionDict ); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const snappyRefineDriver&) = delete; }; diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H index 83ec70f5d7..18e7e9f492 100644 --- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H +++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H @@ -496,13 +496,6 @@ class snappySnapDriver ) const; - //- Disallow default bitwise copy construction - snappySnapDriver(const snappySnapDriver&) = delete; - - //- Disallow default bitwise assignment - void operator=(const snappySnapDriver&) = delete; - - public: //- Runtime type information @@ -519,6 +512,9 @@ public: const labelList& globalToSlavePatch ); + //- Disallow default bitwise copy construction + snappySnapDriver(const snappySnapDriver&) = delete; + // Member Functions @@ -620,6 +616,12 @@ public: const scalar planarAngle, const snapParameters& snapParams ); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const snappySnapDriver&) = delete; }; diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H index 86fa66edb4..7c39c0881e 100644 --- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H +++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H @@ -166,15 +166,6 @@ private: autoPtr tgtMapPtr_; - // Private Member Functions - - //- Disallow default bitwise copy construction - AMIInterpolation(const AMIInterpolation&) = delete; - - //- Disallow default bitwise assignment - void operator=(const AMIInterpolation&) = delete; - - // Parallel functionality //- Calculate if patches are on multiple processors @@ -373,6 +364,9 @@ public: const bool report = false ); + //- Disallow default bitwise copy construction + AMIInterpolation(const AMIInterpolation&) = delete; + //- Destructor virtual ~AMIInterpolation(); @@ -607,6 +601,12 @@ public: const primitivePatch& tgtPatch, const labelListList& srcAddress ) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const AMIInterpolation&) = delete; }; diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H index 81e6bc708d..aeb98c70a0 100644 --- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H +++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/AMIMethod/AMIMethod.H @@ -55,15 +55,6 @@ namespace Foam class AMIMethod { - // Private Member Functions - - //- Disallow default bitwise copy construction - AMIMethod(const AMIMethod&) = delete; - - //- Disallow default bitwise assignment - void operator=(const AMIMethod&) = delete; - - protected: //- Local typedef to octree tree-type @@ -200,6 +191,9 @@ public: const bool requireMatch ); + //- Disallow default bitwise copy construction + AMIMethod(const AMIMethod&) = delete; + //- Selector static autoPtr New @@ -243,6 +237,12 @@ public: label srcFacei = -1, label tgtFacei = -1 ) = 0; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const AMIMethod&) = delete; }; diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.H index ff764b4963..0a660951b6 100644 --- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.H +++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/directAMI/directAMI.H @@ -52,12 +52,6 @@ class directAMI { // Private Member Functions - //- Disallow default bitwise copy construction - directAMI(const directAMI&) = delete; - - //- Disallow default bitwise assignment - void operator=(const directAMI&) = delete; - // Marching front //- Append to list of src face seed indices @@ -112,6 +106,9 @@ public: const bool requireMatch = true ); + //- Disallow default bitwise copy construction + directAMI(const directAMI&) = delete; + //- Destructor virtual ~directAMI(); @@ -131,6 +128,12 @@ public: label srcFacei = -1, label tgtFacei = -1 ); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const directAMI&) = delete; }; diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H index 4c95a9957f..20c7cc9343 100644 --- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H +++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H @@ -60,12 +60,6 @@ protected: // Protected Member Functions - //- Disallow default bitwise copy construction - faceAreaWeightAMI(const faceAreaWeightAMI&) = delete; - - //- Disallow default bitwise assignment - void operator=(const faceAreaWeightAMI&) = delete; - // Marching front //- Calculate addressing and weights using temporary storage @@ -148,6 +142,9 @@ public: const bool restartUncoveredSourceFace = true ); + //- Disallow default bitwise copy construction + faceAreaWeightAMI(const faceAreaWeightAMI&) = delete; + //- Destructor virtual ~faceAreaWeightAMI(); @@ -167,6 +164,12 @@ public: label srcFacei = -1, label tgtFacei = -1 ); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const faceAreaWeightAMI&) = delete; }; diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.H index 4c3b3d4973..341f360895 100644 --- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.H +++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/mapNearestAMI/mapNearestAMI.H @@ -52,12 +52,6 @@ class mapNearestAMI { // Private Member Functions - //- Disallow default bitwise copy construction - mapNearestAMI(const mapNearestAMI&) = delete; - - //- Disallow default bitwise assignment - void operator=(const mapNearestAMI&) = delete; - // Marching front //- Find nearest target face for source face srcFacei @@ -116,6 +110,9 @@ public: const bool requireMatch = true ); + //- Disallow default bitwise copy construction + mapNearestAMI(const mapNearestAMI&) = delete; + //- Destructor virtual ~mapNearestAMI(); @@ -135,6 +132,12 @@ public: label srcFacei = -1, label tgtFacei = -1 ); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const mapNearestAMI&) = delete; }; diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.H index 9bae208f5e..e212a59e6e 100644 --- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.H +++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/partialFaceAreaWeightAMI/partialFaceAreaWeightAMI.H @@ -52,12 +52,6 @@ class partialFaceAreaWeightAMI { // Private Member Functions - //- Disallow default bitwise copy construction - partialFaceAreaWeightAMI(const partialFaceAreaWeightAMI&) = delete; - - //- Disallow default bitwise assignment - void operator=(const partialFaceAreaWeightAMI&) = delete; - // Marching front //- Set the source and target seed faces @@ -93,6 +87,9 @@ public: const bool requireMatch = true ); + //- Disallow default bitwise copy construction + partialFaceAreaWeightAMI(const partialFaceAreaWeightAMI&) = delete; + //- Destructor virtual ~partialFaceAreaWeightAMI(); @@ -118,6 +115,12 @@ public: label srcFacei = -1, label tgtFacei = -1 ); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const partialFaceAreaWeightAMI&) = delete; }; diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H index 3c691b0e0f..534b176e0a 100644 --- a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H +++ b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H @@ -65,18 +65,6 @@ class cyclicAMIGAMGInterfaceField int rank_; - // Private Member Functions - - //- Disallow default bitwise copy construction - cyclicAMIGAMGInterfaceField - ( - const cyclicAMIGAMGInterfaceField& - ) = delete; - - //- Disallow default bitwise assignment - void operator=(const cyclicAMIGAMGInterfaceField&) = delete; - - public: //- Runtime type information @@ -100,6 +88,12 @@ public: const int rank ); + //- Disallow default bitwise copy construction + cyclicAMIGAMGInterfaceField + ( + const cyclicAMIGAMGInterfaceField& + ) = delete; + //- Destructor virtual ~cyclicAMIGAMGInterfaceField(); @@ -154,6 +148,12 @@ public: { return rank_; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const cyclicAMIGAMGInterfaceField&) = delete; }; diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H index 8b9b7ac322..fe593dc292 100644 --- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H +++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H @@ -65,15 +65,6 @@ class cyclicAMIGAMGInterface List AMITransforms_; - // Private Member Functions - - //- Disallow default bitwise copy construction - cyclicAMIGAMGInterface(const cyclicAMIGAMGInterface&) = delete; - - //- Disallow default bitwise assignment - void operator=(const cyclicAMIGAMGInterface&) = delete; - - public: //- Runtime type information @@ -95,6 +86,9 @@ public: const label coarseComm ); + //- Disallow default bitwise copy construction + cyclicAMIGAMGInterface(const cyclicAMIGAMGInterface&) = delete; + //- Destructor virtual ~cyclicAMIGAMGInterface(); @@ -169,6 +163,12 @@ public: // cyclicAMIGAMGInterface. NotImplemented; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const cyclicAMIGAMGInterface&) = delete; }; diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatch/cyclicAMIPointPatch.H b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatch/cyclicAMIPointPatch.H index 9e4e135547..87491ef22a 100644 --- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatch/cyclicAMIPointPatch.H +++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatch/cyclicAMIPointPatch.H @@ -58,15 +58,6 @@ class cyclicAMIPointPatch const cyclicAMIPolyPatch& cyclicAMIPolyPatch_; - // Private Member Functions - - //- Disallow default bitwise copy construction - cyclicAMIPointPatch(const cyclicAMIPointPatch&); - - //- Disallow default bitwise assignment - void operator=(const cyclicAMIPointPatch&); - - protected: // Protected Member Functions @@ -105,6 +96,9 @@ public: const pointBoundaryMesh& bm ); + //- Disallow default bitwise copy construction + cyclicAMIPointPatch(const cyclicAMIPointPatch&); + //- Destructor virtual ~cyclicAMIPointPatch(); @@ -152,6 +146,12 @@ public: { return cyclicAMIPolyPatch_.reverseT(); } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const cyclicAMIPointPatch&); }; diff --git a/src/meshTools/algorithms/MeshWave/FaceCellWave.H b/src/meshTools/algorithms/MeshWave/FaceCellWave.H index a6072cf5bc..03337063ff 100644 --- a/src/meshTools/algorithms/MeshWave/FaceCellWave.H +++ b/src/meshTools/algorithms/MeshWave/FaceCellWave.H @@ -78,15 +78,6 @@ class FaceCellWave : public FaceCellWaveName { - // Private Member Functions - - //- Disallow default bitwise copy construction - FaceCellWave(const FaceCellWave&) = delete; - - //- Disallow default bitwise assignment - void operator=(const FaceCellWave&) = delete; - - protected: // Protected data @@ -321,6 +312,9 @@ public: TrackingData& td = dummyTrackData_ ); + //- Disallow default bitwise copy construction + FaceCellWave(const FaceCellWave&) = delete; + //- Destructor virtual ~FaceCellWave() @@ -387,6 +381,12 @@ public: //- Iterate until no changes or maxIter reached. Returns actual // number of iterations. virtual label iterate(const label maxIter); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const FaceCellWave&) = delete; }; diff --git a/src/meshTools/algorithms/MeshWave/MeshWave.H b/src/meshTools/algorithms/MeshWave/MeshWave.H index 7e42a147e7..d5ab31d9c4 100644 --- a/src/meshTools/algorithms/MeshWave/MeshWave.H +++ b/src/meshTools/algorithms/MeshWave/MeshWave.H @@ -69,19 +69,13 @@ class MeshWave //- Wave calculation engine. FaceCellWave calc_; - // Private Member Functions - //- Disallow default bitwise copy construction - MeshWave(const MeshWave&) = delete; + // Private static data - //- Disallow default bitwise assignment - void operator=(const MeshWave&) = delete; + //- Used as default trackdata value to satisfy default template + // argument. + static int dummyTrackData_; - // Private static data - - //- Used as default trackdata value to satisfy default template - // argument. - static int dummyTrackData_; public: @@ -113,6 +107,9 @@ public: TrackingData& td = dummyTrackData_ ); + //- Disallow default bitwise copy construction + MeshWave(const MeshWave&) = delete; + // Member Functions @@ -156,6 +153,12 @@ public: { return calc_.getUnsetFaces(); } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const MeshWave&) = delete; }; diff --git a/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H b/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H index 8cbd2d6c70..da31310b54 100644 --- a/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H +++ b/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H @@ -151,12 +151,6 @@ class PatchEdgeFaceWave //- Update coupled edges void syncEdges(); - //- Disallow default bitwise copy construction - PatchEdgeFaceWave(const PatchEdgeFaceWave&) = delete; - - //- Disallow default bitwise assignment - void operator=(const PatchEdgeFaceWave&) = delete; - public: @@ -205,6 +199,9 @@ public: TrackingData& td = dummyTrackData_ ); + //- Disallow default bitwise copy construction + PatchEdgeFaceWave(const PatchEdgeFaceWave&) = delete; + // Member Functions @@ -253,6 +250,12 @@ public: //- Iterate until no changes or maxIter reached. Returns actual // number of iterations. label iterate(const label maxIter); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const PatchEdgeFaceWave&) = delete; }; diff --git a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H index 0e6f41c649..08bbd9435a 100644 --- a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H +++ b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H @@ -209,13 +209,6 @@ class PointEdgeWave label handleCollocatedPoints(); - //- Disallow default bitwise copy construction - PointEdgeWave(const PointEdgeWave&) = delete; - - //- Disallow default bitwise assignment - void operator=(const PointEdgeWave&) = delete; - - public: // Static Functions @@ -261,6 +254,9 @@ public: TrackingData& td = dummyTrackData_ ); + //- Disallow default bitwise copy construction + PointEdgeWave(const PointEdgeWave&) = delete; + //- Destructor ~PointEdgeWave(); @@ -313,6 +309,12 @@ public: //- Iterate until no changes or maxIter reached. Returns actual // number of iterations. label iterate(const label maxIter); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const PointEdgeWave&) = delete; }; diff --git a/src/meshTools/cellDist/cellDistFuncs.H b/src/meshTools/cellDist/cellDistFuncs.H index 497aafb2bb..3fb9932045 100644 --- a/src/meshTools/cellDist/cellDistFuncs.H +++ b/src/meshTools/cellDist/cellDistFuncs.H @@ -74,12 +74,6 @@ class cellDistFuncs static label findIndex(const label n, const labelList&, const label); - //- Disallow default bitwise copy construction - cellDistFuncs(const cellDistFuncs&) = delete; - - //- Disallow default bitwise assignment - void operator=(const cellDistFuncs&) = delete; - public: ClassName("cellDistFuncs"); @@ -89,6 +83,9 @@ public: //- Construct from mesh cellDistFuncs(const polyMesh& mesh); + //- Disallow default bitwise copy construction + cellDistFuncs(const cellDistFuncs&) = delete; + // Member Functions @@ -152,6 +149,12 @@ public: scalarField& wallDistCorrected, Map