mars namespace with mars.quantile for GRIB2 adapted

definitions/mars/grib.dacl.pb.def

@@ -1,4 +1,9 @@
-alias   mars.step     = stepRange;
-meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
-alias   mars.quantile = marsQuantile;
-
+alias mars.step     = stepRange;
+if (edition == 1){
+ meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
+ alias mars.quantile = marsQuantile;
+}
+if (edition == 2){
+ meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
+ alias mars.quantile = marsQuantile;
+}

definitions/mars/grib.dacw.pb.def

@@ -1,4 +1,10 @@
-alias   mars.step     = stepRange;
-meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
-alias   mars.quantile = marsQuantile;
+alias mars.step     = stepRange;
+if (edition == 1){
+ meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
+ alias mars.quantile = marsQuantile;
+}
+if (edition == 2){
+ meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
+ alias mars.quantile = marsQuantile;
+}
 

definitions/mars/grib.dcda.me.def

@@ -1 +0,0 @@
-grib.me.def

definitions/mars/grib.dcda.me.def

@@ -0,0 +1,3 @@
+label "_model errors";
+#alias mars.number=perturbationNumber;
+

definitions/mars/grib.eefo.cf.def

@@ -1 +0,0 @@
-base.def

definitions/mars/grib.eefo.cf.def

@@ -0,0 +1,2 @@
+label "_x";
+

definitions/mars/grib.eefo.cr.def

@@ -1 +0,0 @@
-base.def

definitions/mars/grib.eefo.cr.def

@@ -0,0 +1,2 @@
+label "_x";
+

definitions/mars/grib.eefo.ef.def

@@ -1 +0,0 @@
-base.def

definitions/mars/grib.eefo.ef.def

@@ -0,0 +1,2 @@
+label "_x";
+

definitions/mars/grib.eefo.em.def

@@ -1 +1 @@
-alias   mars.step     = stepRange;
+alias mars.step     = stepRange;

definitions/mars/grib.eefo.ep.def

@@ -1 +1 @@
-alias   mars.step     = stepRange;
+alias mars.step     = stepRange;

definitions/mars/grib.eefo.es.def

@@ -1 +1 @@
-alias   mars.step     = stepRange;
+alias mars.step     = stepRange;

definitions/mars/grib.eefo.fc.def

@@ -1 +0,0 @@
-base.def

definitions/mars/grib.eefo.fc.def

@@ -0,0 +1,2 @@
+label "_x";
+

definitions/mars/grib.eefo.pb.def

@@ -1,4 +1,10 @@
-alias   mars.step     = stepRange;
-meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
-alias   mars.quantile = marsQuantile;
+alias mars.step     = stepRange;
+if (edition == 1){
+ meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
+ alias mars.quantile = marsQuantile;
+}
+if (edition == 2){
+ meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
+ alias mars.quantile = marsQuantile;
+}
 

definitions/mars/grib.eefo.pd.def

@@ -1,3 +1,9 @@
-alias   mars.step     = stepRange;
-meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
-alias   mars.quantile = marsQuantile;
+alias mars.step     = stepRange;
+if (edition == 1){
+ meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
+ alias mars.quantile = marsQuantile;
+}
+if (edition == 2){
+ meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
+ alias mars.quantile = marsQuantile;
+}

definitions/mars/grib.eefo.pfc.def

@@ -5,4 +5,5 @@ meta ecpt_model sprintf("%s", postProcessing) : no_copy;
 alias mars.model = ecpt_model;
 
 meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
-alias   mars.quantile = marsQuantile;
+alias mars.quantile = marsQuantile;
+

definitions/mars/grib.eefo.ppm.def

@@ -5,5 +5,5 @@ meta ecpt_model sprintf("%s", postProcessing) : no_copy;
 alias mars.model = ecpt_model;
 
 meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
-alias   mars.quantile = marsQuantile;
+alias mars.quantile = marsQuantile;
 

definitions/mars/grib.eehs.cd.def

@@ -1,3 +1,8 @@
-alias   mars.step     = stepRange;
-alias   mars.quantile = quantile;
-
+alias mars.step     = stepRange;
+if (edition == 1){
+ alias mars.quantile = quantile;
+}
+if (edition == 2){
+ meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
+ alias mars.quantile = marsQuantile;
+}

