diff --git a/include/cantera/cython/wrappers.h b/include/cantera/cython/wrappers.h index 69fc5f6ef..f20867365 100644 --- a/include/cantera/cython/wrappers.h +++ b/include/cantera/cython/wrappers.h @@ -75,7 +75,6 @@ KIN_1D(getRevRatesOfProgress) KIN_1D(getNetRatesOfProgress) KIN_1D(getEquilibriumConstants) -KIN_1D(getActivationEnergies) KIN_1D(getFwdRateConstants) KIN_1D(getRevRateConstants) diff --git a/include/cantera/kinetics/InterfaceKinetics.h b/include/cantera/kinetics/InterfaceKinetics.h index 169eeea77..9829c2725 100644 --- a/include/cantera/kinetics/InterfaceKinetics.h +++ b/include/cantera/kinetics/InterfaceKinetics.h @@ -173,7 +173,6 @@ public: virtual void getFwdRateConstants(doublereal* kfwd); virtual void getRevRateConstants(doublereal* krev, bool doIrreversible = false); - virtual void getActivationEnergies(doublereal* E); //! @} //! @name Reaction Mechanism Construction diff --git a/include/cantera/kinetics/Kinetics.h b/include/cantera/kinetics/Kinetics.h index 7b2ec9ba2..57e7d7fb1 100644 --- a/include/cantera/kinetics/Kinetics.h +++ b/include/cantera/kinetics/Kinetics.h @@ -740,18 +740,6 @@ public: err("getFwdRateConstants"); } - /** - * Return the activation energies in Kelvin. - * - * length is the number of reactions - * - * @param E Ouptut vector of activation energies. Length: m_ii. - * @deprecated To be removed in Cantera 2.2. - */ - virtual void getActivationEnergies(doublereal* E) { - err("getActivationEnergies"); - } - //! @} //! @name Reaction Mechanism Construction //! @{ diff --git a/interfaces/cython/cantera/_cantera.pxd b/interfaces/cython/cantera/_cantera.pxd index 05353001c..975ec753a 100644 --- a/interfaces/cython/cantera/_cantera.pxd +++ b/interfaces/cython/cantera/_cantera.pxd @@ -543,7 +543,6 @@ cdef extern from "cantera/cython/wrappers.h": cdef void kin_getNetRatesOfProgress(CxxKinetics*, double*) except + cdef void kin_getEquilibriumConstants(CxxKinetics*, double*) except + - cdef void kin_getActivationEnergies(CxxKinetics*, double*) except + cdef void kin_getFwdRateConstants(CxxKinetics*, double*) except + cdef void kin_getRevRateConstants(CxxKinetics*, double*) except + diff --git a/interfaces/cython/cantera/kinetics.pyx b/interfaces/cython/cantera/kinetics.pyx index 6246c7d23..de9ad25ef 100644 --- a/interfaces/cython/cantera/kinetics.pyx +++ b/interfaces/cython/cantera/kinetics.pyx @@ -197,11 +197,6 @@ cdef class Kinetics(_SolutionBase): def __get__(self): return get_reaction_array(self, kin_getEquilibriumConstants) - property activation_energies: - """Activation energies for all reactions [K].""" - def __get__(self): - return get_reaction_array(self, kin_getActivationEnergies) - property forward_rate_constants: """ Forward rate constants for all reactions. Units are a combination of diff --git a/src/clib/ct.cpp b/src/clib/ct.cpp index 2bc55cf1a..ddcef1fb9 100644 --- a/src/clib/ct.cpp +++ b/src/clib/ct.cpp @@ -997,18 +997,6 @@ extern "C" { } } - int kin_getActivationEnergies(int n, size_t len, double* E) - { - try { - Kinetics& k = KineticsCabinet::item(n); - k.checkReactionArraySize(len); - k.getActivationEnergies(E); - return 0; - } catch (...) { - return handleAllExceptions(-1, ERR); - } - } - int kin_getDelta(int n, int job, size_t len, double* delta) { try { diff --git a/src/clib/ct.h b/src/clib/ct.h index 9662274f7..2a0ffa9b7 100644 --- a/src/clib/ct.h +++ b/src/clib/ct.h @@ -107,7 +107,6 @@ extern "C" { CANTERA_CAPI int kin_getFwdRateConstants(int n, size_t len, double* kfwd); CANTERA_CAPI int kin_getRevRateConstants(int n, int doIrreversible, size_t len, double* krev); - CANTERA_CAPI int kin_getActivationEnergies(int n, size_t len, double* E); CANTERA_CAPI int kin_getDelta(int n, int job, size_t len, double* delta); CANTERA_CAPI int kin_getCreationRates(int n, size_t len, double* cdot); CANTERA_CAPI int kin_getDestructionRates(int n, size_t len, double* ddot); diff --git a/src/kinetics/InterfaceKinetics.cpp b/src/kinetics/InterfaceKinetics.cpp index c18048f24..5a154e8c0 100644 --- a/src/kinetics/InterfaceKinetics.cpp +++ b/src/kinetics/InterfaceKinetics.cpp @@ -495,13 +495,6 @@ void InterfaceKinetics::getRevRateConstants(doublereal* krev, bool doIrreversibl } } -void InterfaceKinetics::getActivationEnergies(doublereal* E) -{ - warn_deprecated("Kinetics::getActivationEnergies", - "To be removed in Cantera 2.2."); - copy(m_E.begin(), m_E.end(), E); -} - void InterfaceKinetics::updateROP() { _update_rates_T();