Merge branch 'hotfix/2.32.2'

ecmwf · Nov 10, 2023 · 117945d · 117945d
2 parents ee49b84 + 85145ff
commit 117945d
Show file tree

Hide file tree

Showing 31 changed files with 157 additions and 51 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.32.1
+2.32.2
diff --git a/definitions/grib1/localConcepts/ecmf/cfVarName.def b/definitions/grib1/localConcepts/ecmf/cfVarName.def
@@ -17509,7 +17509,7 @@
 	 table2Version = 228 ;
 	 indicatorOfParameter = 3 ;
 	}
-#Mean temperature at 2 metres
+#Mean 2 metre temperature
 'mean2t' = {
 	 table2Version = 228 ;
 	 indicatorOfParameter = 4 ;

diff --git a/definitions/grib1/localConcepts/ecmf/name.def b/definitions/grib1/localConcepts/ecmf/name.def
@@ -17509,8 +17509,8 @@
 	 table2Version = 228 ;
 	 indicatorOfParameter = 3 ;
 	}
-#Mean temperature at 2 metres
-'Mean temperature at 2 metres' = {
+#Mean 2 metre temperature
+'Mean 2 metre temperature' = {
 	 table2Version = 228 ;
 	 indicatorOfParameter = 4 ;
 	}

diff --git a/definitions/grib1/localConcepts/ecmf/paramId.def b/definitions/grib1/localConcepts/ecmf/paramId.def
@@ -17509,7 +17509,7 @@
 	 table2Version = 228 ;
 	 indicatorOfParameter = 3 ;
 	}
-#Mean temperature at 2 metres
+#Mean 2 metre temperature
 '228004' = {
 	 table2Version = 228 ;
 	 indicatorOfParameter = 4 ;

diff --git a/definitions/grib1/localConcepts/ecmf/shortName.def b/definitions/grib1/localConcepts/ecmf/shortName.def
@@ -17509,7 +17509,7 @@
 	 table2Version = 228 ;
 	 indicatorOfParameter = 3 ;
 	}
-#Mean temperature at 2 metres
+#Mean 2 metre temperature
 'mean2t' = {
 	 table2Version = 228 ;
 	 indicatorOfParameter = 4 ;

diff --git a/definitions/grib1/localConcepts/ecmf/units.def b/definitions/grib1/localConcepts/ecmf/units.def
@@ -17509,7 +17509,7 @@
 	 table2Version = 228 ;
 	 indicatorOfParameter = 3 ;
 	}
-#Mean temperature at 2 metres
+#Mean 2 metre temperature
 'K' = {
 	 table2Version = 228 ;
 	 indicatorOfParameter = 4 ;

diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def
@@ -8023,6 +8023,16 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 17 ;
 	}
+#Mean 2 metre temperature
+'mean2t' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Lake total depth
 'dl' = {
 	 discipline = 1 ;

diff --git a/definitions/grib2/destine_activity.table b/definitions/grib2/destine_activity.table
@@ -1,4 +1,5 @@
 0 unknown unknown
 1 CMIP6 Coupled Model Intercomparison Project Phase 6
 2 ScenarioMIP Scenario Model Intercomparison Project
+3 HighResMIP High Resolution Model Intercomparison Project
 65535 65535 Missing
diff --git a/definitions/grib2/destine_experiment.table b/definitions/grib2/destine_experiment.table
@@ -1,9 +1,10 @@
 0 unknown unknown
 1 hist Historical
-2 amip Atmospheric Model Intercomparison Project
-3 SSP1-1.9 Shared Socio-economic Pathways 1-1.9
-4 SSP1-2.6 Shared Socio-economic Pathways 1-2.6
-5 SSP2-4.5 Shared Socio-economic Pathways 2-4.5
-6 SSP3-7.0 Shared Socio-economic Pathways 3-7.0
-7 SSP5-8.5 Shared Socio-economic Pathways 5-8.5
+2 cont Control
+3 amip Atmospheric Model Intercomparison Project
+4 SSP1-1.9 Shared Socio-economic Pathways 1-1.9
+5 SSP1-2.6 Shared Socio-economic Pathways 1-2.6
+6 SSP2-4.5 Shared Socio-economic Pathways 2-4.5
+7 SSP3-7.0 Shared Socio-economic Pathways 3-7.0
+8 SSP5-8.5 Shared Socio-economic Pathways 5-8.5
 65535 65535 Missing
diff --git a/definitions/grib2/destine_resolution.table b/definitions/grib2/destine_resolution.table
@@ -1,4 +1,4 @@
 0 unknown unknown
 1 standard Standard resolution model output with longer availability
-2 highres High resolution model output with limited availability
-65535 65535 Missing
+2 high High resolution model output with limited availability
+65535 65535 Missing
diff --git a/definitions/grib2/localConcepts/ecmf/cfVarName.def b/definitions/grib2/localConcepts/ecmf/cfVarName.def
@@ -21697,12 +21697,6 @@
 	 parameterCategory = 220 ;
 	 parameterNumber = 228 ;
 	}