definitions/mars/grib.efhs.cd.def

@@ -1,3 +1,9 @@
-alias   mars.step     = stepRange;
-alias   mars.quantile = quantile;
+alias mars.step     = stepRange;
+if (edition == 1){
+ alias mars.quantile = quantile;
+}
+if (edition == 2){
+ meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
+ alias mars.quantile = marsQuantile;
+}
 

definitions/mars/grib.enda.4v.def

@@ -1 +0,0 @@
-grib.enda.def

definitions/mars/grib.enda.4v.def

@@ -0,0 +1 @@
+alias mars.number=perturbationNumber;

definitions/mars/grib.enda.an.def

@@ -1 +0,0 @@
-grib.enda.def

definitions/mars/grib.enda.an.def

@@ -0,0 +1 @@
+alias mars.number=perturbationNumber;

definitions/mars/grib.enda.ea.def

@@ -1 +0,0 @@
-grib.enda.def

definitions/mars/grib.enda.ea.def

@@ -0,0 +1 @@
+alias mars.number=perturbationNumber;

definitions/mars/grib.enda.ef.def

@@ -1 +0,0 @@
-grib.enda.def

definitions/mars/grib.enda.ef.def

@@ -0,0 +1 @@
+alias mars.number=perturbationNumber;

definitions/mars/grib.enda.em.def

@@ -1 +0,0 @@
-base.def

definitions/mars/grib.enda.em.def

@@ -0,0 +1,2 @@
+label "_x";
+

definitions/mars/grib.enda.es.def

@@ -1 +0,0 @@
-base.def

definitions/mars/grib.enda.es.def

@@ -0,0 +1,2 @@
+label "_x";
+

definitions/mars/grib.enda.sv.def

@@ -1 +0,0 @@
-grib.enda.def

definitions/mars/grib.enda.sv.def

@@ -0,0 +1 @@
+alias mars.number=perturbationNumber;

definitions/mars/grib.enda.svar.def

@@ -1 +0,0 @@
-grib.enda.def

definitions/mars/grib.enda.svar.def

@@ -0,0 +1 @@
+alias mars.number=perturbationNumber;

definitions/mars/grib.enfo.cf.def

@@ -1 +0,0 @@
-base.def

definitions/mars/grib.enfo.cf.def

@@ -0,0 +1,2 @@
+label "_x";
+

definitions/mars/grib.enfo.cr.def

@@ -1 +0,0 @@
-base.def

definitions/mars/grib.enfo.cr.def

@@ -0,0 +1,2 @@
+label "_x";
+

definitions/mars/grib.enfo.ef.def

@@ -1 +0,0 @@
-base.def

definitions/mars/grib.enfo.ef.def

@@ -0,0 +1,2 @@
+label "_x";
+

definitions/mars/grib.enfo.em.def

@@ -1 +1 @@
-alias   mars.step     = stepRange;
+alias mars.step     = stepRange;

definitions/mars/grib.enfo.ep.def

@@ -1 +1 @@
-alias   mars.step     = stepRange;
+alias mars.step     = stepRange;

definitions/mars/grib.enfo.es.def

@@ -1 +1 @@
-alias   mars.step     = stepRange;
+alias mars.step     = stepRange;

definitions/mars/grib.enfo.fc.def

@@ -1 +0,0 @@
-base.def

definitions/mars/grib.enfo.fc.def

@@ -0,0 +1,2 @@
+label "_x";
+

definitions/mars/grib.enfo.pb.def

@@ -1,4 +1,10 @@
-alias   mars.step     = stepRange;
-meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
-alias   mars.quantile = marsQuantile;
+alias mars.step     = stepRange;
+if (edition == 1){
+ meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
+ alias mars.quantile = marsQuantile;
+}
+if (edition == 2){
+ meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
+ alias mars.quantile = marsQuantile;
+}
 

definitions/mars/grib.enfo.pd.def

@@ -1,3 +1,9 @@
-alias   mars.step     = stepRange;
-meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
-alias   mars.quantile = marsQuantile;
+alias mars.step     = stepRange;
+if (edition == 1){
+ meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
+ alias mars.quantile = marsQuantile;
+}
+if (edition == 2){
+ meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
+ alias mars.quantile = marsQuantile;
+}

