ECC-1886: Fix failing tests

definitions/grib1/localConcepts/ecmf/cfVarName.def

@@ -9,6 +9,16 @@
 	 table2Version = 128 ;
 	 indicatorOfParameter = 49 ;
 	}
+#Maximum temperature at 2 metres in the last 24 hours
+'mx2t24' = {
+	 table2Version = 128 ;
+	 indicatorOfParameter = 51 ;
+	}
+#Minimum temperature at 2 metres in the last 24 hours
+'mn2t24' = {
+	 table2Version = 128 ;
+	 indicatorOfParameter = 52 ;
+	}
 #Maximum temperature at 2 metres in the last 6 hours
 'mx2t6' = {
 	 table2Version = 128 ;
@@ -184,6 +194,16 @@
 	 table2Version = 174 ;
 	 indicatorOfParameter = 96 ;
 	}
+#Maximum temperature at 2 metres in the last 3 hours
+'mx2t3' = {
+	 table2Version = 228 ;
+	 indicatorOfParameter = 26 ;
+	}
+#Minimum temperature at 2 metres in the last 3 hours
+'mn2t3' = {
+	 table2Version = 228 ;
+	 indicatorOfParameter = 27 ;
+	}
 #Maximum 10 metre wind gust in the last 3 hours
 'fg310' = {
 	 table2Version = 228 ;

definitions/grib2/localConcepts/cerise/cfVarName.def

@@ -1,22 +1,4 @@
 # Automatically generated by ./create_def.pl, do not edit
-#Surface runoff
-'sro' = {
-	 localTablesVersion = 1 ;
-	 discipline = 2 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 202 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
-	}
-#Sub-surface runoff
-'ssro' = {
-	 localTablesVersion = 1 ;
-	 discipline = 2 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 204 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
-	}
 #Maximum temperature at 2 metres in the last 24 hours
 'mx2t24' = {
 	 discipline = 0 ;
@@ -40,233 +22,4 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 3 ;
 	 lengthOfTimeRange = 24 ;
-	}
-#Snow depth
-'sd' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 254 ;
-	}
-#Large-scale precipitation
-'lsp' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 196 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
-	}
-#Convective precipitation
-'cp' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 195 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
-	}
-#Snowfall
-'sf' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 198 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
-	}
-#Total cloud cover
-'tcc' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 6 ;
-	 parameterNumber = 192 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfSecondFixedSurface = 8 ;
-	}
-#Evaporation
-'e' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 199 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
-	}
-#Low cloud cover
-'lcc' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 6 ;
-	 parameterNumber = 193 ;
-	}
-#Runoff
-'ro' = {
-	 localTablesVersion = 1 ;
-	 discipline = 2 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 201 ;
-	 typeOfStatisticalProcessing = 1 ;
-	}
-#Total precipitation
-'tp' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 193 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfSecondFixedSurface = 255 ;
-	 typeOfStatisticalProcessing = 1 ;
-	}
-#Forecast albedo
-'fal' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 19 ;
-	 parameterNumber = 193 ;
-	}
-#Mean surface runoff rate
-'msror' = {
-	 localTablesVersion = 1 ;
-	 discipline = 2 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 202 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 0 ;
-	}
-#Mean sub-surface runoff rate
-'mssror' = {
-	 localTablesVersion = 1 ;
-	 discipline = 2 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 204 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 0 ;
-	}
-#Potential evaporation
-'pev' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 200 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
-	}
-#Time-mean snow depth
-'avg_sde' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 11 ;
-	 typeOfStatisticalProcessing = 0 ;
-	}
-#Time-mean snow cover
-'avg_snowc' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 42 ;
-	 typeOfStatisticalProcessing = 0 ;
-	}
-#Time-mean snow depth
-'avg_sd_m' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 254 ;
-	 typeOfStatisticalProcessing = 0 ;
-	}
-#Time-mean low cloud cover
-'avg_lcc_frac' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 6 ;
-	 parameterNumber = 193 ;
-	 typeOfStatisticalProcessing = 0 ;
-	}
-#Time-mean medium cloud cover
-'avg_mcc_frac' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 6 ;
-	 parameterNumber = 194 ;
-	 typeOfStatisticalProcessing = 0 ;
-	}
-#Time-mean high cloud cover
-'avg_hcc_frac' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 6 ;
-	 parameterNumber = 195 ;
-	 typeOfStatisticalProcessing = 0 ;
-	}
-#Time-mean forecast albedo
-'avg_fal_frac' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 19 ;
-	 parameterNumber = 193 ;
-	 typeOfStatisticalProcessing = 0 ;
-	}
-#Mean large-scale precipitation rate
-'mlsprt' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 196 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 0 ;
-	}
-#Mean convective precipitation rate
-'cprate' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 195 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 0 ;
-	}
-#Mean total snowfall rate
-'mtsfr' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 198 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 0 ;
-	}
-#Evaporation
-'erate' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 199 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 0 ;
-	}
-#Mean runoff rate
-'mrort' = {
-	 localTablesVersion = 1 ;
-	 discipline = 2 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 201 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 0 ;
-	}
-#Mean total precipitation rate
-'tprate' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 193 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 0 ;
-	}
-#Mean total cloud cover
-'meantcc' = {
-	 localTablesVersion = 1 ;
-	 discipline = 0 ;
-	 parameterCategory = 6 ;
-	 parameterNumber = 192 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfSecondFixedSurface = 8 ;
-	 typeOfStatisticalProcessing = 0 ;
 }

definitions/grib2/localConcepts/ecmf/cfVarName.def

@@ -1,4 +1,28 @@
 # Automatically generated by ./create_def.pl, do not edit
+#Maximum temperature at 2 metres in the last 24 hours
+'mx2t24' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 indicatorOfUnitForTimeRange = 1 ;
+	 typeOfStatisticalProcessing = 2 ;
+	 lengthOfTimeRange = 24 ;
+	}
+#Minimum temperature at 2 metres in the last 24 hours
+'mn2t24' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 indicatorOfUnitForTimeRange = 1 ;
+	 typeOfStatisticalProcessing = 3 ;
+	 lengthOfTimeRange = 24 ;
+	}
 #10 metre wind gust difference
 'fgdiff10' = {
 	 discipline = 192 ;
@@ -47,6 +71,30 @@
 	 parameterCategory = 171 ;
 	 parameterNumber = 7 ;
 	}
+#Maximum temperature at 2 metres in the last 3 hours
+'mx2t3' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 indicatorOfUnitForTimeRange = 1 ;
+	 typeOfStatisticalProcessing = 2 ;
+	 lengthOfTimeRange = 3 ;
+	}
+#Minimum temperature at 2 metres in the last 3 hours
+'mn2t3' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 indicatorOfUnitForTimeRange = 1 ;
+	 typeOfStatisticalProcessing = 3 ;
+	 lengthOfTimeRange = 3 ;
+	}
 #10 metre wind gust gradient
 'fggrd10' = {
 	 discipline = 192 ;