From 3530050dc4d8c6d1021f4fa4fb545e212f22fb17 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Fri, 28 Mar 2014 23:12:53 +0000 Subject: [PATCH] [Thermo] Remove redundant overrides of ThermoPhase::eosType() --- include/cantera/thermo/GibbsExcessVPSSTP.h | 10 ---------- include/cantera/thermo/IdealMolalSoln.h | 13 ------------- include/cantera/thermo/MargulesVPSSTP.h | 14 -------------- include/cantera/thermo/MixedSolventElectrolyte.h | 14 -------------- include/cantera/thermo/MixtureFugacityTP.h | 9 --------- include/cantera/thermo/MolalityVPSSTP.h | 10 ---------- include/cantera/thermo/MolarityIonicVPSSTP.h | 14 -------------- include/cantera/thermo/PseudoBinaryVPSSTP.h | 13 ------------- include/cantera/thermo/RedlichKisterVPSSTP.h | 13 ------------- include/cantera/thermo/VPStandardStateTP.h | 9 --------- src/thermo/GibbsExcessVPSSTP.cpp | 5 ----- src/thermo/MargulesVPSSTP.cpp | 9 --------- src/thermo/MixedSolventElectrolyte.cpp | 9 --------- src/thermo/MolalityVPSSTP.cpp | 5 ----- src/thermo/MolarityIonicVPSSTP.cpp | 9 --------- src/thermo/PseudoBinaryVPSSTP.cpp | 5 ----- src/thermo/RedlichKisterVPSSTP.cpp | 5 ----- 17 files changed, 166 deletions(-) diff --git a/include/cantera/thermo/GibbsExcessVPSSTP.h b/include/cantera/thermo/GibbsExcessVPSSTP.h index c91cadb63..bf68ab01f 100644 --- a/include/cantera/thermo/GibbsExcessVPSSTP.h +++ b/include/cantera/thermo/GibbsExcessVPSSTP.h @@ -130,16 +130,6 @@ public: virtual ThermoPhase* duplMyselfAsThermoPhase() const; //! @} - //! Equation of state type flag. - /*! - * The ThermoPhase base class returns - * zero. Subclasses should define this to return a unique - * non-zero value. Known constants defined for this purpose are - * listed in mix_defs.h. The MolalityVPSSTP class also returns - * zero, as it is a non-complete class. - */ - virtual int eosType() const; - //! @} //! @name Mechanical Properties //! @{ diff --git a/include/cantera/thermo/IdealMolalSoln.h b/include/cantera/thermo/IdealMolalSoln.h index cbaf24a96..f684ba7e7 100644 --- a/include/cantera/thermo/IdealMolalSoln.h +++ b/include/cantera/thermo/IdealMolalSoln.h @@ -138,19 +138,6 @@ public: */ ThermoPhase* duplMyselfAsThermoPhase() const; - //! @name Utilities - //! @{ - - /** - * Equation of state type flag. The base class returns - * zero. Subclasses should define this to return a unique - * non-zero value. Constants defined for this purpose are - * listed in mix_defs.h. - */ - virtual int eosType() const { - return 0; - } - //! @} //! @name Molar Thermodynamic Properties of the Solution //! @{ diff --git a/include/cantera/thermo/MargulesVPSSTP.h b/include/cantera/thermo/MargulesVPSSTP.h index 4468919ff..22d98d4e7 100644 --- a/include/cantera/thermo/MargulesVPSSTP.h +++ b/include/cantera/thermo/MargulesVPSSTP.h @@ -326,20 +326,6 @@ public: */ virtual ThermoPhase* duplMyselfAsThermoPhase() const; - //! @name Utilities - //! @{ - - //! Equation of state type flag. - /*! - * The ThermoPhase base class returns - * zero. Subclasses should define this to return a unique - * non-zero value. Known constants defined for this purpose are - * listed in mix_defs.h. The MolalityVPSSTP class also returns - * zero, as it is a non-complete class. - */ - virtual int eosType() const; - - //! @} //! @name Molar Thermodynamic Properties //! @{ diff --git a/include/cantera/thermo/MixedSolventElectrolyte.h b/include/cantera/thermo/MixedSolventElectrolyte.h index d8928fd02..04d50e6fa 100644 --- a/include/cantera/thermo/MixedSolventElectrolyte.h +++ b/include/cantera/thermo/MixedSolventElectrolyte.h @@ -318,20 +318,6 @@ public: */ virtual ThermoPhase* duplMyselfAsThermoPhase() const; - //! @name Utilities - //! @{ - - //! Equation of state type flag. - /*! - * The ThermoPhase base class returns - * zero. Subclasses should define this to return a unique - * non-zero value. Known constants defined for this purpose are - * listed in mix_defs.h. The MolalityVPSSTP class also returns - * zero, as it is a non-complete class. - */ - virtual int eosType() const; - - //! @} //! @name Molar Thermodynamic Properties //! @{ diff --git a/include/cantera/thermo/MixtureFugacityTP.h b/include/cantera/thermo/MixtureFugacityTP.h index e046c7365..32b9e9e75 100644 --- a/include/cantera/thermo/MixtureFugacityTP.h +++ b/include/cantera/thermo/MixtureFugacityTP.h @@ -103,15 +103,6 @@ public: //! @} //! @name Utilities //! @{ - /** - * Equation of state type flag. The base class returns - * zero. Subclasses should define this to return a unique - * non-zero value. Constants defined for this purpose are - * listed in mix_defs.h. - */ - virtual int eosType() const { - return 0; - } //! This method returns the convention used in specification //! of the standard state, of which there are currently two, diff --git a/include/cantera/thermo/MolalityVPSSTP.h b/include/cantera/thermo/MolalityVPSSTP.h index f2227ac57..1406b994c 100644 --- a/include/cantera/thermo/MolalityVPSSTP.h +++ b/include/cantera/thermo/MolalityVPSSTP.h @@ -223,16 +223,6 @@ public: //! @name Utilities //! @{ - //! Equation of state type flag. - /*! - * The ThermoPhase base class returns - * zero. Subclasses should define this to return a unique - * non-zero value. Known constants defined for this purpose are - * listed in mix_defs.h. The MolalityVPSSTP class also returns - * zero, as it is a non-complete class. - */ - virtual int eosType() const; - //! Set the pH scale, which determines the scale for single-ion activity //! coefficients. /*! diff --git a/include/cantera/thermo/MolarityIonicVPSSTP.h b/include/cantera/thermo/MolarityIonicVPSSTP.h index f4baf1366..18d4382f6 100644 --- a/include/cantera/thermo/MolarityIonicVPSSTP.h +++ b/include/cantera/thermo/MolarityIonicVPSSTP.h @@ -109,21 +109,7 @@ public: */ virtual ThermoPhase* duplMyselfAsThermoPhase() const; - //! @name Utilities - //! @{ - - //! Equation of state type flag. - /*! - * The ThermoPhase base class returns - * zero. Subclasses should define this to return a unique - * non-zero value. Known constants defined for this purpose are - * listed in mix_defs.h. The MolalityVPSSTP class also returns - * zero, as it is a non-complete class. - */ - virtual int eosType() const; - /** - * @} * @name Activities, Standard States, and Activity Concentrations * * The activity \f$a_k\f$ of a species in solution is diff --git a/include/cantera/thermo/PseudoBinaryVPSSTP.h b/include/cantera/thermo/PseudoBinaryVPSSTP.h index 3d0a89a38..55075575b 100644 --- a/include/cantera/thermo/PseudoBinaryVPSSTP.h +++ b/include/cantera/thermo/PseudoBinaryVPSSTP.h @@ -96,20 +96,7 @@ public: */ virtual ThermoPhase* duplMyselfAsThermoPhase() const; - //! @name Utilities - //! @{ - - //! Equation of state type flag. - /*! - * The ThermoPhase base class returns - * zero. Subclasses should define this to return a unique - * non-zero value. Known constants defined for this purpose are - * listed in mix_defs.h. - */ - virtual int eosType() const; - /** - * @} * @name Activities, Standard States, and Activity Concentrations * * The activity \f$a_k\f$ of a species in solution is diff --git a/include/cantera/thermo/RedlichKisterVPSSTP.h b/include/cantera/thermo/RedlichKisterVPSSTP.h index 84b77d43b..12a64346e 100644 --- a/include/cantera/thermo/RedlichKisterVPSSTP.h +++ b/include/cantera/thermo/RedlichKisterVPSSTP.h @@ -315,19 +315,6 @@ public: */ virtual ThermoPhase* duplMyselfAsThermoPhase() const; - //! @name Utilities - //! @{ - - //! Equation of state type flag. - /*! - * The ThermoPhase base class returns - * zero. Subclasses should define this to return a unique - * non-zero value. Known constants defined for this purpose are - * listed in mix_defs.h. - */ - virtual int eosType() const; - - //! @} //! @name Molar Thermodynamic Properties //! @{ diff --git a/include/cantera/thermo/VPStandardStateTP.h b/include/cantera/thermo/VPStandardStateTP.h index 96bfb34c3..c77ad7a0a 100644 --- a/include/cantera/thermo/VPStandardStateTP.h +++ b/include/cantera/thermo/VPStandardStateTP.h @@ -86,15 +86,6 @@ public: //@} //! @name Utilities (VPStandardStateTP) //@{ - /** - * Equation of state type flag. The base class returns - * zero. Subclasses should define this to return a unique - * non-zero value. Constants defined for this purpose are - * listed in mix_defs.h. - */ - virtual int eosType() const { - return 0; - } //! This method returns the convention used in specification //! of the standard state, of which there are currently two, diff --git a/src/thermo/GibbsExcessVPSSTP.cpp b/src/thermo/GibbsExcessVPSSTP.cpp index f111658f6..14cab7628 100644 --- a/src/thermo/GibbsExcessVPSSTP.cpp +++ b/src/thermo/GibbsExcessVPSSTP.cpp @@ -109,11 +109,6 @@ void GibbsExcessVPSSTP::setConcentrations(const doublereal* const c) getMoleFractions(DATA_PTR(moleFractions_)); } -int GibbsExcessVPSSTP::eosType() const -{ - return 0; -} - /* * ------------ Mechanical Properties ------------------------------ */ diff --git a/src/thermo/MargulesVPSSTP.cpp b/src/thermo/MargulesVPSSTP.cpp index e9a4cef28..e9037b116 100644 --- a/src/thermo/MargulesVPSSTP.cpp +++ b/src/thermo/MargulesVPSSTP.cpp @@ -146,15 +146,6 @@ MargulesVPSSTP::MargulesVPSSTP(int testProb) : m_pSpecies_A_ij[0] = iKCl; } -/* - * -------------- Utilities ------------------------------- - */ - -int MargulesVPSSTP::eosType() const -{ - return 0; -} - /* * - Activities, Standard States, Activity Concentrations ----------- */ diff --git a/src/thermo/MixedSolventElectrolyte.cpp b/src/thermo/MixedSolventElectrolyte.cpp index d1fbb482f..e2e544560 100644 --- a/src/thermo/MixedSolventElectrolyte.cpp +++ b/src/thermo/MixedSolventElectrolyte.cpp @@ -149,15 +149,6 @@ MixedSolventElectrolyte::MixedSolventElectrolyte(int testProb) : m_pSpecies_A_ij[0] = iKCl; } -/* - * -------------- Utilities ------------------------------- - */ - -int MixedSolventElectrolyte::eosType() const -{ - return 0; -} - /* * - Activities, Standard States, Activity Concentrations ----------- */ diff --git a/src/thermo/MolalityVPSSTP.cpp b/src/thermo/MolalityVPSSTP.cpp index a4fe4190e..11cfdaf63 100644 --- a/src/thermo/MolalityVPSSTP.cpp +++ b/src/thermo/MolalityVPSSTP.cpp @@ -81,11 +81,6 @@ ThermoPhase* MolalityVPSSTP::duplMyselfAsThermoPhase() const * -------------- Utilities ------------------------------- */ -int MolalityVPSSTP::eosType() const -{ - return 0; -} - void MolalityVPSSTP::setpHScale(const int pHscaleType) { m_pHScalingType = pHscaleType; diff --git a/src/thermo/MolarityIonicVPSSTP.cpp b/src/thermo/MolarityIonicVPSSTP.cpp index ae80dd8e0..d2c1a027d 100644 --- a/src/thermo/MolarityIonicVPSSTP.cpp +++ b/src/thermo/MolarityIonicVPSSTP.cpp @@ -108,15 +108,6 @@ MolarityIonicVPSSTP::duplMyselfAsThermoPhase() const return new MolarityIonicVPSSTP(*this); } -/* - * -------------- Utilities ------------------------------- - */ - -int MolarityIonicVPSSTP::eosType() const -{ - return 0; -} - /* * - Activities, Standard States, Activity Concentrations ----------- */ diff --git a/src/thermo/PseudoBinaryVPSSTP.cpp b/src/thermo/PseudoBinaryVPSSTP.cpp index 4962b21c8..b7d733be7 100644 --- a/src/thermo/PseudoBinaryVPSSTP.cpp +++ b/src/thermo/PseudoBinaryVPSSTP.cpp @@ -84,11 +84,6 @@ PseudoBinaryVPSSTP::duplMyselfAsThermoPhase() const return new PseudoBinaryVPSSTP(*this); } -int PseudoBinaryVPSSTP::eosType() const -{ - return 0; -} - doublereal PseudoBinaryVPSSTP::standardConcentration(size_t k) const { err("standardConcentration"); diff --git a/src/thermo/RedlichKisterVPSSTP.cpp b/src/thermo/RedlichKisterVPSSTP.cpp index c8c988b7b..2ce87ae99 100644 --- a/src/thermo/RedlichKisterVPSSTP.cpp +++ b/src/thermo/RedlichKisterVPSSTP.cpp @@ -157,11 +157,6 @@ ThermoPhase* RedlichKisterVPSSTP::duplMyselfAsThermoPhase() const return new RedlichKisterVPSSTP(*this); } -int RedlichKisterVPSSTP::eosType() const -{ - return 0; -} - /* * - Activities, Standard States, Activity Concentrations ----------- */