From 71d57330b616a4672b2a37e370aa30b04984a6b3 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Thu, 12 Feb 2015 04:04:51 +0000 Subject: [PATCH] [Thermo] Deprecate methods of IdealGasPhase that only worked for StatMech --- include/cantera/thermo/IdealGasPhase.h | 4 ++++ include/cantera/thermo/ThermoPhase.h | 1 + src/thermo/IdealGasPhase.cpp | 5 ++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/cantera/thermo/IdealGasPhase.h b/include/cantera/thermo/IdealGasPhase.h index f8670425e..8ee20b885 100644 --- a/include/cantera/thermo/IdealGasPhase.h +++ b/include/cantera/thermo/IdealGasPhase.h @@ -433,6 +433,7 @@ public: * C^{tr}_{v,s} \equiv \frac{\partial e^{tr}_s}{\partial T} = \frac{3}{2} R_s * \f] * for atoms. + * @deprecated To be removed after Cantera 2.2. */ virtual doublereal cv_tr(doublereal) const; @@ -443,6 +444,7 @@ public: * \f[ * C^{trans}_{v,s} \equiv \frac{\partial e^{trans}_s}{\partial T} = \frac{3}{2} R_s * \f] + * @deprecated To be removed after Cantera 2.2. */ virtual doublereal cv_trans() const; @@ -456,6 +458,7 @@ public: * \f[ * C^{rot}_{v,s} \equiv C^{tr}_{v,s} - C^{trans}_{v,s} * \f] + * @deprecated To be removed after Cantera 2.2. */ virtual doublereal cv_rot(double atomicity) const; @@ -474,6 +477,7 @@ public: * \f[ * \sum_i \frac{R_s \theta_{v,s,i}}{e^{\theta_{v,s,i}/T}-1} * \f] + * @deprecated To be removed after Cantera 2.2. */ virtual doublereal cv_vib(int k, doublereal T) const; diff --git a/include/cantera/thermo/ThermoPhase.h b/include/cantera/thermo/ThermoPhase.h index e7e92eca9..d9e03c3f0 100644 --- a/include/cantera/thermo/ThermoPhase.h +++ b/include/cantera/thermo/ThermoPhase.h @@ -256,6 +256,7 @@ public: /** * @returns species vibrational specific heat at * constant volume. + * @deprecated To be removed after Cantera 2.2. */ /// Molar heat capacity at constant volume. Units: J/kmol/K. virtual doublereal cv_vib(int, double) const { diff --git a/src/thermo/IdealGasPhase.cpp b/src/thermo/IdealGasPhase.cpp index adc6a1fe4..aba465da9 100644 --- a/src/thermo/IdealGasPhase.cpp +++ b/src/thermo/IdealGasPhase.cpp @@ -84,6 +84,7 @@ doublereal IdealGasPhase::cv_mole() const doublereal IdealGasPhase::cv_tr(doublereal atomicity) const { + warn_deprecated("IdealGasPhase::cv_tr", "To be removed after Cantera 2.2."); // k is the species number int dum = 0; int type = m_spthermo->reportType(); @@ -104,17 +105,19 @@ doublereal IdealGasPhase::cv_tr(doublereal atomicity) const doublereal IdealGasPhase::cv_trans() const { + warn_deprecated("IdealGasPhase::cv_trans", "To be removed after Cantera 2.2."); return 1.5 * GasConstant; } doublereal IdealGasPhase::cv_rot(double atom) const { + warn_deprecated("IdealGasPhase::cv_rot", "To be removed after Cantera 2.2."); return std::max(cv_tr(atom) - cv_trans(), 0.); } doublereal IdealGasPhase::cv_vib(const int k, const doublereal T) const { - + warn_deprecated("IdealGasPhase::cv_vib", "To be removed after Cantera 2.2."); // k is the species number int dum = 0; int type = m_spthermo->reportType();