Skip to content

Commit 6c7b5f9

Browse files
committed
save thermo coverage dependent models as numpy arrays instead a list of rmg quantities
1 parent 2783016 commit 6c7b5f9

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

rmgpy/thermo/nasa.pyx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ cimport numpy as np
3434
from libc.math cimport log
3535

3636
cimport rmgpy.constants as constants
37-
import rmgpy.quantity as quantity
3837

3938
################################################################################
4039

@@ -314,8 +313,8 @@ cdef class NASA(HeatCapacityModel):
314313
for species, parameters in value.items():
315314
# just the polynomial model for now
316315
processed_parameters = {'model': parameters['model'],
317-
'enthalpy-coefficients': [quantity.Dimensionless(p) for p in parameters['enthalpy-coefficients']],
318-
'entropy-coefficients': [quantity.Dimensionless(p) for p in parameters['entropy-coefficients']],
316+
'enthalpy-coefficients': np.array([p for p in parameters['enthalpy-coefficients']]),
317+
'entropy-coefficients': np.array([p for p in parameters['entropy-coefficients']]),
319318
}
320319
self._thermo_coverage_dependence[species] = processed_parameters
321320

rmgpy/thermo/thermodata.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ cdef class ThermoData(HeatCapacityModel):
128128
for species, parameters in value.items():
129129
# just the polynomial model for now
130130
processed_parameters = {'model': parameters['model'],
131-
'enthalpy-coefficients': [quantity.Dimensionless(p) for p in parameters['enthalpy-coefficients']],
132-
'entropy-coefficients': [quantity.Dimensionless(p) for p in parameters['entropy-coefficients']],
131+
'enthalpy-coefficients': np.array([p for p in parameters['enthalpy-coefficients']]),
132+
'entropy-coefficients': np.array([p for p in parameters['entropy-coefficients']]),
133133
}
134134
self._thermo_coverage_dependence[species] = processed_parameters
135135

rmgpy/thermo/wilhoit.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ cdef class Wilhoit(HeatCapacityModel):
150150
for species, parameters in value.items():
151151
# just the polynomial model for now
152152
processed_parameters = {'model': parameters['model'],
153-
'enthalpy-coefficients': [quantity.Dimensionless(p) for p in parameters['enthalpy-coefficients']],
154-
'entropy-coefficients': [quantity.Dimensionless(p) for p in parameters['entropy-coefficients']],
153+
'enthalpy-coefficients': np.array([p for p in parameters['enthalpy-coefficients']]),
154+
'entropy-coefficients': np.array([p for p in parameters['entropy-coefficients']]),
155155
}
156156
self._thermo_coverage_dependence[species] = processed_parameters
157157

0 commit comments

Comments
 (0)