Merge branch 'hotfix/2.35.1'

ecmwf · May 10, 2024 · 058c168 · 058c168
2 parents bdca02e + daba8ee
commit 058c168
Show file tree

Hide file tree

Showing 41 changed files with 4,700 additions and 1,272 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.35.0
+2.35.1
diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def
@@ -4916,6 +4916,34 @@
 	 parameterNumber = 18 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean snow depth
+'msde' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 11 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean snow cover
+'msnowc' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 42 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean geopotential
+'mz' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 4 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean temperature
+'mt' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-mean U component of wind
 'mu' = {
 	 discipline = 0 ;
@@ -4930,6 +4958,13 @@
 	 parameterNumber = 3 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean specific humidity
+'mq' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-mean surface pressure
 'msp' = {
 	 discipline = 0 ;
@@ -4938,6 +4973,13 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean vertical velocity
+'mw' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-mean total column water
 'mtcw' = {
 	 discipline = 0 ;
@@ -4971,6 +5013,13 @@
 	 parameterNumber = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean boundary layer height
+'mblh' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 18 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-mean 10 metre U wind component
 'm10u' = {
 	 discipline = 0 ;

diff --git a/definitions/grib2/localConcepts/ecmf/cfName.def b/definitions/grib2/localConcepts/ecmf/cfName.def
@@ -476,48 +476,12 @@
 	 parameterCategory = 218 ;
 	 parameterNumber = 200 ;
 	}
-#Sea water potential temperature
-'sea_water_potential_temperature' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 129 ;
-	}
-#Sea water practical salinity
-'sea_water_practical_salinity' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 130 ;
-	}
-#Upward sea water velocity
-'upward_sea_water_velocity' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 133 ;
-	}
-#Sea water sigma theta
-'sea_water_sigma_theta' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 138 ;
-	}
 #Ocean barotropic stream function
 'ocean_barotropic_streamfunction' = {
 	 discipline = 192 ;
 	 parameterCategory = 151 ;
 	 parameterNumber = 147 ;
 	}
-#Surface downward eastward stress
-'surface_downward_eastward_stress' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 153 ;
-	}
-#Surface downward northward stress
-'surface_downward_northward_stress' = {
-	 discipline = 192 ;
-	 parameterCategory = 151 ;
-	 parameterNumber = 154 ;
-	}
 #Carbon dioxide mass mixing ratio
 'mass_fraction_of_carbon_dioxide_in_air' = {
 	 discipline = 192 ;

diff --git a/definitions/grib2/localConcepts/ecmf/cfName.legacy.def b/definitions/grib2/localConcepts/ecmf/cfName.legacy.def
@@ -148,3 +148,39 @@
  parameterCategory = 128 ;
  parameterNumber = 206 ;
 }
+#Sea water potential temperature
+'sea_water_potential_temperature' = {
+ discipline = 192 ;
+ parameterCategory = 151 ;
+ parameterNumber = 129 ;
+}
+#Sea water practical salinity
+'sea_water_practical_salinity' = {
+ discipline = 192 ;
+ parameterCategory = 151 ;
+ parameterNumber = 130 ;
+}
+#Upward sea water velocity
+'upward_sea_water_velocity' = {
+ discipline = 192 ;
+ parameterCategory = 151 ;
+ parameterNumber = 133 ;
+}
+#Sea water sigma theta
+'sea_water_sigma_theta' = {
+ discipline = 192 ;
+ parameterCategory = 151 ;
+ parameterNumber = 138 ;
+}
+#Surface downward eastward stress
+'surface_downward_eastward_stress' = {
+ discipline = 192 ;
+ parameterCategory = 151 ;
+ parameterNumber = 153 ;
+}
+#Surface downward northward stress
+'surface_downward_northward_stress' = {
+ discipline = 192 ;
+ parameterCategory = 151 ;
+ parameterNumber = 154 ;
+}