ECC-1903: Reverted change in products files. This doesn't work becaus…

…e the products file comes after the paramId is already decided.
ecmwf · Jan 8, 2025 · 012e04e · 012e04e
1 parent eaa00a0
commit 012e04e
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 28 deletions.
diff --git a/definitions/grib2/localConcepts/s2s/MTG2SwitchConcept.def b/definitions/grib2/localConcepts/s2s/MTG2SwitchConcept.def
@@ -0,0 +1,2 @@
+# This pseudocentre should remain permanently on pre-MTG2 definitions
+0 = {edition=2;}
diff --git a/definitions/grib2/localConcepts/tigge/MTG2SwitchConcept.def b/definitions/grib2/localConcepts/tigge/MTG2SwitchConcept.def
@@ -0,0 +1,2 @@
+# This pseudocentre should remain permanently on pre-MTG2 definitions
+0 = {edition=2;}
diff --git a/definitions/grib2/localConcepts/uerra/MTG2SwitchConcept.def b/definitions/grib2/localConcepts/uerra/MTG2SwitchConcept.def
@@ -0,0 +1,2 @@
+# This pseudocentre should remain permanently on pre-MTG2 definitions
+0 = {edition=2;}
diff --git a/definitions/grib2/products_crra.def b/definitions/grib2/products_crra.def
@@ -142,10 +142,11 @@ if (marsStream is "dame") {
   unalias mars.step;
 }
 # MTG2 support given lack of local section
-if (tablesVersion <= tablesVersionMTG2Switch) {
-    # Pre-MTG2
-    constant MTG2SwitchDefault = 0;
-} else {
-    # All other cases we are post-MTG2
-    constant MTG2SwitchDefault = 1;
-}
+# This comes after the paramId is already decided, so doesn't work.
+# if (tablesVersion <= tablesVersionMTG2Switch) {
+#     # Pre-MTG2
+#     constant MTG2SwitchDefault = 0;
+# } else {
+#     # All other cases we are post-MTG2
+#     constant MTG2SwitchDefault = 1;
+# }
diff --git a/definitions/grib2/products_s2s.def b/definitions/grib2/products_s2s.def
@@ -111,10 +111,11 @@ if (is_ocean3d_param) {
 }
 
 # MTG2 support given lack of local section
-if (tablesVersion <= tablesVersionMTG2Switch) {
-    # Pre-MTG2
-    constant MTG2SwitchDefault = 0;
-} else {
-    # All other cases we are post-MTG2
-    constant MTG2SwitchDefault = 1;
-}
+# This comes after the paramId is already decided, so doesn't work.
+# if (tablesVersion <= tablesVersionMTG2Switch) {
+#     # Pre-MTG2
+#     constant MTG2SwitchDefault = 0;
+# } else {
+#     # All other cases we are post-MTG2
+#     constant MTG2SwitchDefault = 1;
+# }
diff --git a/definitions/grib2/products_tigge.def b/definitions/grib2/products_tigge.def
@@ -83,10 +83,11 @@ alias mars.stream = marsStream;
 alias mars.type   = marsType;
 
 # MTG2 support given lack of local section
-if (tablesVersion <= tablesVersionMTG2Switch) {
-    # Pre-MTG2
-    constant MTG2SwitchDefault = 0;
-} else {
-    # All other cases we are post-MTG2
-    constant MTG2SwitchDefault = 1;
-}
+# This comes after the paramId is already decided, so doesn't work.
+# if (tablesVersion <= tablesVersionMTG2Switch) {
+#     # Pre-MTG2
+#     constant MTG2SwitchDefault = 0;
+# } else {
+#     # All other cases we are post-MTG2
+#     constant MTG2SwitchDefault = 1;
+# }
diff --git a/definitions/grib2/products_uerra.def b/definitions/grib2/products_uerra.def
@@ -98,10 +98,11 @@ alias mars.stream = marsStream;
 alias mars.type   = marsType;
 
 # MTG2 support given lack of local section
-if (tablesVersion <= tablesVersionMTG2Switch) {
-    # Pre-MTG2
-    constant MTG2SwitchDefault = 0;
-} else {
-    # All other cases we are post-MTG2
-    constant MTG2SwitchDefault = 1;
-}
+# This comes after the paramId is already decided, so doesn't work.
+# if (tablesVersion <= tablesVersionMTG2Switch) {
+#     # Pre-MTG2
+#     constant MTG2SwitchDefault = 0;
+# } else {
+#     # All other cases we are post-MTG2
+#     constant MTG2SwitchDefault = 1;
+# }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# This pseudocentre should remain permanently on pre-MTG2 definitions
		0 = {edition=2;}