Skip to content

Commit f9dd6d2

Browse files
committed
use netcdf4 1.3.1 for compatibility with other library versions in windows
1 parent 21969c5 commit f9dd6d2

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

climada/hazard/tc_tracks.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ def _filter_ibtracs(fn_nc, storm_id, year_range, basin):
534534
np.array
535535
"""
536536
nc_data = Dataset(fn_nc)
537-
storm_ids = [''.join(name.data.astype(str))
537+
storm_ids = [''.join(name.astype(str))
538538
for name in nc_data.variables['sid']]
539539
sel_tracks = []
540540
# fileter name
@@ -552,7 +552,7 @@ def _filter_ibtracs(fn_nc, storm_id, year_range, basin):
552552
# filter basin
553553
if basin:
554554
basin0 = np.array([''.join(bas.astype(str)) \
555-
for bas in nc_data.variables['basin'][:, 0, :].data])[sel_tracks]
555+
for bas in nc_data.variables['basin'][:, 0, :]])[sel_tracks]
556556
sel_bas = np.argwhere(basin0 == basin).reshape(-1)
557557
if not sel_tracks.size:
558558
LOGGER.info('No tracks in basin %s.', basin)
@@ -568,20 +568,20 @@ def _read_one_raw(self, nc_data, i_track, provider):
568568
i_track (int): track position in netcdf data
569569
provider (str): data provider. e.g. usa, newdelhi, bom, cma, tokyo
570570
"""
571-
name = ''.join(nc_data.variables['sid'][i_track].data.astype(str))
572-
basin = ''.join(nc_data.variables['basin'][i_track, 0, :].data.astype(str))
571+
name = ''.join(nc_data.variables['sid'][i_track].astype(str))
572+
basin = ''.join(nc_data.variables['basin'][i_track, 0, :].astype(str))
573573
LOGGER.info('Reading %s', name)
574574

575575
isot = nc_data.variables['iso_time'][i_track, :, :]
576576
val_len = isot.mask[isot.mask == False].shape[0]//isot.shape[1]
577577
datetimes = list()
578-
for date_time in isot.data[:val_len]:
578+
for date_time in isot[:val_len]:
579579
datetimes.append(dt.datetime.strptime(''.join(date_time.astype(str)),
580580
'%Y-%m-%d %H:%M:%S'))
581581

582582
id_no = float(name.replace('N', '0').replace('S', '1'))
583-
lat = nc_data.variables[provider + '_lat'][i_track, :].data[:val_len]
584-
lon = nc_data.variables[provider + '_lon'][i_track, :].data[:val_len]
583+
lat = nc_data.variables[provider + '_lat'][i_track, :][:val_len]
584+
lon = nc_data.variables[provider + '_lon'][i_track, :][:val_len]
585585

586586
max_sus_wind = nc_data.variables[provider + '_wind'][i_track, :]. \
587587
data[:val_len].astype(float)
@@ -597,13 +597,13 @@ def _read_one_raw(self, nc_data, i_track, provider):
597597
return None
598598

599599
try:
600-
rmax = nc_data.variables[provider + '_rmw'][i_track, :].data[:val_len]
600+
rmax = nc_data.variables[provider + '_rmw'][i_track, :][:val_len]
601601
except KeyError:
602602
LOGGER.info('%s: No rmax for given provider %s. Set to default.',
603603
name, provider)
604604
rmax = np.zeros(lat.size)
605605
try:
606-
penv = nc_data.variables[provider + '_poci'][i_track, :].data[:val_len]
606+
penv = nc_data.variables[provider + '_poci'][i_track, :][:val_len]
607607
except KeyError:
608608
LOGGER.info('%s: No penv for given provider %s. Set to default.',
609609
name, provider)

climada/test/test_tc_tracks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def test_filter_ibtracs_year_basin_pass(self):
132132
nc_data=Dataset(fn_nc)
133133
for i_sel in sel:
134134
self.assertEqual('WP',
135-
''.join(nc_data.variables['basin'][i_sel, 0, :].data.astype(str)))
135+
''.join(nc_data.variables['basin'][i_sel, 0, :].astype(str)))
136136
isot = nc_data.variables['iso_time'][i_sel, :, :]
137137
val_len = isot.mask[isot.mask==False].shape[0]//isot.shape[1]
138138
date = isot.data[:val_len]

requirements/env_climada.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
- mkl
1515
- mkl_fft
1616
- mkl_random
17-
- netcdf4=1.4.2
17+
- netcdf4=1.3.1
1818
- numba=0.37.0
1919
- numpy=1.14.2
2020
- nbconvert=5.4.1

0 commit comments

Comments
 (0)