definitions/mars/grib.enfo.pfc.def

@@ -5,4 +5,4 @@ meta ecpt_model sprintf("%s", postProcessing) : no_copy;
 alias mars.model = ecpt_model;
 
 meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
-alias   mars.quantile = marsQuantile;
+alias mars.quantile = marsQuantile;

definitions/mars/grib.enfo.ppm.def

@@ -5,5 +5,5 @@ meta ecpt_model sprintf("%s", postProcessing) : no_copy;
 alias mars.model = ecpt_model;
 
 meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
-alias   mars.quantile = marsQuantile;
+alias mars.quantile = marsQuantile;
 

definitions/mars/grib.ewda.4v.def

@@ -1 +0,0 @@
-grib.ewda.def

definitions/mars/grib.ewda.4v.def

@@ -0,0 +1 @@
+alias mars.number=perturbationNumber;

definitions/mars/grib.ewda.an.def

@@ -1 +0,0 @@
-grib.ewda.def

definitions/mars/grib.ewda.an.def

@@ -0,0 +1 @@
+alias mars.number=perturbationNumber;

definitions/mars/grib.ewda.fc.def

@@ -1 +0,0 @@
-grib.ewda.def

definitions/mars/grib.ewda.fc.def

@@ -0,0 +1 @@
+alias mars.number=perturbationNumber;

definitions/mars/grib.mdfa.fc.def

@@ -1,3 +1,3 @@
 # assert(localDefinitionNumber == 1);
-alias   mars.step = stepRange;
+alias mars.step = stepRange;
 unalias mars.time;

definitions/mars/grib.mfam.em.def

@@ -1,7 +1,7 @@
 alias mars.origin = centre;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 
 alias mars.method = methodNumber;

definitions/mars/grib.mfam.fcmean.def

@@ -2,7 +2,7 @@ alias mars.origin = centre;
 alias mars.number = perturbationNumber;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 
 unalias mars.step;
 alias mars.method = methodNumber;

definitions/mars/grib.mfam.fp.def

@@ -1,7 +1,7 @@
 alias mars.origin = centre;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 
 alias mars.method = methodNumber;

definitions/mars/grib.mfam.pb.def

@@ -1,10 +1,16 @@
 alias mars.origin = centre;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 
-meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
-alias   mars.quantile = marsQuantile;
+if (edition == 1){
+ meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
+ alias mars.quantile = marsQuantile;
+}
+if (edition == 2){
+ meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
+ alias mars.quantile = marsQuantile;
+}
 
 # TODO: Check why they are set in the first place
 unalias mars.step;

definitions/mars/grib.mfam.pd.def

@@ -1,10 +1,16 @@
 alias mars.origin = centre;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 
-meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
-alias   mars.quantile = marsQuantile;
+if (edition == 1){
+ meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
+ alias mars.quantile = marsQuantile;
+}
+if (edition == 2){
+ meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
+ alias mars.quantile = marsQuantile;
+}
 
 # TODO: Check why they are set in the first place
 unalias mars.step;

definitions/mars/grib.mfhm.em.def

@@ -1,10 +1,10 @@
 alias mars.origin = centre;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 
-alias   mars.refdate = referenceDate;
+alias mars.refdate = referenceDate;
 unalias mars.date;
 alias mars.method = methodNumber;
 if (class is "od") { alias mars.system = systemNumber; }

definitions/mars/grib.mfhm.es.def

@@ -1,10 +1,10 @@
 alias mars.origin = centre;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 
-alias   mars.refdate = referenceDate;
+alias mars.refdate = referenceDate;
 unalias mars.date;
 alias mars.method = methodNumber;
 if (class is "od") { alias mars.system = systemNumber; }

definitions/mars/grib.mfhm.fcmax.def

@@ -2,9 +2,9 @@ alias mars.number = perturbationNumber;
 alias mars.origin = centre;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 
-alias   mars.refdate = referenceDate;
+alias mars.refdate = referenceDate;
 alias mars.method = methodNumber;
 if (class is "od") { alias mars.system = systemNumber; }

