Merge branch 'develop'

# Conflicts:
#	climada/_version.py
#	setup.py

Author: emanuel-schmid

CHANGELOG.md

@@ -6,6 +6,25 @@ Release date: 2024-02-14
 
 ### Dependency Changes
 
+### Added
+
+### Changed
+
+### Fixed
+
+- Fix `util.coordinates.latlon_bounds` for cases where the specified buffer is very large so that the bounds cover more than the full longitudinal range `[-180, 180]` [#839](https://github.com/CLIMADA-project/climada_python/pull/839)
+- Fix `climada.hazard.trop_cyclone` for TC tracks crossing the antimeridian [#839](https://github.com/CLIMADA-project/climada_python/pull/839)
+
+### Deprecated
+
+### Removed
+
+## 4.1.0
+
+Release date: 2024-02-14
+
+### Dependency Changes
+
 Added:
 
 - `pyproj` >=3.5

climada/_version.py

@@ -1 +1 @@
-__version__ = '4.1.0'
+__version__ = '4.1.1-dev'

climada/hazard/base.py

@@ -840,7 +840,7 @@ def year_month_day_accessor(
                 return array.dt.strftime("%Y-%m-%d").values
 
             # Handle access errors
-            except (ValueError, TypeError) as err:
+            except (ValueError, TypeError, AttributeError) as err:
                 if strict:
                     raise err
 

climada/hazard/test/test_trop_cyclone.py

@@ -127,6 +127,25 @@ def test_set_one_pass(self):
             msk = (intensity > 0)
             np.testing.assert_array_equal(windfield_norms[msk], intensity[msk])
 
+    def test_cross_antimeridian(self):
+        # Two locations on the island Taveuni (Fiji), one west and one east of 180° longitude.
+        # We list the second point twice, with different lon-normalization:
+        cen = Centroids.from_lat_lon([-16.95, -16.8, -16.8], [179.9, 180.1, -179.9])
+        cen.set_dist_coast(precomputed=True)
+
+        # Cyclone YASA (2020) passed directly over Fiji
+        tr = TCTracks.from_ibtracs_netcdf(storm_id=["2020346S13168"])
+
+        inten = TropCyclone.from_tracks(tr, centroids=cen).intensity.toarray()[0, :]
+
+        # Centroids 1 and 2 are identical, they just use a different normalization for lon. This
+        # should not affect the result at all:
+        self.assertEqual(inten[1], inten[2])
+
+        # All locations should be clearly affected by strong winds of appx. 40 m/s. The exact
+        # values are not so important for this test:
+        np.testing.assert_allclose(inten, 40, atol=10)
+
     def test_windfield_models(self):
         """Test _tc_from_track function with different wind field models."""
         intensity_idx = [0, 1, 2,  3,  80, 100, 120, 200, 220, 250, 260, 295]
@@ -256,31 +275,54 @@ class TestWindfieldHelpers(unittest.TestCase):
 
     def test_get_close_centroids_pass(self):
         """Test get_close_centroids function."""
-        t_lat = np.array([0, -0.5, 0])
-        t_lon = np.array([0.9, 2, 3.2])
+        si_track = xr.Dataset({
+            "lat": ("time", np.array([0, -0.5, 0])),
+            "lon": ("time", np.array([0.9, 2, 3.2])),
+        }, attrs={"mid_lon": 0.0})
         centroids = np.array([
             [0, -0.2], [0, 0.9], [-1.1, 1.2], [1, 2.1], [0, 4.3], [0.6, 3.8], [0.9, 4.1],
         ])
-        test_mask = np.array([[False, True, False, False, False, False, False],
-                              [False, False, True, False, False, False, False],
-                              [False, False, False, False, False, True, False]])
-        mask = get_close_centroids(t_lat, t_lon, centroids, 112.0)
-        np.testing.assert_equal(mask, test_mask)
+        centroids_close, mask_close, mask_close_alongtrack = (
+            get_close_centroids(si_track, centroids, 112.0)
+        )
+        self.assertEqual(centroids_close.shape[0], mask_close.sum())
+        self.assertEqual(mask_close_alongtrack.shape[0], si_track.sizes["time"])
+        self.assertEqual(mask_close_alongtrack.shape[1], centroids_close.shape[0])
+        np.testing.assert_equal(mask_close_alongtrack.any(axis=0), True)
+        np.testing.assert_equal(mask_close, np.array(
+            [False, True, True, False, False, True, False]
+        ))
+        np.testing.assert_equal(mask_close_alongtrack, np.array([
+            [True, False, False],
+            [False, True, False],
+            [False, False, True],
+        ]))
+        np.testing.assert_equal(centroids_close, centroids[mask_close])
 
         # example where antimeridian is crossed
-        t_lat = np.linspace(-10, 10, 11)
-        t_lon = np.linspace(170, 200, 11)
-        t_lon[t_lon > 180] -= 360
+        si_track = xr.Dataset({
+            "lat": ("time", np.linspace(-10, 10, 11)),
+            "lon": ("time", np.linspace(170, 200, 11)),
+        }, attrs={"mid_lon": 180.0})
         centroids = np.array([[-11, 169], [-7, 176], [4, -170], [10, 170], [-10, -160]])
-        test_mask = np.array([True, True, True, False, False])
-        mask = get_close_centroids(t_lat, t_lon, centroids, 600.0)
-        np.testing.assert_equal(mask.any(axis=0), test_mask)
+        centroids_close, mask_close, mask_close_alongtrack = (
+            get_close_centroids(si_track, centroids, 600.0)
+        )
+        self.assertEqual(centroids_close.shape[0], mask_close.sum())
+        self.assertEqual(mask_close_alongtrack.shape[0], si_track.sizes["time"])
+        self.assertEqual(mask_close_alongtrack.shape[1], centroids_close.shape[0])
+        np.testing.assert_equal(mask_close_alongtrack.any(axis=0), True)
+        np.testing.assert_equal(mask_close, np.array([True, True, True, False, False]))
+        np.testing.assert_equal(centroids_close, np.array([
+            # the longitudinal coordinate of the third centroid is normalized
+            [-11, 169], [-7, 176], [4, 190],
+        ]))
 
     def test_B_holland_1980_pass(self):
         """Test _B_holland_1980 function."""
         si_track = xr.Dataset({
-            "env": ("time",  MBAR_TO_PA * np.array([1010, 1010])),
-            "cen": ("time",  MBAR_TO_PA * np.array([995, 980])),
+            "env": ("time", MBAR_TO_PA * np.array([1010, 1010])),
+            "cen": ("time", MBAR_TO_PA * np.array([995, 980])),
             "vgrad": ("time",  [35, 40]),
         })
         _B_holland_1980(si_track)