Merge branch 'develop' into feature/from_netcdf_fast

Author: NicolasColombi

climada/hazard/storm_europe.py

@@ -551,9 +551,15 @@ def from_icon_grib(
                 + run_datetime.strftime("%Y%m%d%H")
             )
 
+        # Starting with eccodes 2.28 the name of the data variable in `stacked` is
+        # [i10fg](https://codes.ecmwf.int/grib/param-db/228029).
+        # Before, it used to be the less precise
+        # [gust](https://codes.ecmwf.int/grib/param-db/260065)
+        [data_variable] = list(stacked)
+
         # Create Hazard
         haz = cls(
-            intensity=sparse.csr_matrix(stacked["gust"].T),
+            intensity=sparse.csr_matrix(stacked[data_variable].T),
             centroids=cls._centroids_from_nc(nc_centroids_file),
             event_id=event_id,
             date=date,
@@ -1069,7 +1075,7 @@ def generate_WS_forecast_hazard(
         if haz_model == "cosmo1e_file":
             haz_model = "C1E"
             full_model_name_temp = "COSMO-1E"
-        if haz_model == "cosmo2e_file":
+        else:  # if haz_model == "cosmo2e_file":
             haz_model = "C2E"
             full_model_name_temp = "COSMO-2E"
         haz_file_name = (

climada/util/calibrate/test/test_bayesian_optimizer.py

@@ -94,13 +94,9 @@ def test_optimizer_params(self):
         )
         result = contr.optimizer_params()
 
-        self.assertDictContainsSubset(
-            {
-                "init_points": 1,
-                "n_iter": 2,
-            },
-            result,
-        )
+        self.assertEqual(result.get("init_points"), 1)
+        self.assertEqual(result.get("n_iter"), 2)
+
         util_func = result["acquisition_function"]
         self.assertEqual(util_func.kappa, 3)
         self.assertEqual(util_func._kappa_decay, contr._calc_kappa_decay())