scriptengine-tasks-ecearth 0.10.0__tar.gz → 0.10.1__tar.gz

{scriptengine_tasks_ecearth-0.10.0 → scriptengine_tasks_ecearth-0.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scriptengine-tasks-ecearth
-Version: 0.10.0
+Version: 0.10.1
 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

{scriptengine_tasks_ecearth-0.10.0 → scriptengine_tasks_ecearth-0.10.1}/helpers/cubes.py

@@ -7,7 +7,10 @@ import iris.analysis.cartography
 import iris.cube
 import numpy as np
 from iris.util import equalise_attributes
-from scriptengine.exceptions import ScriptEngineTaskArgumentInvalidError
+from scriptengine.exceptions import (
+    ScriptEngineTaskArgumentInvalidError,
+    ScriptEngineTaskRunError,
+)
 
 from helpers.dates import month_number
 from helpers.nemo import remove_unique_attributes
@@ -201,3 +204,26 @@ def compute_regular_grid_weights(cube):
     cube.coord("latitude").guess_bounds()
     cube.coord("longitude").guess_bounds()
     return iris.analysis.cartography.area_weights(cube)
+
+
+def align_time_coords(new_cube, old_cube):
+    """
+    Align the time coordinates in two cubes.
+    Useful if one cube has time in units seconds since 1990-01-01 00:00:00
+    while the other has seconds since 1995-01-01 00:00:00.
+    Iris can not concatenate two such cubes.
+    """
+
+    old_time_coord = old_cube.coord("time")
+
+    new_cube.coord("time").convert_units(old_time_coord.units)
+
+    # We also need to match the attribute time_origin between
+    # new_cube and current_cube to make Iris happy.
+    # Note: This does not always exist
+    if "time_origin" in old_cube.coord("time").attributes.keys():
+        new_cube.coord("time").attributes["time_origin"] = old_cube.coord(
+            "time"
+        ).attributes["time_origin"]
+
+    return new_cube

{scriptengine_tasks_ecearth-0.10.0 → scriptengine_tasks_ecearth-0.10.1}/monitoring/map.py

@@ -1,4 +1,5 @@
 """Base class for map processing tasks."""
+
 from pathlib import Path
 from tempfile import NamedTemporaryFile
 
@@ -26,6 +27,10 @@ class Map(Task):
             iris.save(new_cube, str(dst))
             return
 
+        # align the time coordinates of current and new cube.
+        # Sets units and coordinate attributes to be the same
+        new_cube = helpers.cubes.align_time_coords(new_cube, current_cube)
+
         current_bounds = current_cube.coord("time").bounds
         new_bounds = new_cube.coord("time").bounds
         if current_bounds[-1][-1] > new_bounds[0][0]:

{scriptengine_tasks_ecearth-0.10.0 → scriptengine_tasks_ecearth-0.10.1}/monitoring/temporalmap.py

@@ -11,6 +11,8 @@ from scriptengine.exceptions import (
 )
 from scriptengine.tasks.core import Task
 
+import helpers.cubes
+
 
 class Temporalmap(Task):
     """Temporalmap Processing Task"""
@@ -25,6 +27,10 @@ class Temporalmap(Task):
             iris.save(new_cube, dst)
             return
 
+        # set units and attribute for time coord to be the same
+        # in current_cube and new_cube
+        new_cube = helpers.cubes.align_time_coords(new_cube, current_cube)
+
         current_bounds = current_cube.coord("time").bounds
         new_bounds = new_cube.coord("time").bounds
         if current_bounds[-1][-1] > new_bounds[0][0]:

{scriptengine_tasks_ecearth-0.10.0 → scriptengine_tasks_ecearth-0.10.1}/monitoring/timeseries.py

@@ -93,6 +93,16 @@ class Timeseries(Task):
             iris.save(new_cube, str(dst))
             return
 
+        # set units and attribute for time coord to be the same
+        # in current_cube and new_cube
+        # Only necessary when coordinate in time, not Leg etc.
+        try:
+            # Will work if time coordinate exists
+            new_cube = helpers.cubes.align_time_coords(new_cube, current_cube)
+        except iris.exceptions.CoordinateNotFoundError:
+            # Cube does not use "time" as its DimCoord
+            pass
+
         self.test_monotonic_increase(current_cube.coords()[0], new_cube.coords()[0])
 
         # Iris changes metadata when saving/loading cube

{scriptengine_tasks_ecearth-0.10.0 → scriptengine_tasks_ecearth-0.10.1}/pyproject.toml

@@ -7,7 +7,7 @@
 
 [project]
     name = "scriptengine-tasks-ecearth"
-    version = "0.10.0"
+    version = "0.10.1"
     authors = [
         { name = "Valentina Schueller", email = "valentina.schueller@gmail.com" },
         { name = "Uwe Fladrich", email = "uwe.fladrich@protonmail.com" },

{scriptengine_tasks_ecearth-0.10.0 → scriptengine_tasks_ecearth-0.10.1}/scriptengine_tasks_ecearth.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scriptengine-tasks-ecearth
-Version: 0.10.0
+Version: 0.10.1
 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

{scriptengine_tasks_ecearth-0.10.0 → scriptengine_tasks_ecearth-0.10.1}/tests/test_map.py

@@ -1,4 +1,5 @@
 """Tests for monitoring/map.py"""
+
 from pathlib import Path
 
 import iris
@@ -21,10 +22,10 @@ def test_map_nonmonotonic_increase(tmp_path):
     test_map = Map({})
 
     old_coord_with_bounds = iris.coords.DimCoord(
-        [1], bounds=[0.5, 1.5], var_name="time"
+        [1], bounds=[0.5, 1.5], var_name="time", units="seconds"
     )
     new_coord_with_bounds = iris.coords.DimCoord(
-        [2], bounds=[1.5, 2.5], var_name="time"
+        [2], bounds=[1.5, 2.5], var_name="time", units="seconds"
     )
     old_cube = iris.cube.Cube([0], dim_coords_and_dims=[(old_coord_with_bounds, 0)])
     new_cube = iris.cube.Cube([0], dim_coords_and_dims=[(new_coord_with_bounds, 0)])

{scriptengine_tasks_ecearth-0.10.0 → scriptengine_tasks_ecearth-0.10.1}/tests/test_timeseries.py

@@ -7,6 +7,7 @@ import iris
 import pytest
 import scriptengine.exceptions
 
+import helpers.cubes
 from monitoring.timeseries import Timeseries
 
 
@@ -168,3 +169,43 @@ def test_time_series_date_time(tmp_path):
     assert cube.units.name == "1"
     assert cube.coord().name() == "time"
     assert cube.coord().units.name == "second since 1900-01-01 00:00:00.0000000 UTC"
+
+
+def test_time_series_align(tmp_path):
+    seconds_value = (
+        datetime.datetime(1992, 1, 1) - datetime.datetime(1990, 1, 1)
+    ).total_seconds()
+    init_datetime1 = {
+        "title": "A date diagnostic",
+        "dst": str(tmp_path / "date_file1.nc"),
+        "data_value": 0,
+        "coord_value": 31536000,
+        "coord_unit": "seconds since 1990-01-01 00:00:00",
+    }
+    init_datetime2 = {
+        "title": "A date diagnostic",
+        "dst": str(tmp_path / "date_file2.nc"),
+        "data_value": 0,
+        "coord_value": 31536000,
+        "coord_unit": "seconds since 1991-01-01 00:00:00",
+    }
+    time_series1 = Timeseries(init_datetime1)
+    time_series2 = Timeseries(init_datetime2)
+    time_series1.run(init_datetime1)
+    time_series2.run(init_datetime2)
+
+    cube1 = iris.load_cube(init_datetime1["dst"])
+    cube2 = iris.load_cube(init_datetime2["dst"])
+    cube1.coord("time").attributes["time_origin"] = "1990-01-01 00:00:00"
+    cube2.coord("time").attributes["time_origin"] = "1991-01-01 00:00:00"
+
+    cube2 = helpers.cubes.align_time_coords(cube2, cube1)
+
+    print(cube1.coord("time").units.name)
+    print(cube2.coord("time").units.name)
+    assert (
+        cube2.coord("time").units.name
+        == "second since 1990-01-01 00:00:00.00000000 UTC"
+    )
+    assert cube2.coord("time").attributes["time_origin"] == "1990-01-01 00:00:00"
+    assert cube2.coord("time").points == [seconds_value]