Merge remote-tracking branch 'origin/develop' into feature/static-risk-traj

Author: spjuhel

climada/engine/unsequa/test/test_unsequa.py

@@ -41,22 +41,18 @@
 from climada.entity import Exposures, ImpactFunc, ImpactFuncSet
 from climada.entity.entity_def import Entity
 from climada.hazard import Hazard
-from climada.util.api_client import Client
+from climada.test import get_test_file
 from climada.util.constants import (
     ENT_DEMO_FUTURE,
     ENT_DEMO_TODAY,
-    EXP_DEMO_H5,
     HAZ_DEMO_H5,
     TEST_UNC_OUTPUT_COSTBEN,
     TEST_UNC_OUTPUT_IMPACT,
 )
 
-test_unc_output_impact = Client().get_dataset_file(
-    name=TEST_UNC_OUTPUT_IMPACT, status="test_dataset"
-)
-test_unc_output_costben = Client().get_dataset_file(
-    name=TEST_UNC_OUTPUT_COSTBEN, status="test_dataset"
-)
+EXP_DEMO_H5 = get_test_file("exp_demo_today", file_format="hdf5")
+test_unc_output_impact = get_test_file(TEST_UNC_OUTPUT_IMPACT)
+test_unc_output_costben = get_test_file(TEST_UNC_OUTPUT_COSTBEN)
 
 
 def impf_dem(x_paa=1, x_mdd=1):
@@ -578,7 +574,7 @@ def test_calc_sensitivity_all_pass(self):
                 "sensitivity_kwargs": {"S": 10, "seed": 12345},
                 "test_param_name": ["x_exp", 0],
                 "test_si_name": ["CV", 16],
-                "test_si_value": [0.25000, 2],
+                "test_si_value": [0.250000, 2],
             },
             "hdmr": {
                 "sampling_method": "saltelli",
@@ -587,7 +583,7 @@ def test_calc_sensitivity_all_pass(self):
                 "sensitivity_kwargs": {},
                 "test_param_name": ["x_exp", 2],
                 "test_si_name": ["Sa", 4],
-                "test_si_value": [0.004658, 3],
+                "test_si_value": [0.004649, 3],
             },
             "ff": {
                 "sampling_method": "ff",
@@ -618,7 +614,7 @@ def test_calc_sensitivity_all_pass(self):
                 },
                 "test_param_name": ["x_exp", 0],
                 "test_si_name": ["dgsm", 8],
-                "test_si_value": [1.697516e-01, 9],
+                "test_si_value": [0.1697516, 9],
             },
             "fast": {
                 "sampling_method": "fast_sampler",
@@ -627,7 +623,7 @@ def test_calc_sensitivity_all_pass(self):
                 "sensitivity_kwargs": {"M": 4, "seed": 12345},
                 "test_param_name": ["x_exp", 0],
                 "test_si_name": ["S1_conf", 8],
-                "test_si_value": [0.671396, 1],
+                "test_si_value": [0.671546, 1],
             },
             "rbd_fast": {
                 "sampling_method": "saltelli",
@@ -636,7 +632,7 @@ def test_calc_sensitivity_all_pass(self):
                 "sensitivity_kwargs": {"M": 4, "seed": 12345},
                 "test_param_name": ["x_exp", 0],
                 "test_si_name": ["S1_conf", 4],
-                "test_si_value": [0.152609, 4],
+                "test_si_value": [0.129919, 4],
             },
             "morris": {
                 "sampling_method": "morris",
@@ -645,7 +641,7 @@ def test_calc_sensitivity_all_pass(self):
                 "sensitivity_kwargs": {},
                 "test_param_name": ["x_exp", 0],
                 "test_si_name": ["mu", 1],
-                "test_si_value": [5066460029.63911, 8],
+                "test_si_value": [7935400297.813827, 8],
             },
         }
 
@@ -700,7 +696,7 @@ def test_sensitivity_method(
                 haz_unc,
                 sensitivity_method,
                 method_params,
-                places=2 if sensitivity_method == "rbd_fast" else 5,
+                places=5,
             )
 
 

climada/entity/exposures/test/test_base.py

@@ -440,10 +440,6 @@ def test_handling_unit_conflicts_pass(self):
         self.assertEqual(exp_df.value_unit, "XSD")
         with self.assertRaises(ValueError) as cm:
             exp_df = Exposures(df, meta={"value_unit": "XSD"}, value_unit="PAK")
-        with self.assertRaises(ValueError) as cm:
-            exp_df = Exposures(df, meta={"value_unit": "PAK"}, value_unit="XSD")
-        with self.assertRaises(ValueError) as cm:
-            exp_df = Exposures(df, meta={"value_unit": "PAK"}, value_unit="PAK")
 
     def test_io_hdf5_pass(self):
         """write and read hdf5"""

climada/entity/measures/test/test_base.py

@@ -36,10 +36,12 @@
 from climada.entity.measures.measure_set import MeasureSet
 from climada.hazard.base import Hazard
 from climada.test import get_test_file
-from climada.util.constants import EXP_DEMO_H5, HAZ_DEMO_H5
+from climada.util.constants import HAZ_DEMO_H5
 
 DATA_DIR = CONFIG.measures.test_data.dir()
 
