Skip to content

Commit 48ed536

Browse files
jonwzhengsevyharris
authored andcommitted
Update ckcsvparser float types
Previous commit updated np.float to np.float64 This now also updates the generic python 'float' to np.float64 in that same file
1 parent 61ecc3a commit 48ed536

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

rmgpy/tools/ckcsvparser.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def get_rop_from_ckcsv(ckcsv_file):
6565
units = row[1].strip()[1:-1].lower()
6666
header = tokens[0] + '_(' + units + ')'
6767

68-
content_col = np.array([float(r) for r in row[2:]], float)
68+
content_col = np.array([float(r) for r in row[2:]], np.float64)
6969
content_col *= {'sec': 1.0, 'min': 60., 'hr': 3600., 'msec': 1e-3, 'microsec': 1e-6}[units]
7070
first_col_dict[header] = content_col
7171
continue
@@ -77,7 +77,7 @@ def get_rop_from_ckcsv(ckcsv_file):
7777
units = row[1].strip()[1:-1].lower()
7878
header = tokens[0] + '_(' + units + ')'
7979

80-
content_col = np.array([float(r) for r in row[2:]], float)
80+
content_col = np.array([float(r) for r in row[2:]], np.float64)
8181
content_col *= {'cm': 1.0, 'mm': 0.1, 'm': 100.}[units]
8282
first_col_dict[header] = content_col
8383
continue
@@ -88,7 +88,7 @@ def get_rop_from_ckcsv(ckcsv_file):
8888
species_string = label.split('_ROP_')[0]
8989
units = row[1].strip()[1:-1].lower()
9090
header = ''
91-
content_col = np.array([float(r) for r in row[2:]], float)
91+
content_col = np.array([float(r) for r in row[2:]], np.float64)
9292
if tokens[-1] == 'Total':
9393
header += species_string + ' ROP ' + tokens[2] \
9494
+ ' ' + tokens[-1] + '_(' + units + ')'
@@ -126,7 +126,7 @@ def get_concentration_dict_from_ckcsv(ckcsv_file):
126126
units = row[1].strip()[1:-1].lower()
127127
header = tokens[0] + '_(' + units + ')'
128128

129-
content_col = np.array([float(r) for r in row[2:]], float)
129+
content_col = np.array([float(r) for r in row[2:]], np.float64)
130130
content_col *= {'sec': 1.0, 'min': 60., 'hr': 3600., 'msec': 1e-3, 'microsec': 1e-6}[units]
131131
first_col_dict[header] = content_col
132132
continue
@@ -138,7 +138,7 @@ def get_concentration_dict_from_ckcsv(ckcsv_file):
138138
units = row[1].strip()[1:-1].lower()
139139
header = tokens[0] + '_(' + units + ')'
140140

141-
content_col = np.array([float(r) for r in row[2:]], float)
141+
content_col = np.array([float(r) for r in row[2:]], np.float64)
142142
content_col *= {'cm': 1.0, 'mm': 0.1, 'm': 100.}[units]
143143
first_col_dict[header] = content_col
144144
continue
@@ -162,7 +162,7 @@ def get_concentration_dict_from_ckcsv(ckcsv_file):
162162
units = row[1].strip()[1:-1].lower()
163163
header = tokens[0] + '_(' + units + ')'
164164

165-
content_col = np.array([float(r) for r in row[2:]], float)
165+
content_col = np.array([float(r) for r in row[2:]], np.float64)
166166
first_col_dict[header] = content_col
167167
continue
168168

@@ -173,7 +173,7 @@ def get_concentration_dict_from_ckcsv(ckcsv_file):
173173
units = row[1].strip()[1:-1].lower()
174174
header = tokens[0] + '_(' + units + ')'
175175

176-
content_col = np.array([float(r) for r in row[2:]], float)
176+
content_col = np.array([float(r) for r in row[2:]], np.float64)
177177
content_col *= {'bar': 1.0, 'atm': 1.01325}[units]
178178
first_col_dict[header] = content_col
179179
continue
@@ -184,7 +184,7 @@ def get_concentration_dict_from_ckcsv(ckcsv_file):
184184
if 'Soln' in tokens[-1]:
185185
raise Exception("This function only supports ckcsv with one Soln!")
186186
species_string = label.split('Mole_fraction_')[1]
187-
content_col = np.array([float(r) for r in row[2:]], float)
187+
content_col = np.array([float(r) for r in row[2:]], np.float64)
188188
header = species_string + ' Mole_fraction'
189189
if species_string not in spc_conc_dict:
190190
spc_conc_dict[species_string] = content_col

0 commit comments

Comments
 (0)