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

…h_chem' into feature/mtg2_tablesVersion_switch_chem_parameters

definitions/grib2/MTG2SwitchConcept.def

@@ -1 +1,4 @@
 -1 = {dummy=0;}
+# Can also include a centre in here to have them permanently pre MTG2.
+# By default all centres are post MTG2.
+0 = {centre=400;}

definitions/grib2/boot.def

@@ -31,6 +31,10 @@ transient missingValue = 9999;
 constant ieeeFloats = 1 : edition_specific;
 constant isHindcast = 0;
 
+# Set MTG2 defaults
+constant tablesVersionMTG2Switch=33: hidden;
+constant MTG2SwitchDefault = 1;
+
 include "grib2/section.0.def"
 
 template core "grib2/sections.def";

definitions/grib2/local/ecmf/section2_extras.def

@@ -1,9 +1,8 @@
 # (C) Copyright 2005- ECMWF.
 # ECMWF specific section 2 extras
 
-constant tablesVersionMTG2Switch=33: hidden;
-
-# MTG2 behaviour based on tablesVersion above
+# MTG2 behaviour based on tablesVersion defined in boot.def
+# Without accessing this logic (i.e. no ECMWF Section 2) the default is 1 = post-MTG2
 # 0 = pre-MTG2 encoding used
 # 1 = post-MTG2 encoding used
 # 2 = post-MTG2 encoding with paramId + chemId used
@@ -59,6 +58,5 @@ if (tablesVersion <= tablesVersionMTG2Switch) {
 #     }
 # }
 
-# Now evaluate concept
-
-concept MTG2Switch(MTG2SwitchDefault, "MTG2SwitchConcept.def", conceptsDir2,conceptsDir1): no_copy, read_only, long_type;
+# Evaluate concept itself in parameters.def
+# This allows non-ECMWF centres to also access functionality of switch

definitions/grib2/localConcepts/era/MTG2SwitchConcept.def

@@ -0,0 +1,2 @@
+# This centre should remain permanently on pre-MTG2 definitions
+0 = {edition=2;}