research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ck2cti] Make 'PCHEB' and 'TCHEB' keywords case insensitive

Browse source 
Fixes Issue 213.
This commit is contained in:
Ray Speth 2014-04-08 19:39:16 +00:00
parent c887c1b6fb
commit f8ff70ed38
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interfaces/cython/cantera/ck2cti.py
View file

@ -1268,17 +1268,17 @@ class Parser(object):
if chebyshev is None:
chebyshev = Chebyshev()
tokens = [t.strip() for t in tokens]
if 'TCHEB' in line:
index = tokens.index('TCHEB')
if contains(tokens, 'TCHEB'):
index = get_index(tokens, 'TCHEB')
tokens2 = tokens[index+1].split()
chebyshev.Tmin = float(tokens2[0].strip())
chebyshev.Tmax = float(tokens2[1].strip())
if 'PCHEB' in line:
index = tokens.index('PCHEB')
if contains(tokens, 'PCHEB'):
index = get_index(tokens, 'PCHEB')
tokens2 = tokens[index+1].split()
chebyshev.Pmin = (float(tokens2[0].strip()), 'atm')
chebyshev.Pmax = (float(tokens2[1].strip()), 'atm')
if 'TCHEB' in line or 'PCHEB' in line:
if contains(tokens, 'TCHEB') or contains(tokens, 'PCHEB'):
pass
elif chebyshev.degreeT == 0 or chebyshev.degreeP == 0:
tokens2 = tokens[1].split()

24
test/data/pdep-test.inp
View file

@ -116,12 +116,12 @@ PLOG / 100 1.28E+06 1.71 9774 /
! PLOG with duplicate rates and negative A-factors
H+R3=P3A+P3B 1.0 0.0 0.0
PLOG / 0.001315789 2.44E+10 1.04 3980 /
PLOG / 0.039473684 3.89E+10 0.989 4114 /
PLOG / 1 3.46E+12 0.442 5463 /
PLOG / 10 1.72E+14 -0.01 7134 /
PLOG / 100 -7.41E+30 -5.54 12108 /
PLOG / 100 1.90E+15 -0.29 8306 /
plog / 0.001315789 2.44E+10 1.04 3980 /
plog / 0.039473684 3.89E+10 0.989 4114 /
plog / 1 3.46E+12 0.442 5463 /
plog / 10 1.72E+14 -0.01 7134 /
plog / 100 -7.41E+30 -5.54 12108 /
plog / 100 1.90E+15 -0.29 8306 /
! Degenerate PLOG with a single rate expression
H+R4=H+P4 1.0 0.0 0.0
@ -129,12 +129,12 @@ PLOG / 10 1.74e+07 1.98 4521 /
! Bimolecular CHEB
R5+H(+m)=P5A+P5B(+m) 1.0E0 0.0 0.0
TCHEB / 300.0 2000.0 / PCHEB / 0.009869232667160128 98.69232667160128 /
CHEB / 4 4 /
CHEB / 8.2883000e+00 -1.1397000e+00 -1.2059000e-01 1.6034000e-02 /
CHEB / 1.9764000e+00 1.0037000e+00 7.2865000e-03 -3.0432000e-02 /
CHEB / 3.1770000e-01 2.6889000e-01 9.4806000e-02 -7.6385000e-03 /
CHEB / -3.1285000e-02 -3.9412000e-02 4.4375000e-02 1.4458000e-02 /
tcheb / 300.0 2000.0 / pcheb / 0.009869232667160128 98.69232667160128 /
cheb / 4 4 /
cheb / 8.2883000e+00 -1.1397000e+00 -1.2059000e-01 1.6034000e-02 /
cheb / 1.9764000e+00 1.0037000e+00 7.2865000e-03 -3.0432000e-02 /
cheb / 3.1770000e-01 2.6889000e-01 9.4806000e-02 -7.6385000e-03 /
cheb / -3.1285000e-02 -3.9412000e-02 4.4375000e-02 1.4458000e-02 /
! Unimolecular decomposition CHEB
R6(+M)=P6A+P6B(+M) 1.000e+00 0.000 0.000