rename _calc_space_params and execute it from integration only when necessary

Author: gabrielaznar

climada/hazard/tc_tracks.py

@@ -115,13 +115,13 @@ def retrieve_ibtracs(self, name_ev, date_ev):
         """
         raise NotImplementedError
 
-    def equal_timestep(self, time_step_h=
-                       CONFIG['trop_cyclone']['time_step_h']):
+    def equal_timestep(self, time_step_h=CONFIG['trop_cyclone']['time_step_h']):
         """ Generate interpolated track values to time steps of min_time_step.
 
         Parameters:
             time_step_h (float): time step in hours to which to interpolate
         """
+        land_param = False
         new_list = list()
         for track in self.data:
             if track.time.size > 3:
@@ -138,15 +138,17 @@ def equal_timestep(self, time_step_h=
                 track.attrs['category'] = set_category( \
                     track.max_sustained_wind.values, \
                     track.max_sustained_wind_unit)
-
+                if 'on_land' in track_int or 'dist_since_lf' in track_int:
+                    land_param = True
             else:
                 LOGGER.warning('Track interpolation not done. ' +
                                'Not enough elements for %s', track.name)
                 track_int = track
             new_list.append(track_int)
 
         self.data = new_list
-        self._calc_space_params()
+        if land_param:
+            self._calc_land_params()
 
     def calc_random_walk(self, ens_size=9, ens_amp0=1.5, max_angle=np.pi/10, \
         ens_amp=0.1, seed=CONFIG['trop_cyclone']['random_seed'], decay=True):
@@ -199,7 +201,7 @@ def calc_random_walk(self, ens_size=9, ens_amp0=1.5, max_angle=np.pi/10, \
                 ens_track.append(i_track)
 
         self.data = ens_track
-        self._calc_space_params()
+        self._calc_land_params()
         if decay:
             v_rel, p_rel = self._calc_land_decay()
             self._apply_land_decay(v_rel, p_rel)
@@ -284,7 +286,7 @@ def _calc_land_decay(self, s_rel=True, check_plot=False):
             for track in hist_tracks:
                 _decay_values(s_rel, track, v_lf, p_lf, x_val)
         except AttributeError:
-            LOGGER.error('Execute _calc_space_params() first.')
+            LOGGER.error('Execute _calc_land_params() first.')
             raise ValueError
 
         v_rel, p_rel = _decay_calc_coeff(x_val, v_lf, p_lf)
@@ -320,7 +322,7 @@ def _apply_land_decay(self, v_rel, p_rel, s_rel=True, check_plot=False):
                     orig_pres.append(np.copy(track.central_pressure.values))
                 _apply_decay_coeffs(track, v_rel, p_rel, s_rel)
         except AttributeError:
-            LOGGER.error('Execute _calc_space_params() first.')
+            LOGGER.error('Execute _calc_land_params() first.')
             raise ValueError
 
         if check_plot:
@@ -331,7 +333,7 @@ def size(self):
         """ Get longitude from coord array """
         return len(self.data)
 
-    def _calc_space_params(self):
+    def _calc_land_params(self):
         """Compute tracks attributes dependent on their coordinates:
         on_land and dist_since_lf.
 

climada/hazard/test/test_tc_tracks.py

@@ -90,8 +90,6 @@ def test_interp_track_pass(self):
         self.assertTrue(np.isnan(tc_track.data[0].basin))
         self.assertEqual(tc_track.data[0].id_no, 1951239012334)
         self.assertEqual(tc_track.data[0].category, 1)
-        self.assertTrue(np.all(np.logical_not(tc_track.data[0].on_land.values)))
-        self.assertTrue(np.all(np.isnan(tc_track.data[0].dist_since_lf.values)))
 
     def test_random_no_landfall_pass(self):
         """ Test calc_random_walk with decay and no historical tracks with landfall """
@@ -158,7 +156,7 @@ def test_calc_decay_no_landfall_pass(self):
         """ Test _calc_land_decay with no historical tracks with landfall """
         tc_track = TCTracks()
         tc_track.read_ibtracs_csv(TEST_TRACK_SHORT)
-        tc_track._calc_space_params()
+        tc_track._calc_land_params()
         with self.assertLogs('climada.hazard.tc_tracks', level='INFO') as cm:
             tc_track._calc_land_decay()
         self.assertIn('No historical track with landfall.', cm.output[0])
@@ -167,7 +165,7 @@ def test_calc_land_decay_pass(self):
         """ Test _calc_land_decay with environmental pressure function."""
         tc_track = TCTracks()
         tc_track.read_ibtracs_csv(TC_ANDREW_FL)
-        tc_track._calc_space_params()
+        tc_track._calc_land_params()
         v_rel, p_rel = tc_track._calc_land_decay()
 
         for i, val in enumerate(v_rel.values()):
@@ -281,7 +279,7 @@ def test_apply_decay_no_landfall_pass(self):
         """ Test _apply_land_decay with no historical tracks with landfall """
         tc_track = TCTracks()
         tc_track.read_ibtracs_csv(TEST_TRACK_SHORT)
-        tc_track._calc_space_params()
+        tc_track._calc_land_params()
         tc_track.data[0]['orig_event_flag']=False
         tc_ref = tc_track.data[0].copy()
         tc_track._apply_land_decay(dict(), dict())
@@ -312,7 +310,7 @@ def test_apply_decay_pass(self):
         tc_track = TCTracks()
         tc_track.read_ibtracs_csv(TC_ANDREW_FL)
         tc_track.data[0]['orig_event_flag'] = False
-        tc_track._calc_space_params()
+        tc_track._calc_land_params()
         tc_track._apply_land_decay(v_rel, p_rel, s_rel=True, check_plot=False)
 
         p_ref = np.array([1.010000000000000, 1.009000000000000, 1.008000000000000,