Merge branch 'develop' into feature/density_tracks

Author: NicolasColombi

.zenodo.json

@@ -0,0 +1,120 @@
+{
+    "creators": [
+      {
+        "name": "Gabriela Aznar Siguan",
+        "affiliation": "MeteoSwiss"
+      },
+      {
+        "name": "David N. Bresch",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Samuel Eberenz",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Jan Hartman",
+        "affiliation": "CelsiusPro"
+      },
+      {
+        "name": "Marine Perus",
+        "affiliation": "CelsiusPro"
+      },
+      {
+        "name": "Thomas R\u00f6\u00f6sli"
+      },
+      {
+        "name": "Dario Stocker"
+      },
+      {
+        "name": "Veronica Bozzini"
+      },
+      {
+        "name": "Carmen B. Steinmann"
+      },
+      {
+        "name": "Evelyn M\u00fchlhofer",
+        "affiliation": "MeteoSwiss"
+      },
+      {
+        "name": "Rachel Bungerer"
+      },
+      {
+        "name": "Inga J. Sauer"
+      },
+      {
+        "name": "Samuel L\u00fcthi",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Pui Man (Mannie) Kam",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Simona Meiler",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Alessio Ciullo",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Thomas Vogt",
+        "affiliation": "Potsdam Institute for Climate Impact Research"
+      },
+      {
+        "name": "Benoit P. Guillod",
+        "affiliation": "CLIMADA Technologies"
+      },
+      {
+        "name": "Chahan M. Kropf",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Emanuel Schmid",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Chris Fairless",
+        "affiliation": "CelsiusPro"
+      },
+      {
+        "name": "Jan W\u00fcthrich"
+      },
+      {
+        "name": "Z\u00e9lie Stalhandske",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Yue Yu"
+      },
+      {
+        "name": "Lukas Riedel",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Raphael Portmann",
+        "affiliation": "Agroscope"
+      },
+      {
+        "name": "Nicolas Colombi",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Leonie Villiger"
+      },
+      {
+        "name": "Timo Schmid"
+      },
+      {
+        "name": "Luca Severino"
+      },
+      {
+        "name": "Samuel Juhel",
+        "affiliation": "ETH Z\u00fcrich"
+      },
+      {
+        "name": "Valentin Gebhart"
+      }
+    ]
+  }

AUTHORS.md

@@ -23,7 +23,7 @@
 * Emanuel Schmid
 * Chris Fairless
 * Jan Wüthrich
-* Zélie Standhanske
+* Zélie Stalhandske
 * Yue Yu
 * Lukas Riedel
 * Raphael Portmann

CHANGELOG.md

@@ -12,8 +12,58 @@ Code freeze date: YYYY-MM-DD
 
 ### Added
 
