From 00ae415b713301f5cc23d97d05668825bc7a3849 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Wed, 5 Jun 2019 23:32:22 +0100 Subject: [PATCH] Added copy constructors to classes with copy assignment operator defined and copy assignment operator for classes with a copy constructor This is often described as the rule of 3 (or rule of 5 in C++11 if move constructors and assignment operators are also defined) and makes good sense in ensuring consistency. For classes in which the default bitwise copy constructor or assignment operator are appropriate these are now specified explicitly using the "= default" keyword if the other is explicitly defined fulfilling the rule of 3 without the need to define the body of the function. --- .../indexedVertex/indexedVertex.H | 4 ++- .../linkTypes/DLListBase/DLListBase.H | 12 +++++++ .../linkTypes/SLListBase/SLListBase.H | 5 +++ .../containers/Lists/FixedList/FixedList.H | 3 -- .../containers/Lists/FixedList/FixedListI.H | 12 +------ .../containers/Lists/PtrList/PtrList.C | 5 +++ .../containers/Lists/SubList/SubList.H | 5 ++- .../Lists/UIndirectList/UIndirectList.H | 5 ++- src/OpenFOAM/db/IOobject/IOobject.H | 3 ++ src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H | 15 +++++++++ .../basic/value/valuePointPatchField.H | 3 ++ .../interpolationTable/interpolationTable.C | 13 ++++++++ .../interpolationTable/interpolationTable.H | 5 ++- .../Identifiers/patch/patchIdentifier.H | 3 +- src/OpenFOAM/primitives/complex/complex.H | 3 +- src/OpenFOAM/primitives/complex/complexI.H | 9 +----- .../functions/Polynomial/Polynomial.C | 14 +------- .../functions/Polynomial/Polynomial.H | 5 +-- .../vectorTensorTransform.H | 3 +- .../vectorTensorTransformI.H | 13 +------- .../primitives/quaternion/quaternion.H | 3 +- .../primitives/quaternion/quaternionI.H | 8 +---- .../primitives/septernion/septernion.H | 3 +- .../primitives/septernion/septernionI.H | 8 +---- src/dynamicMesh/boundaryPatch/boundaryPatch.C | 8 ----- src/dynamicMesh/boundaryPatch/boundaryPatch.H | 3 -- .../directions/directionInfo/directionInfo.H | 3 -- .../directions/directionInfo/directionInfoI.H | 32 +++++-------------- .../wallNormalInfo/wallNormalInfo.H | 2 -- .../wallNormalInfo/wallNormalInfoI.H | 29 +++++------------ .../pointPatchDist/externalPointEdgePoint.H | 3 -- .../pointPatchDist/externalPointEdgePointI.H | 12 +------ src/engine/ignition/ignitionSite.H | 5 ++- .../referredWallFace/referredWallFace.C | 17 +--------- .../referredWallFace/referredWallFace.H | 3 -- .../referredWallFace/referredWallFaceI.H | 4 +-- .../CollisionRecordList/CollisionRecordList.C | 23 +------------ .../CollisionRecordList/CollisionRecordList.H | 7 +--- .../phaseProperties/phaseProperties.C | 12 +------ .../phaseProperties/phaseProperties.H | 3 -- .../ParticleForces/forceSuSp/forceSuSp.H | 5 +-- .../ParticleForces/forceSuSp/forceSuSpI.H | 9 +----- .../SingleKineticRateDevolatilisation.C | 17 +--------- .../SingleKineticRateDevolatilisation.H | 14 -------- .../snappyHexMeshDriver/pointData/pointData.H | 3 -- .../pointData/pointDataI.H | 11 ------- .../PatchEdgeFaceWave/patchEdgeFaceInfo.H | 3 -- .../PatchEdgeFaceWave/patchEdgeFaceInfoI.H | 10 ------ .../algorithms/PointEdgeWave/pointEdgePoint.H | 3 -- .../PointEdgeWave/pointEdgePointI.H | 10 ------ src/meshTools/cellClassification/cellInfo.H | 3 -- src/meshTools/cellClassification/cellInfoI.H | 17 +--------- src/meshTools/cellDist/wallPoint/wallPoint.H | 3 -- src/meshTools/cellDist/wallPoint/wallPointI.H | 9 +----- src/rigidBodyDynamics/joints/joint/joint.H | 5 ++- src/sampling/cuttingPlane/cuttingPlane.C | 20 ------------ src/sampling/cuttingPlane/cuttingPlane.H | 7 +--- .../sixDoFRigidBodyMotionState.C | 16 +--------- .../sixDoFRigidBodyMotionState.H | 3 -- src/surfMesh/surfZone/surfZone/surfZone.C | 8 ----- src/surfMesh/surfZone/surfZone/surfZone.H | 3 -- .../const/constAnIsoSolidTransport.H | 3 +- .../const/constAnIsoSolidTransportI.H | 12 +------ .../transport/const/constIsoSolidTransport.H | 3 +- .../transport/const/constIsoSolidTransportI.H | 13 +------- .../exponential/exponentialSolidTransport.H | 3 +- .../exponential/exponentialSolidTransportI.H | 15 +-------- .../polynomial/polynomialSolidTransport.H | 3 +- .../polynomial/polynomialSolidTransportI.H | 14 +------- .../icoPolynomial/icoPolynomial.H | 3 +- .../icoPolynomial/icoPolynomialI.H | 14 +------- .../incompressiblePerfectGas.H | 3 +- .../incompressiblePerfectGasI.H | 13 +------- .../IrreversibleReaction.H | 32 +++++++++---------- .../NonEquilibriumReversibleReaction.H | 26 ++++++++------- .../ReversibleReaction/ReversibleReaction.H | 30 ++++++++--------- .../specie/specie/specie.H | 5 ++- .../thermo/hPolynomial/hPolynomialThermo.H | 3 +- .../thermo/hPolynomial/hPolynomialThermoI.H | 18 +---------- .../specie/transport/WLF/WLFTransport.H | 5 +-- .../specie/transport/WLF/WLFTransportI.H | 18 +---------- .../specie/transport/const/constTransport.H | 5 +-- .../specie/transport/const/constTransportI.H | 15 +-------- .../logPolynomial/logPolynomialTransport.H | 5 +-- .../logPolynomial/logPolynomialTransportI.H | 15 +-------- .../polynomial/polynomialTransport.H | 5 +-- .../polynomial/polynomialTransportI.H | 15 +-------- .../sutherland/sutherlandTransport.H | 5 +-- .../sutherland/sutherlandTransportI.H | 15 +-------- .../triSurface/interfaces/STL/writeSTL.C | 5 +-- .../triSurface/surfacePatch/surfacePatch.C | 10 +----- .../triSurface/surfacePatch/surfacePatch.H | 4 +-- 92 files changed, 200 insertions(+), 642 deletions(-) diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H index 40f6d0bb7e..1bea90371c 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -171,6 +171,8 @@ public: inline indexedVertex(Cell_handle f); + indexedVertex(const indexedVertex& p) = default; + // Member Functions diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H index 84d69590ea..22c625aa19 100644 --- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H +++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H @@ -207,6 +207,9 @@ public: //- Construct for a given DLListBase and link inline iterator(DLListBase&, link*); + //- Copy constructor + inline iterator(const iterator&) = default; + // Member operators inline void operator=(const iterator&); @@ -245,6 +248,9 @@ public: //- Construct from a non-const iterator inline const_iterator(const iterator&); + //- Copy constructor + inline const_iterator(const const_iterator&) = default; + // Member operators inline void operator=(const const_iterator&); @@ -283,6 +289,12 @@ public: //- Construct for a given DLListBase and link inline const_reverse_iterator(const DLListBase&, const link*); + //- Copy constructor + inline const_reverse_iterator + ( + const const_reverse_iterator& + ) = default; + // Member operators inline void operator=(const const_reverse_iterator&); diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H index d7a1c2f257..948bf4b8bd 100644 --- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H +++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H @@ -190,6 +190,9 @@ public: //- Construct for a given SLListBase and link inline iterator(SLListBase&, link*); + //- Copy constructor + inline iterator(const iterator&) = default; + // Member operators inline void operator=(const iterator&); @@ -228,6 +231,8 @@ public: //- Construct from a non-const iterator inline const_iterator(const iterator&); + //- Copy constructor + inline const_iterator(const const_iterator&) = default; // Member operators diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H index d83f63b14d..249a9cb0ee 100644 --- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H +++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H @@ -138,9 +138,6 @@ public: //- Construct from SLList explicit inline FixedList(const SLList&); - //- Copy constructor - inline FixedList(const FixedList&); - //- Construct from Istream FixedList(Istream&); diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H index 19f0cf8a65..590cdf6c81 100644 --- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H +++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -104,16 +104,6 @@ inline Foam::FixedList::FixedList(const SLList& lst) } -template -inline Foam::FixedList::FixedList(const FixedList& lst) -{ - for (unsigned i=0; i inline Foam::autoPtr> Foam::FixedList::clone() const diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C index b967e64646..c2896e5b28 100644 --- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C +++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C @@ -256,9 +256,14 @@ void Foam::PtrList::shuffle(const labelUList& newToOld) if (oldI >= 0 && oldI < this->size()) { newPtrs_[newI] = this->ptrs_[oldI]; + this->ptrs_[oldI] = nullptr; } } + // Delete all remaining pointers + clear(); + + // Take over new pointers this->ptrs_.transfer(newPtrs_); } diff --git a/src/OpenFOAM/containers/Lists/SubList/SubList.H b/src/OpenFOAM/containers/Lists/SubList/SubList.H index 3e4d47577f..3a1f2d5973 100644 --- a/src/OpenFOAM/containers/Lists/SubList/SubList.H +++ b/src/OpenFOAM/containers/Lists/SubList/SubList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -81,6 +81,9 @@ public: const label startIndex ); + //- Copy constructor + inline SubList(const SubList& sl) = default; + // Member operators diff --git a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H index 388c0a7abe..6ec3f2bf2b 100644 --- a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H +++ b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -72,6 +72,9 @@ public: //- Construct given the complete list and the addressing array inline UIndirectList(const UList&, const labelUList&); + //- Copy constructor + UIndirectList(const UIndirectList&) = default; + // Member Functions diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H index 032b0ae1cc..9e851e2d05 100644 --- a/src/OpenFOAM/db/IOobject/IOobject.H +++ b/src/OpenFOAM/db/IOobject/IOobject.H @@ -262,6 +262,9 @@ public: const word& name ); + //- Copy constructor + IOobject(const IOobject& io) = default; + //- Clone autoPtr clone() const { diff --git a/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H b/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H index 2a3fd98493..36e33f692b 100644 --- a/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H +++ b/src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H @@ -208,6 +208,21 @@ public: //- Print description of IOstream to Ostream void print(Ostream&) const; + + + // Member operators + + //- Assignment operator + void operator=(const ITstream& its) + { + Istream::operator=(its); + tokenList::operator=(its); + name_ = its.name_; + tokenIndex_ = 0; + + setOpened(); + setGood(); + } }; diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H index c404da0c5b..ac59d26d18 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H @@ -109,6 +109,9 @@ public: const DimensionedField& ); + //- Copy constructor + valuePointPatchField(const valuePointPatchField&) = default; + //- Construct and return a clone setting internal field reference virtual autoPtr> clone ( diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C index 352ffe6556..18ab928db9 100644 --- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C +++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.C @@ -385,6 +385,19 @@ Type Foam::interpolationTable::rateOfChange(const scalar value) const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // +template +void Foam::interpolationTable::operator= +( + const interpolationTable& interpTable +) +{ + List>::operator=(interpTable); + boundsHandling_ = interpTable.boundsHandling_; + fileName_ = interpTable.fileName_; + reader_ = interpTable.reader_; // note: steals reader. Used in write(). +} + + template const Foam::Tuple2& Foam::interpolationTable::operator[](const label i) const diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H index f887a85ffc..aba27069c5 100644 --- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H +++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -166,6 +166,9 @@ public: // Member Operators + //- Disallow default bitwise assignment + void operator=(const interpolationTable&); + //- Return an element of constant Tuple2 const Tuple2& operator[](const label) const; diff --git a/src/OpenFOAM/meshes/Identifiers/patch/patchIdentifier.H b/src/OpenFOAM/meshes/Identifiers/patch/patchIdentifier.H index 8731e01ea3..73494cdb8b 100644 --- a/src/OpenFOAM/meshes/Identifiers/patch/patchIdentifier.H +++ b/src/OpenFOAM/meshes/Identifiers/patch/patchIdentifier.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -71,6 +71,7 @@ class patchIdentifier //- Optional groups patch belongs to wordList inGroups_; + public: // Constructors diff --git a/src/OpenFOAM/primitives/complex/complex.H b/src/OpenFOAM/primitives/complex/complex.H index b9106f8a53..b9141a98e1 100644 --- a/src/OpenFOAM/primitives/complex/complex.H +++ b/src/OpenFOAM/primitives/complex/complex.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -126,7 +126,6 @@ public: // Member operators - inline void operator=(const complex&); inline void operator+=(const complex&); inline void operator-=(const complex&); inline void operator*=(const complex&); diff --git a/src/OpenFOAM/primitives/complex/complexI.H b/src/OpenFOAM/primitives/complex/complexI.H index 158c4fc833..b34557ba1e 100644 --- a/src/OpenFOAM/primitives/complex/complexI.H +++ b/src/OpenFOAM/primitives/complex/complexI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,13 +75,6 @@ inline complex complex::conjugate() const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -inline void complex::operator=(const complex& c) -{ - re = c.re; - im = c.im; -} - - inline void complex::operator+=(const complex& c) { re += c.re; diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C index 4c298b02a5..3fbdc0934b 100644 --- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C +++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,18 +41,6 @@ Foam::Polynomial::Polynomial() } -template -Foam::Polynomial::Polynomial -( - const Polynomial& poly -) -: - VectorSpace, scalar, PolySize>(poly), - logActive_(poly.logActive_), - logCoeff_(poly.logCoeff_) -{} - - template Foam::Polynomial::Polynomial(const scalar coeffs[PolySize]) : diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H index a153e1e422..c660d0b0b4 100644 --- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H +++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -106,9 +106,6 @@ public: //- Construct null, with all coefficients = 0.0 Polynomial(); - //- Copy constructor - Polynomial(const Polynomial&); - //- Construct from C-array of coefficients explicit Polynomial(const scalar coeffs[PolySize]); diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H index f774ed0fba..aa89f9c1bb 100644 --- a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H +++ b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -164,7 +164,6 @@ public: // Member operators - inline void operator=(const vectorTensorTransform&); inline void operator&=(const vectorTensorTransform&); inline void operator=(const vector&); diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformI.H b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformI.H index aacdeb7729..614f8d9345 100644 --- a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformI.H +++ b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -171,17 +171,6 @@ inline Foam::pointField Foam::vectorTensorTransform::invTransformPosition // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -inline void Foam::vectorTensorTransform::operator= -( - const vectorTensorTransform& tr -) -{ - t_ = tr.t_; - R_ = tr.R_; - hasR_ = tr.hasR_; -} - - inline void Foam::vectorTensorTransform::operator&= ( const vectorTensorTransform& tr diff --git a/src/OpenFOAM/primitives/quaternion/quaternion.H b/src/OpenFOAM/primitives/quaternion/quaternion.H index cf2fe80b58..86a4fcd76e 100644 --- a/src/OpenFOAM/primitives/quaternion/quaternion.H +++ b/src/OpenFOAM/primitives/quaternion/quaternion.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -213,7 +213,6 @@ public: // Member operators - inline void operator=(const quaternion&); inline void operator+=(const quaternion&); inline void operator-=(const quaternion&); inline void operator*=(const quaternion&); diff --git a/src/OpenFOAM/primitives/quaternion/quaternionI.H b/src/OpenFOAM/primitives/quaternion/quaternionI.H index 862906cea1..987b871226 100644 --- a/src/OpenFOAM/primitives/quaternion/quaternionI.H +++ b/src/OpenFOAM/primitives/quaternion/quaternionI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -523,12 +523,6 @@ inline Foam::vector Foam::quaternion::eulerAngles // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -inline void Foam::quaternion::operator=(const quaternion& q) -{ - w_ = q.w_; - v_ = q.v_; -} - inline void Foam::quaternion::operator+=(const quaternion& q) { w_ += q.w_; diff --git a/src/OpenFOAM/primitives/septernion/septernion.H b/src/OpenFOAM/primitives/septernion/septernion.H index 3e05e465b6..675a3834da 100644 --- a/src/OpenFOAM/primitives/septernion/septernion.H +++ b/src/OpenFOAM/primitives/septernion/septernion.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -130,7 +130,6 @@ public: // Member operators - inline void operator=(const septernion&); inline void operator*=(const septernion&); inline void operator=(const vector&); diff --git a/src/OpenFOAM/primitives/septernion/septernionI.H b/src/OpenFOAM/primitives/septernion/septernionI.H index 53aac8ed14..ca2a7bcab5 100644 --- a/src/OpenFOAM/primitives/septernion/septernionI.H +++ b/src/OpenFOAM/primitives/septernion/septernionI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -93,12 +93,6 @@ inline Foam::vector Foam::septernion::invTransformPoint(const vector& v) const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -inline void Foam::septernion::operator=(const septernion& tr) -{ - t_ = tr.t_; - r_ = tr.r_; -} - inline void Foam::septernion::operator*=(const septernion& tr) { t_ = tr.t() + tr.r().invTransform(t_); diff --git a/src/dynamicMesh/boundaryPatch/boundaryPatch.C b/src/dynamicMesh/boundaryPatch/boundaryPatch.C index 0f4cfe632f..413e9284b9 100644 --- a/src/dynamicMesh/boundaryPatch/boundaryPatch.C +++ b/src/dynamicMesh/boundaryPatch/boundaryPatch.C @@ -57,14 +57,6 @@ Foam::boundaryPatch::boundaryPatch {} -Foam::boundaryPatch::boundaryPatch(const boundaryPatch& p) -: - patchIdentifier(p.name(), p.index(), p.physicalType()), - size_(p.size()), - start_(p.start()) -{} - - Foam::boundaryPatch::boundaryPatch(const boundaryPatch& p, const label index) : patchIdentifier(p.name(), index, p.physicalType()), diff --git a/src/dynamicMesh/boundaryPatch/boundaryPatch.H b/src/dynamicMesh/boundaryPatch/boundaryPatch.H index 6e45ce8097..acbf5d6a62 100644 --- a/src/dynamicMesh/boundaryPatch/boundaryPatch.H +++ b/src/dynamicMesh/boundaryPatch/boundaryPatch.H @@ -86,9 +86,6 @@ public: const label index ); - //- Copy constructor - boundaryPatch(const boundaryPatch&); - //- Copy constructor, resetting the index boundaryPatch(const boundaryPatch&, const label index); diff --git a/src/dynamicMesh/meshCut/directions/directionInfo/directionInfo.H b/src/dynamicMesh/meshCut/directions/directionInfo/directionInfo.H index a1b288034c..2802f2f114 100644 --- a/src/dynamicMesh/meshCut/directions/directionInfo/directionInfo.H +++ b/src/dynamicMesh/meshCut/directions/directionInfo/directionInfo.H @@ -139,9 +139,6 @@ public: const vector& n ); - //- Copy constructor - inline directionInfo(const directionInfo&); - // Member Functions diff --git a/src/dynamicMesh/meshCut/directions/directionInfo/directionInfoI.H b/src/dynamicMesh/meshCut/directions/directionInfo/directionInfoI.H index a754a8882a..95bbc9097e 100644 --- a/src/dynamicMesh/meshCut/directions/directionInfo/directionInfoI.H +++ b/src/dynamicMesh/meshCut/directions/directionInfo/directionInfoI.H @@ -29,7 +29,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -// Null constructor inline Foam::directionInfo::directionInfo() : index_(-3), @@ -37,7 +36,6 @@ inline Foam::directionInfo::directionInfo() {} -// Construct from components inline Foam::directionInfo::directionInfo ( const label index, @@ -49,14 +47,6 @@ inline Foam::directionInfo::directionInfo {} -// Copy constructor -inline Foam::directionInfo::directionInfo(const directionInfo& w2) -: - index_(w2.index()), - n_(w2.n()) -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template @@ -66,7 +56,6 @@ inline bool Foam::directionInfo::valid(TrackingData& td) const } -// No geometric data so never any problem on cyclics template inline bool Foam::directionInfo::sameGeometry ( @@ -81,7 +70,6 @@ inline bool Foam::directionInfo::sameGeometry } -// index_ is already offset in face template inline void Foam::directionInfo::leaveDomain ( @@ -94,10 +82,6 @@ inline void Foam::directionInfo::leaveDomain {} -// index_ is offset in face on other side. So reverse it here. -// (Note: f[0] on other domain is connected to f[0] in this domain, -// f[1] ,, f[size-1] ,, -// etc.) template inline void Foam::directionInfo::enterDomain ( @@ -117,7 +101,6 @@ inline void Foam::directionInfo::enterDomain } -// No geometric data. template inline void Foam::directionInfo::transform ( @@ -128,7 +111,6 @@ inline void Foam::directionInfo::transform {} -// Update this cell with neighbouring face information template inline bool Foam::directionInfo::updateCell ( @@ -209,7 +191,6 @@ inline bool Foam::directionInfo::updateCell } -// Update this face with neighbouring cell information template inline bool Foam::directionInfo::updateFace ( @@ -258,7 +239,6 @@ inline bool Foam::directionInfo::updateFace } -// Merge this with information on same face template inline bool Foam::directionInfo::updateFace ( @@ -298,15 +278,19 @@ inline bool Foam::directionInfo::equal // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -inline bool Foam::directionInfo::operator==(const Foam::directionInfo& rhs) - const +inline bool Foam::directionInfo::operator== +( + const Foam::directionInfo& rhs +) const { return index() == rhs.index() && n() == rhs.n(); } -inline bool Foam::directionInfo::operator!=(const Foam::directionInfo& rhs) - const +inline bool Foam::directionInfo::operator!= +( + const Foam::directionInfo& rhs +) const { return !(*this == rhs); } diff --git a/src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfo.H b/src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfo.H index 71041b482c..aa5a92a322 100644 --- a/src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfo.H +++ b/src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfo.H @@ -87,8 +87,6 @@ public: //- Construct from normal inline wallNormalInfo(const vector& normal); - //- Copy constructor - inline wallNormalInfo(const wallNormalInfo&); // Member Functions diff --git a/src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfoI.H b/src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfoI.H index 3b9e3bca87..7e129b8ba8 100644 --- a/src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfoI.H +++ b/src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfoI.H @@ -27,7 +27,6 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -// Update this with w2 if not yet set. template inline bool Foam::wallNormalInfo::update ( @@ -58,27 +57,18 @@ inline bool Foam::wallNormalInfo::update // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -// Null constructor inline Foam::wallNormalInfo::wallNormalInfo() : normal_(point::max) {} -// Construct from normal inline Foam::wallNormalInfo::wallNormalInfo(const vector& normal) : normal_(normal) {} -// Copy constructor -inline Foam::wallNormalInfo::wallNormalInfo(const wallNormalInfo& wpt) -: - normal_(wpt.normal()) -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // inline const Foam::vector& Foam::wallNormalInfo::normal() const @@ -94,7 +84,6 @@ inline bool Foam::wallNormalInfo::valid(TrackingData& td) const } -// No geometric data so never any problem on cyclics template inline bool Foam::wallNormalInfo::sameGeometry ( @@ -108,7 +97,6 @@ inline bool Foam::wallNormalInfo::sameGeometry } -// No geometric data. template inline void Foam::wallNormalInfo::leaveDomain ( @@ -121,7 +109,6 @@ inline void Foam::wallNormalInfo::leaveDomain {} -// No geometric data. template inline void Foam::wallNormalInfo::transform ( @@ -132,7 +119,6 @@ inline void Foam::wallNormalInfo::transform {} -// No geometric data. template inline void Foam::wallNormalInfo::enterDomain ( @@ -145,7 +131,6 @@ inline void Foam::wallNormalInfo::enterDomain {} -// Update this with w2 if w2 nearer to pt. template inline bool Foam::wallNormalInfo::updateCell ( @@ -161,7 +146,6 @@ inline bool Foam::wallNormalInfo::updateCell } -// Update this with w2 if w2 nearer to pt. template inline bool Foam::wallNormalInfo::updateFace ( @@ -177,7 +161,6 @@ inline bool Foam::wallNormalInfo::updateFace } -// Update this with w2 if w2 nearer to pt. template inline bool Foam::wallNormalInfo::updateFace ( @@ -205,15 +188,19 @@ inline bool Foam::wallNormalInfo::equal // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -inline bool Foam::wallNormalInfo::operator==(const Foam::wallNormalInfo& rhs) - const +inline bool Foam::wallNormalInfo::operator== +( + const Foam::wallNormalInfo& rhs +) const { return normal() == rhs.normal(); } -inline bool Foam::wallNormalInfo::operator!=(const Foam::wallNormalInfo& rhs) - const +inline bool Foam::wallNormalInfo::operator!= +( + const Foam::wallNormalInfo& rhs +) const { return !(*this == rhs); } diff --git a/src/dynamicMesh/pointPatchDist/externalPointEdgePoint.H b/src/dynamicMesh/pointPatchDist/externalPointEdgePoint.H index 84ef4f5f42..c61075473d 100644 --- a/src/dynamicMesh/pointPatchDist/externalPointEdgePoint.H +++ b/src/dynamicMesh/pointPatchDist/externalPointEdgePoint.H @@ -122,9 +122,6 @@ public: //- Construct from origin, distance inline externalPointEdgePoint(const point&, const scalar); - //- Copy constructor - inline externalPointEdgePoint(const externalPointEdgePoint&); - // Member Functions diff --git a/src/dynamicMesh/pointPatchDist/externalPointEdgePointI.H b/src/dynamicMesh/pointPatchDist/externalPointEdgePointI.H index 2209994566..e9cc679439 100644 --- a/src/dynamicMesh/pointPatchDist/externalPointEdgePointI.H +++ b/src/dynamicMesh/pointPatchDist/externalPointEdgePointI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -133,16 +133,6 @@ inline Foam::externalPointEdgePoint::externalPointEdgePoint {} -inline Foam::externalPointEdgePoint::externalPointEdgePoint -( - const externalPointEdgePoint& wpt -) -: - origin_(wpt.origin()), - distSqr_(wpt.distSqr()) -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // inline const Foam::point& Foam::externalPointEdgePoint::origin() const diff --git a/src/engine/ignition/ignitionSite.H b/src/engine/ignition/ignitionSite.H index c8ff965123..a9dbe873d3 100644 --- a/src/engine/ignition/ignitionSite.H +++ b/src/engine/ignition/ignitionSite.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -118,6 +118,9 @@ public: //- Construct from Istream and engineTime ignitionSite(Istream&, const engineTime&, const fvMesh&); + //- Copy constructor + ignitionSite(const ignitionSite&) = default; + //- Clone autoPtr clone() const { diff --git a/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.C b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.C index 7ba4956e57..c47eced8c7 100644 --- a/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.C +++ b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -55,21 +55,6 @@ Foam::referredWallFace::referredWallFace } -Foam::referredWallFace::referredWallFace(const referredWallFace& rWF) -: - face(rWF), - pts_(rWF.pts_), - patchi_(rWF.patchi_) -{ - if (this->size() != pts_.size()) - { - FatalErrorInFunction - << "Face and pointField are not the same size. " << nl << (*this) - << abort(FatalError); - } -} - - // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // Foam::referredWallFace::~referredWallFace() diff --git a/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.H b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.H index 77231190cd..946bc19e6d 100644 --- a/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.H +++ b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.H @@ -87,9 +87,6 @@ public: label patchi ); - //- Copy constructor - referredWallFace(const referredWallFace&); - //- Destructor ~referredWallFace(); diff --git a/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFaceI.H b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFaceI.H index 80c689ce85..ecb78d7c55 100644 --- a/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFaceI.H +++ b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFaceI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,8 +23,6 @@ License \*---------------------------------------------------------------------------*/ -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // const Foam::pointField& Foam::referredWallFace::points() const diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.C index 401cba53a8..f72eefdb00 100644 --- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.C +++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -388,27 +388,6 @@ void Foam::CollisionRecordList::update() } -// * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * // - -template -void Foam::CollisionRecordList::operator= -( - const CollisionRecordList& rhs -) -{ - // Check for assignment to self - if (this == &rhs) - { - FatalErrorInFunction - << "Attempted assignment to self" - << abort(FatalError); - } - - pairRecords_ = rhs.pairRecords_; - wallRecords_ = rhs.wallRecords_; -} - - // * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * * // template diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.H index ca113a15c9..fb680b7e33 100644 --- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.H +++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -194,11 +194,6 @@ public: void update(); - // Member Operators - - void operator=(const CollisionRecordList&); - - // Friend Operators friend bool operator== diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C index 2f0cc7e11c..eed5d458ab 100644 --- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C +++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -193,16 +193,6 @@ Foam::phaseProperties::phaseProperties() {} -Foam::phaseProperties::phaseProperties(const phaseProperties& pp) -: - phase_(pp.phase_), - stateLabel_(pp.stateLabel_), - names_(pp.names_), - Y_(pp.Y_), - carrierIds_(pp.carrierIds_) -{} - - // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // Foam::phaseProperties::~phaseProperties() diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H index 336cf52758..e497f0e548 100644 --- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H +++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H @@ -122,9 +122,6 @@ public: //- Construct from Istream phaseProperties(Istream&); - //- Copy constructor - phaseProperties(const phaseProperties&); - //- Destructor ~phaseProperties(); diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/forceSuSp/forceSuSp.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/forceSuSp/forceSuSp.H index a130bf4850..b43cf5d719 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/forceSuSp/forceSuSp.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/forceSuSp/forceSuSp.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -103,9 +103,6 @@ public: // Operators - //- Assignment - inline void operator=(const forceSuSp& susp); - //- Addition inline void operator+=(const forceSuSp& susp); diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/forceSuSp/forceSuSpI.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/forceSuSp/forceSuSpI.H index d330e9ddb4..445c4b6ab6 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/forceSuSp/forceSuSpI.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/forceSuSp/forceSuSpI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -79,13 +79,6 @@ inline Foam::scalar& Foam::forceSuSp::Sp() // * * * * * * * * * * * * * * * Operators * * * * * * * * * * * * * * * * * // -inline void Foam::forceSuSp::operator=(const forceSuSp& susp) -{ - first() = susp.first(); - second() = susp.second(); -} - - inline void Foam::forceSuSp::operator+=(const forceSuSp& susp) { first() += susp.first(); diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C index 3f128ee08c..c63f565193 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -69,21 +69,6 @@ SingleKineticRateDevolatilisation } -template -Foam::SingleKineticRateDevolatilisation:: -SingleKineticRateDevolatilisation -( - const SingleKineticRateDevolatilisation& dm -) -: - DevolatilisationModel(dm), - volatileData_(dm.volatileData_), - YVolatile0_(dm.YVolatile0_), - volatileToGasMap_(dm.volatileToGasMap_), - residualCoeff_(dm.residualCoeff_) -{} - - // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // template diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H index 467cc1632a..b467e5ada6 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H @@ -106,14 +106,6 @@ class SingleKineticRateDevolatilisation E_(readScalar(is)) {} - //- Copy constructor - volatileData(const volatileData& vd) - : - name_(vd.name_), - A1_(vd.A1_), - E_(vd.E_) - {} - //- Destructor ~volatileData() @@ -203,12 +195,6 @@ public: CloudType& owner ); - //- Construct copy - SingleKineticRateDevolatilisation - ( - const SingleKineticRateDevolatilisation& dm - ); - //- Construct and return a clone virtual autoPtr> clone() const { diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointData.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointData.H index 75c7d73f98..f43efe82e5 100644 --- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointData.H +++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointData.H @@ -87,9 +87,6 @@ public: const vector& v ); - //- Copy constructor - inline pointData(const pointData&); - // Member Functions diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointDataI.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointDataI.H index 02258ef917..4722be6b14 100644 --- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointDataI.H +++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointDataI.H @@ -28,7 +28,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -// Null constructor inline Foam::pointData::pointData() : pointEdgePoint(), @@ -37,7 +36,6 @@ inline Foam::pointData::pointData() {} -// Construct from origin, distance inline Foam::pointData::pointData ( const point& origin, @@ -52,15 +50,6 @@ inline Foam::pointData::pointData {} -// Copy constructor -inline Foam::pointData::pointData(const pointData& wpt) -: - pointEdgePoint(wpt), - s_(wpt.s()), - v_(wpt.v()) -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // inline Foam::scalar Foam::pointData::s() const diff --git a/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceInfo.H b/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceInfo.H index b2b9354554..26f8ac25d7 100644 --- a/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceInfo.H +++ b/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceInfo.H @@ -111,9 +111,6 @@ public: //- Construct from origin, distance inline patchEdgeFaceInfo(const point&, const scalar); - //- Copy constructor - inline patchEdgeFaceInfo(const patchEdgeFaceInfo&); - // Member Functions diff --git a/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceInfoI.H b/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceInfoI.H index 9a258659a1..a6276f5c6a 100644 --- a/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceInfoI.H +++ b/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceInfoI.H @@ -117,7 +117,6 @@ inline bool Foam::patchEdgeFaceInfo::update // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -// Null constructor inline Foam::patchEdgeFaceInfo::patchEdgeFaceInfo() : origin_(point::max), @@ -125,7 +124,6 @@ inline Foam::patchEdgeFaceInfo::patchEdgeFaceInfo() {} -// Construct from origin, distance inline Foam::patchEdgeFaceInfo::patchEdgeFaceInfo ( const point& origin, @@ -137,14 +135,6 @@ inline Foam::patchEdgeFaceInfo::patchEdgeFaceInfo {} -// Copy constructor -inline Foam::patchEdgeFaceInfo::patchEdgeFaceInfo(const patchEdgeFaceInfo& wpt) -: - origin_(wpt.origin()), - distSqr_(wpt.distSqr()) -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // inline const Foam::point& Foam::patchEdgeFaceInfo::origin() const diff --git a/src/meshTools/algorithms/PointEdgeWave/pointEdgePoint.H b/src/meshTools/algorithms/PointEdgeWave/pointEdgePoint.H index 7543f1cda5..bdc71d233a 100644 --- a/src/meshTools/algorithms/PointEdgeWave/pointEdgePoint.H +++ b/src/meshTools/algorithms/PointEdgeWave/pointEdgePoint.H @@ -112,9 +112,6 @@ public: //- Construct from origin, distance inline pointEdgePoint(const point&, const scalar); - //- Copy constructor - inline pointEdgePoint(const pointEdgePoint&); - // Member Functions diff --git a/src/meshTools/algorithms/PointEdgeWave/pointEdgePointI.H b/src/meshTools/algorithms/PointEdgeWave/pointEdgePointI.H index 72d3e22d37..8a6ab6209e 100644 --- a/src/meshTools/algorithms/PointEdgeWave/pointEdgePointI.H +++ b/src/meshTools/algorithms/PointEdgeWave/pointEdgePointI.H @@ -117,7 +117,6 @@ inline bool Foam::pointEdgePoint::update // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -// Null constructor inline Foam::pointEdgePoint::pointEdgePoint() : origin_(point::max), @@ -125,7 +124,6 @@ inline Foam::pointEdgePoint::pointEdgePoint() {} -// Construct from origin, distance inline Foam::pointEdgePoint::pointEdgePoint ( const point& origin, @@ -137,14 +135,6 @@ inline Foam::pointEdgePoint::pointEdgePoint {} -// Copy constructor -inline Foam::pointEdgePoint::pointEdgePoint(const pointEdgePoint& wpt) -: - origin_(wpt.origin()), - distSqr_(wpt.distSqr()) -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // inline const Foam::point& Foam::pointEdgePoint::origin() const diff --git a/src/meshTools/cellClassification/cellInfo.H b/src/meshTools/cellClassification/cellInfo.H index 73100d7912..c169bed134 100644 --- a/src/meshTools/cellClassification/cellInfo.H +++ b/src/meshTools/cellClassification/cellInfo.H @@ -93,9 +93,6 @@ public: //- Construct from cType inline cellInfo(const label); - //- Copy constructor - inline cellInfo(const cellInfo&); - // Member Functions diff --git a/src/meshTools/cellClassification/cellInfoI.H b/src/meshTools/cellClassification/cellInfoI.H index 1f34e9419d..67cec9daa8 100644 --- a/src/meshTools/cellClassification/cellInfoI.H +++ b/src/meshTools/cellClassification/cellInfoI.H @@ -92,27 +92,18 @@ inline bool Foam::cellInfo::update // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -// Null constructor inline Foam::cellInfo::cellInfo() : type_(cellClassification::NOTSET) {} -// Construct from components inline Foam::cellInfo::cellInfo(const label type) : type_(type) {} -// Copy constructor -inline Foam::cellInfo::cellInfo(const cellInfo& w2) -: - type_(w2.type()) -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template @@ -122,7 +113,6 @@ inline bool Foam::cellInfo::valid(TrackingData& td) const } -// No geometric data so never any problem on cyclics template inline bool Foam::cellInfo::sameGeometry ( @@ -137,7 +127,6 @@ inline bool Foam::cellInfo::sameGeometry } -// No geometric data. template inline void Foam::cellInfo::leaveDomain ( @@ -150,7 +139,6 @@ inline void Foam::cellInfo::leaveDomain {} -// No geometric data. template inline void Foam::cellInfo::transform ( @@ -161,7 +149,6 @@ inline void Foam::cellInfo::transform {} -// No geometric data. template inline void Foam::cellInfo::enterDomain ( @@ -174,7 +161,6 @@ inline void Foam::cellInfo::enterDomain {} -// Update this with neighbour information template inline bool Foam::cellInfo::updateCell ( @@ -198,7 +184,6 @@ inline bool Foam::cellInfo::updateCell } -// Update this with neighbour information template inline bool Foam::cellInfo::updateFace ( @@ -221,7 +206,7 @@ inline bool Foam::cellInfo::updateFace ); } -// Update this with neighbour information + template inline bool Foam::cellInfo::updateFace ( diff --git a/src/meshTools/cellDist/wallPoint/wallPoint.H b/src/meshTools/cellDist/wallPoint/wallPoint.H index 38bbeeafa3..36f35abe89 100644 --- a/src/meshTools/cellDist/wallPoint/wallPoint.H +++ b/src/meshTools/cellDist/wallPoint/wallPoint.H @@ -97,9 +97,6 @@ public: //- Construct from origin, distance inline wallPoint(const point& origin, const scalar distSqr); - //- Copy constructor - inline wallPoint(const wallPoint&); - // Member Functions diff --git a/src/meshTools/cellDist/wallPoint/wallPointI.H b/src/meshTools/cellDist/wallPoint/wallPointI.H index d4a0820a23..70cff92be1 100644 --- a/src/meshTools/cellDist/wallPoint/wallPointI.H +++ b/src/meshTools/cellDist/wallPoint/wallPointI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -96,13 +96,6 @@ inline Foam::wallPoint::wallPoint(const point& origin, const scalar distSqr) {} -inline Foam::wallPoint::wallPoint(const wallPoint& wpt) -: - origin_(wpt.origin()), - distSqr_(wpt.distSqr()) -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // inline const Foam::point& Foam::wallPoint::origin() const diff --git a/src/rigidBodyDynamics/joints/joint/joint.H b/src/rigidBodyDynamics/joints/joint/joint.H index 8eaa48dd0f..e293328b2f 100644 --- a/src/rigidBodyDynamics/joints/joint/joint.H +++ b/src/rigidBodyDynamics/joints/joint/joint.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -175,6 +175,9 @@ public: // to the given degrees of freedom of the joint inline joint(const rigidBodyModel& model, const label nDoF); + //- Copy constructor + joint(const joint&) = default; + //- Clone this joint (needed by PtrList) virtual autoPtr clone() const = 0; diff --git a/src/sampling/cuttingPlane/cuttingPlane.C b/src/sampling/cuttingPlane/cuttingPlane.C index d83a941fa3..9dd3f3791d 100644 --- a/src/sampling/cuttingPlane/cuttingPlane.C +++ b/src/sampling/cuttingPlane/cuttingPlane.C @@ -399,14 +399,12 @@ void Foam::cuttingPlane::remapFaces // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -// Construct without cutting Foam::cuttingPlane::cuttingPlane(const plane& pln) : plane(pln) {} -// Construct from plane and mesh reference, restricted to a list of cells Foam::cuttingPlane::cuttingPlane ( const plane& pln, @@ -421,22 +419,4 @@ Foam::cuttingPlane::cuttingPlane } -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - -void Foam::cuttingPlane::operator=(const cuttingPlane& rhs) -{ - // Check for assignment to self - if (this == &rhs) - { - FatalErrorInFunction - << "Attempted assignment to self" - << abort(FatalError); - } - - static_cast(*this) = rhs; - static_cast(*this) = rhs; - cutCells_ = rhs.cutCells(); -} - - // ************************************************************************* // diff --git a/src/sampling/cuttingPlane/cuttingPlane.H b/src/sampling/cuttingPlane/cuttingPlane.H index 3f87a9273a..ad1a9196d0 100644 --- a/src/sampling/cuttingPlane/cuttingPlane.H +++ b/src/sampling/cuttingPlane/cuttingPlane.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -174,11 +174,6 @@ public: template tmp> sample(const tmp>&) const; - - - // Member Operators - - void operator=(const cuttingPlane&); }; diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C index 409cc5ea1c..b6063dfc46 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,20 +59,6 @@ Foam::sixDoFRigidBodyMotionState::sixDoFRigidBodyMotionState {} -Foam::sixDoFRigidBodyMotionState::sixDoFRigidBodyMotionState -( - const sixDoFRigidBodyMotionState& sDoFRBMS -) -: - centreOfRotation_(sDoFRBMS.centreOfRotation()), - Q_(sDoFRBMS.Q()), - v_(sDoFRBMS.v()), - a_(sDoFRBMS.a()), - pi_(sDoFRBMS.pi()), - tau_(sDoFRBMS.tau()) -{} - - // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // Foam::sixDoFRigidBodyMotionState::~sixDoFRigidBodyMotionState() diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.H index ddbbe4e7ce..874c7f0851 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.H +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.H @@ -100,9 +100,6 @@ public: //- Construct from dictionary sixDoFRigidBodyMotionState(const dictionary& dict); - //- Copy constructor - sixDoFRigidBodyMotionState(const sixDoFRigidBodyMotionState&); - //- Destructor ~sixDoFRigidBodyMotionState(); diff --git a/src/surfMesh/surfZone/surfZone/surfZone.C b/src/surfMesh/surfZone/surfZone/surfZone.C index 4f513713be..f876e66226 100644 --- a/src/surfMesh/surfZone/surfZone/surfZone.C +++ b/src/surfMesh/surfZone/surfZone/surfZone.C @@ -86,14 +86,6 @@ Foam::surfZone::surfZone {} -Foam::surfZone::surfZone(const surfZone& zone) -: - surfZoneIdentifier(zone, zone.index()), - size_(zone.size()), - start_(zone.start()) -{} - - Foam::surfZone::surfZone(const surfZone& zone, const label index) : surfZoneIdentifier(zone, index), diff --git a/src/surfMesh/surfZone/surfZone/surfZone.H b/src/surfMesh/surfZone/surfZone/surfZone.H index 1ca7ae74e0..45cbf70e79 100644 --- a/src/surfMesh/surfZone/surfZone/surfZone.H +++ b/src/surfMesh/surfZone/surfZone/surfZone.H @@ -105,9 +105,6 @@ public: const label index ); - //- Copy constructor - surfZone(const surfZone&); - //- Construct from another zone, resetting the index surfZone(const surfZone&, const label index); diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.H index 0055f461f1..bee8fc195f 100644 --- a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.H +++ b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -133,7 +133,6 @@ public: // Member operators - inline void operator=(const constAnIsoSolidTransport&); inline void operator+=(const constAnIsoSolidTransport&); diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H index 61ca6a6bae..96d321cbf1 100644 --- a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H +++ b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -97,16 +97,6 @@ alphah(const scalar p, const scalar T) const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template -inline void Foam::constAnIsoSolidTransport::operator= -( - const constAnIsoSolidTransport& ct -) -{ - kappa_ = ct.kappa_; -} - - template inline void Foam::constAnIsoSolidTransport::operator+= ( diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H index 06b00a54b5..9810f288a9 100644 --- a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H +++ b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -134,7 +134,6 @@ public: // Member operators - inline void operator=(const constIsoSolidTransport&); inline void operator+=(const constIsoSolidTransport&); diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H index b53c29c5bd..363c9b0a32 100644 --- a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H +++ b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -97,17 +97,6 @@ alphah(const scalar p, const scalar T) const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template -inline void Foam::constIsoSolidTransport::operator= -( - const constIsoSolidTransport& ct -) -{ - thermo::operator=(ct); - kappa_ = ct.kappa_; -} - - template inline void Foam::constIsoSolidTransport::operator+= ( diff --git a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H index 0fecae8eff..91f2dd0ccd 100644 --- a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H +++ b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -142,7 +142,6 @@ public: // Member operators - inline void operator=(const exponentialSolidTransport&); inline void operator+=(const exponentialSolidTransport&); diff --git a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H index bc3db3cf23..0a6fe97f1b 100644 --- a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H +++ b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -109,19 +109,6 @@ alphah(const scalar p, const scalar T) const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - -template -inline void Foam::exponentialSolidTransport::operator= -( - const exponentialSolidTransport& ct -) -{ - kappa0_ = ct.kappa0_; - n0_ = ct.n0_; - Tref_ = ct.Tref_; -} - - template inline void Foam::exponentialSolidTransport::operator+= ( diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H index b0db5f219a..6b690be7cf 100644 --- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H +++ b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -177,7 +177,6 @@ public: // Member operators - inline void operator=(const polynomialSolidTransport&); inline void operator+=(const polynomialSolidTransport&); inline void operator*=(const scalar); diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H index 9621ab1992..c361a074a5 100644 --- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H +++ b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -124,18 +124,6 @@ inline Foam::scalar Foam::polynomialSolidTransport::alphah // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template -inline void Foam::polynomialSolidTransport::operator= -( - const polynomialSolidTransport& pt -) -{ - Thermo::operator=(pt); - - kappaCoeffs_ = pt.kappaCoeffs_; -} - - template inline void Foam::polynomialSolidTransport::operator+= ( diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H index 2b47d0ad3a..f6e7590cfa 100644 --- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H +++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -197,7 +197,6 @@ public: // Member operators - inline void operator=(const icoPolynomial&); inline void operator+=(const icoPolynomial&); inline void operator*=(const scalar); diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H index 73cc4d525e..6a4304a91f 100644 --- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H +++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -178,18 +178,6 @@ inline Foam::scalar Foam::icoPolynomial::CpMCv // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template -inline void Foam::icoPolynomial::operator= -( - const icoPolynomial& ip -) -{ - Specie::operator=(ip); - - rhoCoeffs_ = ip.rhoCoeffs_; -} - - template inline void Foam::icoPolynomial::operator+= ( diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H index e31c0de340..16e0b2568b 100644 --- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H +++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -175,7 +175,6 @@ public: // Member operators - inline void operator=(const incompressiblePerfectGas&); inline void operator+=(const incompressiblePerfectGas&); inline void operator*=(const scalar); diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H index bf63745ede..2c48cd814f 100644 --- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H +++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -179,17 +179,6 @@ inline Foam::scalar Foam::incompressiblePerfectGas::CpMCv // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template -inline void Foam::incompressiblePerfectGas::operator= -( - const incompressiblePerfectGas& ipg -) -{ - Specie::operator=(ipg); - pRef_ = ipg.pRef_; -} - - template inline void Foam::incompressiblePerfectGas::operator+= ( diff --git a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H index 74cd193c9b..96c889d391 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H +++ b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -61,20 +61,6 @@ class IrreversibleReaction ReactionRate k_; - // Private Member Functions - - //- Disallow default bitwise assignment - void operator= - ( - const IrreversibleReaction - < - ReactionType, - ReactionThermo, - ReactionRate - >& - ); - - public: //- Runtime type information @@ -230,7 +216,21 @@ public: //- Write - virtual void write(Ostream&) const; + virtual void write(Ostream&) const; // Private Member Functions + + + // Member operators + + //- Disallow default bitwise assignment + void operator= + ( + const IrreversibleReaction + < + ReactionType, + ReactionThermo, + ReactionRate + >& + ) = delete; }; diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H index 7a76048104..35875868bf 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H +++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -63,16 +63,6 @@ class NonEquilibriumReversibleReaction ReactionRate rk_; - // Private Member Functions - - //- Disallow default bitwise assignment - void operator= - ( - const NonEquilibriumReversibleReaction - & - ); - - public: //- Runtime type information @@ -214,6 +204,20 @@ public: //- Write virtual void write(Ostream&) const; + + + // Member operators + + //- Disallow default bitwise assignment + void operator= + ( + const NonEquilibriumReversibleReaction + < + ReactionType, + ReactionThermo, + ReactionRate + >& + ) = delete; }; diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H index 95832776c4..1ce22b4f7c 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H +++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -62,20 +62,6 @@ class ReversibleReaction ReactionRate k_; - // Private Member Functions - - //- Disallow default bitwise assignment - void operator= - ( - const ReversibleReaction - < - ReactionType, - ReactionThermo, - ReactionRate - >& - ); - - public: //- Runtime type information @@ -227,6 +213,20 @@ public: //- Write virtual void write(Ostream&) const; + + + // Member operators + + //- Disallow default bitwise assignment + void operator= + ( + const ReversibleReaction + < + ReactionType, + ReactionThermo, + ReactionRate + >& + ) = delete; }; diff --git a/src/thermophysicalModels/specie/specie/specie.H b/src/thermophysicalModels/specie/specie/specie.H index 4da86fa979..161664c0f0 100644 --- a/src/thermophysicalModels/specie/specie/specie.H +++ b/src/thermophysicalModels/specie/specie/specie.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -102,6 +102,9 @@ public: //- Construct from dictionary specie(const dictionary& dict); + //- Copy constructor + specie(const specie&) = default; + // Member Functions diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H index 7b1597bcc8..69f5b28640 100644 --- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H +++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -217,7 +217,6 @@ public: // Member operators - inline void operator=(const hPolynomialThermo&); inline void operator+=(const hPolynomialThermo&); inline void operator*=(const scalar); diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H index 73a47d6c77..31aebefaed 100644 --- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H +++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -158,22 +158,6 @@ inline Foam::scalar Foam::hPolynomialThermo::dCpdT // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template -inline void Foam::hPolynomialThermo::operator= -( - const hPolynomialThermo& pt -) -{ - EquationOfState::operator=(pt); - - Hf_ = pt.Hf_; - Sf_ = pt.Sf_; - CpCoeffs_ = pt.CpCoeffs_; - hCoeffs_ = pt.hCoeffs_; - sCoeffs_ = pt.sCoeffs_; -} - - template inline void Foam::hPolynomialThermo::operator+= ( diff --git a/src/thermophysicalModels/specie/transport/WLF/WLFTransport.H b/src/thermophysicalModels/specie/transport/WLF/WLFTransport.H index d267b5a2be..049f2198e3 100644 --- a/src/thermophysicalModels/specie/transport/WLF/WLFTransport.H +++ b/src/thermophysicalModels/specie/transport/WLF/WLFTransport.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -159,10 +159,7 @@ public: // Member operators - inline void operator=(const WLFTransport&); - inline void operator+=(const WLFTransport&); - inline void operator*=(const scalar); diff --git a/src/thermophysicalModels/specie/transport/WLF/WLFTransportI.H b/src/thermophysicalModels/specie/transport/WLF/WLFTransportI.H index 1a758b87ca..7a5d8ab647 100644 --- a/src/thermophysicalModels/specie/transport/WLF/WLFTransportI.H +++ b/src/thermophysicalModels/specie/transport/WLF/WLFTransportI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -105,22 +105,6 @@ inline Foam::scalar Foam::WLFTransport::alphah // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template -inline void Foam::WLFTransport::operator= -( - const WLFTransport& wlft -) -{ - Thermo::operator=(wlft); - - mu0_ = wlft.mu0_; - Tr_ = wlft.Tr_; - C1_ = wlft.C1_; - C2_ = wlft.C2_; - rPr_ = wlft.rPr_; -} - - template inline void Foam::WLFTransport::operator+= ( diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.H b/src/thermophysicalModels/specie/transport/const/constTransport.H index 4853b1dce7..d609520b5a 100644 --- a/src/thermophysicalModels/specie/transport/const/constTransport.H +++ b/src/thermophysicalModels/specie/transport/const/constTransport.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -141,10 +141,7 @@ public: // Member operators - inline void operator=(const constTransport&); - inline void operator+=(const constTransport&); - inline void operator*=(const scalar); diff --git a/src/thermophysicalModels/specie/transport/const/constTransportI.H b/src/thermophysicalModels/specie/transport/const/constTransportI.H index 2d321fd011..4bd5354e7d 100644 --- a/src/thermophysicalModels/specie/transport/const/constTransportI.H +++ b/src/thermophysicalModels/specie/transport/const/constTransportI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -114,19 +114,6 @@ inline Foam::scalar Foam::constTransport::alphah // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template -inline void Foam::constTransport::operator= -( - const constTransport& ct -) -{ - Thermo::operator=(ct); - - mu_ = ct.mu_; - rPr_ = ct.rPr_; -} - - template inline void Foam::constTransport::operator+= ( diff --git a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H index 1480103dcf..81f494ebae 100644 --- a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H +++ b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -195,10 +195,7 @@ public: // Member operators - inline void operator=(const logPolynomialTransport&); - inline void operator+=(const logPolynomialTransport&); - inline void operator*=(const scalar); diff --git a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H index 537832711e..f97c18bfa0 100644 --- a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H +++ b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -112,19 +112,6 @@ inline Foam::scalar Foam::logPolynomialTransport::alphah // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template -inline void Foam::logPolynomialTransport::operator= -( - const logPolynomialTransport& pt -) -{ - Thermo::operator=(pt); - - muCoeffs_ = pt.muCoeffs_; - kappaCoeffs_ = pt.kappaCoeffs_; -} - - template inline void Foam::logPolynomialTransport::operator+= ( diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H index e13a3efe27..b06cbedbeb 100644 --- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H +++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -177,10 +177,7 @@ public: // Member operators - inline void operator=(const polynomialTransport&); - inline void operator+=(const polynomialTransport&); - inline void operator*=(const scalar); diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H index 7a524d6230..970dab8116 100644 --- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H +++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -112,19 +112,6 @@ inline Foam::scalar Foam::polynomialTransport::alphah // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template -inline void Foam::polynomialTransport::operator= -( - const polynomialTransport& pt -) -{ - Thermo::operator=(pt); - - muCoeffs_ = pt.muCoeffs_; - kappaCoeffs_ = pt.kappaCoeffs_; -} - - template inline void Foam::polynomialTransport::operator+= ( diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H index 532270a6ac..e139281334 100644 --- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H +++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -166,10 +166,7 @@ public: // Member operators - inline void operator=(const sutherlandTransport&); - inline void operator+=(const sutherlandTransport&); - inline void operator*=(const scalar); diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H index 8bea7f814f..085d510390 100644 --- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H +++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -150,19 +150,6 @@ inline Foam::scalar Foam::sutherlandTransport::alphah // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template -inline void Foam::sutherlandTransport::operator= -( - const sutherlandTransport& st -) -{ - Thermo::operator=(st); - - As_ = st.As_; - Ts_ = st.Ts_; -} - - template inline void Foam::sutherlandTransport::operator+= ( diff --git a/src/triSurface/triSurface/interfaces/STL/writeSTL.C b/src/triSurface/triSurface/interfaces/STL/writeSTL.C index d40cba21b6..827d3b0bdf 100644 --- a/src/triSurface/triSurface/interfaces/STL/writeSTL.C +++ b/src/triSurface/triSurface/interfaces/STL/writeSTL.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -143,7 +143,8 @@ void Foam::triSurface::writeSTLASCII(const bool writeSorted, Ostream& os) const void Foam::triSurface::writeSTLBINARY(std::ostream& os) const { // Write the STL header - string header("Foam binary STL", STLheaderSize); + string header("Foam binary STL"); + header.resize(STLheaderSize); os.write(header.c_str(), STLheaderSize); label nTris = size(); diff --git a/src/triSurface/triSurface/surfacePatch/surfacePatch.C b/src/triSurface/triSurface/surfacePatch/surfacePatch.C index af10080682..838cd9604a 100644 --- a/src/triSurface/triSurface/surfacePatch/surfacePatch.C +++ b/src/triSurface/triSurface/surfacePatch/surfacePatch.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -83,14 +83,6 @@ Foam::surfacePatch::surfacePatch {} -Foam::surfacePatch::surfacePatch(const Foam::surfacePatch& sp) -: - geometricSurfacePatch(sp), - size_(sp.size()), - start_(sp.start()) -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // void Foam::surfacePatch::write(Ostream& os) const diff --git a/src/triSurface/triSurface/surfacePatch/surfacePatch.H b/src/triSurface/triSurface/surfacePatch/surfacePatch.H index b361a2f545..8bdde53c82 100644 --- a/src/triSurface/triSurface/surfacePatch/surfacePatch.H +++ b/src/triSurface/triSurface/surfacePatch/surfacePatch.H @@ -68,6 +68,7 @@ class surfacePatch //- Start label of this patch in the triSurface face list label start_; + public: //- Runtime type information @@ -100,9 +101,6 @@ public: const label index ); - //- Copy constructor - surfacePatch(const surfacePatch&); - // Member Functions