definitions/mars/grib.mfhm.fcmean.def

@@ -2,9 +2,9 @@ alias mars.number = perturbationNumber;
 alias mars.origin = centre;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 
-alias   mars.refdate = referenceDate;
+alias mars.refdate = referenceDate;
 alias mars.method = methodNumber;
 if (class is "od") { alias mars.system = systemNumber; }

definitions/mars/grib.mfhm.fcmin.def

@@ -2,9 +2,9 @@ alias mars.number = perturbationNumber;
 alias mars.origin = centre;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 
-alias   mars.refdate = referenceDate;
+alias mars.refdate = referenceDate;
 alias mars.method = methodNumber;
 if (class is "od") { alias mars.system = systemNumber; }

definitions/mars/grib.mfhm.fcstdev.def

@@ -2,9 +2,9 @@ alias mars.number = perturbationNumber;
 alias mars.origin = centre;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 
-alias   mars.refdate = referenceDate;
+alias mars.refdate = referenceDate;
 alias mars.method = methodNumber;
 if (class is "od") { alias mars.system = systemNumber; }

definitions/mars/grib.mfwm.fcmax.def

@@ -2,7 +2,7 @@ alias mars.number = perturbationNumber;
 alias mars.origin = centre;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 
 alias mars.method = methodNumber;

definitions/mars/grib.mfwm.fcmean.def

@@ -2,7 +2,7 @@ alias mars.number = perturbationNumber;
 alias mars.origin = centre;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 
 alias mars.method = methodNumber;

definitions/mars/grib.mfwm.fcmin.def

@@ -2,7 +2,7 @@ alias mars.number = perturbationNumber;
 alias mars.origin = centre;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 
 alias mars.method = methodNumber;

definitions/mars/grib.mfwm.fcstdev.def

@@ -2,7 +2,7 @@ alias mars.number = perturbationNumber;
 alias mars.origin = centre;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 
 alias mars.method = methodNumber;

definitions/mars/grib.mhwm.fcmax.def

@@ -2,9 +2,9 @@ alias mars.number = perturbationNumber;
 alias mars.origin = centre;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 
-alias   mars.refdate = referenceDate;
+alias mars.refdate = referenceDate;
 alias mars.method = methodNumber;
 if (class is "od") { alias mars.system = systemNumber; }

definitions/mars/grib.mhwm.fcmean.def

@@ -2,9 +2,9 @@ alias mars.number = perturbationNumber;
 alias mars.origin = centre;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 
-alias   mars.refdate = referenceDate;
+alias mars.refdate = referenceDate;
 alias mars.method = methodNumber;
 if (class is "od") { alias mars.system = systemNumber; }

definitions/mars/grib.mhwm.fcmin.def

@@ -2,9 +2,9 @@ alias mars.number = perturbationNumber;
 alias mars.origin = centre;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 
-alias   mars.refdate = referenceDate;
+alias mars.refdate = referenceDate;
 alias mars.method = methodNumber;
 if (class is "od") { alias mars.system = systemNumber; }

definitions/mars/grib.mhwm.fcstdev.def

@@ -2,9 +2,9 @@ alias mars.number = perturbationNumber;
 alias mars.origin = centre;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 
-alias   mars.refdate = referenceDate;
+alias mars.refdate = referenceDate;
 alias mars.method = methodNumber;
 if (class is "od") { alias mars.system = systemNumber; }

definitions/mars/grib.mmaf.fcmean.def

@@ -1,2 +1,2 @@
 alias mars.origin = centre;
-alias  mars.number = perturbationNumber;
+alias mars.number = perturbationNumber;

definitions/mars/grib.mmam.fcmean.def

@@ -1,5 +1,5 @@
 alias mars.origin = centre;
-alias  mars.number = perturbationNumber;
+alias mars.number = perturbationNumber;
 alias mars.fcmonth = marsForecastMonth;
 unalias mars.step;
 

definitions/mars/grib.mnfm.em.def

@@ -1,7 +1,7 @@
 alias mars.origin = centre;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 
 alias mars.method = methodNumber;

definitions/mars/grib.mnfm.es.def

