Merge remote-tracking branch 'origin/feature/mtg2_tablesVersion_switc…

…h_chem' into feature/mtg2_tablesVersion_switch_chem_parameters
ecmwf · Jan 8, 2025 · b386f90 · b386f90
2 parents 7528d29 + e349a45
commit b386f90
Show file tree

Hide file tree

Showing 46 changed files with 5,097 additions and 891 deletions.
diff --git a/definitions/grib2/localConcepts/cerise/name.33.def b/definitions/grib2/localConcepts/cerise/name.33.def
@@ -125,17 +125,17 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 193 ;
 	}
-#Mean surface runoff rate
-'Mean surface runoff rate' = {
+#Time-mean surface runoff rate
+'Time-mean surface runoff rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 202 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
-'Mean sub-surface runoff rate' = {
+#Time-mean sub-surface runoff rate
+'Time-mean sub-surface runoff rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -206,53 +206,53 @@
 	 parameterNumber = 193 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean large-scale precipitation rate
-'Mean large-scale precipitation rate' = {
+#Time-mean large-scale precipitation rate
+'Time-mean large-scale precipitation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 196 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean convective precipitation rate
-'Mean convective precipitation rate' = {
+#Time-mean convective precipitation rate
+'Time-mean convective precipitation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 195 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
-'Mean total snowfall rate' = {
+#Time-mean total snowfall rate
+'Time-mean total snowfall rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 198 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Evaporation
-'Evaporation' = {
+#Time-mean evaporation rate
+'Time-mean evaporation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 199 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean runoff rate
-'Mean runoff rate' = {
+#Time-mean runoff rate
+'Time-mean runoff rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 201 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
-'Mean total precipitation rate' = {
+#Time-mean total precipitation rate
+'Time-mean total precipitation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;

diff --git a/definitions/grib2/localConcepts/cerise/paramId.33.def b/definitions/grib2/localConcepts/cerise/paramId.33.def
@@ -125,7 +125,7 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 193 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 '172008' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -134,7 +134,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 '172009' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -206,7 +206,7 @@
 	 parameterNumber = 193 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 '172142' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -215,7 +215,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 '172143' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -224,7 +224,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 '172144' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -233,7 +233,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 '172182' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -242,7 +242,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 '172205' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -251,7 +251,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 '172228' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;

diff --git a/definitions/grib2/localConcepts/cerise/shortName.33.def b/definitions/grib2/localConcepts/cerise/shortName.33.def
@@ -125,7 +125,7 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 193 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 'msror' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -134,7 +134,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 'mssror' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -206,7 +206,7 @@
 	 parameterNumber = 193 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 'mlsprt' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -215,7 +215,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 'cprate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -224,7 +224,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 'mtsfr' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -233,7 +233,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 'erate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -242,7 +242,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 'mrort' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -251,7 +251,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'tprate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;

diff --git a/definitions/grib2/localConcepts/cerise/units.33.def b/definitions/grib2/localConcepts/cerise/units.33.def
@@ -125,7 +125,7 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 193 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -134,7 +134,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -206,7 +206,7 @@
 	 parameterNumber = 193 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -215,7 +215,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -224,7 +224,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 'm of water equivalent s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -233,7 +233,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 'm of water equivalent s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -242,7 +242,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -251,7 +251,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;

diff --git a/definitions/grib2/localConcepts/destine/MTG2SwitchConcept.def b/definitions/grib2/localConcepts/destine/MTG2SwitchConcept.def
@@ -0,0 +1,2 @@
+# This pseudocentre can be permanently on post-MTG2 definitions
+1 = {edition=2;}
diff --git a/definitions/grib2/localConcepts/destinegen1/MTG2SwitchConcept.def b/definitions/grib2/localConcepts/destinegen1/MTG2SwitchConcept.def
@@ -0,0 +1,2 @@
+# This pseudocentre can be permanently on post-MTG2 definitions
+1 = {edition=2;}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# This pseudocentre can be permanently on post-MTG2 definitions
		1 = {edition=2;}