-#Mean temperature at 2 metres
-'mean2t' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 4 ;
-	}
 #Mean of 10 metre wind speed
 'mean10ws' = {
 	 discipline = 192 ;

diff --git a/definitions/grib2/localConcepts/ecmf/cfVarName.legacy.def b/definitions/grib2/localConcepts/ecmf/cfVarName.legacy.def
@@ -1309,3 +1309,9 @@
  parameterCategory = 140 ;
  parameterNumber = 249 ;
 }
+#Mean temperature at 2 metres
+'mean2t' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 4 ;
+}
diff --git a/definitions/grib2/localConcepts/ecmf/name.def b/definitions/grib2/localConcepts/ecmf/name.def
@@ -21697,12 +21697,6 @@
 	 parameterCategory = 220 ;
 	 parameterNumber = 228 ;
 	}
-#Mean temperature at 2 metres
-'Mean temperature at 2 metres' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 4 ;
-	}
 #Mean of 10 metre wind speed
 'Mean of 10 metre wind speed' = {
 	 discipline = 192 ;

diff --git a/definitions/grib2/localConcepts/ecmf/name.legacy.def b/definitions/grib2/localConcepts/ecmf/name.legacy.def
@@ -1309,3 +1309,9 @@
  parameterCategory = 140 ;
  parameterNumber = 249 ;
 }
+#Mean temperature at 2 metres
+'Mean temperature at 2 metres' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 4 ;
+}
diff --git a/definitions/grib2/localConcepts/ecmf/paramId.def b/definitions/grib2/localConcepts/ecmf/paramId.def
@@ -21697,12 +21697,6 @@
 	 parameterCategory = 220 ;
 	 parameterNumber = 228 ;
 	}
-#Mean temperature at 2 metres
-'228004' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 4 ;
-	}
 #Mean of 10 metre wind speed
 '228005' = {
 	 discipline = 192 ;

diff --git a/definitions/grib2/localConcepts/ecmf/paramId.legacy.def b/definitions/grib2/localConcepts/ecmf/paramId.legacy.def
@@ -1309,3 +1309,9 @@
  parameterCategory = 140 ;
  parameterNumber = 249 ;
 }
+#Mean temperature at 2 metres
+'228004' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 4 ;
+}
diff --git a/definitions/grib2/localConcepts/ecmf/shortName.def b/definitions/grib2/localConcepts/ecmf/shortName.def
@@ -21697,12 +21697,6 @@
 	 parameterCategory = 220 ;
 	 parameterNumber = 228 ;
 	}
-#Mean temperature at 2 metres
-'mean2t' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 4 ;
-	}
 #Mean of 10 metre wind speed
 'mean10ws' = {
 	 discipline = 192 ;

diff --git a/definitions/grib2/localConcepts/ecmf/shortName.legacy.def b/definitions/grib2/localConcepts/ecmf/shortName.legacy.def
@@ -1309,3 +1309,9 @@
  parameterCategory = 140 ;
  parameterNumber = 249 ;
 }
+#Mean temperature at 2 metres
+'mean2t' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 4 ;
+}
diff --git a/definitions/grib2/localConcepts/ecmf/units.def b/definitions/grib2/localConcepts/ecmf/units.def
@@ -21697,12 +21697,6 @@
 	 parameterCategory = 220 ;
 	 parameterNumber = 228 ;
 	}
-#Mean temperature at 2 metres
-'K' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 4 ;
-	}
 #Mean of 10 metre wind speed
 'm s**-1' = {
 	 discipline = 192 ;

diff --git a/definitions/grib2/localConcepts/ecmf/units.legacy.def b/definitions/grib2/localConcepts/ecmf/units.legacy.def
@@ -1309,3 +1309,9 @@
  parameterCategory = 140 ;
  parameterNumber = 249 ;
 }