@@ -1,7 +1,7 @@
 alias mars.origin = centre;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 
 alias mars.method = methodNumber;

definitions/mars/grib.mnfm.fcmax.def

@@ -2,7 +2,7 @@ alias mars.origin = centre;
 alias mars.number = perturbationNumber;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 alias mars.method = methodNumber;
 if (class is "od") { alias mars.system = systemNumber; }

definitions/mars/grib.mnfm.fcmean.def

@@ -2,7 +2,7 @@ alias mars.origin = centre;
 alias mars.number = perturbationNumber;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 alias mars.method = methodNumber;
 if (class is "od") { alias mars.system = systemNumber; }

definitions/mars/grib.mnfm.fcmin.def

@@ -2,7 +2,7 @@ alias mars.origin = centre;
 alias mars.number = perturbationNumber;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 alias mars.method = methodNumber;
 if (class is "od") { alias mars.system = systemNumber; }

definitions/mars/grib.mnfm.fcstdev.def

@@ -2,7 +2,7 @@ alias mars.origin = centre;
 alias mars.number = perturbationNumber;
 
 meta    forecastperiod    g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
-alias   mars.fcperiod = forecastperiod;
+alias mars.fcperiod = forecastperiod;
 unalias mars.step;
 alias mars.method = methodNumber;
 if (class is "od") { alias mars.system = systemNumber; }

definitions/mars/grib.mofm.fcmax.def

@@ -1,4 +1,4 @@
-alias  mars.number = perturbationNumber;
+alias mars.number = perturbationNumber;
 unalias mars.step;
 
 # Old GRIBS do not have forecast forecastMonth set. It is computed from verifyingMonth

definitions/mars/grib.mofm.fcmean.def

@@ -1,4 +1,4 @@
-alias  mars.number = perturbationNumber;
+alias mars.number = perturbationNumber;
 unalias mars.step;
 
 # Old GRIBS do not have forecast forecastMonth set. It is computed from verifyingMonth

definitions/mars/grib.mofm.fcmin.def

@@ -1,4 +1,4 @@
-alias  mars.number = perturbationNumber;
+alias mars.number = perturbationNumber;
 unalias mars.step;
 
 # Old GRIBS do not have forecast forecastMonth set. It is computed from verifyingMonth

definitions/mars/grib.mofm.fcstdev.def

@@ -1,4 +1,4 @@
-alias  mars.number = perturbationNumber;
+alias mars.number = perturbationNumber;
 unalias mars.step;
 
 # Old GRIBS do not have forecast forecastMonth set. It is computed from verifyingMonth

definitions/mars/grib.msmm.hcmean.def

@@ -1 +0,0 @@
-grib.msmm.em.def

definitions/mars/grib.msmm.hcmean.def

@@ -0,0 +1,17 @@
+# assert(16);
+alias mars.fcmonth = marsForecastMonth;
+unalias mars.step;
+
+alias mars.origin = centre;
+alias mars.method = methodNumber;
+
+if (class is "od") { alias mars.system = systemNumber; }
+if (class is "me") { alias mars.system = systemNumber; }
+if (class is "en") { alias mars.system = systemNumber; }
+if (class is "c3") { alias mars.system = systemNumber; }
+
+# See ECC-624
+if (centre == 80 && subCentre == 98 && class is "c3") {
+  constant cnmc_cmcc = 'cmcc';
+  alias mars.origin = cnmc_cmcc;
+}

definitions/mars/grib.oper.3v.def

@@ -1 +0,0 @@
-base.def

definitions/mars/grib.oper.3v.def

@@ -0,0 +1,2 @@
+label "_x";
+

definitions/mars/grib.oper.4v.def

@@ -1 +0,0 @@
-base.def

definitions/mars/grib.oper.4v.def

@@ -0,0 +1,2 @@
+label "_x";
+

definitions/mars/grib.oper.an.def

@@ -1 +0,0 @@
-base.def

definitions/mars/grib.oper.an.def

@@ -0,0 +1,2 @@
+label "_x";
+

definitions/mars/grib.oper.ef.def

@@ -1 +0,0 @@
-base.def

definitions/mars/grib.oper.ef.def

@@ -0,0 +1,2 @@
+label "_x";
+