Merge branch 'hotfix/1.11.7' into develop

ecmwf · Mar 7, 2024 · 20e6f22 · 20e6f22
2 parents 51e03c2 + 561eebc
commit 20e6f22
Show file tree

Hide file tree

Showing 15 changed files with 860 additions and 148 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.11.3
+1.11.7
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/bufr-subtypes.yaml b/share/metkit/bufr-subtypes.yaml
@@ -107,8 +107,10 @@ subtypes:
   - [217, 12]
   - [218, 12]
   - [224, 12]
+  - [220, 12]
   - [230, 5]
   - [231, 5]
+  - [233, 12]
   - [237, 1]
   - [240, 2]
   - [250, 2]

diff --git a/share/metkit/language.yaml b/share/metkit/language.yaml
@@ -115,6 +115,7 @@ _field: &_field
     - [emtm, ensemble mean of temporal mean]
     - [ep, event probability]
     - [es, ensemble standard deviation]
+    - [est, ensemble statistics]
     - [estdtm, ensemble standard deviation of temporal mean]
     - [fa, forecast accumulation]
     - [fb, feedback]
@@ -316,7 +317,7 @@ _field: &_field
 
   model:
     category: data
-    type: any
+    type: lowercase
 
   repres:
     flatten: false
@@ -450,7 +451,7 @@ _field: &_field
     - 400
     - 300
     never:
-    - levtype: sfc
+    - levtype: [sfc, o2d]
     - type: ssd
     type: to-by-list-float
 
@@ -554,6 +555,8 @@ _field: &_field
     default: 0
     type: range
     never:
+    - dataset:
+      - climate-dt
     - stream:
       - msmm
       - mmsa
@@ -605,6 +608,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]
@@ -724,11 +730,11 @@ _field: &_field
 
   activity:
     category: data
-    type: any
+    type: lowercase
 
   experiment:
     category: data
-    type: any
+    type: lowercase
 
   generation:
     category: data
@@ -740,7 +746,7 @@ _field: &_field
 
   resolution:
     category: data
-    type: any
+    type: lowercase
 
 #######################################################################
 

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 = {}