--`climada.hazard.tc_tracks.compute_track_density` function, `climada.util.coordinates.compute_grid_cell_area`
-function, `climada.hazard.plot.plot_track_density` function  [#1003](https://github.com/CLIMADA-project/climada_python/pull/1003)
+### Changed
+
+### Fixed
+
+### Deprecated
+
+### Removed
+
+## 6.0.0
+
+Release date: 2025-03-03
+
+### Dependency Changes
+
+Added:
+
+- `osm-flex` >=1.1
+
+Updated:
+
+- `cartopy` >=0.23 → >=0.24
+- `cfgrib` >=0.9.9,<0.9.10 &rarr; >=0.9
+- `dask` >=2024.2,<2024.3 &rarr; >=2025.2
+- `eccodes` >=2.27,<2.28 &rarr; >=2.40
+- `gdal` >=3.6 &rarr; >=3.10
+- `geopandas` >=0.14 &rarr; >=0.14,<1.0
+- `h5py` >=3.8 &rarr; >=3.12
+- `haversine` >=2.8 &rarr; >=2.9
+- `matplotlib-base` >=3.9 &rarr; >=3.10
+- `netcdf4` >=1.6 &rarr; >=1.7
+- `numba` >=0.60 &rarr; >=0.61
+- `pillow` =9.4 &rarr; =11.1
+- `pyproj` >=3.5 &rarr; >=3.7
+- `pytables` >=3.7 &rarr; >=3.10
+- `python` =3.9 &rarr; =3.11
+- `rasterio` >=1.3 &rarr; >=1.4
+- `scikit-learn` >=1.5 &rarr; >=1.6
+- `scipy` >=1.13 &rarr; >=1.14,<1.15
+- `tqdm` >=4.66 &rarr; >=4.67
+- `xarray` >=2024.6 &rarr; >=2025.1
+- `xlsxwriter` >=3.1 &rarr; >=3.2
+
+Removed:
+
+- `pyepsg`
+
+### Added
+
+-`climada.hazard.tc_tracks.compute_track_density` function, `climada.hazard.tc_tracks.compute_genesis_density` function,
+ `climada.util.coordinates.compute_grid_cell_area` function, `climada.util.coordinates.compute_grid_cell_area_validation` function,
+ `climada.hazard.tc_tracks.normalize_hist` function, `climada.hazard.plot.plot_track_density` function
+ [#1003](https://github.com/CLIMADA-project/climada_python/pull/1003)
 -`climada.hazard.tc_tracks.TCTracks.from_FAST` function, add Australia basin (AU) [#993](https://github.com/CLIMADA-project/climada_python/pull/993)
 - Add `osm-flex` package to CLIMADA core [#981](https://github.com/CLIMADA-project/climada_python/pull/981)
 - `doc.tutorial.climada_entity_Exposures_osm.ipynb` tutorial explaining how to use `osm-flex`with CLIMADA
@@ -42,14 +92,16 @@ function, `climada.hazard.plot.plot_track_density` function  [#1003](https://git
 - In `climada.util.plot.geo_im_from_array`, NaNs are plotted in gray while cells with no centroid are not plotted [#929](https://github.com/CLIMADA-project/climada_python/pull/929)
 - Renamed `climada.util.plot.subplots_from_gdf` to `climada.util.plot.plot_from_gdf` [#929](https://github.com/CLIMADA-project/climada_python/pull/929)
 - `Hazard.local_exceedance_inten`, `Hazard.local_return_period`, and `Impact.local_exceedance_imp` call the corresponding new functions and a deprecation warning is added [#918](https://github.com/CLIMADA-project/climada_python/pull/918). Some inconsistencies in the previous versions are removed and the default method is changed. To reconstruct results from the previous versions, use CLIMADA v5.0.0 or less.
+- elements of `event_name` are now explicitly converted to `str` in `from_raster`, `from_xarray_raster`, `from_excel` and `from_csv`. [#951](https://github.com/CLIMADA-project/climada_python/pull/951), [#910](https://github.com/CLIMADA-project/climada_python/issues/910)
+- `event_id` and `event_name` are now explicitly converted to respectively a `np.ndarray` (`event_id`), a `list` (`event_name`) in readers. [#951](https://github.com/CLIMADA-project/climada_python/pull/951), [#950](https://github.com/CLIMADA-project/climada_python/issues/950)
 - Exposures complete overhaul. Notably
-  - the _geometry_ column of the inherent `GeoDataFrame` is set up at initialization
-  - latitude and longitude column are no longer present there (the according arrays can be retrieved as properties of the Exposures object: `exp.latitude` instead of `exp.gdf.latitude.values`).
-  - `Exposures.gdf` has been renamed to `Exposures.data` (it still works though, as it is a property now pointing to the latter)
-  - the `check` method does not add a default "IMPF_" column to the GeoDataFrame anymore
+- the _geometry_ column of the inherent `GeoDataFrame` is set up at initialization
+- latitude and longitude column are no longer present there (the according arrays can be retrieved as properties of the Exposures object: `exp.latitude` instead of `exp.gdf.latitude.values`).
+- `Exposures.gdf` has been renamed to `Exposures.data` (it still works though, as it is a property now pointing to the latter)
+- the `check` method does not add a default "IMPF_" column to the GeoDataFrame anymore
 - Updated IBTrACS version from v4.0 to v4.1 ([#976](https://github.com/CLIMADA-project/climada_python/pull/976)
-    - Fix xarray future warning in TCTracks for .dims to .sizes
-    - Fix hazard.concatenate type test for pathos pools
+- Fix xarray future warning in TCTracks for .dims to .sizes
+- Fix hazard.concatenate type test for pathos pools
 
 ### Fixed
 
@@ -68,8 +120,6 @@ function, `climada.hazard.plot.plot_track_density` function  [#1003](https://git
 - `climada.engine.impact.Impact.local_exceedance_imp` method
 - `climada.engine.impact.Impact.plot_rp_imp` method
 
-### Removed
-
 ## 5.0.0
 
 Release date: 2024-07-19

climada/_version.py

@@ -1 +1 @@
-__version__ = "5.0.1-dev"
+__version__ = "6.0.1-dev"

climada/engine/impact.py

@@ -41,6 +41,7 @@
 import pandas as pd
 import xlsxwriter
 from deprecation import deprecated
+from pandas.api.types import is_string_dtype
 from pyproj import CRS as pyprojCRS
 from rasterio.crs import CRS as rasterioCRS  # pylint: disable=no-name-in-module
 from scipy import sparse
@@ -50,7 +51,6 @@
 import climada.util.dates_times as u_dt
 import climada.util.interpolation as u_interp
 import climada.util.plot as u_plot
-from climada import CONFIG
 from climada.entity import Exposures
 from climada.util.constants import CMAP_IMPACT, DEF_CRS, DEF_FREQ_UNIT
 from climada.util.select import get_attributes_with_matching_dimension
@@ -107,8 +107,8 @@ def __init__(
         crs=DEF_CRS,
         eai_exp=None,
         at_event=None,
-        tot_value=0.,
-        aai_agg=0.,
+        tot_value=0.0,
+        aai_agg=0.0,
         unit="",
         imp_mat=None,
         haz_type="",
@@ -216,8 +216,8 @@ def calc(
             "The use of Impact().calc() is deprecated."
             " Use ImpactCalc().impact() instead."
         )
-        from climada.engine.impact_calc import (
-            ImpactCalc,  # pylint: disable=import-outside-toplevel
+        from climada.engine.impact_calc import (  # pylint: disable=import-outside-toplevel
+            ImpactCalc,
         )
 
         impcalc = ImpactCalc(exposures, impact_funcs, hazard)
@@ -1191,6 +1191,8 @@ def write_csv(self, file_name):
         file_name : str
             absolute path of the file
         """
+        if not all((isinstance(val, str) for val in self.event_name)):
+            raise TypeError("'event_name' must be a list of strings")
         LOGGER.info("Writing %s", file_name)
         with open(file_name, "w", encoding="utf-8") as imp_file:
             imp_wr = csv.writer(imp_file)
@@ -1239,6 +1241,8 @@ def write_excel(self, file_name):
         file_name : str
             absolute path of the file
         """
+        if not all((isinstance(val, str) for val in self.event_name)):
+            raise TypeError("'event_name' must be a list of strings")
         LOGGER.info("Writing %s", file_name)
 
         def write_col(i_col, imp_ws, xls_data):
@@ -1453,7 +1457,13 @@ def from_csv(cls, file_name):
         imp.aai_agg = imp_df["aai_agg"][0]
         imp.event_id = imp_df["event_id"][~np.isnan(imp_df["event_id"])].values
         num_ev = imp.event_id.size
-        imp.event_name = imp_df["event_name"][:num_ev].values.tolist()
+        event_names = imp_df["event_name"][:num_ev]
+        if not is_string_dtype(event_names):
+            warnings.warn(
+                "Some event names are not str will be converted to str.", UserWarning
+            )
+            event_names = event_names.astype(str)
+        imp.event_name = event_names.values.tolist()
         imp.date = imp_df["event_date"][:num_ev].values
         imp.at_event = imp_df["at_event"][:num_ev].values
         imp.frequency = imp_df["event_frequency"][:num_ev].values
@@ -1475,7 +1485,7 @@ def from_csv(cls, file_name):
     def read_csv(self, *args, **kwargs):
         """This function is deprecated, use Impact.from_csv instead."""
         LOGGER.warning(
-            "The use of Impact.read_csv is deprecated." "Use Impact.from_csv instead."
+            "The use of Impact.read_csv is deprecated. Use Impact.from_csv instead."
         )
         self.__dict__ = Impact.from_csv(*args, **kwargs).__dict__
 
@@ -1494,28 +1504,32 @@ def from_excel(cls, file_name):
             Impact from excel file
         """
         LOGGER.info("Reading %s", file_name)
-        dfr = pd.read_excel(file_name)
-        imp = cls(haz_type=str(dfr["haz_type"][0]))
-
-        imp.unit = dfr["unit"][0]
-        imp.tot_value = dfr["tot_value"][0]
-        imp.aai_agg = dfr["aai_agg"][0]
+        imp_df = pd.read_excel(file_name)
+        imp = cls(haz_type=str(imp_df["haz_type"][0]))
 
-        imp.event_id = dfr["event_id"][~np.isnan(dfr["event_id"].values)].values
-        imp.event_name = dfr["event_name"][: imp.event_id.size].values
-        imp.date = dfr["event_date"][: imp.event_id.size].values
-        imp.frequency = dfr["event_frequency"][: imp.event_id.size].values
+        imp.unit = imp_df["unit"][0]
+        imp.tot_value = imp_df["tot_value"][0]
+        imp.aai_agg = imp_df["aai_agg"][0]
+        imp.event_id = imp_df["event_id"][~np.isnan(imp_df["event_id"].values)].values
+        event_names = imp_df["event_name"][~np.isnan(imp_df["event_id"].values)]
+        if not is_string_dtype(event_names):
+            warnings.warn(
+                "Some event names are not str will be converted to str", UserWarning
+            )
+            event_names = event_names.astype(str)
+        imp.event_name = event_names.values
+        imp.date = imp_df["event_date"][: imp.event_id.size].values
+        imp.frequency = imp_df["event_frequency"][: imp.event_id.size].values
         imp.frequency_unit = (
-            dfr["frequency_unit"][0] if "frequency_unit" in dfr else DEF_FREQ_UNIT
+            imp_df["frequency_unit"][0] if "frequency_unit" in imp_df else DEF_FREQ_UNIT
         )
-        imp.at_event = dfr["at_event"][: imp.event_id.size].values
-
-        imp.eai_exp = dfr["eai_exp"][~np.isnan(dfr["eai_exp"].values)].values
+        imp.at_event = imp_df["at_event"][: imp.event_id.size].values
+        imp.eai_exp = imp_df["eai_exp"][~np.isnan(imp_df["eai_exp"].values)].values
         imp.coord_exp = np.zeros((imp.eai_exp.size, 2))
-        imp.coord_exp[:, 0] = dfr["exp_lat"].values[: imp.eai_exp.size]
-        imp.coord_exp[:, 1] = dfr["exp_lon"].values[: imp.eai_exp.size]
+        imp.coord_exp[:, 0] = imp_df["exp_lat"].values[: imp.eai_exp.size]
+        imp.coord_exp[:, 1] = imp_df["exp_lon"].values[: imp.eai_exp.size]
         try:
-            imp.crs = u_coord.to_csr_user_input(dfr["exp_crs"].values[0])
+            imp.crs = u_coord.to_csr_user_input(imp_df["exp_crs"].values[0])
         except AttributeError:
             imp.crs = DEF_CRS
 
@@ -1679,8 +1693,8 @@ def video_direct_impact(
         -------
         list of Impact
         """
-        from climada.engine.impact_calc import (
-            ImpactCalc,  # pylint: disable=import-outside-toplevel
+        from climada.engine.impact_calc import (  # pylint: disable=import-outside-toplevel
+            ImpactCalc,
         )
 
         if args_exp is None:

climada/engine/test/test_impact.py

@@ -106,7 +106,7 @@ def test_from_eih_pass(self):
         self.assertEqual(imp.frequency_unit, HAZ.frequency_unit)
         self.assertEqual(imp.tot_value, tot_value)
         np.testing.assert_array_almost_equal(imp.event_id, HAZ.event_id)
-        np.testing.assert_array_almost_equal(imp.event_name, HAZ.event_name)
+        np.testing.assert_array_equal(imp.event_name, HAZ.event_name)
         np.testing.assert_array_almost_equal(imp.date, HAZ.date)
         np.testing.assert_array_almost_equal(imp.frequency, HAZ.frequency)
         np.testing.assert_array_almost_equal(imp.eai_exp, fake_eai_exp)

climada/engine/test/test_impact_calc.py

@@ -297,7 +297,7 @@ def test_empty_impact(self):
 
     def test_single_event_impact(self):
         """Check impact for single event"""
-        haz = HAZ.select([1])
+        haz = HAZ.select(event_id=[1])
         icalc = ImpactCalc(ENT.exposures, ENT.impact_funcs, haz)
         impact = icalc.impact()
         aai_agg = 0.0