Merge branch 'develop' into feature/ecbuild_3.4

definitions/bufr/rdb_key.def

@@ -47,28 +47,33 @@ meta ls.rdbtimeTime sprintf("%.2d%.2d%.2d",rdbtimeHour,rdbtimeMinute,rdbtimeSeco
 meta rdbDateTime julian_date(rdbtimeYear,rdbtimeMonth,rdbtimeDay,rdbtimeHour,rdbtimeMinute,rdbtimeSecond) : no_copy;
 
 byte[3] rectime;
-meta rectimeDay     bits(rectime,0,6) : dump,long_type,no_copy;
-meta rectimeHour    bits(rectime,6,5) : dump,long_type,no_copy;
+meta rectimeDay     bits(rectime,0,6)  : dump,long_type,no_copy;
+meta rectimeHour    bits(rectime,6,5)  : dump,long_type,no_copy;
 meta rectimeMinute  bits(rectime,11,6) : dump,long_type,no_copy;
 meta rectimeSecond  bits(rectime,17,6) : dump,long_type,no_copy;
+meta restricted     bits(rectime,23,1) : dump,long_type,no_copy; # ECC-1136
 
 meta recDateTime julian_date(rdbtimeYear,rdbtimeMonth,rectimeDay,rectimeHour,rectimeMinute,rectimeSecond) : no_copy;
 
 byte[1] corr1Data;
 meta correction1     bits(corr1Data,0,6) : dump,long_type,no_copy;
 meta correction1Part bits(corr1Data,6,1) : dump,long_type,no_copy;
+meta spare1          bits(corr1Data,7,1) : long_type,no_copy;
 
 byte[1] corr2Data;
 meta correction2     bits(corr2Data,0,6) : dump,long_type,no_copy;
 meta correction2Part bits(corr2Data,6,1) : dump,long_type,no_copy;
+meta spare2          bits(corr2Data,7,1) : long_type,no_copy;
 
 byte[1] corr3Data;
 meta correction3     bits(corr3Data,0,6) : dump,long_type,no_copy;
 meta correction3Part bits(corr3Data,6,1) : dump,long_type,no_copy;
+meta spare3          bits(corr3Data,7,1) : long_type,no_copy;
 
 byte[1] corr4Data;
 meta correction4     bits(corr4Data,0,6) : dump,long_type,no_copy;
 meta correction4Part bits(corr4Data,6,1) : dump,long_type,no_copy;
+meta spare4          bits(corr4Data,7,1) : long_type,no_copy;
 
 unsigned[1] qualityControl : dump,long_type;
 alias qualityControl=qualityControl;

definitions/grib2/tables/25/4.5.table

@@ -13,9 +13,9 @@
 11 11 Cumulonimbus (CB) base (m)
 12 12 Cumulonimbus (CB) top (m)
 13 13 Lowest level where vertically integrated cloud cover exceeds the specified percentage (cloud base for a given percentage cloud cover) (%)
-14 14 Level of free convection (LFC)
-15 15 Convective condensation level (CCL)
-16 16 Level of neutral buoyancy or equilibrium level (LNB)
+14 14 Level of free convection (LFC) (-)
+15 15 Convective condensation level (CCL) (-)
+16 16 Level of neutral buoyancy or equilibrium level (LNB) (-)
 # 17-19 Reserved 
 20 20 Isothermal level (K)
 21 21 Lowest level where mass density exceeds the specified value (base for a given threshold of mass density) (kg m-3)
@@ -45,7 +45,7 @@
 111 111 Eta level (-)
 112 112 Reserved 
 113 113 Logarithmic hybrid level 
-114 114 Snow level (Numeric)
+114 sol Snow level (Numeric)
 115 115 Sigma height level
 # 116 Reserved
 117 117 Mixed layer depth (m)
@@ -54,7 +54,7 @@
 # 120-149 Reserved 
 150 150 Generalized vertical height coordinate 
 151 sol Soil level (Numeric)
-152 152 Sea ice level (Numeric)
+152 sol Sea ice level (Numeric)
 # 153-159 Reserved
 160 160 Depth below sea level (m)
 161 161 Depth below water surface (m)

examples/python/high_level_api.py

@@ -360,7 +360,7 @@ class TestBufrMessage(unittest.TestCase):
             msg = BufrMessage(bufr_file)
             msg.unpack()
             msg_keys = list(msg.keys())
-            self.assertEqual(len(msg_keys), 201)
+            self.assertEqual(len(msg_keys), 202)
             for key in KNOWN_BUFR_KEYS:
                 assert key in msg_keys
             # Size of message in bytes

tests/bufr_keys_iter.sh

@@ -63,6 +63,7 @@ rectimeDay
 rectimeHour
 rectimeMinute
 rectimeSecond
+restricted
 correction1
 correction1Part
 correction2