Merge branch 'develop' into feature/bounds_NESW_functions

ValentinGebhart · ValentinGebhart · commit 4faaffee3165 · 2024-12-19T08:49:42.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -74,6 +74,6 @@ jobs:
     needs: build-and-test
     with:
       core_branch: ${{ github.ref }}
-      petals_branch: feature/exposures_crs
+      petals_branch: develop
     permissions:
       checks: write
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,6 +41,9 @@ Code freeze date: YYYY-MM-DD
   - 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
 
 ### Fixed
 
diff --git a/climada/engine/impact.py b/climada/engine/impact.py
@@ -107,8 +107,8 @@ def __init__(
         crs=DEF_CRS,
         eai_exp=None,
         at_event=None,
-        tot_value=0,
-        aai_agg=0,
+        tot_value=0.,
+        aai_agg=0.,
         unit="",
         imp_mat=None,
         haz_type="",
diff --git a/climada/entity/exposures/base.py b/climada/entity/exposures/base.py
@@ -132,12 +132,40 @@ def gdf(self):
     @property
     def latitude(self):
         """Latitude array of exposures"""
-        return self.data.geometry.y.values
+        try:
+            return self.data.geometry.y.values
+        except ValueError as valerr:
+            nonpoints = list(
+                self.data[
+                    self.data.geometry.type != "Point"
+                ].geometry.type.drop_duplicates()
+            )
+            if nonpoints:
+                raise ValueError(
+                    "Can only calculate latitude from Points."
+                    f" GeoDataFrame contains {', '.join(nonpoints)}."
+                    " Please see the lines_polygons module tutorial."
+                ) from valerr
+            raise
 
     @property
     def longitude(self):
         """Longitude array of exposures"""
-        return self.data.geometry.x.values
+        try:
+            return self.data.geometry.x.values
+        except ValueError as valerr:
+            nonpoints = list(
+                self.data[
+                    self.data.geometry.type != "Point"
+                ].geometry.type.drop_duplicates()
+            )
+            if nonpoints:
+                raise ValueError(
+                    "Can only calculate longitude from Points."
+                    f" GeoDataFrame contains {', '.join(nonpoints)}."
+                    " Please see the lines_polygons module tutorial."
+                ) from valerr
+            raise
 
     @property
     def geometry(self):
diff --git a/climada/entity/exposures/test/test_base.py b/climada/entity/exposures/test/test_base.py
@@ -27,7 +27,7 @@
 import rasterio
 import scipy as sp
 from rasterio.windows import Window
-from shapely.geometry import Point
+from shapely.geometry import MultiPolygon, Point, Polygon
 from sklearn.metrics import DistanceMetric
 
 import climada.util.coordinates as u_coord
@@ -652,6 +652,39 @@ def test_to_crs_epsg_crs(self):
             Exposures.to_crs(self, crs="GCS", epsg=26915)
         self.assertEqual("one of crs or epsg must be None", str(cm.exception))
 
+    def test_latlon_with_polygons(self):
+        """Check for proper error message if the data frame contains non-Point shapes"""
+        poly = Polygon(
+            [(10.0, 0.0), (10.0, 1.0), (11.0, 1.0), (11.0, 0.0), (10.0, 0.0)]
+        )
+        point = Point((1, -1))
+        multi = MultiPolygon(
+            [
+                (
+                    ((0.0, 0.0), (0.0, 1.0), (1.0, 1.0), (1.0, 0.0)),
+                    [((0.1, 1.1), (0.1, 1.2), (0.2, 1.2), (0.2, 1.1))],
+                )
+            ]
+        )
+        poly = Polygon()
+        exp = Exposures(geometry=[poly, point, multi, poly])
+        with self.assertRaises(ValueError) as valer:
+            exp.latitude
+        self.assertEqual(
+            "Can only calculate latitude from Points."
+            " GeoDataFrame contains Polygon, MultiPolygon."
+            " Please see the lines_polygons module tutorial.",
+            str(valer.exception),
+        )
+        with self.assertRaises(ValueError) as valer:
+            exp.longitude
+        self.assertEqual(
+            "Can only calculate longitude from Points."
+            " GeoDataFrame contains Polygon, MultiPolygon."
+            " Please see the lines_polygons module tutorial.",
+            str(valer.exception),
+        )
+
 
 class TestImpactFunctions(unittest.TestCase):
     """Test impact function handling"""
diff --git a/climada/hazard/base.py b/climada/hazard/base.py
@@ -936,8 +936,7 @@ def append(self, *others):
                 "The hazards are incompatible and cannot be concatenated."
             )
         self.haz_type = haz_types.pop()
