EdgeKinetics now derives from InterfaceKinetics, and InterfaceKinetics has the beta parameter for electrochemistry

This commit is contained in:
Dave Goodwin
2007-05-18 10:54:54 +00:00
parent 5b75d6bae7
commit 39d60dd2d1
11 changed files with 126 additions and 923 deletions

View File

@@ -265,6 +265,24 @@ class Kinetics:
def sourceTerms(self):
return _cantera.kin_getarray(self.ckin,80)
def delta_H(self):
return _cantera.kin_getarray(self.ckin,90)
def delta_G(self):
return _cantera.kin_getarray(self.ckin,91)
def delta_S(self):
return _cantera.kin_getarray(self.ckin,92)
def delta_H0(self):
return _cantera.kin_getarray(self.ckin,93)
def delta_G0(self):
return _cantera.kin_getarray(self.ckin,94)
def delta_S0(self):
return _cantera.kin_getarray(self.ckin,95)
def multiplier(self,i):
return _cantera.kin_multiplier(self.ckin,i)

View File

@@ -135,7 +135,7 @@ kin_getarray(PyObject *self, PyObject *args)
int nrxns = kin_nReactions(kin);
int nsp = kin_nSpecies(kin);
int ix;
if (job < 45) ix = nrxns; else ix = nsp;
if (job < 45 || job >= 90) ix = nrxns; else ix = nsp;
PyArrayObject* x =
(PyArrayObject*)PyArray_FromDims(1, &ix, PyArray_DOUBLE);
@@ -177,7 +177,23 @@ kin_getarray(PyObject *self, PyObject *args)
case 80:
iok = kin_getSourceTerms(kin, nsp, xd);
break;
case 90:
iok = kin_getDelta(kin, 0, nrxns, xd);
break;
case 91:
iok = kin_getDelta(kin, 1, nrxns, xd);
break;
case 92:
iok = kin_getDelta(kin, 2, nrxns, xd);
break;
case 93:
iok = kin_getDelta(kin, 3, nrxns, xd);
break;
case 94:
iok = kin_getDelta(kin, 4, nrxns, xd);
break;
case 95:
iok = kin_getDelta(kin, 5, nrxns, xd);
break;
default:
;