removed class attributes from StormEurope and TropCyclone and removed TropCyclone.set_from_tracks

Author: ValentinGebhart

CHANGELOG.md

@@ -13,7 +13,8 @@ Code freeze date: YYYY-MM-DD
 Removed:
 
 - `pandas-datareader`
-- `intensity_thres` of a general `Hazard` object [#1065](https://github.com/CLIMADA-project/climada_python/pull/1065)
+- `intensity_thres` of `Hazard`, `StormEurope`, and `TropCyclones` object [#1065](https://github.com/CLIMADA-project/climada_python/pull/1065)
+- Deprecated method `climada.hazard.trop_cyclone.trop_cyclone.TropCyclone.set_from_tracks` [#1065](https://github.com/CLIMADA-project/climada_python/pull/1065)
 
 ### Added
 - Added optional parameter to `geo_im_from_array`, `plot_from_gdf`, `plot_rp_imp`, `plot_rp_intensity`,

climada/hazard/storm_europe.py

@@ -92,9 +92,6 @@ class StormEurope(Hazard):
         Threshold below which wind speeds (in m/s) are stored as 0. Defaults to 14.6.
     """
 
-    intensity_thres = DEF_INTENSITY_THRES
-    """Intensity threshold for storage in m/s."""
-
     vars_opt = Hazard.vars_opt.union({"ssi_wisc", "ssi", "ssi_full_area"})
     """Name of the variables that aren't need to compute the impact."""
 
@@ -726,8 +723,7 @@ def calc_ssi(
             ignoring the intensities at sea. Defaults to true, whereas
             the MATLAB version did not.
         threshold : float, optional
-            Intensity threshold used in index
-            definition. Cannot be lower than the read-in value.
+            Intensity threshold used in index definition.
         sel_cen : np.array, bool
             A boolean vector selecting centroids.
             Takes precendence over on_land.
@@ -741,12 +737,7 @@ def calc_ssi(
             intensity = self.intensity
 
         if threshold is not None:
-            assert (
-                threshold >= self.intensity_thres
-            ), "threshold cannot be below threshold upon read_footprint"
             intensity = intensity.multiply(intensity > threshold)
-        else:
-            intensity = intensity.multiply(intensity > self.intensity_thres)
 
         cent = self.centroids
         area_pixel = cent.get_area_pixel()

climada/hazard/trop_cyclone/trop_cyclone.py

@@ -95,9 +95,6 @@ class TropCyclone(Hazard):
         Threshold below which wind speeds (in m/s) are stored as 0. Defaults to 17.5.
     """
 
-    intensity_thres = DEF_INTENSITY_THRES
-    """intensity threshold for storage in m/s"""
-
     vars_opt = Hazard.vars_opt.union({"category"})
     """Name of the variables that are not needed to compute the impact."""
 
@@ -147,19 +144,6 @@ def __init__(
         self.basin = basin if basin is not None else []
         self.windfields = windfields if windfields is not None else []
 
-    def set_from_tracks(self, *args, **kwargs):
-        """This function is deprecated, use TropCyclone.from_tracks instead."""
-        LOGGER.warning(
-            "The use of TropCyclone.set_from_tracks is deprecated."
-            "Use TropCyclone.from_tracks instead."
-        )
-        if "intensity_thres" not in kwargs:
-            # some users modify the threshold attribute before calling `set_from_tracks`
-            kwargs["intensity_thres"] = self.intensity_thres
-        if self.pool is not None and "pool" not in kwargs:
-            kwargs["pool"] = self.pool
-        self.__dict__ = TropCyclone.from_tracks(*args, **kwargs).__dict__
-
     @classmethod
     def from_tracks(
         cls,
@@ -386,7 +370,6 @@ def from_tracks(
         LOGGER.debug("Concatenate events.")
         haz = cls.concat(tc_haz_list)
         haz.pool = pool
-        haz.intensity_thres = intensity_thres
         LOGGER.debug("Compute frequency.")
         haz.frequency_from_tracks(tracks.data)
         return haz
@@ -714,7 +697,6 @@ def from_single_track(
         )
 
         new_haz = cls(haz_type=HAZ_TYPE)
-        new_haz.intensity_thres = intensity_thres
         new_haz.intensity = intensity_sparse
         if store_windfields:
             new_haz.windfields = [windfields_sparse]