From a9379e6f717881cae1a63199cc8cf8a48b3adec1 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Thu, 12 Nov 2015 12:42:46 -0500 Subject: [PATCH] [Thermo] Remove unimplemented versions of setToEquilState --- include/cantera/thermo/ConstDensityThermo.h | 2 -- include/cantera/thermo/DebyeHuckel.h | 11 ----------- include/cantera/thermo/HMWSoln.h | 9 --------- include/cantera/thermo/IdealMolalSoln.h | 8 -------- include/cantera/thermo/MolalityVPSSTP.h | 10 ---------- src/thermo/ConstDensityThermo.cpp | 6 ------ src/thermo/MolalityVPSSTP.cpp | 6 ------ 7 files changed, 52 deletions(-) diff --git a/include/cantera/thermo/ConstDensityThermo.h b/include/cantera/thermo/ConstDensityThermo.h index 654f31f6e..d89353bcb 100644 --- a/include/cantera/thermo/ConstDensityThermo.h +++ b/include/cantera/thermo/ConstDensityThermo.h @@ -123,8 +123,6 @@ public: virtual void initThermo(); - virtual void setToEquilState(const doublereal* lambda_RT); - virtual void setParameters(int n, doublereal* const c) { setDensity(c[0]); } diff --git a/include/cantera/thermo/DebyeHuckel.h b/include/cantera/thermo/DebyeHuckel.h index 9fad99cda..ed27df96e 100644 --- a/include/cantera/thermo/DebyeHuckel.h +++ b/include/cantera/thermo/DebyeHuckel.h @@ -857,17 +857,6 @@ public: //@} - /** - * @name Chemical Equilibrium - * @{ - */ - - virtual void setToEquilState(const doublereal* lambda_RT) { - throw NotImplementedError("DebyeHuckel::setToEquilState"); - } - - //@} - /* * -------------- Utilities ------------------------------- */ diff --git a/include/cantera/thermo/HMWSoln.h b/include/cantera/thermo/HMWSoln.h index c637194e1..1c65491d5 100644 --- a/include/cantera/thermo/HMWSoln.h +++ b/include/cantera/thermo/HMWSoln.h @@ -1645,15 +1645,6 @@ public: virtual void getPartialMolarCp(doublereal* cpbar) const; public: - //! @} - //! @name Chemical Equilibrium - //! @{ - - virtual void setToEquilState(const doublereal* lambda_RT) { - updateStandardStateThermo(); - throw NotImplementedError("HMWSoln::setToEquilState"); - } - //@} //! Get the saturation pressure for a given temperature. diff --git a/include/cantera/thermo/IdealMolalSoln.h b/include/cantera/thermo/IdealMolalSoln.h index 9f0673395..84da99417 100644 --- a/include/cantera/thermo/IdealMolalSoln.h +++ b/include/cantera/thermo/IdealMolalSoln.h @@ -425,14 +425,6 @@ public: */ virtual void getPartialMolarCp(doublereal* cpbar) const; - //!@} - //! @name Chemical Equilibrium - //! @{ - - virtual void setToEquilState(const doublereal* lambda_RT) { - throw NotImplementedError("IdealMolalSoln::setToEquilState"); - } - //@} // -------------- Utilities ------------------------------- diff --git a/include/cantera/thermo/MolalityVPSSTP.h b/include/cantera/thermo/MolalityVPSSTP.h index c22b3b01c..d91164b1d 100644 --- a/include/cantera/thermo/MolalityVPSSTP.h +++ b/include/cantera/thermo/MolalityVPSSTP.h @@ -457,16 +457,6 @@ public: void getElectrochemPotentials(doublereal* mu) const; - //@} - /** - * @name Chemical Equilibrium - * Routines that implement the Chemical equilibrium capability - * for a single phase, based on the element-potential method. - * @{ - */ - - virtual void setToEquilState(const doublereal* lambda_RT); - //@} //! Set equation of state parameter values from XML entries. diff --git a/src/thermo/ConstDensityThermo.cpp b/src/thermo/ConstDensityThermo.cpp index 085ce3ab7..4ab9eea3d 100644 --- a/src/thermo/ConstDensityThermo.cpp +++ b/src/thermo/ConstDensityThermo.cpp @@ -120,12 +120,6 @@ void ConstDensityThermo::initThermo() m_pp.resize(m_kk); } - -void ConstDensityThermo::setToEquilState(const doublereal* lambda_RT) -{ - throw CanteraError("setToEquilState","not yet impl."); -} - void ConstDensityThermo::_updateThermo() const { doublereal tnow = temperature(); diff --git a/src/thermo/MolalityVPSSTP.cpp b/src/thermo/MolalityVPSSTP.cpp index 71ebf4c5b..488236c95 100644 --- a/src/thermo/MolalityVPSSTP.cpp +++ b/src/thermo/MolalityVPSSTP.cpp @@ -300,12 +300,6 @@ void MolalityVPSSTP::getElectrochemPotentials(doublereal* mu) const } } -void MolalityVPSSTP::setToEquilState(const doublereal* lambda_RT) -{ - updateStandardStateThermo(); - throw NotImplementedError("MolalityVPSSTP::setToEquilState"); -} - void MolalityVPSSTP::setStateFromXML(const XML_Node& state) { VPStandardStateTP::setStateFromXML(state);