+EXP_DEMO_H5 = get_test_file("exp_demo_today", file_format="hdf5")
+
 HAZ_TEST_TC: Path = get_test_file("test_tc_florida", file_format="hdf5")
 """
 Hazard test file from Data API: Hurricanes from 1851 to 2011 over Florida with 100 centroids.

climada/hazard/tc_tracks_synth.py

@@ -1049,7 +1049,7 @@ def _apply_decay_coeffs(track, v_rel, p_rel, land_geom, s_rel):
                 # if there is no further landfall, correct until the end of
                 # the track
                 end_cor = track["time"].size
-            rndn = 0.1 * float(np.abs(np.random.normal(size=1) * 5) + 6)
+            rndn = 0.1 * float(np.abs(np.random.default_rng().normal() * 5) + 6)
             r_diff = (
                 track["central_pressure"][land_sea].values
                 - track["central_pressure"][land_sea - 1].values

climada/test/test_api_client.py

@@ -177,14 +177,14 @@ def test_get_exposures(self):
                 "fin_mode": "pop",
                 "exponents": "(0,1)",
             },
-            version="v1",
+            version="v3",
             dump_dir=DATA_DIR,
         )
         self.assertEqual(len(exposures.gdf), 5782)
         self.assertEqual(np.unique(exposures.region_id), 40)
         self.assertEqual(
             exposures.description,
-            "LitPop Exposure for ['AUT'] at 150 as, year: 2018, financial mode: pop, exp: [0, 1], admin1_calc: False",
+            "LitPop Exposure for ['AUT'] at 150 as, year: 2018, financial mode: pop, exp: (0, 1), admin1_calc: False",
         )
 
     def test_get_exposures_fails(self):
@@ -264,12 +264,12 @@ def test_get_hazard_fails(self):
 
     def test_get_litpop(self):
         client = Client()
-        litpop = client.get_litpop(country="LUX", version="v1", dump_dir=DATA_DIR)
+        litpop = client.get_litpop(country="LUX", version="v3", dump_dir=DATA_DIR)
         self.assertEqual(len(litpop.gdf), 188)
         self.assertEqual(np.unique(litpop.region_id), 442)
         self.assertEqual(
             litpop.description,
-            "LitPop Exposure for ['LUX'] at 150 as, year: 2018, financial mode: pc, exp: [1, 1], admin1_calc: False",
+            "LitPop Exposure for ['LUX'] at 150 as, year: 2018, financial mode: pc, exp: (1, 1), admin1_calc: False",
         )
 
     def test_get_litpop_fail(self):

climada/test/test_engine.py

@@ -34,14 +34,15 @@
 from climada.entity import Exposures, ImpactFunc, ImpactFuncSet
 from climada.entity.entity_def import Entity
 from climada.hazard import Hazard
+from climada.test import get_test_file
 from climada.util.constants import (
     ENT_DEMO_FUTURE,
     ENT_DEMO_TODAY,
-    EXP_DEMO_H5,
     HAZ_DEMO_H5,
 )
 
 DATA_DIR = CONFIG.engine.test_data.dir()
+EXP_DEMO_H5 = get_test_file("exp_demo_today", file_format="hdf5")
 EMDAT_TEST_CSV = DATA_DIR.joinpath("emdat_testdata_BGD_USA_1970-2017.csv")
 
 

climada/util/hdf5_handler.py

@@ -89,7 +89,7 @@ def get_string(array):
     -------
     string
     """
-    return "".join(chr(int(c)) for c in array)
+    return "".join(chr(c.item()) for c in array)
 
 
 def get_str_from_ref(file_name, var):

doc/user-guide/index.rst

@@ -3,12 +3,12 @@ User guide
 ====================
 
 This user guide contains all the detailed tutorials about the different parts of CLIMADA.
-If you are a new user, we advise you to have a look at the `10 minutes CLIMADA <0_10min_climada>`_
-which introduces the basics briefly, or the full `Overview <1_main_climada>`_ which goes more in depth.
+If you are a new user, we advise you to have a look at the `10 minutes CLIMADA <0_10min_climada.html>`_
+which introduces the basics briefly, or the full `Overview <1_main_climada.html>`_ which goes more in depth.
 
-You can then go on to more specific tutorial about `Hazard <hazard>`_,
-`Exposures <exposures>`_ or `Impact <impact>`_ or advanced usage such as
-`Uncertainty Quantification <unsequa>`_
+You can then go on to more specific tutorial about `Hazard <hazard.html>`_,
+`Exposures <exposures.html>`_ or `Impact <impact.html>`_ or advanced usage such as
+`Uncertainty Quantification <unsequa.html>`_
 
 .. toctree::
    :maxdepth: 2

requirements/env_climada.yml

@@ -35,7 +35,7 @@ dependencies:
   - rasterio>=1.4
   - requests>=2.32
   - rtree>=1.4
-  - salib>=1.5,<1.5.2  # see https://github.com/CLIMADA-project/climada_python/issues/1081
+  - salib>=1.5.2  # see https://github.com/CLIMADA-project/climada_python/issues/1081
   - scikit-learn>=1.7
   - scipy>=1.15
   - seaborn>=0.13