From f5b2fc37df5211e9d03eb2bfc4412cb68ce76d37 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 11 May 2015 16:16:22 -0400 Subject: [PATCH] [Python] Use name 'pre_exponential_factor' consistently --- interfaces/cython/cantera/reaction.pyx | 4 ++-- interfaces/cython/cantera/test/test_kinetics.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/interfaces/cython/cantera/reaction.pyx b/interfaces/cython/cantera/reaction.pyx index 5a262b04c..0cb527aa6 100644 --- a/interfaces/cython/cantera/reaction.pyx +++ b/interfaces/cython/cantera/reaction.pyx @@ -234,7 +234,7 @@ cdef class Arrhenius: k_f = A T^b \exp{-\tfrac{E}{RT}} - where *A* is the `preexponential_factor`, *b* is the `temperature_exponent`, + where *A* is the `pre_exponential_factor`, *b* is the `temperature_exponent`, and *E* is the `activation_energy`. """ def __cinit__(self, A=0, b=0, E=0, init=True): @@ -246,7 +246,7 @@ cdef class Arrhenius: if self.reaction is None: del self.rate - property preexponential_factor: + property pre_exponential_factor: """ The pre-exponential factor *A* in units of m, kmol, and s raised to powers depending on the reaction order. diff --git a/interfaces/cython/cantera/test/test_kinetics.py b/interfaces/cython/cantera/test/test_kinetics.py index 9eccfe160..80d66dccd 100644 --- a/interfaces/cython/cantera/test/test_kinetics.py +++ b/interfaces/cython/cantera/test/test_kinetics.py @@ -202,8 +202,8 @@ class KineticsFromReactions(utilities.CanteraTest): r2 = surf2.reaction(i) self.assertEqual(r1.reactants, r2.reactants) self.assertEqual(r1.products, r2.products) - self.assertEqual(r1.rate.preexponential_factor, - r2.rate.preexponential_factor) + self.assertEqual(r1.rate.pre_exponential_factor, + r2.rate.pre_exponential_factor) self.assertEqual(r1.rate.temperature_exponent, r2.rate.temperature_exponent) self.assertEqual(r1.rate.activation_energy, @@ -788,7 +788,7 @@ class TestReaction(utilities.CanteraTest): gas = ct.Solution('h2o2.xml') gas.TPX = self.gas.TPX R = self.gas.reaction(2) - A1 = R.rate.preexponential_factor + A1 = R.rate.pre_exponential_factor b1 = R.rate.temperature_exponent Ta1 = R.rate.activation_energy / ct.gas_constant T = gas.T @@ -805,7 +805,7 @@ class TestReaction(utilities.CanteraTest): gas = ct.Solution('h2o2.xml') gas.TPX = self.gas.TPX R = self.gas.reaction(5) - A1 = R.rate.preexponential_factor + A1 = R.rate.pre_exponential_factor b1 = R.rate.temperature_exponent T = gas.T kf1 = gas.forward_rate_constants[5]