adapted storm_europe.py to similar structure as trop_cyclones

Author: ValentinGebhart

climada/hazard/storm_europe.py

@@ -57,6 +57,12 @@
 N_PROB_EVENTS = 5 * 6
 """Number of events per historic event in probabilistic dataset"""
 
+DEF_INTENSITY_THRES = 14.7
+"""
+Default value for the threshold below which wind speeds (in m/s) are stored as 0.
+Same as used by WISC SSI calculations.
+"""
+
 
 class StormEurope(Hazard):
     """A hazard set containing european winter storm events. Historic storm
@@ -76,8 +82,8 @@ class StormEurope(Hazard):
         SSI as set by set_ssi; uses the Dawkins definition by default.
     """
 
-    intensity_thres = 14.7
-    """Intensity threshold for storage in m/s; same as used by WISC SSI calculations."""
+    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."""
@@ -134,7 +140,7 @@ def from_footprints(
         centroids=None,
         files_omit="fp_era20c_1990012515_701_0.nc",
         combine_threshold=None,
-        intensity_thres=None,
+        intensity_thres=DEF_INTENSITY_THRES,
     ):
         """Create new StormEurope object from WISC footprints.
 
@@ -166,18 +172,15 @@ def from_footprints(
             events are combined into one.
             Default is None, Advised for WISC is 2
         intensity_thres : float, optional
-            Intensity threshold for storage in m/s. Default: class attribute
-            StormEurope.intensity_thres (same as used by WISC SSI calculations)
+            Intensity threshold for storage in m/s. Default: 14.7
+            (same as used by WISC SSI calculations)
 
         Returns
         -------
         haz : StormEurope
             StormEurope object with data from WISC footprints.
         """
         # pylint: disable=protected-access
-        intensity_thres = (
-            cls.intensity_thres if intensity_thres is None else intensity_thres
-        )
         file_names = get_file_names(path)
 
         if ref_raster is not None and centroids is not None:
@@ -295,7 +298,7 @@ def from_cosmoe_file(
         event_date=None,
         model_name="COSMO-2E",
         description=None,
-        intensity_thres=None,
+        intensity_thres=DEF_INTENSITY_THRES,
     ):
         """Create a new StormEurope object with gust footprint from weather forecast.
 
@@ -326,17 +329,14 @@ def from_cosmoe_file(
             description of the events, defaults
             to a combination of model_name and run_datetime
         intensity_thres : float, optional
-            Intensity threshold for storage in m/s. Default: class attribute
-            StormEurope.intensity_thres (same as used by WISC SSI calculations)
+            Intensity threshold for storage in m/s. Default: 14.7
+            (same as used by WISC SSI calculations)
 
         Returns
         -------
         haz : StormEurope
             StormEurope object with data from COSMO ensemble file.
         """
-        intensity_thres = (
-            cls.intensity_thres if intensity_thres is None else intensity_thres
-        )
 
         # read intensity from file
         with xr.open_dataset(fp_file) as ncdf:
@@ -430,7 +430,7 @@ def from_icon_grib(
         description=None,
         grib_dir=None,
         delete_raw_data=True,
-        intensity_thres=None,
+        intensity_thres=DEF_INTENSITY_THRES,
     ):
         """Create new StormEurope object from DWD icon weather forecast footprints.
 
@@ -467,18 +467,15 @@ def from_icon_grib(
             .grib.bz2 file format should be stored on the computer or
             removed
         intensity_thres : float, optional
-            Intensity threshold for storage in m/s. Default: class attribute
-            StormEurope.intensity_thres (same as used by WISC SSI calculations)
+            Intensity threshold for storage in m/s. Default: 14.7
+            (same as used by WISC SSI calculations)
 
         Returns
         -------
         haz : StormEurope
             StormEurope object with data from DWD icon weather forecast footprints.
         """
         # pylint: disable=protected-access
-        intensity_thres = (
-            cls.intensity_thres if intensity_thres is None else intensity_thres
-        )
 
         if not (run_datetime.hour == 0 or run_datetime.hour == 12):
             LOGGER.warning(

doc/tutorial/climada_util_local_exceedance_values.ipynb

@@ -40,7 +40,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -86,7 +86,6 @@
     "    frequency_unit=\"1/year\",\n",
     "    units=\"m/s\",\n",
     ")\n",
-    "hazard.intensity_thres = 0\n",
     "\n",
     "# plot first event of Hazard object\n",
     "hazard.plot_intensity(event=1, smooth=False, figsize=(4, 4));"