Merge branch 'develop' into feature/costum_grid_litpop

Author: emanuel-schmid

CHANGELOG.md

@@ -19,6 +19,8 @@ Removed:
 `plot_intensity`, `plot_fraction`, `_event_plot` to mask plotting when regions are too far from data points [#1047](https://github.com/CLIMADA-project/climada_python/pull/1047). To recreate previous plots (no masking), the parameter can be set to None.
 - Added instructions to install Climada petals on Euler cluster in `doc.guide.Guide_Euler.ipynb` [#1029](https://github.com/CLIMADA-project/climada_python/pull/1029)
 
+- `ImpactFunc` and `ImpactFuncSet` now support equality comparisons via `==` [#1027](https://github.com/CLIMADA-project/climada_python/pull/1027)
+
 ### Changed
 
 - `Hazard.local_exceedance_intensity`, `Hazard.local_return_period` and `Impact.local_exceedance_impact`, `Impact.local_return_period`, using the `climada.util.interpolation` module: New default (no binning), binning on decimals, and faster implementation [#1012](https://github.com/CLIMADA-project/climada_python/pull/1012)
@@ -28,6 +30,7 @@ Removed:
 ### Fixed
 
 - NaN plotting issues in `geo_im_from_array`[#1038](https://github.com/CLIMADA-project/climada_python/pull/1038)
+- Broken ECMWF links in pydoc of `climada.hazard.storm_europe` relocated. [#944](https://github.com/CLIMADA-project/climada_python/pull/944)
 
 ### Deprecated
 

climada/entity/impact_funcs/base.py

@@ -97,6 +97,19 @@ def __init__(
         self.mdd = mdd if mdd is not None else np.array([])
         self.paa = paa if paa is not None else np.array([])
 
+    def __eq__(self, value: object, /) -> bool:
+        if isinstance(value, ImpactFunc):
+            return (
+                self.haz_type == value.haz_type
+                and self.id == value.id
+                and self.name == value.name
+                and self.intensity_unit == value.intensity_unit
+                and np.array_equal(self.intensity, value.intensity)
+                and np.array_equal(self.mdd, value.mdd)
+                and np.array_equal(self.paa, value.paa)
+            )
+        return False
+
     def calc_mdr(self, inten: Union[float, np.ndarray]) -> np.ndarray:
         """Interpolate impact function to a given intensity.
 
@@ -177,7 +190,7 @@ def from_step_impf(
         mdd: tuple[float, float] = (0, 1),
         paa: tuple[float, float] = (1, 1),
         impf_id: int = 1,
-        **kwargs
+        **kwargs,
     ):
         """Step function type impact function.
 
@@ -218,7 +231,7 @@ def from_step_impf(
             intensity=intensity,
             mdd=mdd,
             paa=paa,
-            **kwargs
+            **kwargs,
         )
 
     def set_step_impf(self, *args, **kwargs):
@@ -238,7 +251,7 @@ def from_sigmoid_impf(
         x0: float,
         haz_type: str,
         impf_id: int = 1,
-        **kwargs
+        **kwargs,
     ):
         r"""Sigmoid type impact function hinging on three parameter.
 
@@ -287,7 +300,7 @@ def from_sigmoid_impf(
             intensity=intensity,
             paa=paa,
             mdd=mdd,
-            **kwargs
+            **kwargs,
         )
 
     def set_sigmoid_impf(self, *args, **kwargs):
@@ -308,7 +321,7 @@ def from_poly_s_shape(
         exponent: float,
         haz_type: str,
         impf_id: int = 1,
-        **kwargs
+        **kwargs,
     ):
         r"""S-shape polynomial impact function hinging on four parameter.
 

climada/entity/impact_funcs/impact_func_set.py

@@ -109,6 +109,12 @@ def __init__(self, impact_funcs: Optional[Iterable[ImpactFunc]] = None):
             for impf in impact_funcs:
                 self.append(impf)
 
+    def __eq__(self, value: object, /) -> bool:
+        if isinstance(value, ImpactFuncSet):
+            return self._data == value._data
+
+        return False
+
     def clear(self):
         """Reinitialize attributes."""
         self._data = dict()  # {hazard_type : {id:ImpactFunc}}

climada/entity/impact_funcs/test/test_base.py

@@ -26,6 +26,74 @@
 from climada.entity.impact_funcs.base import ImpactFunc
 
 
+class TestEquality(unittest.TestCase):
+    """Test equality method"""
+
+    def setUp(self):
+        self.impf1 = ImpactFunc(
+            haz_type="TC",
+            id=1,
+            intensity=np.array([1, 2, 3]),
+            mdd=np.array([0.1, 0.2, 0.3]),
+            paa=np.array([0.4, 0.5, 0.6]),
+            intensity_unit="m/s",
+            name="Test Impact",
+        )
+        self.impf2 = ImpactFunc(
+            haz_type="TC",
+            id=1,
+            intensity=np.array([1, 2, 3]),
+            mdd=np.array([0.1, 0.2, 0.3]),
+            paa=np.array([0.4, 0.5, 0.6]),
+            intensity_unit="m/s",
+            name="Test Impact",
+        )
+        self.impf3 = ImpactFunc(
+            haz_type="FL",
+            id=2,
+            intensity=np.array([4, 5, 6]),
+            mdd=np.array([0.7, 0.8, 0.9]),
+            paa=np.array([0.1, 0.2, 0.3]),
+            intensity_unit="m",
+            name="Another Impact",
+        )
+
+    def test_reflexivity(self):
+        self.assertEqual(self.impf1, self.impf1)
+
+    def test_symmetry(self):
+        self.assertEqual(self.impf1, self.impf2)
+        self.assertEqual(self.impf2, self.impf1)
+
+    def test_transitivity(self):
+        impf4 = ImpactFunc(
+            haz_type="TC",
+            id=1,
+            intensity=np.array([1, 2, 3]),
+            mdd=np.array([0.1, 0.2, 0.3]),
+            paa=np.array([0.4, 0.5, 0.6]),
+            intensity_unit="m/s",
+            name="Test Impact",
+        )
+        self.assertEqual(self.impf1, self.impf2)
+        self.assertEqual(self.impf2, impf4)
+        self.assertEqual(self.impf1, impf4)
+
+    def test_consistency(self):
+        self.assertEqual(self.impf1, self.impf2)
+        self.assertEqual(self.impf1, self.impf2)
+
+    def test_comparison_with_none(self):
+        self.assertNotEqual(self.impf1, None)
+
+    def test_different_types(self):
+        self.assertNotEqual(self.impf1, "Not an ImpactFunc")
+
+    def test_inequality(self):
+        self.assertNotEqual(self.impf1, self.impf3)
+        self.assertTrue(self.impf1 != self.impf3)
+
+
 class TestInterpolation(unittest.TestCase):
     """Impact function interpolation test"""
 
@@ -139,5 +207,8 @@ def test_aux_vars(impf):
 
 # Execute Tests
 if __name__ == "__main__":
-    TESTS = unittest.TestLoader().loadTestsFromTestCase(TestInterpolation)
-    unittest.TextTestRunner(verbosity=2).run(TESTS)
+    equality_tests = unittest.TestLoader().loadTestsFromTestCase(TestEquality)
+    interpolation_tests = unittest.TestLoader().loadTestsFromTestCase(TestInterpolation)
+    unittest.TextTestRunner(verbosity=2).run(
+        unittest.TestSuite([equality_tests, interpolation_tests])
+    )

climada/entity/impact_funcs/test/test_imp_fun_set.py

@@ -20,6 +20,7 @@
 """
 
 import unittest
+from copy import deepcopy
 
 import numpy as np
 
@@ -288,6 +289,55 @@ def test_remove_add_pass(self):
         self.assertEqual([1], imp_fun.get_ids("TC"))
 
 
+class TestEquality(unittest.TestCase):
+    """Test equality method for ImpactFuncSet"""
+
+    def setUp(self):
+        intensity = np.array([0, 20])
+        paa = np.array([0, 1])
+        mdd = np.array([0, 0.5])
+
+        fun_1 = ImpactFunc("TC", 3, intensity, mdd, paa)
+        fun_2 = ImpactFunc("TC", 3, deepcopy(intensity), deepcopy(mdd), deepcopy(paa))
+        fun_3 = ImpactFunc("TC", 4, intensity + 1, mdd, paa)
+
+        self.impact_set1 = ImpactFuncSet([fun_1])
+        self.impact_set2 = ImpactFuncSet([fun_2])
+        self.impact_set3 = ImpactFuncSet([fun_3])
+        self.impact_set4 = ImpactFuncSet([fun_1, fun_3])
+
+    def test_reflexivity(self):
+        self.assertEqual(self.impact_set1, self.impact_set1)
+
+    def test_symmetry(self):
+        self.assertEqual(self.impact_set1, self.impact_set2)
+        self.assertEqual(self.impact_set2, self.impact_set1)
+
+    def test_transitivity(self):
+        impact_set5 = ImpactFuncSet([self.impact_set1._data["TC"][3]])
+        self.assertEqual(self.impact_set1, self.impact_set2)
+        self.assertEqual(self.impact_set2, impact_set5)
+        self.assertEqual(self.impact_set1, impact_set5)
+
+    def test_consistency(self):
+        self.assertEqual(self.impact_set1, self.impact_set2)
+        self.assertEqual(self.impact_set1, self.impact_set2)
+
+    def test_comparison_with_none(self):
+        self.assertNotEqual(self.impact_set1, None)
+
+    def test_different_types(self):
+        self.assertNotEqual(self.impact_set1, "Not an ImpactFuncSet")
+
+    def test_field_comparison(self):
+        self.assertNotEqual(self.impact_set1, self.impact_set3)
+        self.assertNotEqual(self.impact_set1, self.impact_set4)
+
+    def test_inequality(self):
+        self.assertNotEqual(self.impact_set1, self.impact_set3)
+        self.assertTrue(self.impact_set1 != self.impact_set3)
+
+
 class TestChecker(unittest.TestCase):
     """Test loading funcions from the ImpactFuncSet class"""
 
@@ -592,6 +642,7 @@ def test_write_read_pass(self):
 # Execute Tests
 if __name__ == "__main__":
     TESTS = unittest.TestLoader().loadTestsFromTestCase(TestContainer)
+    TESTS.addTests(unittest.TestLoader().loadTestsFromTestCase(TestEquality))
     TESTS.addTests(unittest.TestLoader().loadTestsFromTestCase(TestChecker))
     TESTS.addTests(unittest.TestLoader().loadTestsFromTestCase(TestExtend))
     TESTS.addTests(unittest.TestLoader().loadTestsFromTestCase(TestReaderExcel))

climada/hazard/storm_europe.py

@@ -60,11 +60,16 @@
 
 class StormEurope(Hazard):
     """A hazard set containing european winter storm events. Historic storm
-    events can be downloaded at http://wisc.climate.copernicus.eu/ and read
-    with `from_footprints`. Weather forecasts can be automatically downloaded from
-    https://opendata.dwd.de/ and read with from_icon_grib(). Weather forecast
-    from the COSMO-Consortium http://www.cosmo-model.org/ can be read with
-    from_cosmoe_file().
+    events can be downloaded at https://cds.climate.copernicus.eu/ and read
+    with :meth:`from_footprints`. Weather forecasts can be automatically downloaded from
+    https://opendata.dwd.de/ and read with :meth:`from_icon_grib`. Weather forecast
+    from the COSMO-Consortium https://www.cosmo-model.org/ can be read with
+    :meth:`from_cosmoe_file`.
+
+    Direct links to CDS data:
+
+    * Winter windstorm indicators (1979 to 2021): https://doi.org/10.24381/cds.9b4ea013
+    * Synthetic windstorm events (1986 to 2011): https://doi.org/10.24381/cds.ce973f02
 
     Attributes
     ----------
@@ -696,7 +701,7 @@ def calc_ssi(
         ssi = sum_i(area_cell_i * intensity_cell_i^3)
 
         'wisc_gust', according to the WISC Tier 1 definition found at
-        https://wisc.climate.copernicus.eu/wisc/#/help/products#tier1_section
+        https://confluence.ecmwf.int/display/CKB/Synthetic+Windstorm+Events+for+Europe+from+1986+to+2011%3A+Product+User+Guide
         ssi = sum(area_on_land) * mean(intensity)^3
 
         In both definitions, only raster cells that are above the threshold are

doc/tutorial/climada_hazard_StormEurope.ipynb

@@ -31,7 +31,7 @@
    "source": [
     "## Reading Data\n",
     "\n",
-    "StormEurope was written under the presumption that you'd start out with [WISC](https://wisc.climate.copernicus.eu/wisc/#/help/products#footprint_section) storm footprint data in netCDF format. This notebook works with a demo dataset. If you would like to work with the real data: (1) Please follow the link and download the file C3S_WISC_FOOTPRINT_NETCDF_0100.tgz from the Copernicus Windstorm Information Service, (2) unzip it (3) uncomment the last two lines in the following codeblock and (4) adjust the variable \"WISC_files\".\n",
+    "StormEurope was written under the presumption that you'd start out with [WISC](https://confluence.ecmwf.int/display/CKB/Synthetic+Windstorm+Events+for+Europe+from+1986+to+2011%3A+Product+User+Guide) storm footprint data in netCDF format. This notebook works with a demo dataset. If you would like to work with the real data: (1) Please follow the link and download the file C3S_WISC_FOOTPRINT_NETCDF_0100.tgz from the Copernicus Windstorm Information Service, (2) unzip it (3) uncomment the last two lines in the following codeblock and (4) adjust the variable \"WISC_files\".\n",
     "\n",
     "We first construct an instance and then point the reader at a directory containing compatible `.nc` files. Since there are other files in there, we must be explicit and use a globbing pattern; supplying incompatible files will make the reader fail.\n",
     "\n",
@@ -42,17 +42,7 @@
    "cell_type": "code",
    "execution_count": 2,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "$CLIMADA_SRC/climada/hazard/centroids/centr.py:822: UserWarning: Geometry is in a geographic CRS. Results from 'buffer' are likely incorrect. Use 'GeoSeries.to_crs()' to re-project geometries to a projected CRS before this operation.\n",
-      "\n",
-      "  xy_pixels = self.geometry.buffer(res / 2).envelope\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "from climada.hazard import StormEurope\n",
     "from climada.util.constants import WS_DEMO_NC\n",
@@ -85,10 +75,10 @@
        "\u001b[0;31mFile:\u001b[0m           ~/code/climada_python/climada/hazard/storm_europe.py\n",
        "\u001b[0;31mDocstring:\u001b[0m     \n",
        "A hazard set containing european winter storm events. Historic storm\n",
-       "events can be downloaded at http://wisc.climate.copernicus.eu/ and read\n",
+       "events can be downloaded at https://cds.climate.copernicus.eu/ and read\n",
        "with `from_footprints`. Weather forecasts can be automatically downloaded from\n",
        "https://opendata.dwd.de/ and read with from_icon_grib(). Weather forecast\n",
-       "from the COSMO-Consortium http://www.cosmo-model.org/ can be read with\n",
+       "from the COSMO-Consortium https://www.cosmo-model.org/ can be read with\n",
        "from_cosmoe_file().\n",
        "\n",
        "Attributes\n",