ECC-1223: GRIB: New and updated parameters for CARRA/CERRA, bunch 3.1

definitions/grib2/cfVarName.def

@@ -1115,15 +1115,6 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Time integral of snow evaporation flux
-'tisef' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 192 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfSecondFixedSurface = 255 ;
-	 typeOfStatisticalProcessing = 1 ;
-	}
 #Time integral of evapotranspiration flux
 'tietrf' = {
 	 discipline = 2 ;

definitions/grib2/localConcepts/ecmf/cfVarName.def

@@ -13636,6 +13636,23 @@
 	 parameterCategory = 228 ;
 	 parameterNumber = 255 ;
 	}
+#Time integral of snow evaporation flux
+'tisef' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Surface roughness length for heat
+'srlh' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 200 ;
+	}
 #Stream function gradient
 'strfgrd' = {
 	 discipline = 192 ;

definitions/grib2/localConcepts/ecmf/name.def

@@ -13636,6 +13636,23 @@
 	 parameterCategory = 228 ;
 	 parameterNumber = 255 ;
 	}
+#Time integral of snow evaporation flux
+'Time integral of snow evaporation flux' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Surface roughness length for heat
+'Surface roughness length for heat' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 200 ;
+	}
 #Stream function gradient
 'Stream function gradient' = {
 	 discipline = 192 ;

definitions/grib2/localConcepts/ecmf/paramId.def

@@ -13636,6 +13636,23 @@
 	 parameterCategory = 228 ;
 	 parameterNumber = 255 ;
 	}
+#Time integral of snow evaporation flux
+'235072' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Surface roughness length for heat
+'260651' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 200 ;
+	}
 #Stream function gradient
 '129001' = {
 	 discipline = 192 ;

definitions/grib2/localConcepts/ecmf/shortName.def

@@ -13636,6 +13636,23 @@
 	 parameterCategory = 228 ;
 	 parameterNumber = 255 ;
 	}
+#Time integral of snow evaporation flux
+'tisef' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Surface roughness length for heat
+'srlh' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 200 ;
+	}
 #Stream function gradient
 'strfgrd' = {
 	 discipline = 192 ;

definitions/grib2/localConcepts/ecmf/units.def

@@ -13636,6 +13636,23 @@
 	 parameterCategory = 228 ;
 	 parameterNumber = 255 ;
 	}
+#Time integral of snow evaporation flux
+'kg m**-2' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Surface roughness length for heat
+'m' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 200 ;
+	}
 #Stream function gradient
 'm**2 s**-1' = {
 	 discipline = 192 ;

definitions/grib2/name.def

@@ -1115,15 +1115,6 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Time integral of snow evaporation flux
-'Time integral of snow evaporation flux' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 192 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfSecondFixedSurface = 255 ;
-	 typeOfStatisticalProcessing = 1 ;
-	}
 #Time integral of evapotranspiration flux
 'Time integral of evapotranspiration flux' = {
 	 discipline = 2 ;

definitions/grib2/paramId.def

@@ -1115,15 +1115,6 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Time integral of snow evaporation flux
-'235072' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 192 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfSecondFixedSurface = 255 ;
-	 typeOfStatisticalProcessing = 1 ;
-	}
 #Time integral of evapotranspiration flux
 '235073' = {
 	 discipline = 2 ;

definitions/grib2/shortName.def

@@ -1115,15 +1115,6 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Time integral of snow evaporation flux
-'tisef' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 192 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfSecondFixedSurface = 255 ;
-	 typeOfStatisticalProcessing = 1 ;
-	}
 #Time integral of evapotranspiration flux
 'tietrf' = {
 	 discipline = 2 ;

definitions/grib2/units.def

@@ -1115,15 +1115,6 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Time integral of snow evaporation flux
-'kg m**-2' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 192 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfSecondFixedSurface = 255 ;
-	 typeOfStatisticalProcessing = 1 ;
-	}
 #Time integral of evapotranspiration flux
 'kg m**-2' = {
 	 discipline = 2 ;