Merge branch 'develop' of https://github.com/ecmwf/climetlab into dev…

…elop
ecmwf · Sep 11, 2023 · 5aee200 · 5aee200
2 parents 340ab75 + e0fb59e
commit 5aee200
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 14 deletions.
diff --git a/climetlab/readers/grib/output.py b/climetlab/readers/grib/output.py
@@ -21,12 +21,30 @@
 ACCUMULATIONS = {("tp", 2): {"productDefinitionTemplateNumber": 8}}
 
 
+_ORDER = (
+    "edition",
+    "setLocalDefinition",
+    "typeOfGeneratingProcess",
+    "productDefinitionTemplateNumber",
+)
+
+ORDER = {}
+for i, k in enumerate(_ORDER):
+    ORDER[k] = i
+
+
+def order(key):
+    ORDER.setdefault(key, len(ORDER))
+    return ORDER[key]
+
+
 class Combined:
     def __init__(self, handle, metadata):
         self.handle = handle
         self.metadata = metadata
 
     def __contains__(self, key):
+        # return key in self.metadata or key in self.handle
         raise NotImplementedError()
 
     def __getitem__(self, key):
@@ -89,13 +107,9 @@ def write(
         else:
             handle = template.handle.clone()
 
+        # print("->", metadata)
         self.update_metadata(handle, metadata, compulsary)
-
-        other = {}
-
-        for k, v in list(metadata.items()):
-            if not isinstance(v, (int, float, str)):
-                other[k] = metadata.pop(k)
+        # print("<-", metadata)
 
         if check_nans:
             import numpy as np
@@ -107,11 +121,13 @@ def write(
                 metadata["missingValue"] = missing_value
                 metadata["bitmapPresent"] = 1
 
-        LOG.debug("GribOutput.metadata %s, other %s", metadata, other)
+        metadata = {
+            k: v for k, v in sorted(metadata.items(), key=lambda x: order(x[0]))
+        }
 
-        handle.set_multiple(metadata)
+        LOG.debug("GribOutput.metadata %s", metadata)
 
-        for k, v in other.items():
+        for k, v in metadata.items():
             handle.set(k, v)
 
         handle.set_values(values)
@@ -166,10 +182,9 @@ def update_metadata(self, handle, metadata, compulsary):
         if "number" in metadata:
             compulsary += ("numberOfForecastsInEnsemble",)
             productDefinitionTemplateNumber = {"tp": 11}
-            metadata.setdefault(
-                "productDefinitionTemplateNumber",
-                productDefinitionTemplateNumber.get(handle.get("shortName"), 1),
-            )
+            metadata[
+                "productDefinitionTemplateNumber"
+            ] = productDefinitionTemplateNumber.get(handle.get("shortName"), 1)
 
         if metadata.get("type") in ("pf", "cf"):
             metadata.setdefault("typeOfGeneratingProcess", 4)

diff --git a/tests/test_output.py b/tests/test_output.py
@@ -174,7 +174,7 @@ def test_tp():
 
 
 if __name__ == "__main__":
-    test_tp()
+    test_mars_labeling()
     # from climetlab.testing import main
 
     # main(__file__)