diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bf7b460f..82e409999 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ Code freeze date: YYYY-MM-DD ### Fixed +- Broken ECMWF links in pydoc of `climada.hazard.storm_europe` relocated. [#944](https://github.com/CLIMADA-project/climada_python/pull/944) - File handles are being closed after reading netcdf files with `climada.hazard` modules [#953](https://github.com/CLIMADA-project/climada_python/pull/953) - Avoids a ValueError in the impact calculation for cases with a single exposure point and MDR values of 0, by explicitly removing zeros in `climada.hazard.Hazard.get_mdr` [#933](https://github.com/CLIMADA-project/climada_python/pull/948) diff --git a/climada/hazard/storm_europe.py b/climada/hazard/storm_europe.py index c4b49e7fc..c31b1ed47 100644 --- a/climada/hazard/storm_europe.py +++ b/climada/hazard/storm_europe.py @@ -60,10 +60,10 @@ 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 + events can be downloaded at https://cds.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 the COSMO-Consortium https://www.cosmo-model.org/ can be read with from_cosmoe_file(). Attributes @@ -690,7 +690,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 diff --git a/doc/tutorial/climada_hazard_StormEurope.ipynb b/doc/tutorial/climada_hazard_StormEurope.ipynb index 7772d6057..1d13396fb 100644 --- a/doc/tutorial/climada_hazard_StormEurope.ipynb +++ b/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",