-
-        haz_classes = {type(haz) for haz in haz_list}
+        haz_classes = {haz.__class__.__name__ for haz in haz_list}
         if len(haz_classes) > 1:
             raise TypeError(
                 f"The given hazards are of different classes: {haz_classes}. "
diff --git a/climada/hazard/tc_tracks.py b/climada/hazard/tc_tracks.py
@@ -84,13 +84,13 @@
 IBTRACS_URL = (
     "https://www.ncei.noaa.gov/data/"
     "international-best-track-archive-for-climate-stewardship-ibtracs/"
-    "v04r00/access/netcdf"
+    "v04r01/access/netcdf"
 )
 """Site of IBTrACS netcdf file containing all tracks v4.0,
 s. https://www.ncdc.noaa.gov/ibtracs/index.php?name=ib-v4-access"""
 
-IBTRACS_FILE = "IBTrACS.ALL.v04r00.nc"
-"""IBTrACS v4.0 file all"""
+IBTRACS_FILE = "IBTrACS.ALL.v04r01.nc"
+"""IBTrACS v4.1 file all"""
 
 IBTRACS_AGENCIES = [
     "usa",
@@ -376,7 +376,7 @@ def from_ibtracs_netcdf(
         correct_pres=False,
         discard_single_points=True,
         additional_variables=None,
-        file_name="IBTrACS.ALL.v04r00.nc",
+        file_name=IBTRACS_FILE,
     ):
         """Create new TCTracks object from IBTrACS databse.
 
@@ -485,7 +485,7 @@ def from_ibtracs_netcdf(
             compatiblity with other functions such as `equal_timesteps`. Default: True.
         file_name : str, optional
             Name of NetCDF file to be dowloaded or located at climada/data/system.
-            Default: 'IBTrACS.ALL.v04r00.nc'
+            Default: 'IBTrACS.ALL.v04r01.nc'
         additional_variables : list of str, optional
             If specified, additional IBTrACS data variables are extracted, such as "nature" or
             "storm_speed". Only variables that are not agency-specific are supported.
@@ -731,7 +731,7 @@ def from_ibtracs_netcdf(
                     )
                     ibtracs_ds = ibtracs_ds.sel(storm=valid_storms_mask)
 
-            if ibtracs_ds.dims["storm"] == 0:
+            if ibtracs_ds.sizes["storm"] == 0:
                 LOGGER.info(
                     "After discarding IBTrACS events without valid values by the selected "
                     "reporting agencies, there are no tracks left that match the specified "
@@ -2576,7 +2576,7 @@ def ibtracs_fit_param(explained, explanatory, year_range=(1980, 2019), order=1):
             raise KeyError("Unknown ibtracs variable: %s" % var)
 
     # load ibtracs dataset
-    fn_nc = SYSTEM_DIR.joinpath("IBTrACS.ALL.v04r00.nc")
+    fn_nc = SYSTEM_DIR.joinpath(IBTRACS_FILE)
     with xr.open_dataset(fn_nc) as ibtracs_ds:
         # choose specified year range
         years = ibtracs_ds.sid.str.slice(0, 4).astype(int)
diff --git a/climada/hazard/test/__init__.py b/climada/hazard/test/__init__.py
@@ -28,7 +28,7 @@
 
 
 def download_ibtracs():
-    """This makes sure a IBTrACS.ALL.v04r00.nc file is present in SYSTEM_DIR
+    """This makes sure a IBTrACS.ALL.v04r01.nc file is present in SYSTEM_DIR
     First, downloading from the original sources is attempted. If that fails an old version
     is downloaded from the CLIMADA Data API
     """
@@ -44,9 +44,9 @@ def download_ibtracs():
     ):  # plan b: download an old version of that file from the climada api
         client = Client()
         dsinfo = client.get_dataset_info(
-            name="IBTrACS", version="v04r00", status="external"
+            name="IBTrACS", version="v04r01", status="external"
         )
         [fileinfo] = [
-            fi for fi in dsinfo.files if fi.file_name == "IBTrACS.ALL.v04r00.nc"
+            fi for fi in dsinfo.files if fi.file_name == "IBTrACS.ALL.v04r01.nc"
         ]
         client._download_file(local_path=SYSTEM_DIR, fileinfo=fileinfo)
diff --git a/climada/hazard/test/test_tc_tracks.py b/climada/hazard/test/test_tc_tracks.py
@@ -82,13 +82,35 @@ def test_penv_rmax_penv_pass(self):
             provider="usa", storm_id="1992230N11325"
         )
         penv_ref = np.ones(97) * 1010
