diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C index b842493eef9a0c21df169f9277999254762ed718..8f3381ea45a634a60de6614e33b6f9eadd13f709 100644 --- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C +++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C @@ -69,16 +69,6 @@ Foam::Polynomial<PolySize>::Polynomial(const word& name, Istream& is) } -template<int PolySize> -Foam::Polynomial<PolySize>::Polynomial(const Polynomial<PolySize>& poly) -: - VectorSpace<Polynomial<PolySize>, scalar, PolySize>(poly), - name_(poly.name_), - logActive_(poly.logActive_), - logCoeff_(poly.logCoeff_) -{} - - template<int PolySize> Foam::Polynomial<PolySize>::Polynomial ( @@ -93,13 +83,6 @@ Foam::Polynomial<PolySize>::Polynomial {} -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -template<int PolySize> -Foam::Polynomial<PolySize>::~Polynomial() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template<int PolySize> @@ -210,16 +193,4 @@ Foam::Polynomial<PolySize>::integrateMinus1(const scalar intConstant) } -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - -template<int PolySize> -void Foam::Polynomial<PolySize>::operator=(const Polynomial<PolySize>& poly) -{ - name_ = poly.name_; - VectorSpace<Polynomial<PolySize>, scalar, PolySize>::operator=(poly); - logActive_ = poly.logActive_; - logCoeff_ = poly.logCoeff_; -} - - // ************************************************************************* // diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H index 89ecb9c1840ed77874335b6a02730d48b54fbe4c..85d41fa880541332b497bd8b41e3d6207ac76bea 100644 --- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H +++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H @@ -52,7 +52,6 @@ SourceFiles #include "scalar.H" #include "Ostream.H" #include "VectorSpace.H" -#include "Vector.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -81,8 +80,6 @@ class Polynomial : public VectorSpace<Polynomial<PolySize>, scalar, PolySize> { -private: - // Private data //- Polynomial name @@ -101,9 +98,6 @@ public: typedef Polynomial<PolySize+1> intPolyType; - //- Run-time type information - TypeName("Polynomial") - // Constructors @@ -113,17 +107,10 @@ public: //- Construct from name and Istream Polynomial(const word& name, Istream& is); - //- Copy constructor - Polynomial(const Polynomial& poly); - //- Copy constructor with name Polynomial(const word& name, const Polynomial& poly); - //- Destructor - ~Polynomial(); - - // Member Functions // Access @@ -155,11 +142,6 @@ public: scalar integrateLimits(const scalar x1, const scalar x2) const; - // Member operators - - void operator=(const Polynomial& poly); - - //- Ostream Operator friend Ostream& operator<< <PolySize> ( diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H index 1a476f66a9eb392021ac0d8085bfbe804f82bccf..a3d936757eaa5fc190dfb7890ff2f0194406f9a8 100644 --- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H +++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H @@ -105,6 +105,7 @@ private: // - schedule mutable autoPtr<mapDistribute> mapPtr_; + // Private Member Functions //- Collect single list of samples and originating processor+face. @@ -162,7 +163,7 @@ private: public: //- Runtime type information - ClassName("directMappedPatchBase"); + TypeName("directMappedPatchBase"); // Constructors @@ -177,15 +178,14 @@ public: directMappedPatchBase(const polyPatch&, const directMappedPatchBase&); - // Destructor - - ~directMappedPatchBase(); - - void clearOut(); + //- Destructor + virtual ~directMappedPatchBase(); // Member functions + void clearOut(); + //- What to sample const sampleMode& mode() const { diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H index 522564b33775c89f135092dc1b161875c9a78ed0..fdd4baec85c9547ded1b7911c765d696c0d10946 100644 --- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H +++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H @@ -151,9 +151,8 @@ public: } - // Destructor - - ~directMappedPolyPatch(); + //- Destructor + virtual ~directMappedPolyPatch(); // Member functions diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H b/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H index 407d62ddda2c07958a45b0ea642567ceaf4c1078..457552e42140f9a92a49b1ca3fd40ba99d1df1c9 100644 --- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H +++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H @@ -158,9 +158,8 @@ public: } - // Destructor - - ~directMappedWallPolyPatch(); + //- Destructor + virtual ~directMappedWallPolyPatch(); // Member functions diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H index b23de491d1b3fcc066d8c806cf82effc6ed667f6..27190fd833bfdedf79961cfb0b7467faaf42e84f 100644 --- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H +++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H @@ -105,8 +105,6 @@ class icoPolynomial public: - TypeName("icoPolynomial") - // Constructors //- Construct from components