Merge branch 'develop' into remove-pandas-datareader

Author: emanuel-schmid

.github/CODEOWNERS

@@ -0,0 +1,7 @@
+# This is a comment.
+# Each line is a file pattern followed by one or more owners.
+
+# These owners will be the default owners for everything in
+# the repo. Unless a later match takes precedence, they will
+# be requested for review when someone opens a pull request.
+*       @emanuel-schmid @chahank @peanutfun

.github/workflows/pull-request.yml

@@ -16,7 +16,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
       -
         name: Checkout target commit
-        run: git -c protocol.version=2 fetch --no-tags --prune --no-recurse-submodules --depth=1 origin ${{ github.event.pull_request.base.ref }}
+        run: git -c protocol.version=2 fetch --no-tags --prune --no-recurse-submodules --depth=50 origin ${{ github.event.pull_request.base.ref }}
       -
         name: Set up Python 3.11
         uses: actions/setup-python@v5

CHANGELOG.md

@@ -22,6 +22,7 @@ Removed:
 - World Bank indicator data is now downloaded directly from their API via the function `download_world_bank_indicator`, instead of relying on the `pandas-datareader` package [#1033](https://github.com/CLIMADA-project/climada_python/pull/1033)
 
 ### Fixed
+- NaN plotting issues in `geo_im_from_array`[#1038](https://github.com/CLIMADA-project/climada_python/pull/1038)
 
 ### Deprecated
 
@@ -195,6 +196,7 @@ CLIMADA tutorials. [#872](https://github.com/CLIMADA-project/climada_python/pull
 - `Impact.from_hdf5` now calls `str` on `event_name` data that is not strings, and issue a warning then [#894](https://github.com/CLIMADA-project/climada_python/pull/894)
 - `Impact.write_hdf5` now throws an error if `event_name` is does not contain strings exclusively [#894](https://github.com/CLIMADA-project/climada_python/pull/894)
 - Split `climada.hazard.trop_cyclone` module into smaller submodules without affecting module usage [#911](https://github.com/CLIMADA-project/climada_python/pull/911)
+- `yearly_steps` parameter of `TropCyclone.apply_climate_scenario_knu` has been made explicit [#991](https://github.com/CLIMADA-project/climada_python/pull/991)
 
 ### Fixed
 

climada/hazard/trop_cyclone/trop_cyclone.py

@@ -391,7 +391,7 @@ def apply_climate_scenario_knu(
         percentile: str = "50",
         scenario: str = "4.5",
         target_year: int = 2050,
-        **kwargs,
+        yearly_steps: int = 5,
     ):
         """
         From current TC hazard instance, return new hazard set with future events
@@ -437,6 +437,9 @@ def apply_climate_scenario_knu(
 
         target_year : int
             future year to be simulated, between 2000 and 2100. Default: 2050.
+        yearly_steps : int
+            yearly resolution at which projections are provided. Default is 5 years.
+
         Returns
         -------
         haz_cc : climada.hazard.TropCyclone
@@ -465,11 +468,11 @@ def apply_climate_scenario_knu(
         for basin in np.unique(tc_cc.basin):
             scale_year_rcp_05, scale_year_rcp_45 = [
                 get_knutson_scaling_factor(
-                    percentile=percentile,
                     variable=variable,
+                    percentile=percentile,
                     basin=basin,
                     baseline=(np.min(years), np.max(years)),
-                    **kwargs,
+                    yearly_steps=yearly_steps,
                 ).loc[target_year, scenario]
                 for variable in ["cat05", "cat45"]
             ]

climada/util/plot.py

@@ -37,6 +37,7 @@
 import cartopy.crs as ccrs
 import geopandas as gpd
 import matplotlib as mpl
+import matplotlib.patches as mpatches
 import matplotlib.pyplot as plt
 import numpy as np
 import requests
@@ -374,6 +375,11 @@ def geo_im_from_array(
     -------
     cartopy.mpl.geoaxes.GeoAxesSubplot
 
+    Notes
+    -----
+    Data points with NaN or inf are plotted in gray. White regions correspond to
+    regions outside the convex hull of the given coordinates.
+
     Raises
     ------
     ValueError
@@ -420,8 +426,7 @@ def geo_im_from_array(
 
     # prepare colormap
     cmap = plt.get_cmap(kwargs.pop("cmap", CMAP_RASTER))
-    cmap.set_bad("gainsboro")  # For NaNs and infs
-    cmap.set_under("white", alpha=0)  # For values below vmin
+    cmap.set_under("white")  # For values below vmin
 
     # Generate each subplot
     for array_im, axis, tit, name in zip(
@@ -470,6 +475,17 @@ def geo_im_from_array(
             cmap=cmap,
             **kwargs,
         )
+        # handle NaNs in griddata
+        color_nan = "gainsboro"
+        if np.any(np.isnan(x) for x in grid_im):
+            no_data_patch = mpatches.Patch(
+                facecolor=color_nan, edgecolor="black", label="NaN"
+            )
+            axis.legend(
+                handles=[no_data_patch] + axis.get_legend_handles_labels()[0],
+                loc="lower right",
+            )
+        axis.set_facecolor(color_nan)
         cbar = plt.colorbar(img, cax=cbax, orientation="vertical")
         cbar.set_label(name)
         axis.set_title("\n".join(wrap(tit)))

doc/index.rst

@@ -6,7 +6,7 @@ Welcome to CLIMADA!
    :align: center
    :alt: CLIMADA Logo
 
-CLIMADA stands for CLIMate ADAptation and is a probabilistic natural catastrophe impact model, that also calculates averted damage (benefit) thanks to adaptation measures of any kind (from grey to green infrastructure, behavioural, etc.).
+`CLIMADA <https://climada.ethz.ch/>`_ stands for CLIMate ADAptation and is a probabilistic natural catastrophe impact model, that also calculates averted damage (benefit) thanks to adaptation measures of any kind (from grey to green infrastructure, behavioural, etc.).
 
 CLIMADA is primarily developed and maintained by the `Weather and Climate Risks Group <https://wcr.ethz.ch/>`_ at `ETH Zürich <https://ethz.ch/en.html>`_.
 
@@ -22,6 +22,7 @@ Jump right in:
 * :doc:`Overview <tutorial/1_main_climada>`
 * `GitHub Repository <https://github.com/CLIMADA-project/climada_python>`_
 * :doc:`Module Reference <climada/climada>`
+* `CLIMADA Webpage <https://climada.ethz.ch/>`_
 
 .. ifconfig:: readthedocs
 
@@ -50,6 +51,7 @@ Jump right in:
 .. toctree::
    :hidden:
 
+   CLIMADA Webpage <https://climada.ethz.ch/>
    GitHub Repositories <https://github.com/CLIMADA-project>
    CLIMADA Petals <https://climada-petals.readthedocs.io/en/stable/>
    Weather and Climate Risks Group <https://wcr.ethz.ch/>

requirements/env_climada.yml

@@ -34,6 +34,7 @@ dependencies:
   - seaborn>=0.13
   - scikit-learn>=1.6
   - scipy>=1.14,<1.15  # 1.15 is not compatible with climada_petals, climada_petals.engine.test.test_supplychain fails with "'Series' has no attribute 'nonzero'"
+  - shapely<2.1  # in 2.1 'shapely.ops' has no attribute 'cascaded_union' anymore, which is used in black_marble
   - sparse>=0.15
   - statsmodels>=0.14
   - tabulate>=0.9