+#Mean temperature at 2 metres
+'K' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 4 ;
+}
diff --git a/definitions/grib2/localConcepts/s2s/cfVarName.def b/definitions/grib2/localConcepts/s2s/cfVarName.def
@@ -38,6 +38,17 @@
 	 typeOfFirstFixedSurface = 103 ;
 	 scaledValueOfFirstFixedSurface = 15 ;
 	 scaleFactorOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#2 metre temperature
+'t2m' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
 	}
 #2 metre dewpoint temperature
 'd2m' = {

diff --git a/definitions/grib2/localConcepts/s2s/name.def b/definitions/grib2/localConcepts/s2s/name.def
@@ -38,6 +38,17 @@
 	 typeOfFirstFixedSurface = 103 ;
 	 scaledValueOfFirstFixedSurface = 15 ;
 	 scaleFactorOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#2 metre temperature
+'2 metre temperature' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
 	}
 #2 metre dewpoint temperature
 '2 metre dewpoint temperature' = {

diff --git a/definitions/grib2/localConcepts/s2s/paramId.def b/definitions/grib2/localConcepts/s2s/paramId.def
@@ -38,6 +38,17 @@
 	 typeOfFirstFixedSurface = 103 ;
 	 scaledValueOfFirstFixedSurface = 15 ;
 	 scaleFactorOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#2 metre temperature
+'167' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
 	}
 #2 metre dewpoint temperature
 '168' = {

diff --git a/definitions/grib2/localConcepts/s2s/shortName.def b/definitions/grib2/localConcepts/s2s/shortName.def
@@ -38,6 +38,17 @@
 	 typeOfFirstFixedSurface = 103 ;
 	 scaledValueOfFirstFixedSurface = 15 ;
 	 scaleFactorOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#2 metre temperature
+'2t' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
 	}
 #2 metre dewpoint temperature
 '2d' = {

diff --git a/definitions/grib2/localConcepts/s2s/units.def b/definitions/grib2/localConcepts/s2s/units.def
@@ -38,6 +38,17 @@
 	 typeOfFirstFixedSurface = 103 ;
 	 scaledValueOfFirstFixedSurface = 15 ;
 	 scaleFactorOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#2 metre temperature
+'K' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
 	}
 #2 metre dewpoint temperature
 'K' = {

diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def
@@ -8023,6 +8023,16 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 17 ;
 	}
+#Mean 2 metre temperature
+'Mean 2 metre temperature' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Lake total depth
 'Lake total depth' = {
 	 discipline = 1 ;

diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def
@@ -8023,6 +8023,16 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 17 ;
 	}
+#Mean 2 metre temperature
+'228004' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Lake total depth
 '228007' = {
 	 discipline = 1 ;

diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def
@@ -8023,6 +8023,16 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 17 ;
 	}
+#Mean 2 metre temperature
+'mean2t' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Lake total depth
 'dl' = {
 	 discipline = 1 ;

diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def
@@ -8023,6 +8023,16 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 17 ;
 	}
+#Mean 2 metre temperature
+'K' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Lake total depth
 'm' = {
 	 discipline = 1 ;

diff --git a/definitions/mars/grib.clte.fc.def b/definitions/mars/grib.clte.fc.def
@@ -1,5 +1,4 @@
-alias mars.date = validityDate;
-meta padded_vtime sprintf("%.4d", validityTime): no_copy;
-alias mars.time = padded_vtime;
+alias mars.date = dataDate;
+alias mars.time = dataTime;
 unalias mars.step;
-unalias mars.domain;
+unalias mars.domain;
diff --git a/tests/grib_ecc-1691.sh b/tests/grib_ecc-1691.sh
@@ -65,13 +65,13 @@ ${tools_dir}/grib_set -s numberOfDataPoints=12582912,gridDefinitionTemplateNumbe
 grib_check_key_equals $temp_grib_a "gridSpecification" "H1024"
 
 # Now check streams.
-# Setting stream clte and type fc should set mars.date and mars.time to validityDate and validityTime,
+# Setting stream clte and type fc should set mars.date and mars.time to dataDate and dataTime,
 # and mars.step should be unaliased
 
 ${tools_dir}/grib_set -s stream=clte,type=fc $destine_sample $temp_grib_a
 
 result1=$( ${tools_dir}/grib_get -p mars.date,mars.time $temp_grib_a )
-result2=$( ${tools_dir}/grib_get -p validityDate,validityTime $temp_grib_a )
+result2=$( ${tools_dir}/grib_get -p dataDate,dataTime $temp_grib_a )
 [ "$result1" = "$result2" ]
 
 ${tools_dir}/grib_ls -jm $temp_grib_a