core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Feature/mars namespace quantiles (#250) 

* initial commit

* quantile mars namespace - GRIB2 and GRIB3 same -> if else

* ECC-1935: include mars.quantile.def instead of repeating same definitions several times

* Update grib.efhs.cd.def

Fix error

* ECC-1935: remove GRIB2 from if clause

---------

Co-authored-by: shahramn <masn@ecmwf.int>
This commit is contained in:
rdosinski 2024-10-14 13:16:24 +02:00 committed by GitHub
parent 3812f5ef18
commit 886460db9b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
definitions/mars/grib.dacl.pb.def
View File

@ -1,4 +1,3 @@
alias mars.step = stepRange;
meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
alias mars.quantile = marsQuantile;
alias mars.step = stepRange;
include "mars/mars.quantile.def"

6
definitions/mars/grib.dacw.pb.def
View File

@ -1,4 +1,4 @@
alias mars.step = stepRange;
meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
alias mars.quantile = marsQuantile;
alias mars.step = stepRange;
include "mars/mars.quantile.def"

5
definitions/mars/grib.eefo.pb.def
View File

@ -1,4 +1,3 @@
alias mars.step = stepRange;
meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
alias mars.quantile = marsQuantile;
alias mars.step = stepRange;
include "mars/mars.quantile.def"

6
definitions/mars/grib.eefo.pd.def
View File

@ -1,3 +1,3 @@
alias mars.step = stepRange;
meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
alias mars.quantile = marsQuantile;
alias mars.step = stepRange;
include "mars/mars.quantile.def"

4
definitions/mars/grib.eehs.cd.def
View File

@ -1,3 +1,3 @@
alias mars.step = stepRange;
alias mars.quantile = quantile;
alias mars.step = stepRange;
include "mars/mars.quantile.def"

4
definitions/mars/grib.efhs.cd.def
View File

@ -1,3 +1,3 @@
alias mars.step = stepRange;
alias mars.quantile = quantile;
alias mars.step = stepRange;
include "mars/mars.quantile.def"

5
definitions/mars/grib.enfo.pb.def
View File

@ -1,4 +1,3 @@
alias mars.step = stepRange;
meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
alias mars.quantile = marsQuantile;
alias mars.step = stepRange;
include "mars/mars.quantile.def"

6
definitions/mars/grib.enfo.pd.def
View File

@ -1,3 +1,3 @@
alias mars.step = stepRange;
meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
alias mars.quantile = marsQuantile;
alias mars.step = stepRange;
include "mars/mars.quantile.def"

3
definitions/mars/grib.mfam.pb.def
View File

@ -3,8 +3,7 @@ alias mars.origin = centre;
meta forecastperiod g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
alias mars.fcperiod = forecastperiod;
meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
alias mars.quantile = marsQuantile;
include "mars/mars.quantile.def"
# TODO: Check why they are set in the first place
unalias mars.step;

3
definitions/mars/grib.mfam.pd.def
View File

@ -3,8 +3,7 @@ alias mars.origin = centre;
meta forecastperiod g1fcperiod(P1,P2,timeRangeIndicator,indicatorOfUnitOfTimeRange) : no_copy;
alias mars.fcperiod = forecastperiod;
meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
alias mars.quantile = marsQuantile;
include "mars/mars.quantile.def"
# TODO: Check why they are set in the first place
unalias mars.step;

4
definitions/mars/grib.wees.cd.def
View File

@ -1,3 +1,3 @@
alias mars.step = stepRange;
alias mars.quantile = quantile;
alias mars.step = stepRange;
include "mars/mars.quantile.def"

4
definitions/mars/grib.wehs.cd.def
View File

@ -1,3 +1,3 @@
alias mars.step = stepRange;
alias mars.quantile = quantile;
alias mars.step = stepRange;
include "mars/mars.quantile.def"

17
definitions/mars/mars.quantile.def Normal file
View File

@ -0,0 +1,17 @@
if ((stream is "eehs" or stream is "efhs" or stream is "wees" or stream is "wehs") and (type is "cd")){
if (edition == 1){
# defined in local section 19
alias mars.quantile = quantile;
} else {
meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
alias mars.quantile = marsQuantile;
}
} else {
if (edition == 1){
meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
alias mars.quantile = marsQuantile;
} else {
meta marsQuantile sprintf("%d:%d",quantileValue,totalNumberOfQuantiles);
alias mars.quantile = marsQuantile;
}
}