deal with sid and name in tc tracks and trop cyclone

Author: gabrielaznar

climada/hazard/tc_tracks.py

@@ -82,6 +82,7 @@ class TCTracks():
                 - max_sustained_wind_unit (attrs)
                 - central_pressure_unit (attrs)
                 - name (attrs)
+                - sid (attrs)
                 - orig_event_flag (attrs)
                 - data_provider (attrs)
                 - basin (attrs)
@@ -109,7 +110,8 @@ def get_track(self, track_name=None):
         """Get track with provided name. Return all tracks if no name provided.
 
         Parameters:
-            track_name (str, optional): name of track (ibtracsID for IBTrACS)
+            track_name (str, optional): name or sid (ibtracsID for IBTrACS)
+                of track
 
         Returns:
             xarray.Dataset or [xarray.Dataset]
@@ -120,7 +122,7 @@ def get_track(self, track_name=None):
             return self.data
 
         for track in self.data:
-            if track.name == track_name:
+            if track.name == track_name or track.sid == track_name:
                 return track
 
         LOGGER.info('No track with name %s found.', track_name)
@@ -333,8 +335,8 @@ def _one_rnd_walk(track, ens_size, ens_amp0, ens_amp, max_angle):
             i_track.lon.values = i_track.lon.values + d_lat_lon[0, :]
             i_track.lat.values = i_track.lat.values + d_lat_lon[1, :]
             i_track.attrs['orig_event_flag'] = False
-            i_track.attrs['name'] = i_track.attrs['name'] + '_gen' + \
-                                    str(i_ens+1)
+            i_track.attrs['name'] = i_track.attrs['name'] + '_gen' + str(i_ens+1)
+            i_track.attrs['sid'] = i_track.attrs['sid'] + '_gen' + str(i_ens+1)
             i_track.attrs['id_no'] = i_track.attrs['id_no'] + (i_ens+1)/100
 
             ens_track.append(i_track)
@@ -506,6 +508,7 @@ def _read_one_csv(self, file_name):
         tr_ds.attrs['max_sustained_wind_unit'] = max_sus_wind_unit
         tr_ds.attrs['central_pressure_unit'] = 'mb'
         tr_ds.attrs['name'] = name
+        tr_ds.attrs['sid'] = name
         tr_ds.attrs['orig_event_flag'] = bool(dfr['original_data']. values[0])
         tr_ds.attrs['data_provider'] = dfr['data_provider'].values[0]
         tr_ds.attrs['basin'] = dfr['gen_basin'].values[0]
@@ -572,7 +575,7 @@ def _read_one_raw(self, nc_data, i_track, provider):
             [nc_data.variables['name'][i_track].mask==False].data.astype(str))
         sid = ''.join(nc_data.variables['sid'][i_track].astype(str))
         basin = ''.join(nc_data.variables['basin'][i_track, 0, :].astype(str))
-        LOGGER.info('Reading %s', name)
+        LOGGER.info('Reading %s: %s', sid, name)
 
         isot = nc_data.variables['iso_time'][i_track, :, :]
         val_len = isot.mask[isot.mask == False].shape[0]//isot.shape[1]

climada/hazard/test/test_tc_tracks.py

@@ -59,6 +59,7 @@ def test_read_pass(self):
         self.assertEqual(tc_track.data[0].central_pressure_unit, 'mb')
         self.assertEqual(tc_track.data[0].orig_event_flag, 1)
         self.assertEqual(tc_track.data[0].name, '1951239N12334')
+        self.assertEqual(tc_track.data[0].sid, '1951239N12334')
         self.assertEqual(tc_track.data[0].id_no, 1951239012334)
         self.assertEqual(tc_track.data[0].data_provider, 'hurdat_atl')
         self.assertTrue(np.isnan(tc_track.data[0].basin))

climada/hazard/trop_cyclone.py

@@ -151,7 +151,7 @@ def _tc_from_track(track, centroids, coastal_centr, model='H08'):
         new_haz.event_id = np.array([1])
         # frequency set when all tracks available
         new_haz.frequency = np.array([1])
-        new_haz.event_name = [track.name]
+        new_haz.event_name = [track.sid]
         new_haz.fraction = new_haz.intensity.copy()
         new_haz.fraction.data.fill(1)
         # store date of start

climada/test/test_tc_tracks.py

@@ -66,8 +66,6 @@ def test_read_raw_pass(self):
         tc_track = TCTracks()
         tc_track.read_ibtracs_netcdf(provider='usa', storm_id='2017242N16333')
         self.assertEqual(len(tc_track.data), 1)
-        self.assertEqual(tc_track.get_track().sid, '2017242N16333')
-        self.assertEqual(tc_track.get_track().name, 'IRMA')
         self.assertEqual(tc_track.get_track().time.dt.year.values[0], 2017)
         self.assertEqual(tc_track.get_track().time.dt.month.values[0], 8)
         self.assertEqual(tc_track.get_track().time.dt.day.values[0], 30)
@@ -97,7 +95,8 @@ def test_read_raw_pass(self):
         self.assertEqual(tc_track.get_track().basin, 'NA')
         self.assertEqual(tc_track.get_track().max_sustained_wind_unit, 'kn')
         self.assertEqual(tc_track.get_track().central_pressure_unit, 'mb')
-        self.assertEqual(tc_track.get_track().name, '2017242N16333')
+        self.assertEqual(tc_track.get_track().sid, '2017242N16333')
+        self.assertEqual(tc_track.get_track().name, 'IRMA')
         self.assertEqual(tc_track.get_track().orig_event_flag, True)
         self.assertEqual(tc_track.get_track().data_provider, 'usa')
         self.assertEqual(tc_track.get_track().category, 5)