Merge branch 'master' into master

CHANGELOG.rst

@@ -2,8 +2,8 @@
 Changelog for cfgrib
 ====================
 
-x.x.x.x (xxxx-xx-xx)
---------------------
+0.9.12.0 (2024-05-26)
+---------------------
 
 - fixed issue where GRIB messages with non-hourly steps could not be read
   See `#370 <https://github.com/ecmwf/cfgrib/pull/370>`_.

cfgrib/__init__.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.9.11.0"
+__version__ = "0.9.12.0"
 
 # cfgrib core API depends on the ECMWF ecCodes C-library only
 from .abc import Field, Fieldset, Index, MappingFieldset

cfgrib/xarray_store.py

@@ -42,6 +42,7 @@ def open_dataset(path, **kwargs):
 def merge_datasets(datasets, **kwargs):
     # type: (T.Sequence[xr.Dataset], T.Any) -> T.List[xr.Dataset]
     merged = []  # type: T.List[xr.Dataset]
+    first = []  # type: T.List[xr.Dataset]
     for ds in datasets:
         ds.attrs.pop("history", None)
         for i, o in enumerate(merged):
@@ -55,6 +56,19 @@ def merge_datasets(datasets, **kwargs):
                     pass
         else:
             merged.append(ds)
+            first.append(ds)
+
+    # Add the important coordinate encoding fields from the first found, to the merged:
+    preserve_encoding_fields = ["source", "units", "calendar", "dtype"]
+    for i, o in enumerate(first):
+        for var in o.coords:
+            out_encoding = {
+                key: o[var].encoding[key]
+                for key in preserve_encoding_fields
+                if key in o[var].encoding
+            }
+            merged[i][var].encoding.update(out_encoding)
+
     return merged
 
 

tests/test_40_xarray_store.py

@@ -159,6 +159,19 @@ def test_open_datasets_differet_step_types_zeros() -> None:
     assert res[1].cfrzr.attrs["GRIB_stepType"] == "avg"
 
 
+# ensure that the encoding of the coordinates is preserved
+def test_open_datasets_differet_preserve_coordinate_encoding() -> None:
+    res = xarray_store.open_datasets(TEST_DATA_DIFFERENT_STEP_TYPES)
+    assert len(res) == 2
+    assert "units" in res[0].valid_time.encoding
+    assert "units" in res[1].valid_time.encoding
+
+    res = xarray_store.open_datasets(TEST_DATA_DIFFERENT_STEP_TYPES_ZEROS)
+    assert len(res) == 2
+    assert "units" in res[0].valid_time.encoding
+    assert "units" in res[1].valid_time.encoding
+
+
 def test_open_dataset_steps_in_minutes() -> None:
     res = xarray_store.open_dataset(TEST_DATA_STEPS_IN_MINUTES)