-        penv_ref[26:36] = [1011, 1012, 1013, 1014, 1015, 1014, 1014, 1014, 1014, 1012]
+        penv_ref[26:36] = [1011, 1012, 1013, 1014, 1015, 1015, 1014, 1014, 1014, 1012]
+        rmax_ref = np.zeros(97)
+        rmax_ref[63:82] = [
+            10.0,
+            10.0,
+            10.625,
+            11.25,
+            11.875,
+            12.5,
+            13.125,
+            13.75,
+            14.375,
+            15.0,
+            15.625,
+            16.25,
+            16.875,
+            17.5,
+            18.125,
+            18.75,
+            19.375,
+            20.0,
+            20.0,
+        ]
 
-        self.assertTrue(
-            np.allclose(tc_track.get_track()["environmental_pressure"].values, penv_ref)
+        np.testing.assert_array_almost_equal(
+            tc_track.get_track()["environmental_pressure"].values, penv_ref, decimal=4
         )
-        self.assertTrue(
-            np.allclose(tc_track.get_track()["radius_max_wind"].values, np.zeros(97))
+        np.testing.assert_array_almost_equal(
+            tc_track.get_track()["radius_max_wind"].values, rmax_ref, decimal=4
         )
 
     def test_ibtracs_raw_pass(self):
@@ -278,7 +300,7 @@ def test_ibtracs_correct_pass(self):
             tc_try.data[0]["central_pressure"].values[0], 1013, places=0
         )
         self.assertAlmostEqual(
-            tc_try.data[0]["central_pressure"].values[5], 1008, places=0
+            tc_try.data[0]["central_pressure"].values[5], 1007, places=0
         )
         self.assertAlmostEqual(
             tc_try.data[0]["central_pressure"].values[-1], 1012, places=0
@@ -701,14 +723,14 @@ def test_get_extent(self):
         tc_track = tc.TCTracks.from_ibtracs_netcdf(
             storm_id=storms, provider=["usa", "bom"]
         )
-        bounds = (153.585022, -23.200001, 258.714996, 17.514986)
-        bounds_buf = (153.485022, -23.300001, 258.814996, 17.614986)
-        np.testing.assert_array_almost_equal(tc_track.bounds, bounds)
+        bounds = (153.6, -23.2, 258.7, 17.5)
+        bounds_buf = (153.5, -23.3, 258.8, 17.6)
+        np.testing.assert_array_almost_equal(tc_track.bounds, bounds, decimal=4)
         np.testing.assert_array_almost_equal(
-            tc_track.get_bounds(deg_buffer=0.1), bounds_buf
+            tc_track.get_bounds(deg_buffer=0.1), bounds_buf, decimal=4
         )
         np.testing.assert_array_almost_equal(
-            tc_track.extent, u_coord.toggle_extent_bounds(bounds)
+            tc_track.extent, u_coord.toggle_extent_bounds(bounds), decimal=4
         )
 
     def test_generate_centroids(self):
@@ -718,13 +740,13 @@ def test_generate_centroids(self):
             storm_id=storms, provider=["usa", "bom"]
         )
         cen = tc_track.generate_centroids(10, 1)
-        cen_bounds = (157.585022, -19.200001, 257.585022, 10.799999)
+        cen_bounds = (157.6, -19.2, 257.6, 10.8)
         self.assertEqual(cen.size, 44)
         self.assertEqual(np.unique(cen.lat).size, 4)
         self.assertEqual(np.unique(cen.lon).size, 11)
         np.testing.assert_array_equal(np.diff(np.unique(cen.lat)), 10)
         np.testing.assert_array_equal(np.diff(np.unique(cen.lon)), 10)
-        np.testing.assert_array_almost_equal(cen.total_bounds, cen_bounds)
+        np.testing.assert_array_almost_equal(cen.total_bounds, cen_bounds, decimal=4)
 
     def test_interp_track_pass(self):
         """Interpolate track to min_time_step. Compare to MATLAB reference."""
diff --git a/climada/util/test/test_finance.py b/climada/util/test/test_finance.py
@@ -107,8 +107,8 @@ def test_gdp_sxm_2010_pass(self):
         with self.assertLogs("climada.util.finance", level="INFO") as cm:
             gdp_year, gdp_val = gdp("SXM", ref_year)
 
-        ref_val = 936089385.47486  # reference GDP value
-        ref_year = 2011  # nearest year with data available (might change)
+        ref_val = 892290502.793296  # reference GDP value
+        ref_year = 2010  # nearest year with data available (might change)
         # GDP and years with data available might change if worldbank input
         # data changes, check magnitude and adjust ref_val and/or ref_year
         # if test fails:
@@ -133,7 +133,7 @@ def test_wb_esp_1950_pass(self):
         wb_year, wb_val = world_bank("ESP", ref_year, "NY.GDP.MKTP.CD")
 
         ref_year = 1960
-        ref_val = 12433394725.2159
+        ref_val = 12424514013.7604
         self.assertEqual(wb_year, ref_year)
         self.assertAlmostEqual(wb_val, ref_val)
 
diff --git a/doc/tutorial/climada_hazard_TropCyclone.ipynb b/doc/tutorial/climada_hazard_TropCyclone.ipynb
@@ -64,9 +64,9 @@
     "<a id='Part1.a'></a> \n",
     "### a) Load TC tracks from historical records\n",
     "\n",
-    "The best-track historical data from the International Best Track Archive for Climate Stewardship ([IBTrACS](https://www.ncdc.noaa.gov/ibtracs/)) can easily be loaded into CLIMADA to study the historical records of TC events. The constructor `from_ibtracs_netcdf()` generates the `Datasets` for tracks selected by [IBTrACS](https://www.ncdc.noaa.gov/ibtracs/) id, or by basin and year range. To achieve this, it downloads the first time the [IBTrACS data v4 in netcdf format](https://www.ncei.noaa.gov/data/international-best-track-archive-for-climate-stewardship-ibtracs/v04r00/access/netcdf/) and stores it in `~/climada/data/`. The tracks can be accessed later either using the attribute `data` or using `get_track()`, which allows to select tracks by its name or id. Use the method `append()` to extend the `data` list.\n",
+    "The best-track historical data from the International Best Track Archive for Climate Stewardship ([IBTrACS](https://www.ncdc.noaa.gov/ibtracs/)) can easily be loaded into CLIMADA to study the historical records of TC events. The constructor `from_ibtracs_netcdf()` generates the `Datasets` for tracks selected by [IBTrACS](https://www.ncdc.noaa.gov/ibtracs/) id, or by basin and year range. To achieve this, it downloads the first time the [IBTrACS data v4 in netcdf format](https://www.ncei.noaa.gov/data/international-best-track-archive-for-climate-stewardship-ibtracs/v04r01/access/netcdf/) and stores it in `~/climada/data/`. The tracks can be accessed later either using the attribute `data` or using `get_track()`, which allows to select tracks by its name or id. Use the method `append()` to extend the `data` list.\n",
     "\n",
-    "If you get an error downloading the IBTrACS data, try to manually access [https://www.ncei.noaa.gov/data/international-best-track-archive-for-climate-stewardship-ibtracs/v04r00/access/netcdf/](https://www.ncei.noaa.gov/data/international-best-track-archive-for-climate-stewardship-ibtracs/v04r00/access/netcdf/), click on the file `IBTrACS.ALL.v04r00.nc` and copy it to `~/climada/data/`.\n",
+    "If you get an error downloading the IBTrACS data, try to manually access [https://www.ncei.noaa.gov/data/international-best-track-archive-for-climate-stewardship-ibtracs/v04r01/access/netcdf/](https://www.ncei.noaa.gov/data/international-best-track-archive-for-climate-stewardship-ibtracs/v04r01/access/netcdf/), click on the file `IBTrACS.ALL.v04r01.nc` and copy it to `~/climada/data/`.\n",
     "\n",
     "To visualize the tracks use `plot()`.\n"
    ]
