ECC-1903: Hard coding MTG2Switch for S2S, TIGGE and UERRA data as they will use the old definitions, and adding the corresponding definition files.

definitions/grib2/localConcepts/ecmf/MTG2SwitchConcept.def

@@ -7,11 +7,11 @@
 1 = {tablesVersion=35; productionStatusOfProcessedData=1; modelVersion='cy50r1';}
 1 = {tablesVersion=35; productionStatusOfProcessedData=0; modelVersion='cy50r2';}
 # MC
-2 = {tablesVersion=35; productionStatusOfProcessedData=1; modelVersion='cy50r1'; class=mc;}
-2 = {tablesVersion=35; productionStatusOfProcessedData=0; modelVersion='cy50r2'; class=mc;}
+2 = {tablesVersion=35; productionStatusOfProcessedData=1; modelVersion='cy50r1'; marsClass=mc;}
+2 = {tablesVersion=35; productionStatusOfProcessedData=0; modelVersion='cy50r2'; marsClass=mc;}
 # RD
 0 = {tablesVersion=35; productionStatusOfProcessedData=2; modelVersion='cy50r1';}
-1 = {tablesVersion=35; productionStatusOfProcessedData=2; modelVersion='cy50r1'; typeOfProcessedData=9;}
+# 1 = {tablesVersion=35; productionStatusOfProcessedData=2; modelVersion='cy50r1'; typeOfProcessedData=9;}
 1 = {tablesVersion=35; productionStatusOfProcessedData=2; modelVersion='cy50r2';}
 
 # SEAS6

definitions/grib2/parameters.def

@@ -3,14 +3,6 @@
 transient dummyc=0: hidden;
 # If MTG2Switch is defined and it is 0 (pre-MTG2) we need to look at pre-MTG2 definitions.
 # Otherwise (if it is different from 0, or not defined) look at new definitions.
-
-# Possible other case, if we want non-local data (e.g. S2S, TIGGE) to keep the old way.
-# In this case we would also need the "paramId.[tablesVersionMTG2Switch].def" files in the S2S
-# pseudocentre folder.
-# Would need to move the MTG2Switch tablesVersion to Section 1. Put it here for now.
-# constant tablesVersionMTG2Switch=33: hidden;
-# if ( (defined(MTG2Switch) and MTG2Switch == 0) or (!defined(MTG2Switch) and tablesVersion <= tablesVersionMTG2Switch) ) {
-
 # Cannot use constant in concept, has to be string, so duplicating code for now
 
 if ( defined(MTG2Switch) and MTG2Switch == 0 ) {

definitions/grib2/products_s2s.def

@@ -4,6 +4,9 @@
 constant marsClass  = 's2';
 constant marsModel  = 'glob';
 
+# S2S data will always use pre-MTG2 definitions
+constant MTG2Switch = 0;
+
 alias parameter.paramId=paramId;
 alias parameter.shortName=shortName;
 alias parameter.units=units;

definitions/grib2/products_tigge.def

@@ -4,6 +4,9 @@
 constant marsClass = 'ti';
 constant marsModel = 'glob';
 
+# TIGGE data will always use pre-MTG2 definitions
+constant MTG2Switch = 0;
+
 alias tigge_short_name=shortName;
 alias short_name=shortName;
 alias parameter=paramId;

definitions/grib2/products_uerra.def

@@ -3,6 +3,9 @@
 # Uncertainties in ensembles of regional re-analysis project (UERRA)
 constant marsClass = 'ur';
 
+# UERRA data will always use pre-MTG2 definitions
+constant MTG2Switch = 0;
+
 alias tigge_short_name=shortName;
 alias short_name=shortName;
 alias parameter=paramId;