From 0a059d406a948b5fc225c0f7a653fccb6399ff94 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 29 Apr 2013 18:04:23 +0000 Subject: [PATCH] Eliminated unnecessary empty destructors from derived classes See http://www.parashift.com/c++-faq-lite/virtual-dtors.html --- include/cantera/Edge.h | 3 --- include/cantera/GRI30.h | 2 -- include/cantera/IdealGasMix.h | 2 -- include/cantera/IncompressibleSolid.h | 2 -- include/cantera/Interface.h | 4 ---- include/cantera/Metal.h | 2 -- include/cantera/PureFluid.h | 2 -- include/cantera/kinetics/AqueousKinetics.h | 4 ---- include/cantera/kinetics/EdgeKinetics.h | 3 --- include/cantera/kinetics/FalloffFactory.h | 9 -------- include/cantera/kinetics/GRI_30_Kinetics.h | 3 --- include/cantera/kinetics/GasKinetics.h | 3 --- include/cantera/kinetics/KineticsFactory.h | 6 ------ include/cantera/numerics/BandMatrix.h | 3 --- include/cantera/numerics/DenseMatrix.h | 3 --- include/cantera/numerics/Func1.h | 21 +++---------------- include/cantera/numerics/ResidJacEval.h | 3 --- include/cantera/numerics/SquareMatrix.h | 4 ---- include/cantera/oneD/Inlet1D.h | 10 --------- include/cantera/oneD/MultiJac.h | 3 --- include/cantera/oneD/Sim1D.h | 3 --- include/cantera/oneD/StFlow.h | 5 ----- include/cantera/thermo/AdsorbateThermo.h | 3 --- include/cantera/thermo/ConstDensityThermo.h | 3 --- include/cantera/thermo/Crystal.h | 5 ----- include/cantera/thermo/EdgePhase.h | 3 --- include/cantera/thermo/FixedChemPotSSTP.h | 3 --- include/cantera/thermo/GibbsExcessVPSSTP.h | 3 --- include/cantera/thermo/IdealGasPhase.h | 3 --- include/cantera/thermo/IdealMolalSoln.h | 3 --- include/cantera/thermo/IdealSolidSolnPhase.h | 3 --- include/cantera/thermo/IdealSolnGasVPSS.h | 3 --- include/cantera/thermo/LatticePhase.h | 3 --- include/cantera/thermo/MargulesVPSSTP.h | 3 --- include/cantera/thermo/MetalPhase.h | 2 -- include/cantera/thermo/MineralEQ3.h | 3 --- .../cantera/thermo/MixedSolventElectrolyte.h | 3 --- include/cantera/thermo/MixtureFugacityTP.h | 3 --- include/cantera/thermo/MolalityVPSSTP.h | 3 --- include/cantera/thermo/MolarityIonicVPSSTP.h | 3 --- include/cantera/thermo/Mu0Poly.h | 3 --- include/cantera/thermo/Nasa9Poly1.h | 3 --- include/cantera/thermo/NasaPoly1.h | 3 --- include/cantera/thermo/PDSS_ConstVol.h | 3 --- include/cantera/thermo/PDSS_IdealGas.h | 3 --- include/cantera/thermo/PDSS_IonsFromNeutral.h | 3 --- include/cantera/thermo/PDSS_SSVol.h | 3 --- .../cantera/thermo/PhaseCombo_Interaction.h | 3 --- include/cantera/thermo/PseudoBinaryVPSSTP.h | 3 --- include/cantera/thermo/RedlichKisterVPSSTP.h | 3 --- include/cantera/thermo/RedlichKwongMFTP.h | 3 --- include/cantera/thermo/SemiconductorPhase.h | 2 -- include/cantera/thermo/SimpleThermo.h | 3 --- include/cantera/thermo/SingleSpeciesTP.h | 3 --- include/cantera/thermo/SpeciesThermoFactory.h | 10 --------- .../cantera/thermo/SpeciesThermoInterpType.h | 3 --- include/cantera/thermo/SpeciesThermoMgr.h | 5 ----- include/cantera/thermo/StatMech.h | 3 --- include/cantera/thermo/StoichSubstance.h | 3 --- include/cantera/thermo/StoichSubstanceSSTP.h | 3 --- include/cantera/thermo/SurfPhase.h | 3 --- include/cantera/thermo/ThermoFactory.h | 10 --------- include/cantera/thermo/VPSSMgr_ConstVol.h | 3 --- include/cantera/thermo/VPSSMgr_General.h | 3 --- include/cantera/thermo/VPSSMgr_IdealGas.h | 3 --- .../cantera/thermo/VPSSMgr_Water_ConstVol.h | 3 --- include/cantera/thermo/VPSSMgr_Water_HKFT.h | 3 --- include/cantera/transport/AqueousTransport.h | 3 --- include/cantera/transport/GasTransport.h | 1 - include/cantera/transport/LTPspecies.h | 12 ----------- .../cantera/transport/LiquidTranInteraction.h | 16 -------------- include/cantera/transport/MixTransport.h | 3 --- include/cantera/transport/MultiTransport.h | 4 ---- include/cantera/transport/PecosTransport.h | 3 --- include/cantera/transport/SolidTransport.h | 3 --- include/cantera/transport/TransportFactory.h | 9 -------- include/cantera/transport/TransportParams.h | 3 --- include/cantera/transport/WaterTransport.h | 3 --- include/cantera/zeroD/ConstPressureReactor.h | 6 ------ include/cantera/zeroD/FlowReactor.h | 5 ----- include/cantera/zeroD/Reactor.h | 5 ----- include/cantera/zeroD/ReactorFactory.h | 5 ----- include/cantera/zeroD/Reservoir.h | 1 - include/cantera/zeroD/flowControllers.h | 6 ------ src/base/xml.cpp | 6 ------ src/kinetics/AqueousKinetics.cpp | 4 ---- src/kinetics/FalloffFactory.cpp | 15 ------------- src/kinetics/GasKinetics.cpp | 4 ---- src/numerics/BandMatrix.cpp | 5 ----- src/numerics/DenseMatrix.cpp | 5 ----- src/numerics/ResidJacEval.cpp | 4 ---- src/numerics/SquareMatrix.cpp | 4 ---- src/thermo/ConstCpPoly.cpp | 2 -- src/thermo/ConstCpPoly.h | 3 --- src/thermo/FixedChemPotSSTP.cpp | 4 ---- src/thermo/GibbsExcessVPSSTP.cpp | 4 ---- src/thermo/IdealGasPhase.cpp | 4 ---- src/thermo/IdealMolalSoln.cpp | 4 ---- src/thermo/IdealSolnGasVPSS.cpp | 4 ---- src/thermo/LatticePhase.cpp | 4 ---- src/thermo/MargulesVPSSTP.cpp | 4 ---- src/thermo/MineralEQ3.cpp | 4 ---- src/thermo/MixedSolventElectrolyte.cpp | 4 ---- src/thermo/MixtureFugacityTP.cpp | 5 ----- src/thermo/MolalityVPSSTP.cpp | 4 ---- src/thermo/MolarityIonicVPSSTP.cpp | 4 ---- src/thermo/Mu0Poly.cpp | 7 ------- src/thermo/Nasa9Poly1.cpp | 4 ---- src/thermo/NasaPoly2.h | 3 --- src/thermo/NasaThermo.h | 2 -- src/thermo/PDSS_ConstVol.cpp | 4 ---- src/thermo/PDSS_IdealGas.cpp | 4 ---- src/thermo/PDSS_IonsFromNeutral.cpp | 4 ---- src/thermo/PDSS_SSVol.cpp | 4 ---- src/thermo/PhaseCombo_Interaction.cpp | 4 ---- src/thermo/PseudoBinaryVPSSTP.cpp | 4 ---- src/thermo/RedlichKisterVPSSTP.cpp | 4 ---- src/thermo/RedlichKwongMFTP.cpp | 4 ---- src/thermo/ShomatePoly.h | 3 --- src/thermo/ShomateThermo.h | 3 --- src/thermo/SingleSpeciesTP.cpp | 4 ---- src/thermo/SpeciesThermoFactory.cpp | 4 ---- src/thermo/SpeciesThermoInterpType.cpp | 4 ---- src/thermo/StatMech.cpp | 4 ---- src/thermo/StoichSubstance.cpp | 4 ---- src/thermo/StoichSubstanceSSTP.cpp | 4 ---- src/thermo/SurfPhase.cpp | 4 ---- src/thermo/VPSSMgrFactory.cpp | 4 ---- src/thermo/VPSSMgrFactory.h | 10 --------- src/thermo/VPSSMgr_ConstVol.cpp | 5 ----- src/thermo/VPSSMgr_General.cpp | 4 ---- src/thermo/VPSSMgr_IdealGas.cpp | 4 ---- src/thermo/VPSSMgr_Water_ConstVol.cpp | 4 ---- src/thermo/VPSSMgr_Water_HKFT.cpp | 6 ------ src/tpx/CarbonDioxide.h | 1 - src/tpx/HFC134a.h | 1 - src/tpx/Heptane.h | 1 - src/tpx/Hydrogen.h | 1 - src/tpx/Methane.h | 1 - src/tpx/Nitrogen.h | 1 - src/tpx/Oxygen.h | 1 - src/tpx/RedlichKwong.h | 3 --- src/tpx/Water.h | 1 - src/tpx/lk.h | 1 - src/transport/LTPspecies.cpp | 17 --------------- src/transport/SolidTransport.cpp | 4 ---- src/transport/TortuosityBruggeman.cpp | 6 ------ src/transport/TortuosityBruggeman.h | 3 --- src/transport/TortuosityMaxwell.cpp | 6 ------ src/transport/TortuosityMaxwell.h | 3 --- src/transport/TortuosityPercolation.cpp | 6 ------ src/transport/TortuosityPercolation.h | 3 --- src/transport/TransportParams.cpp | 6 ------ src/transport/WaterTransport.cpp | 6 ------ 154 files changed, 3 insertions(+), 628 deletions(-) diff --git a/include/cantera/Edge.h b/include/cantera/Edge.h index cbf68d49c..3d529ac81 100644 --- a/include/cantera/Edge.h +++ b/include/cantera/Edge.h @@ -33,9 +33,6 @@ public: m_ok = true; } - - virtual ~Edge() {} - bool operator!() { return !m_ok; } diff --git a/include/cantera/GRI30.h b/include/cantera/GRI30.h index 4a01e0cc9..f42580cfe 100644 --- a/include/cantera/GRI30.h +++ b/include/cantera/GRI30.h @@ -33,8 +33,6 @@ public: "buildSolutionFromXML returned false"); } - virtual ~GRI30() {} - bool operator!() { return !m_ok; } diff --git a/include/cantera/IdealGasMix.h b/include/cantera/IdealGasMix.h index 5a4bd3038..a6eb184de 100644 --- a/include/cantera/IdealGasMix.h +++ b/include/cantera/IdealGasMix.h @@ -45,8 +45,6 @@ public: m_ok = buildSolutionFromXML(*m_r, m_id, "phase", this, this); } - virtual ~IdealGasMix() {} - bool operator!() { return !m_ok; } diff --git a/include/cantera/IncompressibleSolid.h b/include/cantera/IncompressibleSolid.h index 652b007e8..037e85acb 100644 --- a/include/cantera/IncompressibleSolid.h +++ b/include/cantera/IncompressibleSolid.h @@ -24,8 +24,6 @@ public: "buildSolutionFromXML returned false"); } - virtual ~IncompressibleSolid() {} - bool operator!() { return !m_ok; } diff --git a/include/cantera/Interface.h b/include/cantera/Interface.h index f58d9002d..56fa4f0cd 100644 --- a/include/cantera/Interface.h +++ b/include/cantera/Interface.h @@ -88,10 +88,6 @@ public: return *this; } - //! Destructor. Does nothing. - virtual ~Interface() { - } - //! Not operator bool operator!() { return !m_ok; diff --git a/include/cantera/Metal.h b/include/cantera/Metal.h index c37556fe1..d6f7614d0 100644 --- a/include/cantera/Metal.h +++ b/include/cantera/Metal.h @@ -23,8 +23,6 @@ public: "buildSolutionFromXML returned false"); } - virtual ~Metal() {} - bool operator!() { return !m_ok; } diff --git a/include/cantera/PureFluid.h b/include/cantera/PureFluid.h index 4a0c0c05b..d71b14ce4 100644 --- a/include/cantera/PureFluid.h +++ b/include/cantera/PureFluid.h @@ -33,8 +33,6 @@ public: m_ok = buildSolutionFromXML(root, id, "phase", this, 0); } - virtual ~PureFluid() {} - bool operator!() { return !m_ok; } diff --git a/include/cantera/kinetics/AqueousKinetics.h b/include/cantera/kinetics/AqueousKinetics.h index 74d52ce8f..d59793394 100644 --- a/include/cantera/kinetics/AqueousKinetics.h +++ b/include/cantera/kinetics/AqueousKinetics.h @@ -57,10 +57,6 @@ public: AqueousKinetics& operator=(const AqueousKinetics& right); - /// Destructor. - virtual ~AqueousKinetics(); - - //! Duplication routine for objects which inherit from Kinetics /*! * This virtual routine can be used to duplicate %Kinetics objects diff --git a/include/cantera/kinetics/EdgeKinetics.h b/include/cantera/kinetics/EdgeKinetics.h index 97c637abb..a3b93fd9a 100644 --- a/include/cantera/kinetics/EdgeKinetics.h +++ b/include/cantera/kinetics/EdgeKinetics.h @@ -23,9 +23,6 @@ public: //! Constructor EdgeKinetics() : InterfaceKinetics() {} - /// Destructor. - virtual ~EdgeKinetics() {} - EdgeKinetics(const EdgeKinetics& right) : InterfaceKinetics(right) { *this=right; diff --git a/include/cantera/kinetics/FalloffFactory.h b/include/cantera/kinetics/FalloffFactory.h index 132f35c49..7928ae1d2 100644 --- a/include/cantera/kinetics/FalloffFactory.h +++ b/include/cantera/kinetics/FalloffFactory.h @@ -118,15 +118,6 @@ public: } } - /** - * Destructor doesn't do anything. We do not delete statically created - * single instance of this class here, because it would create an infinite - * loop if destructor is called for that single instance. Instead, to - * delete single instance, we call delete[] from FalloffMng's destructor. - */ - virtual ~FalloffFactory() { - } - //! Return a pointer to a new falloff function calculator. /*! * @param type Integer flag specifying the type of falloff function. The diff --git a/include/cantera/kinetics/GRI_30_Kinetics.h b/include/cantera/kinetics/GRI_30_Kinetics.h index 0590b3d0c..5a20b5df7 100644 --- a/include/cantera/kinetics/GRI_30_Kinetics.h +++ b/include/cantera/kinetics/GRI_30_Kinetics.h @@ -24,9 +24,6 @@ public: /// Default constructor. GRI_30_Kinetics(thermo_t* th=0); - /// Destructor. - virtual ~GRI_30_Kinetics() {} - virtual int type() const { return cGRI_30_Kinetics; } diff --git a/include/cantera/kinetics/GasKinetics.h b/include/cantera/kinetics/GasKinetics.h index 93a9b5cf0..2b3709438 100644 --- a/include/cantera/kinetics/GasKinetics.h +++ b/include/cantera/kinetics/GasKinetics.h @@ -53,9 +53,6 @@ public: //! Copy Constructor GasKinetics(const GasKinetics& right); - //! Destructor. - virtual ~GasKinetics(); - //! Assignment operator GasKinetics& operator=(const GasKinetics& right); diff --git a/include/cantera/kinetics/KineticsFactory.h b/include/cantera/kinetics/KineticsFactory.h index 2768be267..c4d14cc76 100644 --- a/include/cantera/kinetics/KineticsFactory.h +++ b/include/cantera/kinetics/KineticsFactory.h @@ -22,7 +22,6 @@ public: CanteraError(proc, "Specified Kinetics model " + kineticsModel + " does not match any known type.") {} - virtual ~UnknownKineticsModel() throw() {} }; /** @@ -39,11 +38,6 @@ public: return s_factory; } - virtual ~KineticsFactory() { - //delete s_factory; - //s_factory = 0; - } - virtual void deleteFactory() { ScopedLock lock(kinetics_mutex); if (s_factory) { diff --git a/include/cantera/numerics/BandMatrix.h b/include/cantera/numerics/BandMatrix.h index 8181a28ac..f639fb6b9 100644 --- a/include/cantera/numerics/BandMatrix.h +++ b/include/cantera/numerics/BandMatrix.h @@ -63,9 +63,6 @@ public: */ BandMatrix(const BandMatrix& y); - //! Destructor. Does nothing. - virtual ~BandMatrix(); - //! assignment operator /*! * @param y reference to the matrix to be copied diff --git a/include/cantera/numerics/DenseMatrix.h b/include/cantera/numerics/DenseMatrix.h index c4799a900..dc8204617 100644 --- a/include/cantera/numerics/DenseMatrix.h +++ b/include/cantera/numerics/DenseMatrix.h @@ -97,9 +97,6 @@ public: */ DenseMatrix& operator=(const DenseMatrix& y); - //! Destructor. Does nothing. - virtual ~DenseMatrix(); - //! Resize the matrix /*! * Resize the matrix to n rows by m cols. diff --git a/include/cantera/numerics/Func1.h b/include/cantera/numerics/Func1.h index b20f96947..e3f48fc38 100644 --- a/include/cantera/numerics/Func1.h +++ b/include/cantera/numerics/Func1.h @@ -147,8 +147,6 @@ public: m_c = omega; } - virtual ~Sin1() {} - Sin1(const Sin1& b) : Func1(b) { } @@ -187,7 +185,7 @@ public: Func1() { m_c = omega; } - virtual ~Cos1() {} + Cos1(const Cos1& b) : Func1(b) { } @@ -224,8 +222,7 @@ public: Func1() { m_c = A; } - virtual ~Exp1() { - } + Exp1(const Exp1& b) : Func1(b) { } @@ -261,7 +258,7 @@ public: Func1() { m_c = n; } - virtual ~Pow1() {} + Pow1(const Pow1& b) : Func1(b) { } @@ -298,8 +295,6 @@ public: Func1() { m_c = A; } - virtual ~Const1() { - } Const1(const Const1& b) : Func1(b) { @@ -819,8 +814,6 @@ public: m_tau = fwhm/(2.0*std::sqrt(std::log(2.0))); } - virtual ~Gaussian() {} - Gaussian(const Gaussian& b) : Func1(b) { *this = Gaussian::operator=(b); @@ -867,9 +860,6 @@ public: std::copy(c, c+m_n, m_cpoly.begin()); } - virtual ~Poly1() { - } - Poly1(const Poly1& b) : Func1(b) { *this = Poly1::operator=(b); @@ -930,8 +920,6 @@ public: std::copy(b, b+n, m_csin.begin()); } - virtual ~Fourier1() {} - Fourier1(const Fourier1& b) : Func1(b) { *this = Fourier1::operator=(b); @@ -996,9 +984,6 @@ public: m_E[i] = c[loc+2]; } } - virtual ~Arrhenius1() { - } - Arrhenius1(const Arrhenius1& b) : Func1() { diff --git a/include/cantera/numerics/ResidJacEval.h b/include/cantera/numerics/ResidJacEval.h index bec41ffda..e6ea18ad6 100644 --- a/include/cantera/numerics/ResidJacEval.h +++ b/include/cantera/numerics/ResidJacEval.h @@ -67,9 +67,6 @@ public: */ ResidJacEval(const ResidJacEval& right); - /// Destructor. Does nothing. - virtual ~ResidJacEval(); - //! Assignment operator /*! * This is NOT a virtual function. diff --git a/include/cantera/numerics/SquareMatrix.h b/include/cantera/numerics/SquareMatrix.h index c89b902c2..c1f66e97e 100644 --- a/include/cantera/numerics/SquareMatrix.h +++ b/include/cantera/numerics/SquareMatrix.h @@ -53,10 +53,6 @@ public: */ SquareMatrix& operator=(const SquareMatrix& right); - - //! Destructor. Does nothing. - virtual ~SquareMatrix(); - //! Solves the Ax = b system returning x in the b spot. /*! * @param b Vector for the rhs of the equation system diff --git a/include/cantera/oneD/Inlet1D.h b/include/cantera/oneD/Inlet1D.h index 1c621b15e..372312f37 100644 --- a/include/cantera/oneD/Inlet1D.h +++ b/include/cantera/oneD/Inlet1D.h @@ -41,8 +41,6 @@ public: Bdry1D(); - virtual ~Bdry1D() {} - /// Initialize. virtual void init() { _init(1); @@ -133,7 +131,6 @@ public: m_type = cInletType; m_xstr = ""; } - virtual ~Inlet1D() {} /// set spreading rate virtual void setSpreadRate(doublereal V0) { @@ -211,7 +208,6 @@ public: Empty1D() : Domain1D() { m_type = cEmptyType; } - virtual ~Empty1D() {} virtual std::string componentName(size_t n) const; virtual void showSolution(const doublereal* x) {} @@ -244,7 +240,6 @@ public: Symm1D() : Bdry1D() { m_type = cSymmType; } - virtual ~Symm1D() {} virtual std::string componentName(size_t n) const; @@ -277,7 +272,6 @@ public: Outlet1D() : Bdry1D() { m_type = cOutletType; } - virtual ~Outlet1D() {} virtual std::string componentName(size_t n) const; @@ -315,7 +309,6 @@ public: m_type = cOutletResType; m_xstr = ""; } - virtual ~OutletRes1D() {} virtual void showSolution(const doublereal* x) {} @@ -366,7 +359,6 @@ public: Surf1D() : Bdry1D() { m_type = cSurfType; } - virtual ~Surf1D() {} virtual std::string componentName(size_t n) const; @@ -429,8 +421,6 @@ public: m_enabled = docov; } - virtual ~ReactingSurf1D() {} - virtual std::string componentName(size_t n) const; virtual void init(); diff --git a/include/cantera/oneD/MultiJac.h b/include/cantera/oneD/MultiJac.h index 8177c7396..94bc8ea70 100644 --- a/include/cantera/oneD/MultiJac.h +++ b/include/cantera/oneD/MultiJac.h @@ -32,9 +32,6 @@ public: */ MultiJac(OneDim& r); - /// Destructor. Does nothing. - virtual ~MultiJac() {} - /** * Evaluate the Jacobian at x0. The unperturbed residual * function is resid0, which must be supplied on input. The diff --git a/include/cantera/oneD/Sim1D.h b/include/cantera/oneD/Sim1D.h index c2df6a020..7d2e8ea8e 100644 --- a/include/cantera/oneD/Sim1D.h +++ b/include/cantera/oneD/Sim1D.h @@ -40,9 +40,6 @@ public: */ Sim1D(std::vector& domains); - /// Destructor. Does nothing. - virtual ~Sim1D() {} - /** * @name Setting initial values * diff --git a/include/cantera/oneD/StFlow.h b/include/cantera/oneD/StFlow.h index 7ddec0d66..5d6058f98 100644 --- a/include/cantera/oneD/StFlow.h +++ b/include/cantera/oneD/StFlow.h @@ -60,9 +60,6 @@ public: /// @param nsp Number of species. StFlow(IdealGasPhase* ph = 0, size_t nsp = 1, size_t points = 1); - /// Destructor. - virtual ~StFlow() {} - /** * @name Problem Specification */ @@ -521,7 +518,6 @@ public: StFlow(ph, nsp, points) { m_dovisc = true; } - virtual ~AxiStagnFlow() {} virtual void evalRightBoundary(doublereal* x, doublereal* res, integer* diag, doublereal rdt); @@ -544,7 +540,6 @@ public: m_dovisc = false; setID("flame"); } - virtual ~FreeFlame() {} virtual void evalRightBoundary(doublereal* x, doublereal* res, integer* diag, doublereal rdt); diff --git a/include/cantera/thermo/AdsorbateThermo.h b/include/cantera/thermo/AdsorbateThermo.h index 388cd3200..69e0cda6a 100644 --- a/include/cantera/thermo/AdsorbateThermo.h +++ b/include/cantera/thermo/AdsorbateThermo.h @@ -67,9 +67,6 @@ public: m_freq.begin()); } - //! destructor - virtual ~Adsorbate() {} - virtual SpeciesThermoInterpType* duplMyselfAsSpeciesThermoInterpType() const { Adsorbate* np = new Adsorbate(*this); diff --git a/include/cantera/thermo/ConstDensityThermo.h b/include/cantera/thermo/ConstDensityThermo.h index dcb3a5222..b6971c60d 100644 --- a/include/cantera/thermo/ConstDensityThermo.h +++ b/include/cantera/thermo/ConstDensityThermo.h @@ -34,9 +34,6 @@ public: //! Constructor. ConstDensityThermo(); - //! Destructor - virtual ~ConstDensityThermo() {} - //! Copy Constructor /*! * @param right Object to be copied diff --git a/include/cantera/thermo/Crystal.h b/include/cantera/thermo/Crystal.h index 75a6e8cff..dd6ab895a 100644 --- a/include/cantera/thermo/Crystal.h +++ b/include/cantera/thermo/Crystal.h @@ -20,11 +20,6 @@ public: /// phases are added using method addPhase. Crystal() : MultiPhase() {} - /// Destructor. Does nothing. Class MultiPhase does not take - /// "ownership" (i.e. responsibility for destroying) the - /// phase objects. - virtual ~Crystal() {} - void addLattices(std::vector& lattices, const vector_fp& latticeSiteDensity); diff --git a/include/cantera/thermo/EdgePhase.h b/include/cantera/thermo/EdgePhase.h index 354a37c4d..38c64e120 100644 --- a/include/cantera/thermo/EdgePhase.h +++ b/include/cantera/thermo/EdgePhase.h @@ -49,9 +49,6 @@ public: */ EdgePhase& operator=(const EdgePhase& right); - //! Destructor - virtual ~EdgePhase() {} - //! Duplicator from a ThermoPhase object ThermoPhase* duplMyselfAsThermoPhase() const; diff --git a/include/cantera/thermo/FixedChemPotSSTP.h b/include/cantera/thermo/FixedChemPotSSTP.h index 54401248f..b0d2b0792 100644 --- a/include/cantera/thermo/FixedChemPotSSTP.h +++ b/include/cantera/thermo/FixedChemPotSSTP.h @@ -198,9 +198,6 @@ public: */ FixedChemPotSSTP& operator=(const FixedChemPotSSTP& right); - //! Destructor for the routine - virtual ~FixedChemPotSSTP(); - //! Duplication function /*! * This virtual function is used to create a duplicate of the diff --git a/include/cantera/thermo/GibbsExcessVPSSTP.h b/include/cantera/thermo/GibbsExcessVPSSTP.h index daf9a3d96..a987dcaad 100644 --- a/include/cantera/thermo/GibbsExcessVPSSTP.h +++ b/include/cantera/thermo/GibbsExcessVPSSTP.h @@ -121,9 +121,6 @@ public: */ GibbsExcessVPSSTP& operator=(const GibbsExcessVPSSTP& b); - /// Destructor. - virtual ~GibbsExcessVPSSTP(); - //! Duplication routine for objects which inherit from ThermoPhase. /*! * This virtual routine can be used to duplicate thermophase objects diff --git a/include/cantera/thermo/IdealGasPhase.h b/include/cantera/thermo/IdealGasPhase.h index 961064569..e65150225 100644 --- a/include/cantera/thermo/IdealGasPhase.h +++ b/include/cantera/thermo/IdealGasPhase.h @@ -348,9 +348,6 @@ public: */ IdealGasPhase& operator=(const IdealGasPhase& right); - //! Destructor - virtual ~IdealGasPhase(); - //! Duplicator from the ThermoPhase parent class /*! * Given a pointer to a ThermoPhase object, this function will diff --git a/include/cantera/thermo/IdealMolalSoln.h b/include/cantera/thermo/IdealMolalSoln.h index 93d369746..a50615913 100644 --- a/include/cantera/thermo/IdealMolalSoln.h +++ b/include/cantera/thermo/IdealMolalSoln.h @@ -128,9 +128,6 @@ public: */ IdealMolalSoln(XML_Node& phaseRef, const std::string& id = ""); - /// Destructor. - virtual ~IdealMolalSoln(); - //! Duplication function /*! * This virtual function is used to create a duplicate of the diff --git a/include/cantera/thermo/IdealSolidSolnPhase.h b/include/cantera/thermo/IdealSolidSolnPhase.h index c9d59bc5c..8fff3953f 100644 --- a/include/cantera/thermo/IdealSolidSolnPhase.h +++ b/include/cantera/thermo/IdealSolidSolnPhase.h @@ -111,9 +111,6 @@ public: */ virtual ThermoPhase* duplMyselfAsThermoPhase() const; - //! Destructor - virtual ~IdealSolidSolnPhase() {} - /** * Equation of state flag. Returns a value depending upon the value of * #m_formGC, which is defined at instantiation. diff --git a/include/cantera/thermo/IdealSolnGasVPSS.h b/include/cantera/thermo/IdealSolnGasVPSS.h index acab35610..deb8f3ee7 100644 --- a/include/cantera/thermo/IdealSolnGasVPSS.h +++ b/include/cantera/thermo/IdealSolnGasVPSS.h @@ -60,9 +60,6 @@ public: /// Assignment operator IdealSolnGasVPSS& operator=(const IdealSolnGasVPSS&); - /// Destructor. - virtual ~IdealSolnGasVPSS(); - //! Duplication routine virtual ThermoPhase* duplMyselfAsThermoPhase() const; diff --git a/include/cantera/thermo/LatticePhase.h b/include/cantera/thermo/LatticePhase.h index 93cb9cc0e..56e6744aa 100644 --- a/include/cantera/thermo/LatticePhase.h +++ b/include/cantera/thermo/LatticePhase.h @@ -275,9 +275,6 @@ public: */ LatticePhase(XML_Node& phaseRef, const std::string& id = ""); - //! Destructor - virtual ~LatticePhase(); - //! Duplication function /*! * This virtual function is used to create a duplicate of the diff --git a/include/cantera/thermo/MargulesVPSSTP.h b/include/cantera/thermo/MargulesVPSSTP.h index 9f7d46314..4468919ff 100644 --- a/include/cantera/thermo/MargulesVPSSTP.h +++ b/include/cantera/thermo/MargulesVPSSTP.h @@ -318,9 +318,6 @@ public: */ MargulesVPSSTP& operator=(const MargulesVPSSTP& b); - //! Destructor - virtual ~MargulesVPSSTP(); - //! Duplication routine for objects which inherit from ThermoPhase. /*! * This virtual routine can be used to duplicate thermophase objects diff --git a/include/cantera/thermo/MetalPhase.h b/include/cantera/thermo/MetalPhase.h index cf358601f..863c6741f 100644 --- a/include/cantera/thermo/MetalPhase.h +++ b/include/cantera/thermo/MetalPhase.h @@ -39,8 +39,6 @@ public: return *this; } - virtual ~MetalPhase() {} - //! Duplicator virtual ThermoPhase* duplMyselfAsThermoPhase() const { MetalPhase* idg = new MetalPhase(*this); diff --git a/include/cantera/thermo/MineralEQ3.h b/include/cantera/thermo/MineralEQ3.h index 463e2b215..ca023f6d4 100644 --- a/include/cantera/thermo/MineralEQ3.h +++ b/include/cantera/thermo/MineralEQ3.h @@ -129,9 +129,6 @@ public: */ MineralEQ3& operator=(const MineralEQ3& right); - //! Destructor for the routine (virtual) - virtual ~MineralEQ3(); - //! Duplication function /*! * This virtual function is used to create a duplicate of the diff --git a/include/cantera/thermo/MixedSolventElectrolyte.h b/include/cantera/thermo/MixedSolventElectrolyte.h index 302eecf9e..47587dd84 100644 --- a/include/cantera/thermo/MixedSolventElectrolyte.h +++ b/include/cantera/thermo/MixedSolventElectrolyte.h @@ -310,9 +310,6 @@ public: */ MixedSolventElectrolyte& operator=(const MixedSolventElectrolyte& b); - //! Destructor - virtual ~MixedSolventElectrolyte(); - //! Duplication routine for objects which inherit from ThermoPhase. /*! * This virtual routine can be used to duplicate thermophase objects diff --git a/include/cantera/thermo/MixtureFugacityTP.h b/include/cantera/thermo/MixtureFugacityTP.h index 8dc581061..3b3e34931 100644 --- a/include/cantera/thermo/MixtureFugacityTP.h +++ b/include/cantera/thermo/MixtureFugacityTP.h @@ -94,9 +94,6 @@ public: */ MixtureFugacityTP& operator=(const MixtureFugacityTP& b); - //! Destructor. - virtual ~MixtureFugacityTP(); - //! Duplication routine /*! * @return Returns a duplication diff --git a/include/cantera/thermo/MolalityVPSSTP.h b/include/cantera/thermo/MolalityVPSSTP.h index 876be8d3d..501b198c5 100644 --- a/include/cantera/thermo/MolalityVPSSTP.h +++ b/include/cantera/thermo/MolalityVPSSTP.h @@ -212,9 +212,6 @@ public: */ MolalityVPSSTP& operator=(const MolalityVPSSTP& b); - /// Destructor. - virtual ~MolalityVPSSTP(); - //! Duplication routine for objects which inherit from ThermoPhase. /*! * This virtual routine can be used to duplicate objects diff --git a/include/cantera/thermo/MolarityIonicVPSSTP.h b/include/cantera/thermo/MolarityIonicVPSSTP.h index 3bf46eb86..f4baf1366 100644 --- a/include/cantera/thermo/MolarityIonicVPSSTP.h +++ b/include/cantera/thermo/MolarityIonicVPSSTP.h @@ -101,9 +101,6 @@ public: */ MolarityIonicVPSSTP& operator=(const MolarityIonicVPSSTP& b); - /// Destructor. - virtual ~MolarityIonicVPSSTP(); - //! Duplication routine for objects which inherit from ThermoPhase. /*! * This virtual routine can be used to duplicate thermophase objects diff --git a/include/cantera/thermo/Mu0Poly.h b/include/cantera/thermo/Mu0Poly.h index b51fe080a..8123ca856 100644 --- a/include/cantera/thermo/Mu0Poly.h +++ b/include/cantera/thermo/Mu0Poly.h @@ -109,9 +109,6 @@ public: //! Assignment operator Mu0Poly& operator=(const Mu0Poly&); - //! Destructor - virtual ~Mu0Poly(); - virtual SpeciesThermoInterpType* duplMyselfAsSpeciesThermoInterpType() const; diff --git a/include/cantera/thermo/Nasa9Poly1.h b/include/cantera/thermo/Nasa9Poly1.h index f97a7ba58..7cbb0072b 100644 --- a/include/cantera/thermo/Nasa9Poly1.h +++ b/include/cantera/thermo/Nasa9Poly1.h @@ -96,9 +96,6 @@ public: */ Nasa9Poly1& operator=(const Nasa9Poly1& b); - //! Destructor - virtual ~Nasa9Poly1(); - virtual SpeciesThermoInterpType* duplMyselfAsSpeciesThermoInterpType() const; diff --git a/include/cantera/thermo/NasaPoly1.h b/include/cantera/thermo/NasaPoly1.h index c48d3eee4..eb2188a73 100644 --- a/include/cantera/thermo/NasaPoly1.h +++ b/include/cantera/thermo/NasaPoly1.h @@ -103,9 +103,6 @@ public: return *this; } - //! Destructor - virtual ~NasaPoly1() {} - virtual SpeciesThermoInterpType* duplMyselfAsSpeciesThermoInterpType() const { NasaPoly1* np = new NasaPoly1(*this); diff --git a/include/cantera/thermo/PDSS_ConstVol.h b/include/cantera/thermo/PDSS_ConstVol.h index 58bf51417..7974c966b 100644 --- a/include/cantera/thermo/PDSS_ConstVol.h +++ b/include/cantera/thermo/PDSS_ConstVol.h @@ -78,9 +78,6 @@ public: */ PDSS_ConstVol& operator=(const PDSS_ConstVol& b); - //! Destructor - virtual ~PDSS_ConstVol(); - virtual PDSS* duplMyselfAsPDSS() const; //! @} diff --git a/include/cantera/thermo/PDSS_IdealGas.h b/include/cantera/thermo/PDSS_IdealGas.h index 121d39257..5d967763b 100644 --- a/include/cantera/thermo/PDSS_IdealGas.h +++ b/include/cantera/thermo/PDSS_IdealGas.h @@ -80,9 +80,6 @@ public: PDSS_IdealGas(VPStandardStateTP* vptp_ptr, size_t spindex, const XML_Node& speciesNode, const XML_Node& phaseRef, bool spInstalled); - //! Destructor - virtual ~PDSS_IdealGas(); - virtual PDSS* duplMyselfAsPDSS() const; //! @} diff --git a/include/cantera/thermo/PDSS_IonsFromNeutral.h b/include/cantera/thermo/PDSS_IonsFromNeutral.h index 2c8b666c4..4a0ba88e1 100644 --- a/include/cantera/thermo/PDSS_IonsFromNeutral.h +++ b/include/cantera/thermo/PDSS_IonsFromNeutral.h @@ -82,9 +82,6 @@ public: */ PDSS_IonsFromNeutral& operator=(const PDSS_IonsFromNeutral& b); - //! Destructor - virtual ~PDSS_IonsFromNeutral(); - virtual PDSS* duplMyselfAsPDSS() const; virtual void initAllPtrs(VPStandardStateTP* vptp_ptr, VPSSMgr* vpssmgr_ptr, SpeciesThermo* spthermo_ptr); diff --git a/include/cantera/thermo/PDSS_SSVol.h b/include/cantera/thermo/PDSS_SSVol.h index 8c478f9e2..ad5d64d9d 100644 --- a/include/cantera/thermo/PDSS_SSVol.h +++ b/include/cantera/thermo/PDSS_SSVol.h @@ -211,9 +211,6 @@ public: */ PDSS_SSVol& operator=(const PDSS_SSVol& b); - //! Destructor - virtual ~PDSS_SSVol(); - virtual PDSS* duplMyselfAsPDSS() const; //! @} diff --git a/include/cantera/thermo/PhaseCombo_Interaction.h b/include/cantera/thermo/PhaseCombo_Interaction.h index e5b48d7f8..15afa2044 100644 --- a/include/cantera/thermo/PhaseCombo_Interaction.h +++ b/include/cantera/thermo/PhaseCombo_Interaction.h @@ -383,9 +383,6 @@ public: */ PhaseCombo_Interaction& operator=(const PhaseCombo_Interaction& b); - //! Destructor - virtual ~PhaseCombo_Interaction(); - //! Duplication routine for objects which inherit from ThermoPhase. /*! * This virtual routine can be used to duplicate thermophase objects diff --git a/include/cantera/thermo/PseudoBinaryVPSSTP.h b/include/cantera/thermo/PseudoBinaryVPSSTP.h index e6713c44f..546c1a33a 100644 --- a/include/cantera/thermo/PseudoBinaryVPSSTP.h +++ b/include/cantera/thermo/PseudoBinaryVPSSTP.h @@ -88,9 +88,6 @@ public: */ PseudoBinaryVPSSTP& operator=(const PseudoBinaryVPSSTP& b); - /// Destructor. - virtual ~PseudoBinaryVPSSTP(); - //! Duplication routine for objects which inherit from ThermoPhase. /*! * This virtual routine can be used to duplicate thermophase objects diff --git a/include/cantera/thermo/RedlichKisterVPSSTP.h b/include/cantera/thermo/RedlichKisterVPSSTP.h index 6914e88b3..84b77d43b 100644 --- a/include/cantera/thermo/RedlichKisterVPSSTP.h +++ b/include/cantera/thermo/RedlichKisterVPSSTP.h @@ -307,9 +307,6 @@ public: */ RedlichKisterVPSSTP& operator=(const RedlichKisterVPSSTP& b); - //! Destructor - virtual ~RedlichKisterVPSSTP(); - //! Duplication routine for objects which inherit from ThermoPhase. /*! * This virtual routine can be used to duplicate thermophase objects diff --git a/include/cantera/thermo/RedlichKwongMFTP.h b/include/cantera/thermo/RedlichKwongMFTP.h index 14cf84f73..062ba5621 100644 --- a/include/cantera/thermo/RedlichKwongMFTP.h +++ b/include/cantera/thermo/RedlichKwongMFTP.h @@ -86,9 +86,6 @@ public: */ RedlichKwongMFTP& operator=(const RedlichKwongMFTP& right); - //! Destructor. - virtual ~RedlichKwongMFTP(); - //! Duplicator from the ThermoPhase parent class /*! * Given a pointer to a ThermoPhase object, this function will diff --git a/include/cantera/thermo/SemiconductorPhase.h b/include/cantera/thermo/SemiconductorPhase.h index 490aa3333..c50f56481 100644 --- a/include/cantera/thermo/SemiconductorPhase.h +++ b/include/cantera/thermo/SemiconductorPhase.h @@ -43,8 +43,6 @@ public: return *this; } - virtual ~SemiconductorPhase() {} - //! Duplicator virtual ThermoPhase* duplMyselfAsThermoPhase() const { SemiconductorPhase* idg = new SemiconductorPhase(*this); diff --git a/include/cantera/thermo/SimpleThermo.h b/include/cantera/thermo/SimpleThermo.h index 07f4a624f..a34af506e 100644 --- a/include/cantera/thermo/SimpleThermo.h +++ b/include/cantera/thermo/SimpleThermo.h @@ -58,9 +58,6 @@ public: m_p0(-1.0), m_nspData(0) {} - //! Destructor - virtual ~SimpleThermo() {} - //! Copy constructor /*! * @param right Object to be copied diff --git a/include/cantera/thermo/SingleSpeciesTP.h b/include/cantera/thermo/SingleSpeciesTP.h index b5276af27..71b21147d 100644 --- a/include/cantera/thermo/SingleSpeciesTP.h +++ b/include/cantera/thermo/SingleSpeciesTP.h @@ -84,9 +84,6 @@ public: */ SingleSpeciesTP& operator=(const SingleSpeciesTP& right); - //! Destructor - virtual ~SingleSpeciesTP(); - //! Duplication function /*! * This virtual function is used to create a duplicate of the diff --git a/include/cantera/thermo/SpeciesThermoFactory.h b/include/cantera/thermo/SpeciesThermoFactory.h index 6c624e632..3846f8fa5 100644 --- a/include/cantera/thermo/SpeciesThermoFactory.h +++ b/include/cantera/thermo/SpeciesThermoFactory.h @@ -43,8 +43,6 @@ public: ": Specified speciesThermoPhase model " + speciesThermoModel + " does not match any known type.") {} - //! destructor - virtual ~UnknownSpeciesThermoModel() throw() {} }; //! Factory to build instances of classes that manage the @@ -96,14 +94,6 @@ public: */ void deleteFactory(); - //! Destructor - /** - * Doesn't do anything. We do not delete statically created single - * instance of this class here, because it would create an infinite loop - * if destructor is called for that single instance. - */ - virtual ~SpeciesThermoFactory(); - //! Create a new species property manager for the reference state. /*! * @param type the integer type to be created. diff --git a/include/cantera/thermo/SpeciesThermoInterpType.h b/include/cantera/thermo/SpeciesThermoInterpType.h index 561e5ae65..eaab77e74 100644 --- a/include/cantera/thermo/SpeciesThermoInterpType.h +++ b/include/cantera/thermo/SpeciesThermoInterpType.h @@ -312,9 +312,6 @@ public: */ STITbyPDSS(const STITbyPDSS& b); - //! Destructor - virtual ~STITbyPDSS(); - virtual SpeciesThermoInterpType* duplMyselfAsSpeciesThermoInterpType() const; //! Initialize and/or Reinitialize all the pointers for this object diff --git a/include/cantera/thermo/SpeciesThermoMgr.h b/include/cantera/thermo/SpeciesThermoMgr.h index a549eea7f..ca3e26beb 100644 --- a/include/cantera/thermo/SpeciesThermoMgr.h +++ b/include/cantera/thermo/SpeciesThermoMgr.h @@ -43,8 +43,6 @@ public: UnknownSpeciesThermo(const std::string& proc, const std::string& stype) : CanteraError(proc, "Specified species parameterization type (" + stype + ") does not match any known type.") {} - //! destructor - virtual ~UnknownSpeciesThermo() throw() {} }; /** @@ -62,9 +60,6 @@ public: //! Constructor SpeciesThermoDuo() {}; - //! Destructor - virtual ~SpeciesThermoDuo() {}; - //! copy constructor /*! * @param right Object to be copied diff --git a/include/cantera/thermo/StatMech.h b/include/cantera/thermo/StatMech.h index c0efc7d2f..f02b53f16 100644 --- a/include/cantera/thermo/StatMech.h +++ b/include/cantera/thermo/StatMech.h @@ -58,9 +58,6 @@ public: */ StatMech& operator=(const StatMech& b); - //! Destructor - virtual ~StatMech(); - //! duplicator virtual SpeciesThermoInterpType* duplMyselfAsSpeciesThermoInterpType() const; diff --git a/include/cantera/thermo/StoichSubstance.h b/include/cantera/thermo/StoichSubstance.h index 9c813ac8a..d141ccfa1 100644 --- a/include/cantera/thermo/StoichSubstance.h +++ b/include/cantera/thermo/StoichSubstance.h @@ -50,9 +50,6 @@ public: */ StoichSubstance& operator=(const StoichSubstance& right); - //! Destructor - virtual ~StoichSubstance(); - //! Duplicator from the %ThermoPhase parent class /* * Given a pointer to a %ThermoPhase object, this function will diff --git a/include/cantera/thermo/StoichSubstanceSSTP.h b/include/cantera/thermo/StoichSubstanceSSTP.h index ca70224fb..89dfd0806 100644 --- a/include/cantera/thermo/StoichSubstanceSSTP.h +++ b/include/cantera/thermo/StoichSubstanceSSTP.h @@ -191,9 +191,6 @@ public: */ StoichSubstanceSSTP& operator=(const StoichSubstanceSSTP& right); - //! Destructor - virtual ~StoichSubstanceSSTP(); - //! Duplication function /*! * This virtual function is used to create a duplicate of the diff --git a/include/cantera/thermo/SurfPhase.h b/include/cantera/thermo/SurfPhase.h index 50a94f906..04e26c267 100644 --- a/include/cantera/thermo/SurfPhase.h +++ b/include/cantera/thermo/SurfPhase.h @@ -187,9 +187,6 @@ public: */ SurfPhase& operator=(const SurfPhase& right); - //! Destructor. - virtual ~SurfPhase(); - //! Duplicator from the %ThermoPhase parent class /* * Given a pointer to a %ThermoPhase object, this function will diff --git a/include/cantera/thermo/ThermoFactory.h b/include/cantera/thermo/ThermoFactory.h index a5c263e01..61006a6d3 100644 --- a/include/cantera/thermo/ThermoFactory.h +++ b/include/cantera/thermo/ThermoFactory.h @@ -47,8 +47,6 @@ public: CanteraError(proc, "Specified ThermoPhase model " + thermoModel + " does not match any known type.") {} - //! destructor - virtual ~UnknownThermoPhaseModel() throw() {} }; @@ -80,14 +78,6 @@ public: } } - //! Destructor doesn't do anything. - /*! - * We do not delete statically created single instance of this - * class here, because it would create an infinite loop if - * destructor is called for that single instance. - */ - virtual ~ThermoFactory() { } - //! Create a new thermodynamic property manager. /*! * @param model String to look up the model against diff --git a/include/cantera/thermo/VPSSMgr_ConstVol.h b/include/cantera/thermo/VPSSMgr_ConstVol.h index 5900844c3..45c0d67fa 100644 --- a/include/cantera/thermo/VPSSMgr_ConstVol.h +++ b/include/cantera/thermo/VPSSMgr_ConstVol.h @@ -47,9 +47,6 @@ public: */ VPSSMgr_ConstVol(VPStandardStateTP* vp_ptr, SpeciesThermo* spth); - //! Destructor - virtual ~VPSSMgr_ConstVol(); - //! Copy Constructor VPSSMgr_ConstVol(const VPSSMgr_ConstVol& right); diff --git a/include/cantera/thermo/VPSSMgr_General.h b/include/cantera/thermo/VPSSMgr_General.h index e56959e37..f4bcd58d3 100644 --- a/include/cantera/thermo/VPSSMgr_General.h +++ b/include/cantera/thermo/VPSSMgr_General.h @@ -50,9 +50,6 @@ public: VPSSMgr_General(VPStandardStateTP* vp_ptr, SpeciesThermo* spth); - //! Destructor - virtual ~VPSSMgr_General(); - //! Copy Constructor VPSSMgr_General(const VPSSMgr_General& right); diff --git a/include/cantera/thermo/VPSSMgr_IdealGas.h b/include/cantera/thermo/VPSSMgr_IdealGas.h index 22bd145c0..f49ba072f 100644 --- a/include/cantera/thermo/VPSSMgr_IdealGas.h +++ b/include/cantera/thermo/VPSSMgr_IdealGas.h @@ -38,9 +38,6 @@ public: */ VPSSMgr_IdealGas(VPStandardStateTP* vp_ptr, SpeciesThermo* spth); - //! Destructor - virtual ~VPSSMgr_IdealGas(); - //! Copy Constructor VPSSMgr_IdealGas(const VPSSMgr_IdealGas& right); diff --git a/include/cantera/thermo/VPSSMgr_Water_ConstVol.h b/include/cantera/thermo/VPSSMgr_Water_ConstVol.h index 487af9dc4..e7b386bb8 100644 --- a/include/cantera/thermo/VPSSMgr_Water_ConstVol.h +++ b/include/cantera/thermo/VPSSMgr_Water_ConstVol.h @@ -42,9 +42,6 @@ public: */ VPSSMgr_Water_ConstVol(VPStandardStateTP* vp_ptr, SpeciesThermo* sp_ptr); - //! Destructor - virtual ~VPSSMgr_Water_ConstVol(); - //! Copy Constructor VPSSMgr_Water_ConstVol(const VPSSMgr_Water_ConstVol& right); diff --git a/include/cantera/thermo/VPSSMgr_Water_HKFT.h b/include/cantera/thermo/VPSSMgr_Water_HKFT.h index c2c98b4fc..570282940 100644 --- a/include/cantera/thermo/VPSSMgr_Water_HKFT.h +++ b/include/cantera/thermo/VPSSMgr_Water_HKFT.h @@ -43,9 +43,6 @@ public: VPSSMgr_Water_HKFT(VPStandardStateTP* vptp_ptr, SpeciesThermo* spth); - //! Destructor - virtual ~VPSSMgr_Water_HKFT(); - //! Copy Constructor VPSSMgr_Water_HKFT(const VPSSMgr_Water_HKFT& right); diff --git a/include/cantera/transport/AqueousTransport.h b/include/cantera/transport/AqueousTransport.h index 3d3638b93..c965df3fc 100644 --- a/include/cantera/transport/AqueousTransport.h +++ b/include/cantera/transport/AqueousTransport.h @@ -127,9 +127,6 @@ public: //! default constructor AqueousTransport(); - //! virtual destructor - virtual ~AqueousTransport() {} - //! Return the model id for this transport parameterization virtual int model() const { return cAqueousTransport; diff --git a/include/cantera/transport/GasTransport.h b/include/cantera/transport/GasTransport.h index 49404c55b..22ca85554 100644 --- a/include/cantera/transport/GasTransport.h +++ b/include/cantera/transport/GasTransport.h @@ -15,7 +15,6 @@ namespace Cantera class GasTransport : public Transport { public: - virtual ~GasTransport() {} GasTransport(const GasTransport& right); GasTransport& operator=(const GasTransport& right); diff --git a/include/cantera/transport/LTPspecies.h b/include/cantera/transport/LTPspecies.h index bf9fba734..36bb5a5b8 100644 --- a/include/cantera/transport/LTPspecies.h +++ b/include/cantera/transport/LTPspecies.h @@ -242,9 +242,6 @@ public: */ LTPspecies_Const& operator=(const LTPspecies_Const& right); - //! Destructor - virtual ~LTPspecies_Const(); - //! duplication routine /*! * @return Returns a copy of this routine as a pointer to LTPspecies @@ -327,9 +324,6 @@ public: */ LTPspecies_Arrhenius& operator=(const LTPspecies_Arrhenius& right); - //! Destructor - virtual ~LTPspecies_Arrhenius(); - //! duplication routine /*! * @return Returns a copy of this routine as a pointer to LTPspecies @@ -434,9 +428,6 @@ public: */ LTPspecies_Poly& operator=(const LTPspecies_Poly& right); - //! Destructor - virtual ~LTPspecies_Poly(); - //! Duplication routine /*! * @return Returns a copy of this routine as a pointer to LTPspecies @@ -524,9 +515,6 @@ public: */ LTPspecies_ExpT& operator=(const LTPspecies_ExpT& right); - //! Destructor - virtual ~LTPspecies_ExpT(); - //! Duplication routine /*! * @return Returns a copy of this routine as a pointer to LTPspecies diff --git a/include/cantera/transport/LiquidTranInteraction.h b/include/cantera/transport/LiquidTranInteraction.h index 43e13886b..210966b83 100644 --- a/include/cantera/transport/LiquidTranInteraction.h +++ b/include/cantera/transport/LiquidTranInteraction.h @@ -201,8 +201,6 @@ public: //! Assignment operator // LTI_Solvent& operator=( const LTI_Solvent &right ); - virtual ~LTI_Solvent() { } - //! Return the mixture transport property value. /** * Takes the separate species transport properties @@ -249,8 +247,6 @@ public: //! Assignment operator // LTI_MoleFracs& operator=( const LTI_MoleFracs &right ); - virtual ~LTI_MoleFracs() { } - //! Return the mixture transport property value. /** * Takes the separate species transport properties @@ -302,8 +298,6 @@ public: //! Assignment operator // LTI_MassFracs& operator=( const LTI_MassFracs &right ); - virtual ~LTI_MassFracs() { } - //! Return the mixture transport property value. /** * Takes the separate species transport properties @@ -383,8 +377,6 @@ public: //! Assignment operator // LTI_Log_MoleFracs& operator=( const LTI_Log_MoleFracs &right ); - virtual ~LTI_Log_MoleFracs() { } - //! Return the mixture transport property value. /** * Takes the separate species transport properties @@ -447,8 +439,6 @@ public: //! Assignment operator // LTI_Pairwise_Interaction& operator=( const LTI_Pairwise_Interaction &right ); - virtual ~LTI_Pairwise_Interaction() { } - void setParameters(LiquidTransportParams& trParam) ; //! Return the mixture transport property value. @@ -558,8 +548,6 @@ public: //! Assignment operator // LTI_StefanMaxwell_PPN& operator=( const LTI_StefanMaxwell_PPN &right ); - virtual ~LTI_StefanMaxwell_PPN() { } - void setParameters(LiquidTransportParams& trParam) ; //! Return the mixture transport property value. @@ -610,8 +598,6 @@ public: //! Assignment operator // LTI_StokesEinstein& operator=( const LTI_StokesEinstein &right ); - virtual ~LTI_StokesEinstein() { } - void setParameters(LiquidTransportParams& trParam); //! Return the mixture transport property value. @@ -661,8 +647,6 @@ public: //! Assignment operator // LTI_MoleFracs_ExpT& operator=( const LTI_MoleFracs_ExpT &right ); - virtual ~LTI_MoleFracs_ExpT() { } - //! Return the mixture transport property value. /** * Takes the separate species transport properties diff --git a/include/cantera/transport/MixTransport.h b/include/cantera/transport/MixTransport.h index e09eb34ee..907c13387 100644 --- a/include/cantera/transport/MixTransport.h +++ b/include/cantera/transport/MixTransport.h @@ -101,9 +101,6 @@ public: */ virtual Transport* duplMyselfAsTransport() const; - //! Destructor - virtual ~MixTransport() {} - //! Return the model id for transport /*! * @return cMixtureAverage diff --git a/include/cantera/transport/MultiTransport.h b/include/cantera/transport/MultiTransport.h index c4c7bb565..e8fb8c491 100644 --- a/include/cantera/transport/MultiTransport.h +++ b/include/cantera/transport/MultiTransport.h @@ -45,10 +45,6 @@ protected: MultiTransport(thermo_t* thermo=0); public: - - //! Destructor - virtual ~MultiTransport() {} - // overloaded base class methods virtual int model() const { if (m_mode == CK_Mode) { diff --git a/include/cantera/transport/PecosTransport.h b/include/cantera/transport/PecosTransport.h index 53f2199df..ea2681b59 100644 --- a/include/cantera/transport/PecosTransport.h +++ b/include/cantera/transport/PecosTransport.h @@ -44,9 +44,6 @@ class PecosTransport : public Transport { public: - - virtual ~PecosTransport() {} - virtual int model() const { return cPecosTransport; } diff --git a/include/cantera/transport/SolidTransport.h b/include/cantera/transport/SolidTransport.h index b02c62fb2..9bf4086c1 100644 --- a/include/cantera/transport/SolidTransport.h +++ b/include/cantera/transport/SolidTransport.h @@ -39,9 +39,6 @@ public: */ SolidTransport(const SolidTransport& right); - //! Destructor - virtual ~SolidTransport(); - //! Assignment operator /*! * This is NOT a virtual function. diff --git a/include/cantera/transport/TransportFactory.h b/include/cantera/transport/TransportFactory.h index 567b2c30f..0f43d7468 100644 --- a/include/cantera/transport/TransportFactory.h +++ b/include/cantera/transport/TransportFactory.h @@ -69,15 +69,6 @@ public: //! Deletes the statically malloced instance. virtual void deleteFactory(); - /*! - * Destructor - * - * We do not delete statically created single instance of this - * class here, because it would create an infinite loop if - * destructor is called for that single instance. - */ - virtual ~TransportFactory() {} - //! Get the name of the transport model corresponding to the specified constant. /*! * @param model Integer representing the model name diff --git a/include/cantera/transport/TransportParams.h b/include/cantera/transport/TransportParams.h index 0f7b88dde..ac2a22865 100644 --- a/include/cantera/transport/TransportParams.h +++ b/include/cantera/transport/TransportParams.h @@ -98,9 +98,6 @@ public: //! Constructor GasTransportParams(); - //! Destructor - virtual ~GasTransportParams(); - // polynomial fits //! temperature-fit of the viscosity diff --git a/include/cantera/transport/WaterTransport.h b/include/cantera/transport/WaterTransport.h index 04004beed..3a6e68cd4 100644 --- a/include/cantera/transport/WaterTransport.h +++ b/include/cantera/transport/WaterTransport.h @@ -81,9 +81,6 @@ public: */ virtual Transport* duplMyselfAsTransport() const; - //! virtual destructor - virtual ~WaterTransport(); - //! Return the model id for this transport parameterization virtual int model() const { return cWaterTransport; diff --git a/include/cantera/zeroD/ConstPressureReactor.h b/include/cantera/zeroD/ConstPressureReactor.h index 4e83d159f..f6a6b9787 100644 --- a/include/cantera/zeroD/ConstPressureReactor.h +++ b/include/cantera/zeroD/ConstPressureReactor.h @@ -32,12 +32,6 @@ public: */ ConstPressureReactor(); - /** - * Destructor. Deletes the integrator. - */ - virtual ~ConstPressureReactor() {} - - virtual int type() const { return ConstPressureReactorType; } diff --git a/include/cantera/zeroD/FlowReactor.h b/include/cantera/zeroD/FlowReactor.h index a18ce489c..833cf5615 100644 --- a/include/cantera/zeroD/FlowReactor.h +++ b/include/cantera/zeroD/FlowReactor.h @@ -25,11 +25,6 @@ public: */ FlowReactor(); - /** - * Destructor. - */ - virtual ~FlowReactor() {} - virtual int type() const { return FlowReactorType; } diff --git a/include/cantera/zeroD/Reactor.h b/include/cantera/zeroD/Reactor.h index db2d51756..144911070 100644 --- a/include/cantera/zeroD/Reactor.h +++ b/include/cantera/zeroD/Reactor.h @@ -54,11 +54,6 @@ public: //! Default constructor. Reactor(); - /** - * Destructor. Deletes the integrator. - */ - virtual ~Reactor() {} - virtual int type() const { return ReactorType; } diff --git a/include/cantera/zeroD/ReactorFactory.h b/include/cantera/zeroD/ReactorFactory.h index 373c6536b..2d67b703a 100644 --- a/include/cantera/zeroD/ReactorFactory.h +++ b/include/cantera/zeroD/ReactorFactory.h @@ -35,11 +35,6 @@ public: } } - /** - * Destructor doesn't do anything. - */ - virtual ~ReactorFactory() {} - /** * Create a new reactor. * @param n the type to be created. diff --git a/include/cantera/zeroD/Reservoir.h b/include/cantera/zeroD/Reservoir.h index 60f67aef5..bb58f6465 100644 --- a/include/cantera/zeroD/Reservoir.h +++ b/include/cantera/zeroD/Reservoir.h @@ -18,7 +18,6 @@ class Reservoir : public ReactorBase public: Reservoir() {} - virtual ~Reservoir() {} virtual int type() const { return ReservoirType; } diff --git a/include/cantera/zeroD/flowControllers.h b/include/cantera/zeroD/flowControllers.h index a84a405d4..76e23a830 100644 --- a/include/cantera/zeroD/flowControllers.h +++ b/include/cantera/zeroD/flowControllers.h @@ -27,8 +27,6 @@ public: m_type = MFC_Type; } - virtual ~MassFlowController() {} - virtual bool ready() { return FlowDevice::ready() && m_mdot >= 0.0; } @@ -63,8 +61,6 @@ public: m_type = PressureController_Type; } - virtual ~PressureController() {} - virtual bool ready() { return FlowDevice::ready() && m_master != 0; } @@ -102,8 +98,6 @@ public: m_type = Valve_Type; } - virtual ~Valve() {} - virtual bool ready() { return FlowDevice::ready() && m_coeffs.size() >= 1; } diff --git a/src/base/xml.cpp b/src/base/xml.cpp index d04b61b13..33539ddf6 100644 --- a/src/base/xml.cpp +++ b/src/base/xml.cpp @@ -76,9 +76,6 @@ public: m_msg += "<" + opentag + "> paired with .\n"; setError("XML_TagMismatch", m_msg); } - - //! Destructor - virtual ~XML_TagMismatch() throw() {} }; //! Class representing a specific type of XML file formatting error @@ -109,9 +106,6 @@ public: m_msg += ss.str() + "\n"; setError("XML_NoChild", m_msg); } - - //! Destructor - virtual ~XML_NoChild() throw() {} }; //////////////////// XML_Reader methods /////////////////////// diff --git a/src/kinetics/AqueousKinetics.cpp b/src/kinetics/AqueousKinetics.cpp index e27f2429e..9cd60735c 100644 --- a/src/kinetics/AqueousKinetics.cpp +++ b/src/kinetics/AqueousKinetics.cpp @@ -48,10 +48,6 @@ AqueousKinetics::AqueousKinetics(const AqueousKinetics& right) : *this = right; } -AqueousKinetics::~AqueousKinetics() -{ -} - AqueousKinetics& AqueousKinetics::operator=(const AqueousKinetics& right) { if (this == &right) { diff --git a/src/kinetics/FalloffFactory.cpp b/src/kinetics/FalloffFactory.cpp index c53f58ff1..2763366fd 100644 --- a/src/kinetics/FalloffFactory.cpp +++ b/src/kinetics/FalloffFactory.cpp @@ -51,9 +51,6 @@ public: //! Default constructor. Troe3() : m_a(0.0), m_rt3(0.0), m_rt1(0.0) {} - //! Destructor. - virtual ~Troe3() {} - /** * Initialize. * @param c Coefficient vector of length 3, @@ -163,9 +160,6 @@ public: Troe4() : m_a(0.0), m_rt3(0.0), m_rt1(0.0), m_t2(0.0) {} - //! Destructor - virtual ~Troe4() {} - //! Initialization of the object /*! * @param c Vector of four doubles: The doubles are the parameters, @@ -266,9 +260,6 @@ public: //! Constructor SRI3() {} - //! Destructor - virtual ~SRI3() {} - //! Initialization of the object /*! * @param c Vector of three doubles: The doubles are the parameters, @@ -354,9 +345,6 @@ public: //! Constructor SRI5() {} - //! Destructor - virtual ~SRI5() {} - //! Initialization of the object /*! * @param c Vector of five doubles: The doubles are the parameters, @@ -453,9 +441,6 @@ public: //! Default constructor WF93() {} - //! Destructor - virtual ~WF93() {} - //! Initialization routine /*! * @param c Vector of 10 doubles with the following ordering: a, T_1, diff --git a/src/kinetics/GasKinetics.cpp b/src/kinetics/GasKinetics.cpp index 8b0e579a5..2a2483a43 100644 --- a/src/kinetics/GasKinetics.cpp +++ b/src/kinetics/GasKinetics.cpp @@ -53,10 +53,6 @@ GasKinetics::GasKinetics(const GasKinetics& right) : *this = right; } -GasKinetics::~GasKinetics() -{ -} - GasKinetics& GasKinetics::operator=(const GasKinetics& right) { if (this == &right) { diff --git a/src/numerics/BandMatrix.cpp b/src/numerics/BandMatrix.cpp index ec729042c..664a060ac 100644 --- a/src/numerics/BandMatrix.cpp +++ b/src/numerics/BandMatrix.cpp @@ -74,11 +74,6 @@ BandMatrix::BandMatrix(const BandMatrix& y) : for (size_t j = 0; j < m_n; j++) { m_colPtrs[j] = &(data[ldab * j]); } -} -//==================================================================================================================== -BandMatrix::~BandMatrix() -{ - } //==================================================================================================================== BandMatrix& BandMatrix::operator=(const BandMatrix& y) diff --git a/src/numerics/DenseMatrix.cpp b/src/numerics/DenseMatrix.cpp index 493d9bb45..d485df4d1 100644 --- a/src/numerics/DenseMatrix.cpp +++ b/src/numerics/DenseMatrix.cpp @@ -78,11 +78,6 @@ DenseMatrix& DenseMatrix::operator=(const DenseMatrix& y) return *this; } //==================================================================================================================== -// Destructor. Does nothing. -DenseMatrix::~DenseMatrix() -{ -} -//==================================================================================================================== void DenseMatrix::resize(size_t n, size_t m, doublereal v) { Array2D::resize(n,m,v); diff --git a/src/numerics/ResidJacEval.cpp b/src/numerics/ResidJacEval.cpp index d5ea7e687..8d8944002 100644 --- a/src/numerics/ResidJacEval.cpp +++ b/src/numerics/ResidJacEval.cpp @@ -37,10 +37,6 @@ ResidJacEval::ResidJacEval(const ResidJacEval& right) : *this = operator=(right); } //==================================================================================================================== -ResidJacEval::~ResidJacEval() -{ -} -//==================================================================================================================== ResidJacEval& ResidJacEval::operator=(const ResidJacEval& right) { if (this == &right) { diff --git a/src/numerics/SquareMatrix.cpp b/src/numerics/SquareMatrix.cpp index 8274a48d3..7e2fc35a6 100644 --- a/src/numerics/SquareMatrix.cpp +++ b/src/numerics/SquareMatrix.cpp @@ -83,10 +83,6 @@ SquareMatrix& SquareMatrix::operator=(const SquareMatrix& y) return *this; } //==================================================================================================================== -SquareMatrix::~SquareMatrix() -{ -} -//==================================================================================================================== /* * Solve Ax = b. Vector b is overwritten on exit with x. */ diff --git a/src/thermo/ConstCpPoly.cpp b/src/thermo/ConstCpPoly.cpp index a0bdb64d2..299843a21 100644 --- a/src/thermo/ConstCpPoly.cpp +++ b/src/thermo/ConstCpPoly.cpp @@ -68,8 +68,6 @@ ConstCpPoly& ConstCpPoly::operator=(const ConstCpPoly& b) return *this; } -ConstCpPoly::~ConstCpPoly() {} - SpeciesThermoInterpType* ConstCpPoly::duplMyselfAsSpeciesThermoInterpType() const { diff --git a/src/thermo/ConstCpPoly.h b/src/thermo/ConstCpPoly.h index ba1a04189..4e6bbe540 100644 --- a/src/thermo/ConstCpPoly.h +++ b/src/thermo/ConstCpPoly.h @@ -74,9 +74,6 @@ public: //! Assignment operator ConstCpPoly& operator=(const ConstCpPoly&); - //! Destructor - virtual ~ConstCpPoly(); - virtual SpeciesThermoInterpType* duplMyselfAsSpeciesThermoInterpType() const; diff --git a/src/thermo/FixedChemPotSSTP.cpp b/src/thermo/FixedChemPotSSTP.cpp index 3ead62717..ea2b9209a 100644 --- a/src/thermo/FixedChemPotSSTP.cpp +++ b/src/thermo/FixedChemPotSSTP.cpp @@ -145,10 +145,6 @@ FixedChemPotSSTP::operator=(const FixedChemPotSSTP& right) return *this; } -FixedChemPotSSTP::~FixedChemPotSSTP() -{ -} - ThermoPhase* FixedChemPotSSTP::duplMyselfAsThermoPhase() const { return new FixedChemPotSSTP(*this); diff --git a/src/thermo/GibbsExcessVPSSTP.cpp b/src/thermo/GibbsExcessVPSSTP.cpp index 6429a0794..d06fbf575 100644 --- a/src/thermo/GibbsExcessVPSSTP.cpp +++ b/src/thermo/GibbsExcessVPSSTP.cpp @@ -74,10 +74,6 @@ operator=(const GibbsExcessVPSSTP& b) return *this; } -GibbsExcessVPSSTP::~GibbsExcessVPSSTP() -{ -} - ThermoPhase* GibbsExcessVPSSTP::duplMyselfAsThermoPhase() const { diff --git a/src/thermo/IdealGasPhase.cpp b/src/thermo/IdealGasPhase.cpp index ad8546563..261743c0f 100644 --- a/src/thermo/IdealGasPhase.cpp +++ b/src/thermo/IdealGasPhase.cpp @@ -38,10 +38,6 @@ IdealGasPhase::IdealGasPhase(XML_Node& phaseRef, const std::string& id_) : initThermoXML(phaseRef, id_); } -IdealGasPhase::~IdealGasPhase() -{ -} - IdealGasPhase::IdealGasPhase(const IdealGasPhase& right) : m_p0(right.m_p0), m_tlast(right.m_tlast), diff --git a/src/thermo/IdealMolalSoln.cpp b/src/thermo/IdealMolalSoln.cpp index bc310f3ec..0bf0097b0 100644 --- a/src/thermo/IdealMolalSoln.cpp +++ b/src/thermo/IdealMolalSoln.cpp @@ -133,10 +133,6 @@ IdealMolalSoln::IdealMolalSoln(XML_Node& root, const std::string& id_) : importPhase(*findXMLPhase(&root, id_), this); } -IdealMolalSoln::~IdealMolalSoln() -{ -} - ThermoPhase* IdealMolalSoln::duplMyselfAsThermoPhase() const { return new IdealMolalSoln(*this); diff --git a/src/thermo/IdealSolnGasVPSS.cpp b/src/thermo/IdealSolnGasVPSS.cpp index 36a13d0d7..d0ac7dcf8 100644 --- a/src/thermo/IdealSolnGasVPSS.cpp +++ b/src/thermo/IdealSolnGasVPSS.cpp @@ -74,10 +74,6 @@ operator=(const IdealSolnGasVPSS& b) return *this; } -IdealSolnGasVPSS::~IdealSolnGasVPSS() -{ -} - ThermoPhase* IdealSolnGasVPSS::duplMyselfAsThermoPhase() const { return new IdealSolnGasVPSS(*this); diff --git a/src/thermo/LatticePhase.cpp b/src/thermo/LatticePhase.cpp index b4d8fe4b4..2437eacb0 100644 --- a/src/thermo/LatticePhase.cpp +++ b/src/thermo/LatticePhase.cpp @@ -58,10 +58,6 @@ LatticePhase& LatticePhase::operator=(const LatticePhase& right) return *this; } -LatticePhase::~LatticePhase() -{ -} - LatticePhase::LatticePhase(const std::string& inputFile, const std::string& id_) { initThermoFile(inputFile, id_); diff --git a/src/thermo/MargulesVPSSTP.cpp b/src/thermo/MargulesVPSSTP.cpp index 754a42f3c..887e672d4 100644 --- a/src/thermo/MargulesVPSSTP.cpp +++ b/src/thermo/MargulesVPSSTP.cpp @@ -83,10 +83,6 @@ operator=(const MargulesVPSSTP& b) return *this; } -MargulesVPSSTP::~MargulesVPSSTP() -{ -} - ThermoPhase* MargulesVPSSTP::duplMyselfAsThermoPhase() const { diff --git a/src/thermo/MineralEQ3.cpp b/src/thermo/MineralEQ3.cpp index 7d8ba1a56..904c085a6 100644 --- a/src/thermo/MineralEQ3.cpp +++ b/src/thermo/MineralEQ3.cpp @@ -102,10 +102,6 @@ MineralEQ3::operator=(const MineralEQ3& right) return *this; } -MineralEQ3::~MineralEQ3() -{ -} - ThermoPhase* MineralEQ3::duplMyselfAsThermoPhase() const { return new MineralEQ3(*this); diff --git a/src/thermo/MixedSolventElectrolyte.cpp b/src/thermo/MixedSolventElectrolyte.cpp index baaca7ccf..d411372dc 100644 --- a/src/thermo/MixedSolventElectrolyte.cpp +++ b/src/thermo/MixedSolventElectrolyte.cpp @@ -87,10 +87,6 @@ operator=(const MixedSolventElectrolyte& b) return *this; } -MixedSolventElectrolyte::~MixedSolventElectrolyte() -{ -} - ThermoPhase* MixedSolventElectrolyte::duplMyselfAsThermoPhase() const { diff --git a/src/thermo/MixtureFugacityTP.cpp b/src/thermo/MixtureFugacityTP.cpp index 16769c51b..f26df034f 100644 --- a/src/thermo/MixtureFugacityTP.cpp +++ b/src/thermo/MixtureFugacityTP.cpp @@ -77,11 +77,6 @@ MixtureFugacityTP::operator=(const MixtureFugacityTP& b) return *this; } -MixtureFugacityTP::~MixtureFugacityTP() -{ -} - - ThermoPhase* MixtureFugacityTP::duplMyselfAsThermoPhase() const { return new MixtureFugacityTP(*this); diff --git a/src/thermo/MolalityVPSSTP.cpp b/src/thermo/MolalityVPSSTP.cpp index 80ea4c9ca..be3419554 100644 --- a/src/thermo/MolalityVPSSTP.cpp +++ b/src/thermo/MolalityVPSSTP.cpp @@ -73,10 +73,6 @@ operator=(const MolalityVPSSTP& b) return *this; } -MolalityVPSSTP::~MolalityVPSSTP() -{ -} - ThermoPhase* MolalityVPSSTP::duplMyselfAsThermoPhase() const { diff --git a/src/thermo/MolarityIonicVPSSTP.cpp b/src/thermo/MolarityIonicVPSSTP.cpp index f59c7de0a..de3085714 100644 --- a/src/thermo/MolarityIonicVPSSTP.cpp +++ b/src/thermo/MolarityIonicVPSSTP.cpp @@ -104,10 +104,6 @@ operator=(const MolarityIonicVPSSTP& b) return *this; } -MolarityIonicVPSSTP::~MolarityIonicVPSSTP() -{ -} - ThermoPhase* MolarityIonicVPSSTP::duplMyselfAsThermoPhase() const { diff --git a/src/thermo/Mu0Poly.cpp b/src/thermo/Mu0Poly.cpp index 5b0009cef..56ef19dbb 100644 --- a/src/thermo/Mu0Poly.cpp +++ b/src/thermo/Mu0Poly.cpp @@ -73,13 +73,6 @@ Mu0Poly& Mu0Poly::operator=(const Mu0Poly& b) return *this; } -/* - * Destructor: - */ -Mu0Poly::~Mu0Poly() -{ -} - SpeciesThermoInterpType* Mu0Poly::duplMyselfAsSpeciesThermoInterpType() const { diff --git a/src/thermo/Nasa9Poly1.cpp b/src/thermo/Nasa9Poly1.cpp index 8d9439278..5347a13fa 100644 --- a/src/thermo/Nasa9Poly1.cpp +++ b/src/thermo/Nasa9Poly1.cpp @@ -57,10 +57,6 @@ Nasa9Poly1& Nasa9Poly1::operator=(const Nasa9Poly1& b) return *this; } -Nasa9Poly1::~Nasa9Poly1() -{ -} - SpeciesThermoInterpType* Nasa9Poly1::duplMyselfAsSpeciesThermoInterpType() const { diff --git a/src/thermo/NasaPoly2.h b/src/thermo/NasaPoly2.h index 79644c305..a3edb40de 100644 --- a/src/thermo/NasaPoly2.h +++ b/src/thermo/NasaPoly2.h @@ -113,9 +113,6 @@ public: return *this; } - //! destructor - virtual ~NasaPoly2() { } - virtual SpeciesThermoInterpType* duplMyselfAsSpeciesThermoInterpType() const { NasaPoly2* np = new NasaPoly2(*this); diff --git a/src/thermo/NasaThermo.h b/src/thermo/NasaThermo.h index 7a1ef4c79..623d72d95 100644 --- a/src/thermo/NasaThermo.h +++ b/src/thermo/NasaThermo.h @@ -54,8 +54,6 @@ public: NasaThermo& operator=(const NasaThermo& right); - virtual ~NasaThermo() {} - virtual SpeciesThermo* duplMyselfAsSpeciesThermo() const { NasaThermo* nt = new NasaThermo(*this); return (SpeciesThermo*) nt; diff --git a/src/thermo/PDSS_ConstVol.cpp b/src/thermo/PDSS_ConstVol.cpp index 8c8f51ba5..72bcd8ec0 100644 --- a/src/thermo/PDSS_ConstVol.cpp +++ b/src/thermo/PDSS_ConstVol.cpp @@ -66,10 +66,6 @@ PDSS_ConstVol& PDSS_ConstVol::operator=(const PDSS_ConstVol& b) return *this; } -PDSS_ConstVol::~PDSS_ConstVol() -{ -} - PDSS* PDSS_ConstVol::duplMyselfAsPDSS() const { return new PDSS_ConstVol(*this); diff --git a/src/thermo/PDSS_IdealGas.cpp b/src/thermo/PDSS_IdealGas.cpp index 0545930ba..519fd6df0 100644 --- a/src/thermo/PDSS_IdealGas.cpp +++ b/src/thermo/PDSS_IdealGas.cpp @@ -66,10 +66,6 @@ PDSS_IdealGas& PDSS_IdealGas::operator=(const PDSS_IdealGas& b) return *this; } -PDSS_IdealGas::~PDSS_IdealGas() -{ -} - PDSS* PDSS_IdealGas::duplMyselfAsPDSS() const { return new PDSS_IdealGas(*this); diff --git a/src/thermo/PDSS_IonsFromNeutral.cpp b/src/thermo/PDSS_IonsFromNeutral.cpp index eb1972213..56725edd5 100644 --- a/src/thermo/PDSS_IonsFromNeutral.cpp +++ b/src/thermo/PDSS_IonsFromNeutral.cpp @@ -97,10 +97,6 @@ PDSS_IonsFromNeutral& PDSS_IonsFromNeutral::operator=(const PDSS_IonsFromNeutral return *this; } -PDSS_IonsFromNeutral::~PDSS_IonsFromNeutral() -{ -} - PDSS* PDSS_IonsFromNeutral::duplMyselfAsPDSS() const { return new PDSS_IonsFromNeutral(*this); diff --git a/src/thermo/PDSS_SSVol.cpp b/src/thermo/PDSS_SSVol.cpp index 5a3158494..9cf11fa7d 100644 --- a/src/thermo/PDSS_SSVol.cpp +++ b/src/thermo/PDSS_SSVol.cpp @@ -80,10 +80,6 @@ PDSS_SSVol& PDSS_SSVol::operator=(const PDSS_SSVol& b) return *this; } -PDSS_SSVol::~PDSS_SSVol() -{ -} - PDSS* PDSS_SSVol::duplMyselfAsPDSS() const { return new PDSS_SSVol(*this); diff --git a/src/thermo/PhaseCombo_Interaction.cpp b/src/thermo/PhaseCombo_Interaction.cpp index aace4729d..4dda0fbd4 100644 --- a/src/thermo/PhaseCombo_Interaction.cpp +++ b/src/thermo/PhaseCombo_Interaction.cpp @@ -82,10 +82,6 @@ operator=(const PhaseCombo_Interaction& b) return *this; } -PhaseCombo_Interaction::~PhaseCombo_Interaction() -{ -} - ThermoPhase* PhaseCombo_Interaction::duplMyselfAsThermoPhase() const { diff --git a/src/thermo/PseudoBinaryVPSSTP.cpp b/src/thermo/PseudoBinaryVPSSTP.cpp index 39f4d3679..d0925c1de 100644 --- a/src/thermo/PseudoBinaryVPSSTP.cpp +++ b/src/thermo/PseudoBinaryVPSSTP.cpp @@ -80,10 +80,6 @@ operator=(const PseudoBinaryVPSSTP& b) return *this; } -PseudoBinaryVPSSTP::~PseudoBinaryVPSSTP() -{ -} - ThermoPhase* PseudoBinaryVPSSTP::duplMyselfAsThermoPhase() const { diff --git a/src/thermo/RedlichKisterVPSSTP.cpp b/src/thermo/RedlichKisterVPSSTP.cpp index 9d44b9905..09b3b5d5f 100644 --- a/src/thermo/RedlichKisterVPSSTP.cpp +++ b/src/thermo/RedlichKisterVPSSTP.cpp @@ -153,10 +153,6 @@ operator=(const RedlichKisterVPSSTP& b) return *this; } -RedlichKisterVPSSTP::~RedlichKisterVPSSTP() -{ -} - ThermoPhase* RedlichKisterVPSSTP::duplMyselfAsThermoPhase() const { diff --git a/src/thermo/RedlichKwongMFTP.cpp b/src/thermo/RedlichKwongMFTP.cpp index dfec07faf..f66142a69 100644 --- a/src/thermo/RedlichKwongMFTP.cpp +++ b/src/thermo/RedlichKwongMFTP.cpp @@ -217,10 +217,6 @@ operator=(const RedlichKwongMFTP& b) return *this; } -RedlichKwongMFTP::~RedlichKwongMFTP() -{ -} - ThermoPhase* RedlichKwongMFTP::duplMyselfAsThermoPhase() const { return new RedlichKwongMFTP(*this); diff --git a/src/thermo/ShomatePoly.h b/src/thermo/ShomatePoly.h index 47c393ca4..990335aa0 100644 --- a/src/thermo/ShomatePoly.h +++ b/src/thermo/ShomatePoly.h @@ -123,9 +123,6 @@ public: return *this; } - //! Destructor - virtual ~ShomatePoly() {} - virtual SpeciesThermoInterpType* duplMyselfAsSpeciesThermoInterpType() const { ShomatePoly* sp = new ShomatePoly(*this); diff --git a/src/thermo/ShomateThermo.h b/src/thermo/ShomateThermo.h index 06e6c7693..53c284a33 100644 --- a/src/thermo/ShomateThermo.h +++ b/src/thermo/ShomateThermo.h @@ -75,9 +75,6 @@ public: m_t.resize(7); } - //! destructor - virtual ~ShomateThermo() {} - //! Copy Constructor /*! * @param right Object to be copied diff --git a/src/thermo/SingleSpeciesTP.cpp b/src/thermo/SingleSpeciesTP.cpp index 19a1372b8..3684ddf9e 100644 --- a/src/thermo/SingleSpeciesTP.cpp +++ b/src/thermo/SingleSpeciesTP.cpp @@ -48,10 +48,6 @@ SingleSpeciesTP& SingleSpeciesTP::operator=(const SingleSpeciesTP& right) return *this; } -SingleSpeciesTP::~SingleSpeciesTP() -{ -} - ThermoPhase* SingleSpeciesTP::duplMyselfAsThermoPhase() const { return new SingleSpeciesTP(*this); diff --git a/src/thermo/SpeciesThermoFactory.cpp b/src/thermo/SpeciesThermoFactory.cpp index e34ba504a..9be67f335 100644 --- a/src/thermo/SpeciesThermoFactory.cpp +++ b/src/thermo/SpeciesThermoFactory.cpp @@ -129,10 +129,6 @@ void SpeciesThermoFactory::deleteFactory() } } -SpeciesThermoFactory::~SpeciesThermoFactory() -{ -} - SpeciesThermo* SpeciesThermoFactory::newSpeciesThermo(std::vector & spDataNodeList) const { int inasa = 0, ishomate = 0, isimple = 0, iother = 0; diff --git a/src/thermo/SpeciesThermoInterpType.cpp b/src/thermo/SpeciesThermoInterpType.cpp index 44a529226..69d54fd2b 100644 --- a/src/thermo/SpeciesThermoInterpType.cpp +++ b/src/thermo/SpeciesThermoInterpType.cpp @@ -63,10 +63,6 @@ STITbyPDSS::STITbyPDSS(const STITbyPDSS& b) : { } -STITbyPDSS::~STITbyPDSS() -{ -} - SpeciesThermoInterpType* STITbyPDSS::duplMyselfAsSpeciesThermoInterpType() const { diff --git a/src/thermo/StatMech.cpp b/src/thermo/StatMech.cpp index 563e3bbf5..17f3ad2c1 100644 --- a/src/thermo/StatMech.cpp +++ b/src/thermo/StatMech.cpp @@ -53,10 +53,6 @@ StatMech& StatMech::operator=(const StatMech& b) return *this; } -StatMech::~StatMech() -{ -} - SpeciesThermoInterpType* StatMech::duplMyselfAsSpeciesThermoInterpType() const { diff --git a/src/thermo/StoichSubstance.cpp b/src/thermo/StoichSubstance.cpp index 8c60cedaa..e83f5b366 100644 --- a/src/thermo/StoichSubstance.cpp +++ b/src/thermo/StoichSubstance.cpp @@ -48,10 +48,6 @@ ThermoPhase* StoichSubstance::duplMyselfAsThermoPhase() const return new StoichSubstance(*this); } -StoichSubstance::~StoichSubstance() -{ -} - doublereal StoichSubstance::enthalpy_mole() const { return intEnergy_mole() + m_press / molarDensity(); diff --git a/src/thermo/StoichSubstanceSSTP.cpp b/src/thermo/StoichSubstanceSSTP.cpp index 411c14e2a..0da82938c 100644 --- a/src/thermo/StoichSubstanceSSTP.cpp +++ b/src/thermo/StoichSubstanceSSTP.cpp @@ -88,10 +88,6 @@ StoichSubstanceSSTP::operator=(const StoichSubstanceSSTP& right) return *this; } -StoichSubstanceSSTP::~StoichSubstanceSSTP() -{ -} - ThermoPhase* StoichSubstanceSSTP::duplMyselfAsThermoPhase() const { return new StoichSubstanceSSTP(*this); diff --git a/src/thermo/SurfPhase.cpp b/src/thermo/SurfPhase.cpp index 8523438a6..f6c450027 100644 --- a/src/thermo/SurfPhase.cpp +++ b/src/thermo/SurfPhase.cpp @@ -114,10 +114,6 @@ doublereal SurfPhase::enthalpy_mole() const return mean_X(DATA_PTR(m_h0)); } -SurfPhase::~SurfPhase() -{ -} - doublereal SurfPhase::intEnergy_mole() const { return enthalpy_mole(); diff --git a/src/thermo/VPSSMgrFactory.cpp b/src/thermo/VPSSMgrFactory.cpp index 2503e5f28..2d56e057f 100644 --- a/src/thermo/VPSSMgrFactory.cpp +++ b/src/thermo/VPSSMgrFactory.cpp @@ -195,10 +195,6 @@ void VPSSMgrFactory::deleteFactory() } } -VPSSMgrFactory::~VPSSMgrFactory() -{ -} - VPSSMgr_enumType VPSSMgrFactory::VPSSMgr_StringConversion(const std::string& ssModel) const { diff --git a/src/thermo/VPSSMgrFactory.h b/src/thermo/VPSSMgrFactory.h index ad62b103b..45d65fbd4 100644 --- a/src/thermo/VPSSMgrFactory.h +++ b/src/thermo/VPSSMgrFactory.h @@ -42,8 +42,6 @@ public: CanteraError(proc, "Specified VPSSMgr model " + VPSSMgrModel + " does not match any known type.") {} - //! destructor - virtual ~UnknownVPSSMgrModel() throw() {} }; //! Factory to build instances of classes that manage the @@ -102,14 +100,6 @@ public: */ void deleteFactory(); - //! Destructor - /*! - * Doesn't do anything. We do not delete statically created single - * instance of this class here, because it would create an infinite loop - * if destructor is called for that single instance. - */ - virtual ~VPSSMgrFactory(); - //! String conversion to an enumType /*! * This routine is a string conversion. The string is obtained from the diff --git a/src/thermo/VPSSMgr_ConstVol.cpp b/src/thermo/VPSSMgr_ConstVol.cpp index 3132f032a..1f3e09c29 100644 --- a/src/thermo/VPSSMgr_ConstVol.cpp +++ b/src/thermo/VPSSMgr_ConstVol.cpp @@ -30,11 +30,6 @@ VPSSMgr_ConstVol::VPSSMgr_ConstVol(VPStandardStateTP* vp_ptr, SpeciesThermo* spt m_useTmpStandardStateStorage = true; } - -VPSSMgr_ConstVol::~VPSSMgr_ConstVol() -{ -} - VPSSMgr_ConstVol::VPSSMgr_ConstVol(const VPSSMgr_ConstVol& right) : VPSSMgr(right.m_vptp_ptr, right.m_spthermo) { diff --git a/src/thermo/VPSSMgr_General.cpp b/src/thermo/VPSSMgr_General.cpp index 734b783ac..0c09558ac 100644 --- a/src/thermo/VPSSMgr_General.cpp +++ b/src/thermo/VPSSMgr_General.cpp @@ -40,10 +40,6 @@ VPSSMgr_General::VPSSMgr_General(VPStandardStateTP* vp_ptr, m_useTmpRefStateStorage = true; } -VPSSMgr_General::~VPSSMgr_General() -{ -} - VPSSMgr_General::VPSSMgr_General(const VPSSMgr_General& right) : VPSSMgr(right.m_vptp_ptr, right.m_spthermo) { diff --git a/src/thermo/VPSSMgr_IdealGas.cpp b/src/thermo/VPSSMgr_IdealGas.cpp index ac424123f..d0b044302 100644 --- a/src/thermo/VPSSMgr_IdealGas.cpp +++ b/src/thermo/VPSSMgr_IdealGas.cpp @@ -32,10 +32,6 @@ VPSSMgr_IdealGas::VPSSMgr_IdealGas(VPStandardStateTP* vp_ptr, SpeciesThermo* spt m_useTmpStandardStateStorage = true; } -VPSSMgr_IdealGas::~VPSSMgr_IdealGas() -{ -} - VPSSMgr_IdealGas::VPSSMgr_IdealGas(const VPSSMgr_IdealGas& right) : VPSSMgr(right.m_vptp_ptr, right.m_spthermo) { diff --git a/src/thermo/VPSSMgr_Water_ConstVol.cpp b/src/thermo/VPSSMgr_Water_ConstVol.cpp index 746625525..732d87d81 100644 --- a/src/thermo/VPSSMgr_Water_ConstVol.cpp +++ b/src/thermo/VPSSMgr_Water_ConstVol.cpp @@ -32,10 +32,6 @@ VPSSMgr_Water_ConstVol::VPSSMgr_Water_ConstVol(VPStandardStateTP* vp_ptr, m_useTmpStandardStateStorage = true; } -VPSSMgr_Water_ConstVol::~VPSSMgr_Water_ConstVol() -{ -} - VPSSMgr_Water_ConstVol::VPSSMgr_Water_ConstVol(const VPSSMgr_Water_ConstVol& right) : VPSSMgr(right.m_vptp_ptr, right.m_spthermo) { diff --git a/src/thermo/VPSSMgr_Water_HKFT.cpp b/src/thermo/VPSSMgr_Water_HKFT.cpp index 4a80cdf0b..361ef6815 100644 --- a/src/thermo/VPSSMgr_Water_HKFT.cpp +++ b/src/thermo/VPSSMgr_Water_HKFT.cpp @@ -34,12 +34,6 @@ VPSSMgr_Water_HKFT::VPSSMgr_Water_HKFT(VPStandardStateTP* vp_ptr, m_useTmpStandardStateStorage = true; } - -VPSSMgr_Water_HKFT::~VPSSMgr_Water_HKFT() -{ - // m_waterSS is owned by VPStandardState -} - VPSSMgr_Water_HKFT::VPSSMgr_Water_HKFT(const VPSSMgr_Water_HKFT& right) : VPSSMgr(right.m_vptp_ptr, right.m_spthermo), m_waterSS(0), diff --git a/src/tpx/CarbonDioxide.h b/src/tpx/CarbonDioxide.h index c0631ed45..ffa4b2658 100644 --- a/src/tpx/CarbonDioxide.h +++ b/src/tpx/CarbonDioxide.h @@ -16,7 +16,6 @@ public: m_name="CarbonDioxide"; m_formula="CO2"; } - virtual ~CarbonDioxide() {} double MolWt(); double Tcrit(); diff --git a/src/tpx/HFC134a.h b/src/tpx/HFC134a.h index d97aec133..fffdf3f66 100644 --- a/src/tpx/HFC134a.h +++ b/src/tpx/HFC134a.h @@ -20,7 +20,6 @@ public: m_name = "HFC-134a"; m_formula = "C2F4H2"; } - ~HFC134a() {} double MolWt(); double Tcrit(); diff --git a/src/tpx/Heptane.h b/src/tpx/Heptane.h index 61a800ea1..80aa83d23 100644 --- a/src/tpx/Heptane.h +++ b/src/tpx/Heptane.h @@ -14,7 +14,6 @@ public: m_name = "Heptane"; m_formula = "C7H16"; } - virtual ~Heptane() {} double MolWt(); double Tcrit(); diff --git a/src/tpx/Hydrogen.h b/src/tpx/Hydrogen.h index 419c7e5c2..d28d5dd4d 100644 --- a/src/tpx/Hydrogen.h +++ b/src/tpx/Hydrogen.h @@ -15,7 +15,6 @@ public: m_name = "hydrogen"; m_formula = "H2"; } - virtual ~hydrogen() {} double MolWt(); double Tcrit(); diff --git a/src/tpx/Methane.h b/src/tpx/Methane.h index 07a8cea15..851c95e4a 100644 --- a/src/tpx/Methane.h +++ b/src/tpx/Methane.h @@ -15,7 +15,6 @@ public: m_name = "methane"; m_formula = "CH4"; } - virtual ~methane() {} double MolWt(); double Tcrit(); diff --git a/src/tpx/Nitrogen.h b/src/tpx/Nitrogen.h index 4b60b6aed..f2c75f201 100644 --- a/src/tpx/Nitrogen.h +++ b/src/tpx/Nitrogen.h @@ -16,7 +16,6 @@ public: m_name = "nitrogen"; m_formula = "N2"; } - virtual ~nitrogen() {} double MolWt(); double Tcrit(); diff --git a/src/tpx/Oxygen.h b/src/tpx/Oxygen.h index d65305739..4d980fa21 100644 --- a/src/tpx/Oxygen.h +++ b/src/tpx/Oxygen.h @@ -14,7 +14,6 @@ public: m_name="oxygen"; m_formula="O2"; } - virtual ~oxygen() {} double MolWt(); double Tcrit(); diff --git a/src/tpx/RedlichKwong.h b/src/tpx/RedlichKwong.h index d2496e4e9..62a472636 100644 --- a/src/tpx/RedlichKwong.h +++ b/src/tpx/RedlichKwong.h @@ -36,9 +36,6 @@ public: return m_b; } - // destructor - ~RedlichKwong() {} - double MolWt() { return m_mw; } diff --git a/src/tpx/Water.h b/src/tpx/Water.h index a5479eabc..9b1dee418 100644 --- a/src/tpx/Water.h +++ b/src/tpx/Water.h @@ -14,7 +14,6 @@ public: m_name = "water"; m_formula = "H2O"; } - ~water() {} double MolWt(); double Tcrit(); diff --git a/src/tpx/lk.h b/src/tpx/lk.h index a709f9ce1..5a234192d 100644 --- a/src/tpx/lk.h +++ b/src/tpx/lk.h @@ -20,7 +20,6 @@ public: m_name = "Lee-Kesler"; m_formula = "---"; } - ~leekesler() {} double MolWt(); double Tcrit(); diff --git a/src/transport/LTPspecies.cpp b/src/transport/LTPspecies.cpp index 727e04374..f05d37d34 100644 --- a/src/transport/LTPspecies.cpp +++ b/src/transport/LTPspecies.cpp @@ -182,10 +182,6 @@ LTPspecies_Const& LTPspecies_Const::operator=(const LTPspecies_Const& right) return *this; } //==================================================================================================================== -LTPspecies_Const::~LTPspecies_Const() -{ -} -//==================================================================================================================== // Duplication routine /* * @return Returns a copy of this routine as a pointer to LTPspecies @@ -258,11 +254,6 @@ LTPspecies_Arrhenius& LTPspecies_Arrhenius::operator=(const LTPspecies_Arrhenius return *this; } //==================================================================================================================== -// Destructor -LTPspecies_Arrhenius::~LTPspecies_Arrhenius() -{ -} -//==================================================================================================================== // Duplication routine /* * @return Returns a copy of this routine as a pointer to LTPspecies @@ -360,10 +351,6 @@ LTPspecies_Poly& LTPspecies_Poly::operator=(const LTPspecies_Poly& right) return *this; } //==================================================================================================================== -LTPspecies_Poly::~LTPspecies_Poly() -{ -} -//==================================================================================================================== // Duplication routine /* * @return Returns a copy of this routine as a pointer to LTPspecies @@ -434,10 +421,6 @@ LTPspecies_ExpT& LTPspecies_ExpT::operator=(const LTPspecies_ExpT& right) return *this; } //==================================================================================================================== -LTPspecies_ExpT::~LTPspecies_ExpT() -{ -} -//==================================================================================================================== // Duplication routine /* * @return Returns a copy of this routine as a pointer to LTPspecies diff --git a/src/transport/SolidTransport.cpp b/src/transport/SolidTransport.cpp index 863f782be..3bb61bb38 100644 --- a/src/transport/SolidTransport.cpp +++ b/src/transport/SolidTransport.cpp @@ -34,10 +34,6 @@ SolidTransport::SolidTransport() : { } //==================================================================================================================== -SolidTransport::~SolidTransport() -{ -} -//==================================================================================================================== SolidTransport::SolidTransport(const SolidTransport& right) : Transport(), m_nmobile(0), diff --git a/src/transport/TortuosityBruggeman.cpp b/src/transport/TortuosityBruggeman.cpp index 1bbb86279..dff326a6d 100644 --- a/src/transport/TortuosityBruggeman.cpp +++ b/src/transport/TortuosityBruggeman.cpp @@ -35,12 +35,6 @@ TortuosityBruggeman::TortuosityBruggeman(const TortuosityBruggeman& right) : expBrug_(right.expBrug_) { *this = right; -} -//==================================================================================================================== -// Default destructor for TortuosityBruggeman -TortuosityBruggeman::~TortuosityBruggeman() -{ - } //==================================================================================================================== // Assignment operator diff --git a/src/transport/TortuosityBruggeman.h b/src/transport/TortuosityBruggeman.h index 39aa988b9..591dab43b 100644 --- a/src/transport/TortuosityBruggeman.h +++ b/src/transport/TortuosityBruggeman.h @@ -57,9 +57,6 @@ public: */ TortuosityBruggeman(const TortuosityBruggeman& right); - //! Default destructor for TortuosityBruggeman - virtual ~TortuosityBruggeman(); - //! Assignment operator /*! * @param right Object to be copied diff --git a/src/transport/TortuosityMaxwell.cpp b/src/transport/TortuosityMaxwell.cpp index cb909e1aa..e2ca4475e 100644 --- a/src/transport/TortuosityMaxwell.cpp +++ b/src/transport/TortuosityMaxwell.cpp @@ -35,12 +35,6 @@ TortuosityMaxwell::TortuosityMaxwell(const TortuosityMaxwell& right) : relativeConductivities_(right.relativeConductivities_) { *this = right; -} -//==================================================================================================================== -// Default destructor for TortuosityMaxwell -TortuosityMaxwell::~TortuosityMaxwell() -{ - } //==================================================================================================================== // Assignment operator diff --git a/src/transport/TortuosityMaxwell.h b/src/transport/TortuosityMaxwell.h index 5d4ed8e17..5a2cdbffa 100644 --- a/src/transport/TortuosityMaxwell.h +++ b/src/transport/TortuosityMaxwell.h @@ -54,9 +54,6 @@ public: */ TortuosityMaxwell(const TortuosityMaxwell& right); - //! Default destructor for TortuosityMaxwell - virtual ~TortuosityMaxwell(); - //! Assignment operator /*! * @param right Object to be copied diff --git a/src/transport/TortuosityPercolation.cpp b/src/transport/TortuosityPercolation.cpp index dadaa1be6..76e8e74c9 100644 --- a/src/transport/TortuosityPercolation.cpp +++ b/src/transport/TortuosityPercolation.cpp @@ -38,12 +38,6 @@ TortuosityPercolation::TortuosityPercolation(const TortuosityPercolation& right) conductivityExponent_(right.conductivityExponent_) { *this = right; -} -//==================================================================================================================== -// Default destructor for TortuosityPercolation -TortuosityPercolation::~TortuosityPercolation() -{ - } //==================================================================================================================== // Assignment operator diff --git a/src/transport/TortuosityPercolation.h b/src/transport/TortuosityPercolation.h index 84fe5fa24..595aeead4 100644 --- a/src/transport/TortuosityPercolation.h +++ b/src/transport/TortuosityPercolation.h @@ -36,9 +36,6 @@ public: */ TortuosityPercolation(const TortuosityPercolation& right); - //! Default destructor for TortuosityPercolation - virtual ~TortuosityPercolation(); - //! Assignment operator /*! * @param right Object to be copied diff --git a/src/transport/TransportParams.cpp b/src/transport/TransportParams.cpp index bf6a448c1..b505c5257 100644 --- a/src/transport/TransportParams.cpp +++ b/src/transport/TransportParams.cpp @@ -68,12 +68,6 @@ GasTransportParams::GasTransportParams() : delta(0, 0) { } -//==================================================================================================================== -GasTransportParams:: ~GasTransportParams() -{ -} - - //==================================================================================================================== } // End of namespace Cantera //====================================================================================================================== diff --git a/src/transport/WaterTransport.cpp b/src/transport/WaterTransport.cpp index b1c48cb44..a8689c2df 100644 --- a/src/transport/WaterTransport.cpp +++ b/src/transport/WaterTransport.cpp @@ -68,12 +68,6 @@ Transport* WaterTransport::duplMyselfAsTransport() const return new WaterTransport(*this); } - -// virtual destructor -WaterTransport::~WaterTransport() -{ -} - // Routine to do some common initializations at the start of using // this routine. void WaterTransport::initTP()