Skip to content

Commit ad4ae72

Browse files
committed
Add flag to ensure pandas to_record produces datetime.datetime dates.
Note this was caused by a change which conflicts with the documentation. See: pandas-dev/pandas#18160
1 parent 4243dfa commit ad4ae72

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

dtocean_core/data/definitions.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,8 @@ def auto_db(self):
241241
df = df.drop("Date", 1)
242242
df = df.drop("Time", 1)
243243
df = df.set_index("DateTime")
244-
245-
result = df.to_records()
244+
245+
result = df.to_records(convert_datetime64=True)
246246

247247
self.data.result = result
248248

example_data/fixed_tidal_fixed_layout_scenario.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -305,12 +305,12 @@
305305
tidal_series = metocean.loc[:, ['Cs']]
306306
tidal_series['DateTime'] = pd.to_datetime(datetime_index_dict, format =fmtStr)
307307
tidal_series = tidal_series.set_index(["DateTime"])
308-
tidal_series = tidal_series.to_records()
308+
tidal_series = tidal_series.to_records(convert_datetime64=True)
309309

310310
wind_series = metocean.loc[:, ['Ws']]
311311
wind_series['DateTime'] = pd.to_datetime(datetime_index_dict, format = fmtStr)
312312
wind_series = wind_series.set_index(["DateTime"])
313-
wind_series = wind_series.to_records()
313+
wind_series = wind_series.to_records(convert_datetime64=True)
314314

315315
### CABLE CORRIDOR
316316

test_data/inputs_wp5.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -274,13 +274,13 @@
274274
tidal_series = metocean.loc[:, ['Cs']]
275275
tidal_series['DateTime'] = date_index.copy()
276276
tidal_series = tidal_series.set_index(["DateTime"])
277-
tidal_series = tidal_series.to_records()
277+
tidal_series = tidal_series.to_records(convert_datetime64=True)
278278
tidal_series = [(x, float(y)) for x, y in tidal_series]
279279

280280
wind_series = metocean.loc[:, ['Ws']]
281281
wind_series['DateTime'] = date_index.copy()
282282
wind_series = wind_series.set_index(["DateTime"])
283-
wind_series = wind_series.to_records()
283+
wind_series = wind_series.to_records(convert_datetime64=True)
284284
wind_series = [(x, float(y)) for x, y in wind_series]
285285

286286
### Device

0 commit comments

Comments
 (0)