Merge branch 'develop' into feature/grib-jump

ecmwf · Feb 19, 2024 · a715497 · a715497
2 parents 64e7f9f + 2849a10
commit a715497
Show file tree

Hide file tree

Showing 9 changed files with 767 additions and 115 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.11.1
+1.11.5
diff --git a/share/metkit/axis.yaml b/share/metkit/axis.yaml
@@ -40,3 +40,12 @@ axes:
     - direction
     - channel
     - reportype
+    - dataset
+    - activity
+    - experiment
+    - generation
+    - model
+    - realization
+    - resolution
+    - year
+    - month
diff --git a/share/metkit/language.yaml b/share/metkit/language.yaml
@@ -7,11 +7,13 @@ _field: &_field
     flatten: false
     type: enum
     values:
+    - [ai, operational aifs]
     - [at, austria]
     - [be, belgium]
     - [c3, c3s]
     - [ce, cems]
     - [ch, switzerland]
+    - [ci, cerise]
     - [co, cosmo]
     - [cr, cams research]
     - [cs, ecsn]
@@ -448,7 +450,7 @@ _field: &_field
     - 400
     - 300
     never:
-    - levtype: sfc
+    - levtype: [sfc, o2d]
     - type: ssd
     type: to-by-list-float
 
@@ -552,6 +554,8 @@ _field: &_field
     default: 0
     type: range
     never:
+    - dataset:
+      - climate-dt
     - stream:
       - msmm
       - mmsa
@@ -603,6 +607,9 @@ _field: &_field
     default: g
     flatten: false
     type: enum
+    never:
+    - dataset:
+      - climate-dt
     values:
     - [a, north west europe]
     - [b, north east europe, baltic and black sea]

diff --git a/share/metkit/make-paramids-yaml.py b/share/metkit/make-paramids-yaml.py
@@ -5,7 +5,8 @@
 import os
 
 # import json
-db = MySQLdb.connect("bol-db-products-prod-01.ecmwf.int", "ecmwf_ro", "ecmwf_ro", "param")
+db = MySQLdb.connect("webapps-db-prod", "ecmwf_ro", "ecmwf_ro", "param")
+# db = MySQLdb.connect("bol-db-products-prod-01.ecmwf.int", "ecmwf_ro", "ecmwf_ro", "param")
 # db = MySQLdb.connect("k8s-bol-webapps-test-worker-016.ecmwf.int", "products", "products", "param", port=30544)
 
 PRODGEN = {}