Merge branch 'develop' of https://github.com/CLIMADA-project/climada_python into develop

Author: emanuel-schmid

CHANGELOG.md

@@ -13,6 +13,7 @@ Code freeze date: YYYY-MM-DD
 ### Added
 
 ### Changed
+- Updated Impact Calculation Tutorial (`doc.climada_engine_Impact.ipynb`) [#1095](https://github.com/CLIMADA-project/climada_python/pull/1095).
 
 ### Fixed
 

climada/engine/unsequa/input_var.py

@@ -246,9 +246,8 @@ def haz(haz_list, n_ev=None, bounds_int=None, bounds_frac=None, bounds_freq=None
             The frequency of all events is multiplied by a number
             sampled uniformly from a distribution with (min, max) = bounds_freq
         HL: sample uniformly from hazard list
-            From the provided list of hazard is elements are uniformly
-            sampled. For example, Hazards outputs from dynamical models
-            for different input factors.
+            For each sample, one element is drawn uniformly from the provided list of hazards.
+            For example, Hazards outputs from dynamical models for different input factors.
 
         If a bounds is None, this parameter is assumed to have no uncertainty.
 
@@ -310,8 +309,8 @@ def exp(exp_list, bounds_totval=None, bounds_noise=None):
             with (min, max) = bounds_noise. EN is the value of the seed
             for  the uniform random number generator.
         EL: sample uniformly from exposure list
-            From the provided list of exposure is elements are uniformly
-            sampled. For example, LitPop instances with different exponents.
+            For each sample, one element is drawn uniformly from the provided list of exposures.
+            For example, LitPop instances with different exponents.
 
         If a bounds is None, this parameter is assumed to have no uncertainty.
 
@@ -376,9 +375,8 @@ def impfset(
             sampled uniformly from a distribution with
             (min, max) = bounds_int
         IL: sample uniformly from impact function set list
-            From the provided list of impact function sets elements are uniformly
-            sampled. For example, impact functions obtained from different
-            calibration methods.
+            For each sample, one element is drawn uniformly from the provided list of impact function sets.
+            For example, impact functions obtained from different calibration methods.
 
 
         If a bounds is None, this parameter is assumed to have no uncertainty.
@@ -468,8 +466,8 @@ def ent(
             with (min, max) = bounds_noise. EN is the value of the seed
             for  the uniform random number generator.
         EL: sample uniformly from exposure list
-            From the provided list of exposure is elements are uniformly
-            sampled. For example, LitPop instances with different exponents.
+            For each sample, one element is drawn uniformly from the provided list of exposures.
+            For example, LitPop instances with different exponents.
         MDD: scale the mdd (homogeneously)
             The value of mdd at each intensity is multiplied by a number
             sampled uniformly from a distribution with
@@ -483,9 +481,8 @@ def ent(
             sampled uniformly from a distribution with
             (min, max) = bounds_int
         IL: sample uniformly from impact function set list
-            From the provided list of impact function sets elements are uniformly
-            sampled. For example, impact functions obtained from different
-            calibration methods.
+            For each sample, one element is drawn uniformly from the provided list of impact function sets.
+            For example, impact functions obtained from different calibration methods.
 
         If a bounds is None, this parameter is assumed to have no uncertainty.
 
@@ -566,7 +563,7 @@ def ent(
                 bounds_noise=bounds_noise,
                 exp_list=exp_list,
                 meas_set=meas_set,
-                **kwargs
+                **kwargs,
             ),
             _ent_unc_dict(
                 bounds_totval=bounds_totval,
@@ -616,8 +613,8 @@ def entfut(
             with (min, max) = bounds_noise. EN is the value of the seed
             for  the uniform random number generator.
         EL: sample uniformly from exposure list
-            From the provided list of exposure is elements are uniformly
-            sampled. For example, LitPop instances with different exponents.
+            For each sample, one element is drawn uniformly from the provided list of exposures.
+            For example, LitPop instances with different exponents.
         MDD: scale the mdd (homogeneously)
             The value of mdd at each intensity is multiplied by a number
             sampled uniformly from a distribution with
@@ -631,9 +628,8 @@ def entfut(
             sampled uniformly from a distribution with
             (min, max) = bounds_impfi
         IL: sample uniformly from impact function set list
-            From the provided list of impact function sets elements are uniformly
-            sampled. For example, impact functions obtained from different
-            calibration methods.
+            For each sample, one element is drawn uniformly from the provided list of impact function sets.
+            For example, impact functions obtained from different calibration methods.
 
         If a bounds is None, this parameter is assumed to have no uncertainty.
 
@@ -706,7 +702,7 @@ def entfut(
                 impf_set_list=impf_set_list,
                 exp_list=exp_list,
                 meas_set=meas_set,
-                **kwargs
+                **kwargs,
             ),
             _entfut_unc_dict(
                 bounds_eg=bounds_eg,

doc/development/Guide_Euler.ipynb

@@ -106,15 +106,23 @@
     "\n",
     "```bash\n",
     "pip install \\\n",
-    "  dask[dataframe] \\\n",
-    "  fiona==1.9 \\\n",
-    "  gdal==3.6 \\\n",
-    "  netcdf4==1.6.2 \\\n",
-    "  rasterio==1.4 \\\n",
-    "  pyproj==3.7 \\\n",
-    "  geopandas==1.0 \\\n",
-    "  xarray==2024.9 \\\n",
-    "  sparse==0.15\n",
+    "  --no-binary fiona \\\n",
+    "  --no-binary rasterio \\\n",
+    "  pyproj==3.7.1 \\\n",
+    "  fiona \\\n",
+    "  rasterio\n",
+    "\n",
+    "pip install \\\n",
+    "  'numpy<2' \\\n",
+    "  netcdf4 \\\n",
+    "  gdal==3.6.3 \\\n",
+    "  geopandas \\\n",
+    "  xarray \\\n",
+    "  cartopy \\\n",
+    "  sparse \\\n",
+    "  salib \\\n",
+    "  pyarrow \\\n",
+    "  xlrd\n",
     "```"
    ]
   },