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

[ck2cti] Fix conversion of NASA9 thermo with only one temperature range

Browse source
This commit is contained in:
Ray Speth 2016-03-28 12:48:10 -04:00
parent 2e3726fe5f
commit 233399f899
3 changed files with 7 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -224,7 +224,10 @@ class MultiNASA(ThermoModel):
lines = []
for i,p in enumerate(self.polynomials):
if i == 0:
lines.append('({0}'.format(p.to_cti(indent+1)))
if len(self.polynomials) == 1:
lines.append('({0})'.format(p.to_cti(indent+1)))
else:
lines.append('({0}'.format(p.to_cti(indent+1)))
elif i != len(self.polynomials)-1:
lines.append(prefix + ' {0}'.format(p.to_cti(indent+1)))
else:

10
test/data/nasa9-test-therm.dat
View file

@ -20,16 +20,8 @@ ALCL3 Gurvich,1996a pt1 p173 pt2 p134.
-1.378630916D+05-5.579207290D+01 1.004190387D+01-1.682165339D-05 3.724664660D-09
-4.275526780D-13 1.982341329D-17 -7.343407470D+04-2.045130429D+01
AR Ref-Elm. Moore,1971. Gordon,1999..
3 g 3/98 Ar 1.00 0.00 0.00 0.00 0.00 0 39.9480000 0.000
1 g 3/98 Ar 1.00 0.00 0.00 0.00 0.00 0 39.9480000 0.000
200.000 1000.0007 -2.0 -1.0 0.0 1.0 2.0 3.0 4.0 0.0 6197.428
0.000000000D+00 0.000000000D+00 2.500000000D+00 0.000000000D+00 0.000000000D+00
0.000000000D+00 0.000000000D+00 -7.453750000D+02 4.379674910D+00
1000.000 6000.0007 -2.0 -1.0 0.0 1.0 2.0 3.0 4.0 0.0 6197.428
2.010538475D+01-5.992661070D-02 2.500069401D+00-3.992141160D-08 1.205272140D-11
-1.819015576D-15 1.078576636D-19 -7.449939610D+02 4.379180110D+00
6000.000 20000.0007 -2.0 -1.0 0.0 1.0 2.0 3.0 4.0 0.0 6197.428
-9.951265080D+08 6.458887260D+05-1.675894697D+02 2.319933363D-02-1.721080911D-06
6.531938460D-11-9.740147729D-16 -5.078300340D+06 1.465298484D+03
END

16
test/data/nasa9-test.xml
View file

@ -4,8 +4,8 @@
<!-- phase sample -->
<phase dim="3" id="sample">
<elementArray datasrc="elements.xml">O H Al Cl E Ar </elementArray>
<speciesArray datasrc="#species_data">ALCL3 e- AR </speciesArray>
<elementArray datasrc="elements.xml">O H Al Cl E Ar</elementArray>
<speciesArray datasrc="#species_data">ALCL3 e- AR</speciesArray>
<reactionArray datasrc="#reaction_data"/>
<state>
<temperature units="K">300.0</temperature>
@ -77,18 +77,6 @@
0.000000000E+00, 0.000000000E+00, 0.000000000E+00, -7.453750000E+02,
4.379674910E+00</floatArray>
</NASA9>
<NASA9 Tmax="6000.0" Tmin="1000.0" P0="100000.0">
<floatArray name="coeffs" size="9">
2.010538475E+01, -5.992661070E-02, 2.500069401E+00, -3.992141160E-08,
1.205272140E-11, -1.819015576E-15, 1.078576636E-19, -7.449939610E+02,
4.379180110E+00</floatArray>
</NASA9>
<NASA9 Tmax="20000.0" Tmin="6000.0" P0="100000.0">
<floatArray name="coeffs" size="9">
-9.951265080E+08, 6.458887260E+05, -1.675894697E+02, 2.319933363E-02,
-1.721080911E-06, 6.531938460E-11, -9.740147729E-16, -5.078300340E+06,
1.465298484E+03</floatArray>
</NASA9>
</thermo>
</species>
</speciesData>