diff --git a/definitions/mars/grib.dacl.pb.def b/definitions/mars/grib.dacl.pb.def index 5ecc47b04..1f178e5c7 100644 --- a/definitions/mars/grib.dacl.pb.def +++ b/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; +} diff --git a/definitions/mars/grib.dacw.pb.def b/definitions/mars/grib.dacw.pb.def index 5ecc47b04..2e95b03ee 100644 --- a/definitions/mars/grib.dacw.pb.def +++ b/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; +} diff --git a/definitions/mars/grib.dcda.me.def b/definitions/mars/grib.dcda.me.def deleted file mode 120000 index 3def55f94..000000000 --- a/definitions/mars/grib.dcda.me.def +++ /dev/null @@ -1 +0,0 @@ -grib.me.def \ No newline at end of file diff --git a/definitions/mars/grib.dcda.me.def b/definitions/mars/grib.dcda.me.def new file mode 100644 index 000000000..62336f480 --- /dev/null +++ b/definitions/mars/grib.dcda.me.def @@ -0,0 +1,3 @@ +label "_model errors"; +#alias mars.number=perturbationNumber; + diff --git a/definitions/mars/grib.eefo.cf.def b/definitions/mars/grib.eefo.cf.def deleted file mode 120000 index a720ff713..000000000 --- a/definitions/mars/grib.eefo.cf.def +++ /dev/null @@ -1 +0,0 @@ -base.def \ No newline at end of file diff --git a/definitions/mars/grib.eefo.cf.def b/definitions/mars/grib.eefo.cf.def new file mode 100644 index 000000000..f5da9a369 --- /dev/null +++ b/definitions/mars/grib.eefo.cf.def @@ -0,0 +1,2 @@ +label "_x"; + diff --git a/definitions/mars/grib.eefo.cr.def b/definitions/mars/grib.eefo.cr.def deleted file mode 120000 index a720ff713..000000000 --- a/definitions/mars/grib.eefo.cr.def +++ /dev/null @@ -1 +0,0 @@ -base.def \ No newline at end of file diff --git a/definitions/mars/grib.eefo.cr.def b/definitions/mars/grib.eefo.cr.def new file mode 100644 index 000000000..f5da9a369 --- /dev/null +++ b/definitions/mars/grib.eefo.cr.def @@ -0,0 +1,2 @@ +label "_x"; + diff --git a/definitions/mars/grib.eefo.ef.def b/definitions/mars/grib.eefo.ef.def deleted file mode 120000 index a720ff713..000000000 --- a/definitions/mars/grib.eefo.ef.def +++ /dev/null @@ -1 +0,0 @@ -base.def \ No newline at end of file diff --git a/definitions/mars/grib.eefo.ef.def b/definitions/mars/grib.eefo.ef.def new file mode 100644 index 000000000..f5da9a369 --- /dev/null +++ b/definitions/mars/grib.eefo.ef.def @@ -0,0 +1,2 @@ +label "_x"; + diff --git a/definitions/mars/grib.eefo.em.def b/definitions/mars/grib.eefo.em.def index d23a251e9..39e3362e3 100644 --- a/definitions/mars/grib.eefo.em.def +++ b/definitions/mars/grib.eefo.em.def @@ -1 +1 @@ -alias mars.step = stepRange; +alias mars.step = stepRange; diff --git a/definitions/mars/grib.eefo.ep.def b/definitions/mars/grib.eefo.ep.def index d23a251e9..39e3362e3 100644 --- a/definitions/mars/grib.eefo.ep.def +++ b/definitions/mars/grib.eefo.ep.def @@ -1 +1 @@ -alias mars.step = stepRange; +alias mars.step = stepRange; diff --git a/definitions/mars/grib.eefo.es.def b/definitions/mars/grib.eefo.es.def index d23a251e9..39e3362e3 100644 --- a/definitions/mars/grib.eefo.es.def +++ b/definitions/mars/grib.eefo.es.def @@ -1 +1 @@ -alias mars.step = stepRange; +alias mars.step = stepRange; diff --git a/definitions/mars/grib.eefo.fc.def b/definitions/mars/grib.eefo.fc.def deleted file mode 120000 index a720ff713..000000000 --- a/definitions/mars/grib.eefo.fc.def +++ /dev/null @@ -1 +0,0 @@ -base.def \ No newline at end of file diff --git a/definitions/mars/grib.eefo.fc.def b/definitions/mars/grib.eefo.fc.def new file mode 100644 index 000000000..f5da9a369 --- /dev/null +++ b/definitions/mars/grib.eefo.fc.def @@ -0,0 +1,2 @@ +label "_x"; + diff --git a/definitions/mars/grib.eefo.pb.def b/definitions/mars/grib.eefo.pb.def index 5ecc47b04..2e95b03ee 100644 --- a/definitions/mars/grib.eefo.pb.def +++ b/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; +} diff --git a/definitions/mars/grib.eefo.pd.def b/definitions/mars/grib.eefo.pd.def index a53d82ca0..1f178e5c7 100644 --- a/definitions/mars/grib.eefo.pd.def +++ b/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; +} diff --git a/definitions/mars/grib.eefo.pfc.def b/definitions/mars/grib.eefo.pfc.def index c1bc2b6bd..d7a92e08b 100644 --- a/definitions/mars/grib.eefo.pfc.def +++ b/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; + diff --git a/definitions/mars/grib.eefo.ppm.def b/definitions/mars/grib.eefo.ppm.def index a8c09a96e..d7a92e08b 100644 --- a/definitions/mars/grib.eefo.ppm.def +++ b/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; diff --git a/definitions/mars/grib.eehs.cd.def b/definitions/mars/grib.eehs.cd.def index 05e94a6f1..5ef03fc33 100644 --- a/definitions/mars/grib.eehs.cd.def +++ b/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; +} diff --git a/definitions/mars/grib.efhs.cd.def b/definitions/mars/grib.efhs.cd.def index 05e94a6f1..45127bd73 100644 --- a/definitions/mars/grib.efhs.cd.def +++ b/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; +} diff --git a/definitions/mars/grib.enda.4v.def b/definitions/mars/grib.enda.4v.def deleted file mode 120000 index 347c47ad3..000000000 --- a/definitions/mars/grib.enda.4v.def +++ /dev/null @@ -1 +0,0 @@ -grib.enda.def \ No newline at end of file diff --git a/definitions/mars/grib.enda.4v.def b/definitions/mars/grib.enda.4v.def new file mode 100644 index 000000000..4af93e55d --- /dev/null +++ b/definitions/mars/grib.enda.4v.def @@ -0,0 +1 @@ +alias mars.number=perturbationNumber; diff --git a/definitions/mars/grib.enda.an.def b/definitions/mars/grib.enda.an.def deleted file mode 120000 index 347c47ad3..000000000 --- a/definitions/mars/grib.enda.an.def +++ /dev/null @@ -1 +0,0 @@ -grib.enda.def \ No newline at end of file diff --git a/definitions/mars/grib.enda.an.def b/definitions/mars/grib.enda.an.def new file mode 100644 index 000000000..4af93e55d --- /dev/null +++ b/definitions/mars/grib.enda.an.def @@ -0,0 +1 @@ +alias mars.number=perturbationNumber; diff --git a/definitions/mars/grib.enda.ea.def b/definitions/mars/grib.enda.ea.def deleted file mode 120000 index 347c47ad3..000000000 --- a/definitions/mars/grib.enda.ea.def +++ /dev/null @@ -1 +0,0 @@ -grib.enda.def \ No newline at end of file diff --git a/definitions/mars/grib.enda.ea.def b/definitions/mars/grib.enda.ea.def new file mode 100644 index 000000000..4af93e55d --- /dev/null +++ b/definitions/mars/grib.enda.ea.def @@ -0,0 +1 @@ +alias mars.number=perturbationNumber; diff --git a/definitions/mars/grib.enda.ef.def b/definitions/mars/grib.enda.ef.def deleted file mode 120000 index 347c47ad3..000000000 --- a/definitions/mars/grib.enda.ef.def +++ /dev/null @@ -1 +0,0 @@ -grib.enda.def \ No newline at end of file diff --git a/definitions/mars/grib.enda.ef.def b/definitions/mars/grib.enda.ef.def new file mode 100644 index 000000000..4af93e55d --- /dev/null +++ b/definitions/mars/grib.enda.ef.def @@ -0,0 +1 @@ +alias mars.number=perturbationNumber; diff --git a/definitions/mars/grib.enda.em.def b/definitions/mars/grib.enda.em.def deleted file mode 120000 index a720ff713..000000000 --- a/definitions/mars/grib.enda.em.def +++ /dev/null @@ -1 +0,0 @@ -base.def \ No newline at end of file diff --git a/definitions/mars/grib.enda.em.def b/definitions/mars/grib.enda.em.def new file mode 100644 index 000000000..f5da9a369 --- /dev/null +++ b/definitions/mars/grib.enda.em.def @@ -0,0 +1,2 @@ +label "_x"; + diff --git a/definitions/mars/grib.enda.es.def b/definitions/mars/grib.enda.es.def deleted file mode 120000 index a720ff713..000000000 --- a/definitions/mars/grib.enda.es.def +++ /dev/null @@ -1 +0,0 @@ -base.def \ No newline at end of file diff --git a/definitions/mars/grib.enda.es.def b/definitions/mars/grib.enda.es.def new file mode 100644 index 000000000..f5da9a369 --- /dev/null +++ b/definitions/mars/grib.enda.es.def @@ -0,0 +1,2 @@ +label "_x"; + diff --git a/definitions/mars/grib.enda.sv.def b/definitions/mars/grib.enda.sv.def deleted file mode 120000 index 347c47ad3..000000000 --- a/definitions/mars/grib.enda.sv.def +++ /dev/null @@ -1 +0,0 @@ -grib.enda.def \ No newline at end of file diff --git a/definitions/mars/grib.enda.sv.def b/definitions/mars/grib.enda.sv.def new file mode 100644 index 000000000..4af93e55d --- /dev/null +++ b/definitions/mars/grib.enda.sv.def @@ -0,0 +1 @@ +alias mars.number=perturbationNumber; diff --git a/definitions/mars/grib.enda.svar.def b/definitions/mars/grib.enda.svar.def deleted file mode 120000 index 347c47ad3..000000000 --- a/definitions/mars/grib.enda.svar.def +++ /dev/null @@ -1 +0,0 @@ -grib.enda.def \ No newline at end of file diff --git a/definitions/mars/grib.enda.svar.def b/definitions/mars/grib.enda.svar.def new file mode 100644 index 000000000..4af93e55d --- /dev/null +++ b/definitions/mars/grib.enda.svar.def @@ -0,0 +1 @@ +alias mars.number=perturbationNumber; diff --git a/definitions/mars/grib.enfo.cf.def b/definitions/mars/grib.enfo.cf.def deleted file mode 120000 index a720ff713..000000000 --- a/definitions/mars/grib.enfo.cf.def +++ /dev/null @@ -1 +0,0 @@ -base.def \ No newline at end of file diff --git a/definitions/mars/grib.enfo.cf.def b/definitions/mars/grib.enfo.cf.def new file mode 100644 index 000000000..f5da9a369 --- /dev/null +++ b/definitions/mars/grib.enfo.cf.def @@ -0,0 +1,2 @@ +label "_x"; + diff --git a/definitions/mars/grib.enfo.cr.def b/definitions/mars/grib.enfo.cr.def deleted file mode 120000 index a720ff713..000000000 --- a/definitions/mars/grib.enfo.cr.def +++ /dev/null @@ -1 +0,0 @@ -base.def \ No newline at end of file diff --git a/definitions/mars/grib.enfo.cr.def b/definitions/mars/grib.enfo.cr.def new file mode 100644 index 000000000..f5da9a369 --- /dev/null +++ b/definitions/mars/grib.enfo.cr.def @@ -0,0 +1,2 @@ +label "_x"; + diff --git a/definitions/mars/grib.enfo.ef.def b/definitions/mars/grib.enfo.ef.def deleted file mode 120000 index a720ff713..000000000 --- a/definitions/mars/grib.enfo.ef.def +++ /dev/null @@ -1 +0,0 @@ -base.def \ No newline at end of file diff --git a/definitions/mars/grib.enfo.ef.def b/definitions/mars/grib.enfo.ef.def new file mode 100644 index 000000000..f5da9a369 --- /dev/null +++ b/definitions/mars/grib.enfo.ef.def @@ -0,0 +1,2 @@ +label "_x"; + diff --git a/definitions/mars/grib.enfo.em.def b/definitions/mars/grib.enfo.em.def index d23a251e9..39e3362e3 100644 --- a/definitions/mars/grib.enfo.em.def +++ b/definitions/mars/grib.enfo.em.def @@ -1 +1 @@ -alias mars.step = stepRange; +alias mars.step = stepRange; diff --git a/definitions/mars/grib.enfo.ep.def b/definitions/mars/grib.enfo.ep.def index d23a251e9..39e3362e3 100644 --- a/definitions/mars/grib.enfo.ep.def +++ b/definitions/mars/grib.enfo.ep.def @@ -1 +1 @@ -alias mars.step = stepRange; +alias mars.step = stepRange; diff --git a/definitions/mars/grib.enfo.es.def b/definitions/mars/grib.enfo.es.def index d23a251e9..39e3362e3 100644 --- a/definitions/mars/grib.enfo.es.def +++ b/definitions/mars/grib.enfo.es.def @@ -1 +1 @@ -alias mars.step = stepRange; +alias mars.step = stepRange; diff --git a/definitions/mars/grib.enfo.fc.def b/definitions/mars/grib.enfo.fc.def deleted file mode 120000 index a720ff713..000000000 --- a/definitions/mars/grib.enfo.fc.def +++ /dev/null @@ -1 +0,0 @@ -base.def \ No newline at end of file diff --git a/definitions/mars/grib.enfo.fc.def b/definitions/mars/grib.enfo.fc.def new file mode 100644 index 000000000..f5da9a369 --- /dev/null +++ b/definitions/mars/grib.enfo.fc.def @@ -0,0 +1,2 @@ +label "_x"; + diff --git a/definitions/mars/grib.enfo.pb.def b/definitions/mars/grib.enfo.pb.def index 5ecc47b04..2e95b03ee 100644 --- a/definitions/mars/grib.enfo.pb.def +++ b/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; +} diff --git a/definitions/mars/grib.enfo.pd.def b/definitions/mars/grib.enfo.pd.def index a53d82ca0..1f178e5c7 100644 --- a/definitions/mars/grib.enfo.pd.def +++ b/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; +} diff --git a/definitions/mars/grib.enfo.pfc.def b/definitions/mars/grib.enfo.pfc.def index c1bc2b6bd..a9db6210a 100644 --- a/definitions/mars/grib.enfo.pfc.def +++ b/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; diff --git a/definitions/mars/grib.enfo.ppm.def b/definitions/mars/grib.enfo.ppm.def index a8c09a96e..d7a92e08b 100644 --- a/definitions/mars/grib.enfo.ppm.def +++ b/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; diff --git a/definitions/mars/grib.ewda.4v.def b/definitions/mars/grib.ewda.4v.def deleted file mode 120000 index 844ff2f71..000000000 --- a/definitions/mars/grib.ewda.4v.def +++ /dev/null @@ -1 +0,0 @@ -grib.ewda.def \ No newline at end of file diff --git a/definitions/mars/grib.ewda.4v.def b/definitions/mars/grib.ewda.4v.def new file mode 100644 index 000000000..4af93e55d --- /dev/null +++ b/definitions/mars/grib.ewda.4v.def @@ -0,0 +1 @@ +alias mars.number=perturbationNumber; diff --git a/definitions/mars/grib.ewda.an.def b/definitions/mars/grib.ewda.an.def deleted file mode 120000 index 844ff2f71..000000000 --- a/definitions/mars/grib.ewda.an.def +++ /dev/null @@ -1 +0,0 @@ -grib.ewda.def \ No newline at end of file diff --git a/definitions/mars/grib.ewda.an.def b/definitions/mars/grib.ewda.an.def new file mode 100644 index 000000000..4af93e55d --- /dev/null +++ b/definitions/mars/grib.ewda.an.def @@ -0,0 +1 @@ +alias mars.number=perturbationNumber; diff --git a/definitions/mars/grib.ewda.fc.def b/definitions/mars/grib.ewda.fc.def deleted file mode 120000 index 844ff2f71..000000000 --- a/definitions/mars/grib.ewda.fc.def +++ /dev/null @@ -1 +0,0 @@ -grib.ewda.def \ No newline at end of file diff --git a/definitions/mars/grib.ewda.fc.def b/definitions/mars/grib.ewda.fc.def new file mode 100644 index 000000000..4af93e55d --- /dev/null +++ b/definitions/mars/grib.ewda.fc.def @@ -0,0 +1 @@ +alias mars.number=perturbationNumber; diff --git a/definitions/mars/grib.mdfa.fc.def b/definitions/mars/grib.mdfa.fc.def index 63d270822..42b028836 100644 --- a/definitions/mars/grib.mdfa.fc.def +++ b/definitions/mars/grib.mdfa.fc.def @@ -1,3 +1,3 @@ # assert(localDefinitionNumber == 1); -alias mars.step = stepRange; +alias mars.step = stepRange; unalias mars.time; diff --git a/definitions/mars/grib.mfam.em.def b/definitions/mars/grib.mfam.em.def index 054adbcc9..490588a21 100644 --- a/definitions/mars/grib.mfam.em.def +++ b/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; diff --git a/definitions/mars/grib.mfam.fcmean.def b/definitions/mars/grib.mfam.fcmean.def index 6085a05a5..e704e2a4a 100644 --- a/definitions/mars/grib.mfam.fcmean.def +++ b/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; diff --git a/definitions/mars/grib.mfam.fp.def b/definitions/mars/grib.mfam.fp.def index 054adbcc9..490588a21 100644 --- a/definitions/mars/grib.mfam.fp.def +++ b/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; diff --git a/definitions/mars/grib.mfam.pb.def b/definitions/mars/grib.mfam.pb.def index 27df3cc1b..e0f0e5686 100644 --- a/definitions/mars/grib.mfam.pb.def +++ b/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; diff --git a/definitions/mars/grib.mfam.pd.def b/definitions/mars/grib.mfam.pd.def index 96f272f62..4d3b5fcb5 100644 --- a/definitions/mars/grib.mfam.pd.def +++ b/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; diff --git a/definitions/mars/grib.mfhm.em.def b/definitions/mars/grib.mfhm.em.def index 381662b97..7a83b30f7 100644 --- a/definitions/mars/grib.mfhm.em.def +++ b/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; } diff --git a/definitions/mars/grib.mfhm.es.def b/definitions/mars/grib.mfhm.es.def index 381662b97..7a83b30f7 100644 --- a/definitions/mars/grib.mfhm.es.def +++ b/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; } diff --git a/definitions/mars/grib.mfhm.fcmax.def b/definitions/mars/grib.mfhm.fcmax.def index 0c5d0646b..7a78af652 100644 --- a/definitions/mars/grib.mfhm.fcmax.def +++ b/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; } diff --git a/definitions/mars/grib.mfhm.fcmean.def b/definitions/mars/grib.mfhm.fcmean.def index 0c5d0646b..7a78af652 100644 --- a/definitions/mars/grib.mfhm.fcmean.def +++ b/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; } diff --git a/definitions/mars/grib.mfhm.fcmin.def b/definitions/mars/grib.mfhm.fcmin.def index 0c5d0646b..7a78af652 100644 --- a/definitions/mars/grib.mfhm.fcmin.def +++ b/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; } diff --git a/definitions/mars/grib.mfhm.fcstdev.def b/definitions/mars/grib.mfhm.fcstdev.def index 0c5d0646b..7a78af652 100644 --- a/definitions/mars/grib.mfhm.fcstdev.def +++ b/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; } diff --git a/definitions/mars/grib.mfwm.fcmax.def b/definitions/mars/grib.mfwm.fcmax.def index fff22f47e..daba2be12 100644 --- a/definitions/mars/grib.mfwm.fcmax.def +++ b/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; diff --git a/definitions/mars/grib.mfwm.fcmean.def b/definitions/mars/grib.mfwm.fcmean.def index fff22f47e..daba2be12 100644 --- a/definitions/mars/grib.mfwm.fcmean.def +++ b/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; diff --git a/definitions/mars/grib.mfwm.fcmin.def b/definitions/mars/grib.mfwm.fcmin.def index fff22f47e..daba2be12 100644 --- a/definitions/mars/grib.mfwm.fcmin.def +++ b/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; diff --git a/definitions/mars/grib.mfwm.fcstdev.def b/definitions/mars/grib.mfwm.fcstdev.def index fff22f47e..daba2be12 100644 --- a/definitions/mars/grib.mfwm.fcstdev.def +++ b/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; diff --git a/definitions/mars/grib.mhwm.fcmax.def b/definitions/mars/grib.mhwm.fcmax.def index 0c5d0646b..7a78af652 100644 --- a/definitions/mars/grib.mhwm.fcmax.def +++ b/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; } diff --git a/definitions/mars/grib.mhwm.fcmean.def b/definitions/mars/grib.mhwm.fcmean.def index 0c5d0646b..7a78af652 100644 --- a/definitions/mars/grib.mhwm.fcmean.def +++ b/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; } diff --git a/definitions/mars/grib.mhwm.fcmin.def b/definitions/mars/grib.mhwm.fcmin.def index 0c5d0646b..7a78af652 100644 --- a/definitions/mars/grib.mhwm.fcmin.def +++ b/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; } diff --git a/definitions/mars/grib.mhwm.fcstdev.def b/definitions/mars/grib.mhwm.fcstdev.def index 0c5d0646b..7a78af652 100644 --- a/definitions/mars/grib.mhwm.fcstdev.def +++ b/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; } diff --git a/definitions/mars/grib.mmaf.fcmean.def b/definitions/mars/grib.mmaf.fcmean.def index 48ddc47de..cd3c21fbb 100644 --- a/definitions/mars/grib.mmaf.fcmean.def +++ b/definitions/mars/grib.mmaf.fcmean.def @@ -1,2 +1,2 @@ alias mars.origin = centre; -alias mars.number = perturbationNumber; +alias mars.number = perturbationNumber; diff --git a/definitions/mars/grib.mmam.fcmean.def b/definitions/mars/grib.mmam.fcmean.def index a2ece7923..919f7caac 100644 --- a/definitions/mars/grib.mmam.fcmean.def +++ b/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; diff --git a/definitions/mars/grib.mnfm.em.def b/definitions/mars/grib.mnfm.em.def index 054adbcc9..490588a21 100644 --- a/definitions/mars/grib.mnfm.em.def +++ b/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; diff --git a/definitions/mars/grib.mnfm.es.def b/definitions/mars/grib.mnfm.es.def index 054adbcc9..490588a21 100644 --- a/definitions/mars/grib.mnfm.es.def +++ b/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; diff --git a/definitions/mars/grib.mnfm.fcmax.def b/definitions/mars/grib.mnfm.fcmax.def index 4fdd23bf1..6cfae44e3 100644 --- a/definitions/mars/grib.mnfm.fcmax.def +++ b/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; } diff --git a/definitions/mars/grib.mnfm.fcmean.def b/definitions/mars/grib.mnfm.fcmean.def index 4fdd23bf1..6cfae44e3 100644 --- a/definitions/mars/grib.mnfm.fcmean.def +++ b/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; } diff --git a/definitions/mars/grib.mnfm.fcmin.def b/definitions/mars/grib.mnfm.fcmin.def index 4fdd23bf1..6cfae44e3 100644 --- a/definitions/mars/grib.mnfm.fcmin.def +++ b/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; } diff --git a/definitions/mars/grib.mnfm.fcstdev.def b/definitions/mars/grib.mnfm.fcstdev.def index 4fdd23bf1..6cfae44e3 100644 --- a/definitions/mars/grib.mnfm.fcstdev.def +++ b/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; } diff --git a/definitions/mars/grib.mofm.fcmax.def b/definitions/mars/grib.mofm.fcmax.def index 43d6b856a..e6911ab1b 100644 --- a/definitions/mars/grib.mofm.fcmax.def +++ b/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 diff --git a/definitions/mars/grib.mofm.fcmean.def b/definitions/mars/grib.mofm.fcmean.def index ba7077cbc..288c8cbe6 100644 --- a/definitions/mars/grib.mofm.fcmean.def +++ b/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 diff --git a/definitions/mars/grib.mofm.fcmin.def b/definitions/mars/grib.mofm.fcmin.def index ba7077cbc..288c8cbe6 100644 --- a/definitions/mars/grib.mofm.fcmin.def +++ b/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 diff --git a/definitions/mars/grib.mofm.fcstdev.def b/definitions/mars/grib.mofm.fcstdev.def index ba7077cbc..288c8cbe6 100644 --- a/definitions/mars/grib.mofm.fcstdev.def +++ b/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 diff --git a/definitions/mars/grib.msmm.hcmean.def b/definitions/mars/grib.msmm.hcmean.def deleted file mode 120000 index 0b5cb2f13..000000000 --- a/definitions/mars/grib.msmm.hcmean.def +++ /dev/null @@ -1 +0,0 @@ -grib.msmm.em.def \ No newline at end of file diff --git a/definitions/mars/grib.msmm.hcmean.def b/definitions/mars/grib.msmm.hcmean.def new file mode 100644 index 000000000..3131d45a7 --- /dev/null +++ b/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; +} diff --git a/definitions/mars/grib.oper.3v.def b/definitions/mars/grib.oper.3v.def deleted file mode 120000 index a720ff713..000000000 --- a/definitions/mars/grib.oper.3v.def +++ /dev/null @@ -1 +0,0 @@ -base.def \ No newline at end of file diff --git a/definitions/mars/grib.oper.3v.def b/definitions/mars/grib.oper.3v.def new file mode 100644 index 000000000..f5da9a369 --- /dev/null +++ b/definitions/mars/grib.oper.3v.def @@ -0,0 +1,2 @@ +label "_x"; + diff --git a/definitions/mars/grib.oper.4v.def b/definitions/mars/grib.oper.4v.def deleted file mode 120000 index a720ff713..000000000 --- a/definitions/mars/grib.oper.4v.def +++ /dev/null @@ -1 +0,0 @@ -base.def \ No newline at end of file diff --git a/definitions/mars/grib.oper.4v.def b/definitions/mars/grib.oper.4v.def new file mode 100644 index 000000000..f5da9a369 --- /dev/null +++ b/definitions/mars/grib.oper.4v.def @@ -0,0 +1,2 @@ +label "_x"; + diff --git a/definitions/mars/grib.oper.an.def b/definitions/mars/grib.oper.an.def deleted file mode 120000 index a720ff713..000000000 --- a/definitions/mars/grib.oper.an.def +++ /dev/null @@ -1 +0,0 @@ -base.def \ No newline at end of file diff --git a/definitions/mars/grib.oper.an.def b/definitions/mars/grib.oper.an.def new file mode 100644 index 000000000..f5da9a369 --- /dev/null +++ b/definitions/mars/grib.oper.an.def @@ -0,0 +1,2 @@ +label "_x"; + diff --git a/definitions/mars/grib.oper.ef.def b/definitions/mars/grib.oper.ef.def deleted file mode 120000 index a720ff713..000000000 --- a/definitions/mars/grib.oper.ef.def +++ /dev/null @@ -1 +0,0 @@ -base.def \ No newline at end of file diff --git a/definitions/mars/grib.oper.ef.def b/definitions/mars/grib.oper.ef.def new file mode 100644 index 000000000..f5da9a369 --- /dev/null +++ b/definitions/mars/grib.oper.ef.def @@ -0,0 +1,2 @@ +label "_x"; + diff --git a/definitions/mars/grib.oper.gai.def b/definitions/mars/grib.oper.gai.def deleted file mode 120000 index a720ff713..000000000 --- a/definitions/mars/grib.oper.gai.def +++ /dev/null @@ -1 +0,0 @@ -base.def \ No newline at end of file diff --git a/definitions/mars/grib.oper.gai.def b/definitions/mars/grib.oper.gai.def new file mode 100644 index 000000000..f5da9a369 --- /dev/null +++ b/definitions/mars/grib.oper.gai.def @@ -0,0 +1,2 @@ +label "_x"; + diff --git a/definitions/mars/grib.oper.ia.def b/definitions/mars/grib.oper.ia.def deleted file mode 120000 index a720ff713..000000000 --- a/definitions/mars/grib.oper.ia.def +++ /dev/null @@ -1 +0,0 @@ -base.def \ No newline at end of file diff --git a/definitions/mars/grib.oper.ia.def b/definitions/mars/grib.oper.ia.def new file mode 100644 index 000000000..f5da9a369 --- /dev/null +++ b/definitions/mars/grib.oper.ia.def @@ -0,0 +1,2 @@ +label "_x"; + diff --git a/definitions/mars/grib.oper.me.def b/definitions/mars/grib.oper.me.def deleted file mode 120000 index 3def55f94..000000000 --- a/definitions/mars/grib.oper.me.def +++ /dev/null @@ -1 +0,0 @@ -grib.me.def \ No newline at end of file diff --git a/definitions/mars/grib.oper.me.def b/definitions/mars/grib.oper.me.def new file mode 100644 index 000000000..62336f480 --- /dev/null +++ b/definitions/mars/grib.oper.me.def @@ -0,0 +1,3 @@ +label "_model errors"; +#alias mars.number=perturbationNumber; + diff --git a/definitions/mars/grib.oper.oi.def b/definitions/mars/grib.oper.oi.def deleted file mode 120000 index a720ff713..000000000 --- a/definitions/mars/grib.oper.oi.def +++ /dev/null @@ -1 +0,0 @@ -base.def \ No newline at end of file diff --git a/definitions/mars/grib.oper.oi.def b/definitions/mars/grib.oper.oi.def new file mode 100644 index 000000000..f5da9a369 --- /dev/null +++ b/definitions/mars/grib.oper.oi.def @@ -0,0 +1,2 @@ +label "_x"; + diff --git a/definitions/mars/grib.oper.pfc.def b/definitions/mars/grib.oper.pfc.def index a8c09a96e..d7a92e08b 100644 --- a/definitions/mars/grib.oper.pfc.def +++ b/definitions/mars/grib.oper.pfc.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; diff --git a/definitions/mars/grib.oper.si.def b/definitions/mars/grib.oper.si.def deleted file mode 120000 index a720ff713..000000000 --- a/definitions/mars/grib.oper.si.def +++ /dev/null @@ -1 +0,0 @@ -base.def \ No newline at end of file diff --git a/definitions/mars/grib.oper.si.def b/definitions/mars/grib.oper.si.def new file mode 100644 index 000000000..f5da9a369 --- /dev/null +++ b/definitions/mars/grib.oper.si.def @@ -0,0 +1,2 @@ +label "_x"; + diff --git a/definitions/mars/grib.scda.me.def b/definitions/mars/grib.scda.me.def deleted file mode 120000 index 3def55f94..000000000 --- a/definitions/mars/grib.scda.me.def +++ /dev/null @@ -1 +0,0 @@ -grib.me.def \ No newline at end of file diff --git a/definitions/mars/grib.scda.me.def b/definitions/mars/grib.scda.me.def new file mode 100644 index 000000000..62336f480 --- /dev/null +++ b/definitions/mars/grib.scda.me.def @@ -0,0 +1,3 @@ +label "_model errors"; +#alias mars.number=perturbationNumber; + diff --git a/definitions/mars/grib.wave.4v.def b/definitions/mars/grib.wave.4v.def deleted file mode 120000 index 72a1352d1..000000000 --- a/definitions/mars/grib.wave.4v.def +++ /dev/null @@ -1 +0,0 @@ -grib.wave.def \ No newline at end of file diff --git a/definitions/mars/grib.wave.4v.def b/definitions/mars/grib.wave.4v.def new file mode 100644 index 000000000..46a39ac0c --- /dev/null +++ b/definitions/mars/grib.wave.4v.def @@ -0,0 +1,3 @@ +transient conceptDir = "mars"; +concept waveDomain(unknown,"wave_domain.def",conceptDir,conceptDir) : no_copy,read_only; +alias mars.domain = waveDomain; diff --git a/definitions/mars/grib.wees.cd.def b/definitions/mars/grib.wees.cd.def index 05e94a6f1..45127bd73 100644 --- a/definitions/mars/grib.wees.cd.def +++ b/definitions/mars/grib.wees.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; +} diff --git a/definitions/mars/grib.wehs.cd.def b/definitions/mars/grib.wehs.cd.def index 05e94a6f1..45127bd73 100644 --- a/definitions/mars/grib.wehs.cd.def +++ b/definitions/mars/grib.wehs.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; +} diff --git a/definitions/mars/grib.wmfm.fcmax.def b/definitions/mars/grib.wmfm.fcmax.def index 2cca02b9b..66d520ff2 100644 --- a/definitions/mars/grib.wmfm.fcmax.def +++ b/definitions/mars/grib.wmfm.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 diff --git a/definitions/mars/grib.wmfm.fcmean.def b/definitions/mars/grib.wmfm.fcmean.def index 2cca02b9b..66d520ff2 100644 --- a/definitions/mars/grib.wmfm.fcmean.def +++ b/definitions/mars/grib.wmfm.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 diff --git a/definitions/mars/grib.wmfm.fcmin.def b/definitions/mars/grib.wmfm.fcmin.def index 2cca02b9b..66d520ff2 100644 --- a/definitions/mars/grib.wmfm.fcmin.def +++ b/definitions/mars/grib.wmfm.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 diff --git a/definitions/mars/grib.wmfm.fcstdev.def b/definitions/mars/grib.wmfm.fcstdev.def index 2cca02b9b..66d520ff2 100644 --- a/definitions/mars/grib.wmfm.fcstdev.def +++ b/definitions/mars/grib.wmfm.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