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

[ck2cti] Fix for reading files with no final 'END' keyword

Browse source
This commit is contained in:
Ray Speth 2013-08-02 23:17:38 +00:00
parent 10aa8ba060
commit c32b54a47d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interfaces/python/ck2cti.py
View file

@ -1340,7 +1340,7 @@ class Parser(object):
if contains(line, 'ELEMENTS'):
index = get_index(tokens, 'ELEMENTS')
tokens = tokens[index+1:]
while not contains(line, 'END'):
while line is not None and not contains(line, 'END'):
# Grudging support for implicit end of section
if contains(line, 'SPECIES'):
self.warn('"ELEMENTS" section implicitly ended by start of '
@ -1361,7 +1361,7 @@ class Parser(object):
# List of species identifiers
index = get_index(tokens, 'SPECIES')
tokens = tokens[index+1:]
while not contains(line, 'END'):
while line is not None and not contains(line, 'END'):
# Grudging support for implicit end of section
if (contains(line, 'REACTIONS') or contains(line, 'TRAN') or
contains(line, 'THERM')):
@ -1388,7 +1388,7 @@ class Parser(object):
entryPosition = 0
entryLength = None
entry = []
while not get_index(line, 'END') == 0:
while line is not None and not get_index(line, 'END') == 0:
# Grudging support for implicit end of section
if (contains(line, 'REACTIONS') or contains(line, 'TRAN')):
self.warn('"THERMO" section implicitly ended by start of '
@ -1442,10 +1442,10 @@ class Parser(object):
elif contains(line, 'THERM'):
# List of thermodynamics (hopefully one per species!)
line, comment = readline()
if not contains(line, 'END'):
if line is not None and not contains(line, 'END'):
TintDefault = float(line.split()[1])
thermo = []
while not contains(line, 'END'):
while line is not None and not contains(line, 'END'):
# Grudging support for implicit end of section
if contains(line, 'REACTIONS') or contains(line, 'TRAN'):
self.warn('"THERMO" section implicitly ended by start of '