diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtk/vtkPVFoamReader.h b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtk/vtkPVFoamReader.h index 7877e52234..c022790e43 100644 --- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtk/vtkPVFoamReader.h +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtk/vtkPVFoamReader.h @@ -173,6 +173,9 @@ protected: //- Construct null vtkPVFoamReader(); + //- Disallow default bitwise copy construct + vtkPVFoamReader(const vtkPVFoamReader&) = delete; + //- Destructor ~vtkPVFoamReader(); @@ -201,15 +204,12 @@ protected: //- The file name for this case char* FileName; - -private: - - //- Disallow default bitwise copy construct - vtkPVFoamReader(const vtkPVFoamReader&) = delete; - //- Disallow default bitwise assignment void operator=(const vtkPVFoamReader&) = delete; + +private: + //- Add/remove patch names to/from the view void updatePatchNamesView(const bool show); diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtk/vtkPVblockMeshReader.h b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtk/vtkPVblockMeshReader.h index b559b91691..0106009966 100644 --- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtk/vtkPVblockMeshReader.h +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtk/vtkPVblockMeshReader.h @@ -62,6 +62,7 @@ class vtkPVblockMeshReader { public: vtkTypeMacro(vtkPVblockMeshReader, vtkMultiBlockDataSetAlgorithm); + void PrintSelf(ostream&, vtkIndent); static vtkPVblockMeshReader* New(); @@ -113,6 +114,9 @@ protected: //- Construct null vtkPVblockMeshReader(); + //- Disallow default bitwise copy construct + vtkPVblockMeshReader(const vtkPVblockMeshReader&) = delete; + //- Destructor ~vtkPVblockMeshReader(); @@ -135,20 +139,18 @@ protected: //- Fill in additional port information virtual int FillOutputPortInformation(int, vtkInformation*); - // The observer to modify this object when array selections are modified + //- The observer to modify this object when array selections are modified vtkCallbackCommand* SelectionObserver; + //- The file name for this case char* FileName; - -private: - - //- Disallow default bitwise copy construct - vtkPVblockMeshReader(const vtkPVblockMeshReader&) = delete; - //- Disallow default bitwise assignment void operator=(const vtkPVblockMeshReader&) = delete; + +private: + //- Add/remove point numbers to/from the view void updatePointNumbersView(const bool show); diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H index a4609e4fde..b17f2ffff9 100644 --- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H +++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H @@ -104,15 +104,6 @@ class IndirectList private IndirectListAddressing, public UIndirectList { - // Private Member Functions - - //- Disallow default bitwise assignment - void operator=(const IndirectList&) = delete; - - //- Disallow assignment from UIndirectList - void operator=(const UIndirectList&) = delete; - - public: // Constructors @@ -148,6 +139,12 @@ public: //- Assignment operator using UIndirectList::operator=; + + //- Disallow default bitwise assignment + void operator=(const IndirectList&) = delete; + + //- Disallow assignment from UIndirectList + void operator=(const UIndirectList&) = delete; }; diff --git a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H index 0b34903ecd..b05baa2299 100644 --- a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H +++ b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H @@ -71,9 +71,6 @@ class dictionaryEntry void readData(Istream&); - //- Disallow bitwise copy - dictionaryEntry(const dictionary&) = delete; - public: @@ -105,6 +102,9 @@ public: const dictionaryEntry& ); + //- Disallow bitwise copy + dictionaryEntry(const dictionary&) = delete; + autoPtr clone(const dictionary& parentDict) const { return autoPtr(new dictionaryEntry(parentDict, *this)); diff --git a/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntry.H b/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntry.H index 2a9ccc0b4b..70e3af8b6d 100644 --- a/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntry.H +++ b/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntry.H @@ -69,9 +69,6 @@ class dictionaryListEntry //- Returns size of dictionary without FoamFile static label realSize(const dictionary&); - //- Disallow bitwise copy - dictionaryListEntry(const dictionary&) = delete; - public: @@ -87,6 +84,9 @@ public: const dictionaryListEntry& ); + //- Disallow bitwise copy + dictionaryListEntry(const dictionary&) = delete; + autoPtr clone(const dictionary& parentDict) const { return autoPtr(new dictionaryListEntry(parentDict, *this)); diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.H b/src/OpenFOAM/db/regIOobject/regIOobject.H index bac7b4d2ad..c52f4df3e5 100644 --- a/src/OpenFOAM/db/regIOobject/regIOobject.H +++ b/src/OpenFOAM/db/regIOobject/regIOobject.H @@ -77,12 +77,11 @@ class regIOobject //- Return Istream Istream& readStream(const bool read = true); - //- Disallow assignment - void operator=(const regIOobject&) = delete; - protected: + // Protected Member Functions + //- Read header, check readOpt flags and read data if necessary. // Format is set to ASCII if defaultFormat and file format are ASCII bool readHeaderOk @@ -309,7 +308,11 @@ public: // Member Operators + //- Assign to IOobject void operator=(const IOobject&); + + //- Disallow default assignment + void operator=(const regIOobject&) = delete; }; diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H index 5c0b31469a..7c5d65e786 100644 --- a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H +++ b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H @@ -69,12 +69,6 @@ class procLduInterface label comm_; - // Private Member Functions - - //- Disallow construction as copy - procLduInterface(const procLduInterface&) = delete; - - public: friend class LUscalarMatrix; @@ -90,6 +84,9 @@ public: procLduInterface(Istream& is); + //- Disallow construction as copy + procLduInterface(const procLduInterface&) = delete; + autoPtr clone() { NotImplemented; diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/procLduMatrix.H b/src/OpenFOAM/matrices/LUscalarMatrix/procLduMatrix.H index ab986be2c7..ed029ffd4c 100644 --- a/src/OpenFOAM/matrices/LUscalarMatrix/procLduMatrix.H +++ b/src/OpenFOAM/matrices/LUscalarMatrix/procLduMatrix.H @@ -71,12 +71,6 @@ class procLduMatrix PtrList interfaces_; - // Private Member Functions - - //- Disallow construction as copy - procLduMatrix(const procLduMatrix&) = delete; - - public: friend class LUscalarMatrix; @@ -93,6 +87,9 @@ public: procLduMatrix(Istream& is); + //- Disallow construction as copy + procLduMatrix(const procLduMatrix&) = delete; + // Member Functions diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H index ceaecdbd75..8653d30b59 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H @@ -50,18 +50,6 @@ class processorCyclicGAMGInterfaceField : public processorGAMGInterfaceField { - // Private Member Functions - - //- Disallow default bitwise copy construction - processorCyclicGAMGInterfaceField - ( - const processorCyclicGAMGInterfaceField& - ) = delete; - - //- Disallow default bitwise assignment - void operator=(const processorCyclicGAMGInterfaceField&) = delete; - - public: //- Runtime type information @@ -84,10 +72,22 @@ public: const int rank ); + //- Disallow default bitwise copy construction + processorCyclicGAMGInterfaceField + ( + const processorCyclicGAMGInterfaceField& + ) = delete; + // Destructor virtual ~processorCyclicGAMGInterfaceField(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const processorCyclicGAMGInterfaceField&) = delete; }; diff --git a/src/OpenFOAM/memory/refCount/refCount.H b/src/OpenFOAM/memory/refCount/refCount.H index 1056440dc2..e32a0a9f99 100644 --- a/src/OpenFOAM/memory/refCount/refCount.H +++ b/src/OpenFOAM/memory/refCount/refCount.H @@ -54,15 +54,6 @@ class refCount int count_; - // Private Member Functions - - //- Disallow copy - refCount(const refCount&) = delete; - - //- Disallow bitwise assignment - void operator=(const refCount&) = delete; - - protected: // Constructors @@ -73,6 +64,9 @@ protected: count_(0) {} + //- Disallow copy + refCount(const refCount&) = delete; + public: @@ -116,6 +110,9 @@ public: { count_--; } + + //- Disallow bitwise assignment + void operator=(const refCount&) = delete; }; diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.H index 987bf3ba54..1fb18742ce 100644 --- a/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.H +++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.H @@ -51,15 +51,6 @@ class pointBoundaryMesh; class coupledPointPatch { - // Private Member Functions - - //- Disallow default bitwise copy construction - coupledPointPatch(const coupledPointPatch&) = delete; - - //- Disallow default bitwise assignment - void operator=(const coupledPointPatch&) = delete; - - protected: // Protected Member Functions @@ -94,10 +85,18 @@ public: //- Construct from components coupledPointPatch(const pointBoundaryMesh& bm); + //- Disallow default bitwise copy construction + coupledPointPatch(const coupledPointPatch&) = delete; + //- Destructor virtual ~coupledPointPatch(); + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const coupledPointPatch&) = delete; }; diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H index f4432ae112..44f25265ea 100644 --- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H +++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H @@ -58,15 +58,6 @@ class cyclicPointPatch const cyclicPolyPatch& cyclicPolyPatch_; - // Private Member Functions - - //- Disallow default bitwise copy construction - cyclicPointPatch(const cyclicPointPatch&) = delete; - - //- Disallow default bitwise assignment - void operator=(const cyclicPointPatch&) = delete; - - // Demand driven private data //- Initialise the calculation of the patch geometry @@ -103,6 +94,9 @@ public: const pointBoundaryMesh& bm ); + //- Disallow default bitwise copy construction + cyclicPointPatch(const cyclicPointPatch&) = delete; + //- Destructor virtual ~cyclicPointPatch(); @@ -139,6 +133,12 @@ public: // and/or mapping. First index is on this patch, second on the // neighbour patch. virtual const edgeList& transformPairs() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const cyclicPointPatch&) = delete; }; diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H index 83a883978f..f8ff6f168d 100644 --- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H +++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H @@ -87,12 +87,6 @@ class processorPointPatch virtual void topoChange(PstreamBuffers&); - //- Disallow default bitwise copy construction - processorPointPatch(const processorPointPatch&) = delete; - - //- Disallow default bitwise assignment - void operator=(const processorPointPatch&) = delete; - public: //- Runtime type information @@ -108,6 +102,9 @@ public: const pointBoundaryMesh& bm ); + //- Disallow default bitwise copy construction + processorPointPatch(const processorPointPatch&) = delete; + //- Destructor virtual ~processorPointPatch(); @@ -153,6 +150,12 @@ public: //- Return mesh points in the correct order for the receiving side const labelList& reverseMeshPoints() const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const processorPointPatch&) = delete; }; diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.H index 30f8476c20..6cc04fa39b 100644 --- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.H +++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.H @@ -63,11 +63,6 @@ class processorCyclicPointPatch const processorCyclicPolyPatch& procCycPolyPatch_; - //- Disallow default bitwise copy construction - processorCyclicPointPatch(const processorCyclicPointPatch&) = delete; - - //- Disallow default bitwise assignment - void operator=(const processorCyclicPointPatch&) = delete; public: @@ -84,6 +79,9 @@ public: const pointBoundaryMesh& bm ); + //- Disallow default bitwise copy construction + processorCyclicPointPatch(const processorCyclicPointPatch&) = delete; + // Destructor @@ -104,6 +102,12 @@ public: { return procCycPolyPatch_; } + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const processorCyclicPointPatch&) = delete; }; diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H index ef0bcda947..bfdb3c5cc7 100644 --- a/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H +++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H @@ -61,21 +61,12 @@ class coupledFacePointPatch const coupledPolyPatch& coupledPolyPatch_; - // Private Member Functions - - //- Disallow default bitwise copy construction - coupledFacePointPatch(const coupledFacePointPatch&) = delete; - - //- Disallow default bitwise assignment - void operator=(const coupledFacePointPatch&) = delete; - - protected: - // Construction of demand-driven data + // Protected Member Functions - //- Calculate mesh points - virtual void calcGeometry(PstreamBuffers&) = 0; + //- Calculate mesh points + virtual void calcGeometry(PstreamBuffers&) = 0; public: @@ -93,9 +84,19 @@ public: const pointBoundaryMesh& bm ); + //- Disallow default bitwise copy construction + coupledFacePointPatch(const coupledFacePointPatch&) = delete; + + //- Destructor virtual ~coupledFacePointPatch(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const coupledFacePointPatch&) = delete; }; diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H index bbc26e37d7..10fbb8afde 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H +++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H @@ -132,7 +132,6 @@ private: //- Have the primitives been cleared bool clearedPrimitives_; - //- Boundary mesh mutable polyBoundaryMesh boundary_; @@ -273,7 +272,6 @@ public: static word meshSubDir; - // Constructors //- Construct from IOobject diff --git a/src/OpenFOAM/meshes/polyMesh/zones/MeshZones/MeshZones.H b/src/OpenFOAM/meshes/polyMesh/zones/MeshZones/MeshZones.H index 9022c7dc0a..5cd6f3be69 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/MeshZones/MeshZones.H +++ b/src/OpenFOAM/meshes/polyMesh/zones/MeshZones/MeshZones.H @@ -79,10 +79,6 @@ class MeshZones //- Read if IOobject flags set. Return true if read. bool read(); - //- Disallow default bitwise assignment - void operator=(const MeshZones&) = delete; - - //- Create zone map void calcZoneMap() const; @@ -190,6 +186,9 @@ public: //- Return reference to ZoneType by name. ZoneType& operator[](const word&); + //- Disallow default bitwise assignment + void operator=(const MeshZones&) = delete; + // Ostream operator diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/sixDoFMotion/sixDoFMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/sixDoFMotion/sixDoFMotion.H index 2ae1f37982..1353f100f4 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/sixDoFMotion/sixDoFMotion.H +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/sixDoFMotion/sixDoFMotion.H @@ -94,7 +94,6 @@ public: //- Disallow default bitwise copy construction sixDoFMotion(const sixDoFMotion&) = delete; - //- Construct and return a clone virtual autoPtr clone() const { diff --git a/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H b/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H index 74fc67cf8f..7598ad8cbe 100644 --- a/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H +++ b/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H @@ -82,10 +82,7 @@ public: ); //- Disallow default bitwise copy construction - velocityMotionSolver - ( - const velocityMotionSolver& - ) = delete; + velocityMotionSolver(const velocityMotionSolver&) = delete; //- Destructor diff --git a/src/fileFormats/vtk/vtkUnstructuredReader.H b/src/fileFormats/vtk/vtkUnstructuredReader.H index 0f98600d4f..bb77a25698 100644 --- a/src/fileFormats/vtk/vtkUnstructuredReader.H +++ b/src/fileFormats/vtk/vtkUnstructuredReader.H @@ -133,50 +133,51 @@ public: private: - //- Header - string header_; + // Private Data - //- Title - string title_; + //- Header + string header_; - //- DataType - string dataType_; + //- Title + string title_; + + //- DataType + string dataType_; - // Geometry + // Geometry - //- Points - pointField points_; + //- Points + pointField points_; - //- 3D cells. - cellShapeList cells_; + //- 3D cells. + cellShapeList cells_; - //- Map from cells back to original ID - labelList cellMap_; + //- Map from cells back to original ID + labelList cellMap_; - //- 2D cells (=faces) - faceList faces_; + //- 2D cells (=faces) + faceList faces_; - //- Map from faces back to original ID - labelList faceMap_; + //- Map from faces back to original ID + labelList faceMap_; - //- 1D cells (=edges) - labelListList lines_; + //- 1D cells (=edges) + labelListList lines_; - labelList lineMap_; + labelList lineMap_; - // Data + // Data - //- Cell based fields - objectRegistry cellData_; + //- Cell based fields + objectRegistry cellData_; - //- Point based fields - objectRegistry pointData_; - - //- Other fields - objectRegistry otherData_; + //- Point based fields + objectRegistry pointData_; + //- Other fields + objectRegistry otherData_; // Private Member Functions @@ -227,20 +228,19 @@ private: void read(ISstream& inFile); - //- Disallow assignment - void operator=(const vtkUnstructuredReader&) = delete; - public: //- Runtime type information ClassName("vtkUnstructuredReader"); + // Constructors //- Construct from Istream, read all vtkUnstructuredReader(const objectRegistry& obr, ISstream&); + // Member Functions //- Header @@ -261,7 +261,6 @@ public: return dataType_; } - //- Points const pointField& points() const { @@ -354,11 +353,15 @@ public: return otherData_; } - //- Debug: print contents of objectRegistry template void printFieldStats(const objectRegistry&) const; + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const vtkUnstructuredReader&) = delete; }; diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H index d622fd74d1..4621280710 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H +++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H @@ -67,15 +67,6 @@ class gradScheme const fvMesh& mesh_; - // Private Member Functions - - //- Disallow default bitwise copy construction - gradScheme(const gradScheme&) = delete; - - //- Disallow default bitwise assignment - void operator=(const gradScheme&) = delete; - - public: //- Runtime type information @@ -102,6 +93,9 @@ public: mesh_(mesh) {} + //- Disallow default bitwise copy construction + gradScheme(const gradScheme&) = delete; + // Selectors @@ -161,6 +155,12 @@ public: ( const tmp>& ) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const gradScheme&) = delete; }; diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H index 5d3b0dcb2b..60d4e07d74 100644 --- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H +++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H @@ -73,21 +73,12 @@ protected: // Protected data const fvMesh& mesh_; + tmp> tinterpGammaScheme_; + tmp> tsnGradScheme_; -private: - - // Private Member Functions - - //- Disallow default bitwise copy construction - laplacianScheme(const laplacianScheme&) = delete; - - //- Disallow default bitwise assignment - void operator=(const laplacianScheme&) = delete; - - public: //- Runtime type information @@ -147,6 +138,9 @@ public: tsnGradScheme_(sngs) {} + //- Disallow default bitwise copy construction + laplacianScheme(const laplacianScheme&) = delete; + // Selectors @@ -198,6 +192,12 @@ public: const VolField&, const VolField& ); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const laplacianScheme&) = delete; }; diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H index d5e97cba72..19d044783a 100644 --- a/src/finiteVolume/fvMesh/fvMesh.H +++ b/src/finiteVolume/fvMesh/fvMesh.H @@ -306,9 +306,11 @@ public: friend fvMeshTopoChangers::list; + // Declare name of the class and its debug switch ClassName("fvMesh"); + // Static data //- Set of names of registered geometric fields @@ -643,6 +645,7 @@ public: void operator=(const fvMesh&) = delete; bool operator!=(const fvMesh&) const; + bool operator==(const fvMesh&) const; }; diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H index 0baa306b50..afe589ab4a 100644 --- a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H +++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H @@ -94,8 +94,6 @@ class fvPatchMapper public: - // Static Data Members - // Constructors //- Construct from mappers @@ -106,10 +104,7 @@ public: ); //- Disallow default bitwise copy construction - fvPatchMapper - ( - const fvPatchMapper& - ) = delete; + fvPatchMapper(const fvPatchMapper&) = delete; //- Destructor diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H index ee1377f816..24c6a05b63 100644 --- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H +++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H @@ -93,6 +93,7 @@ public: friend class fvBoundaryMesh; friend class surfaceInterpolation; + //- Runtime type information TypeName(polyPatch::typeName_()); diff --git a/src/surfMesh/surfMesh/surfMesh.H b/src/surfMesh/surfMesh/surfMesh.H index c81ff0b577..76d5964c09 100644 --- a/src/surfMesh/surfMesh/surfMesh.H +++ b/src/surfMesh/surfMesh/surfMesh.H @@ -55,13 +55,16 @@ template class MeshedSurface; class surfMesh : - public surfaceRegistry, + public surfaceRegistry, private MeshedSurfaceIOAllocator, - public PrimitivePatch<::Foam::UList, ::Foam::SubField> + public PrimitivePatch, SubField> { - // friends - template friend class MeshedSurface; - template friend class UnsortedMeshedSurface; + // Friendship + + template friend class MeshedSurface; + + template friend class UnsortedMeshedSurface; + public: @@ -85,8 +88,7 @@ private: typedef MeshedSurfaceIOAllocator Allocator; - typedef PrimitivePatch<::Foam::UList, ::Foam::SubField> - MeshReference; + typedef PrimitivePatch, SubField> MeshReference; protected: @@ -125,17 +127,21 @@ public: // Public Typedefs - typedef surfMesh Mesh; + typedef surfMesh Mesh; - //- Placeholder only, but do not remove - it is needed for GeoMesh - typedef bool BoundaryMesh; + //- Placeholder only, but do not remove - it is needed for GeoMesh + typedef bool BoundaryMesh; + + + // Public Static Data + + //- The mesh sub-directory name (normally "surfMesh") + static word meshSubDir; //- Runtime type information TypeName("surfMesh"); - //- Return the mesh sub-directory name (normally "surfMesh") - static word meshSubDir; // Constructors @@ -201,7 +207,6 @@ public: return nFaces(); } - //- Return points virtual const pointField& points() const; @@ -256,6 +261,7 @@ public: //- Write to file void write(const fileName&); + // Storage management //- Clear geometry