scriptengine-tasks-ecearth 0.8.0__tar.gz → 0.9.0__tar.gz

{scriptengine_tasks_ecearth-0.8.0 → scriptengine_tasks_ecearth-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scriptengine-tasks-ecearth
-Version: 0.8.0
+Version: 0.9.0
 Summary: ScriptEngine tasks for use with the EC-Earth climate model
 Author-email: Valentina Schueller <valentina.schueller@gmail.com>, Uwe Fladrich <uwe.fladrich@protonmail.com>
 Project-URL: Homepage, https://github.com/uwefladrich/scriptengine-tasks-ecearth
@@ -8,7 +8,7 @@ Project-URL: Bug Tracker, https://github.com/uwefladrich/scriptengine-tasks-ecea
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: scriptengine>=0.8.1
@@ -16,7 +16,7 @@ Requires-Dist: pyYAML>=5.1
 Requires-Dist: matplotlib>=3.1
 Requires-Dist: numpy>=1.18
 Requires-Dist: imageio>=2.18
-Requires-Dist: scitools-iris>=3.5
+Requires-Dist: scitools-iris>=3.12.2
 Requires-Dist: cartopy>=0.20
 Requires-Dist: python-redmine
 Requires-Dist: python-gitlab

{scriptengine_tasks_ecearth-0.8.0 → scriptengine_tasks_ecearth-0.9.0}/helpers/cubes.py

@@ -3,6 +3,7 @@
 import warnings
 
 import iris
+import iris.analysis.cartography
 import iris.cube
 import numpy as np
 from iris.util import equalise_attributes
@@ -157,3 +158,43 @@ def mask_other_hemisphere(cube, hemisphere):
     else:
         raise ValueError("Invalid hemisphere, must be 'north' or 'south'")
     return cube
+
+
+def compute_area_weights(cube):
+    if is_grid_regular(cube):
+        return compute_regular_grid_weights(cube)
+    return compute_reduced_grid_weights(cube)
+
+
+def is_grid_regular(cube) -> bool:
+    if not cube.coords("latitude", dim_coords=True):
+        return False
+    return True
+
+
+def compute_reduced_grid_weights(cube):
+    """compute area weights for the reduced gaussian grid"""
+    nh_latitudes = np.ma.masked_less(cube.coord("latitude").points, 0)
+    unique_lats, gridpoints_per_lat = np.unique(nh_latitudes, return_counts=True)
+    unique_lats, gridpoints_per_lat = unique_lats[0:-1], gridpoints_per_lat[0:-1]
+    areas = []
+    last_angle = 0
+    earth_radius = 6371
+    for latitude, amount in zip(unique_lats, gridpoints_per_lat):
+        delta = latitude - last_angle
+        current_angle = last_angle + 2 * delta
+        sin_diff = np.sin(np.deg2rad(current_angle)) - np.sin(np.deg2rad(last_angle))
+        ring_area = 2 * np.pi * earth_radius**2 * sin_diff
+        grid_area = ring_area / amount
+        areas.extend([grid_area] * amount)
+        last_angle = current_angle
+    areas = np.append(areas[::-1], areas)
+    area_weights = np.broadcast_to(areas, cube.data.shape)
+    return area_weights
+
+
+def compute_regular_grid_weights(cube):
+    """compute area weights for a regular lat/lon grid"""
+    cube.coord("latitude").guess_bounds()
+    cube.coord("longitude").guess_bounds()
+    return iris.analysis.cartography.area_weights(cube)

{scriptengine_tasks_ecearth-0.8.0 → scriptengine_tasks_ecearth-0.9.0}/monitoring/oifs_global_mean_year_mean_timeseries.py

@@ -37,36 +37,13 @@ class OifsGlobalMeanYearMeanTimeseries(Timeseries):
 
         time_mean_cube = self.compute_time_mean(oifs_cube)
 
-        area_weights = self.compute_area_weights(time_mean_cube)
+        area_weights = helpers.cubes.compute_area_weights(time_mean_cube)
         timeseries_cube = self.compute_spatial_mean(time_mean_cube, area_weights)
 
         self.set_cell_methods(timeseries_cube)
         timeseries_cube = self.adjust_metadata(timeseries_cube, varname)
         self.save(timeseries_cube, dst)
 
-    def compute_area_weights(self, cube):
-        """compute area weights for the reduced gaussian grid"""
-        self.log_debug("Computing area weights.")
-        nh_latitudes = np.ma.masked_less(cube.coord("latitude").points, 0)
-        unique_lats, gridpoints_per_lat = np.unique(nh_latitudes, return_counts=True)
-        unique_lats, gridpoints_per_lat = unique_lats[0:-1], gridpoints_per_lat[0:-1]
-        areas = []
-        last_angle = 0
-        earth_radius = 6371
-        for latitude, amount in zip(unique_lats, gridpoints_per_lat):
-            delta = latitude - last_angle
-            current_angle = last_angle + 2 * delta
-            sin_diff = np.sin(np.deg2rad(current_angle)) - np.sin(
-                np.deg2rad(last_angle)
-            )
-            ring_area = 2 * np.pi * earth_radius**2 * sin_diff
-            grid_area = ring_area / amount
-            areas.extend([grid_area] * amount)
-            last_angle = current_angle
-        areas = np.append(areas[::-1], areas)
-        area_weights = np.broadcast_to(areas, cube.data.shape)
-        return area_weights
-
     def set_cell_methods(self, timeseries_cube):
         """add the correct cell methods"""
         timeseries_cube.cell_methods = ()
@@ -100,7 +77,7 @@ class OifsGlobalMeanYearMeanTimeseries(Timeseries):
         ).bounds[:, [0, 1]]
         time_mean_cube.coord("longitude").bounds = time_mean_cube.coord(
             "longitude"
-        ).bounds[:, [0, 2]]
+        ).bounds[:, [0, 1]]
         with warnings.catch_warnings():
             # Suppress warning about insufficient metadata.
             warnings.filterwarnings(

{scriptengine_tasks_ecearth-0.8.0 → scriptengine_tasks_ecearth-0.9.0}/pyproject.toml

@@ -7,7 +7,7 @@
 
 [project]
     name = "scriptengine-tasks-ecearth"
-    version = "0.8.0"
+    version = "0.9.0"
     authors = [
         { name = "Valentina Schueller", email = "valentina.schueller@gmail.com" },
         { name = "Uwe Fladrich", email = "uwe.fladrich@protonmail.com" },
@@ -19,14 +19,14 @@
         "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
         "Operating System :: OS Independent",
     ]
-    requires-python = ">=3.8"
+    requires-python = ">=3.11"
     dependencies = [
         "scriptengine>=0.8.1",
         "pyYAML>=5.1",
         "matplotlib>=3.1",
         "numpy>=1.18",
         "imageio>=2.18",
-        "scitools-iris>=3.5",
+        "scitools-iris>=3.12.2",  # https://github.com/SciTools/iris/issues/6417
         "cartopy>=0.20",
         "python-redmine",
         "python-gitlab",

{scriptengine_tasks_ecearth-0.8.0 → scriptengine_tasks_ecearth-0.9.0}/scriptengine_tasks_ecearth.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scriptengine-tasks-ecearth
-Version: 0.8.0
+Version: 0.9.0
 Summary: ScriptEngine tasks for use with the EC-Earth climate model
 Author-email: Valentina Schueller <valentina.schueller@gmail.com>, Uwe Fladrich <uwe.fladrich@protonmail.com>
 Project-URL: Homepage, https://github.com/uwefladrich/scriptengine-tasks-ecearth
@@ -8,7 +8,7 @@ Project-URL: Bug Tracker, https://github.com/uwefladrich/scriptengine-tasks-ecea
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: scriptengine>=0.8.1
@@ -16,7 +16,7 @@ Requires-Dist: pyYAML>=5.1
 Requires-Dist: matplotlib>=3.1
 Requires-Dist: numpy>=1.18
 Requires-Dist: imageio>=2.18
-Requires-Dist: scitools-iris>=3.5
+Requires-Dist: scitools-iris>=3.12.2
 Requires-Dist: cartopy>=0.20
 Requires-Dist: python-redmine
 Requires-Dist: python-gitlab

{scriptengine_tasks_ecearth-0.8.0 → scriptengine_tasks_ecearth-0.9.0}/scriptengine_tasks_ecearth.egg-info/requires.txt

@@ -3,7 +3,7 @@ pyYAML>=5.1
 matplotlib>=3.1
 numpy>=1.18
 imageio>=2.18
-scitools-iris>=3.5
+scitools-iris>=3.12.2
 cartopy>=0.20
 python-redmine
 python-gitlab

{scriptengine_tasks_ecearth-0.8.0 → scriptengine_tasks_ecearth-0.9.0}/tests/test_oifs_all_mean_map.py

@@ -25,6 +25,24 @@ def test_oifs_all_mean_map_working(tmp_path):
     assert len(cube.coord("time").points) == 1
 
 
+def test_oifs_all_mean_map_regular_grid(tmp_path):
+    init = {
+        "src": ["./tests/testdata/regular_grid_tas.nc"],
+        "dst": str(tmp_path / "test.nc"),
+        "varname": "tas",
+    }
+    atmo_map = OifsAllMeanMap(init)
+    atmo_map.run(init)
+    cube = iris.load_cube(init["dst"])
+    assert cube.name() == "air_temperature"
+    assert cube.attributes["title"] is not None
+    assert cube.attributes["comment"] is not None
+    assert cube.attributes["diagnostic_type"] == "map"
+    assert cube.attributes["map_type"] == "global atmosphere"
+    assert cube.coord("time").climatological
+    assert len(cube.coord("time").points) == 1
+
+
 def test_oifs_all_mean_map_wrong_code(tmp_path):
     init = {
         "src": ["./tests/testdata/TES1_atm_1m_1990_2t.nc"],

{scriptengine_tasks_ecearth-0.8.0 → scriptengine_tasks_ecearth-0.9.0}/tests/test_oifs_global_mean_year_mean_timeseries.py

@@ -28,6 +28,27 @@ def test_oifs_global_mean_year_mean_timeseries_working(tmp_path):
     )
 
 
+def test_oifs_timeseries_compare_grids(tmp_path):
+    init = {
+        "src": ["./tests/testdata/regular_grid_tas.nc"],
+        "dst": str(tmp_path / "test_reg.nc"),
+        "varname": "tas",
+    }
+    atmo_ts = OifsGlobalMeanYearMeanTimeseries(init)
+    atmo_ts.run(init)
+    cube_reg = iris.load_cube(init["dst"])
+
+    init = {
+        "src": ["./tests/testdata/reduced_grid_tas.nc"],
+        "dst": str(tmp_path / "test_red.nc"),
+        "varname": "tas",
+    }
+    atmo_ts = OifsGlobalMeanYearMeanTimeseries(init)
+    atmo_ts.run(init)
+    cube_red = iris.load_cube(init["dst"])
+    assert abs(cube_red.data - cube_reg.data) < 1e-3
+
+
 def test_oifs_global_mean_year_mean_timeseries_wrong_varname(tmp_path):
     init = {
         "src": ["./tests/testdata/TES1_atm_1m_1990_2t.nc"],

{scriptengine_tasks_ecearth-0.8.0 → scriptengine_tasks_ecearth-0.9.0}/tests/test_oifs_year_mean_temporalmap.py

@@ -23,6 +23,22 @@ def test_oifs_year_mean_temporalmap_working(tmp_path):
     assert cube.attributes["map_type"] == "global atmosphere"
 
 
+def test_oifs_year_mean_temporalmap_regular_grid(tmp_path):
+    init = {
+        "src": ["./tests/testdata/regular_grid_tas.nc"],
+        "dst": str(tmp_path / "test.nc"),
+        "varname": "tas",
+    }
+    atmos_time_map = OifsYearMeanTemporalmap(init)
+    atmos_time_map.run(init)
+    cube = iris.load_cube(init["dst"])
+    assert cube.name() == "air_temperature"
+    assert cube.attributes["title"] is not None
+    assert cube.attributes["comment"] is not None
+    assert cube.attributes["diagnostic_type"] == "temporal map"
+    assert cube.attributes["map_type"] == "global atmosphere"
+
+
 def test_oifs_year_mean_temporalmap_wrong_varname(tmp_path):
     init = {
         "src": ["./tests/testdata/TES1_atm_1m_1990_2t.nc"],