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

Definitions: Simplify logic, use isnot operator

This commit is contained in:
shahramn 2024-07-16 11:55:07 +01:00
parent 3381521394
commit 5e4f379ea0
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
definitions/grib2/local/ecmf/section4_extras.def
View File

@ -4,7 +4,7 @@
if (centre is "ecmf" or datasetForLocal is "era6") {
concept modelName(unknown, "modelNameConcept.def", conceptsMasterDir, conceptsLocalDirAll): no_copy, dump, read_only;
if (!(modelName is "unknown")) {
if (modelName isnot "unknown") {
concept modelVersion(unknown, "modelVersionConcept_[modelName].def", conceptsMasterDir, conceptsLocalDirAll): no_copy, dump, read_only;
# alias ls.model = modelName;
# alias mars.model = modelName;

2
definitions/grib2/post_meta_data.hook.products_12.def
View File

@ -9,6 +9,6 @@ concept destineOrigin(unknown, "destineOriginConcept.def", conceptsDir2, concept
unalias mars.domain;
# ECC-1796: stepRange indexing for DestinE ExtremesDT and On-Demand ExtremesDT data
if ( defined(dataset) && !(dataset is "climate-dt") ) {
if ( defined(dataset) && dataset isnot "climate-dt" ) {
alias mars.step=stepRange;
}

2
definitions/grib2/section.4.def
View File

@ -51,7 +51,7 @@ concept datasetForLocal(unknown) {
"unknown" = { dummy=1; }
}
if (!(datasetForLocal is "unknown")) {
if (datasetForLocal isnot "unknown") {
constant conceptsDir2 = "grib2/localConcepts/[datasetForLocal]": hidden;
constant conceptsDir1 = "grib2": hidden;
}

14
definitions/mars/grib.mmsf.an.def
View File

@ -1,15 +1,16 @@
#no step in type an
unalias mars.step;
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; }
if (class is "ci") { alias mars.system = systemNumber; }
if (class is "od" || class is "me" || class is "en" ||
class is "c3" || class is "ci")
{
alias mars.system = systemNumber;
}
alias mars.number = perturbationNumber;
alias mars.method = methodNumber;
if (!(class is "gw")) { # ECC-1448
if (class isnot "gw") { # ECC-1448
alias mars.origin = centre;
}
@ -20,4 +21,3 @@ if (centre == 80 && subCentre == 98 && class is "c3") {
}
if (class is "ci") { unalias mars.method; }

14
definitions/mars/grib.mmsf.fc.def
View File

@ -4,15 +4,16 @@ if (levtype is "o2d" || levtype is "o3d") {
alias mars.step = endStep;
}
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; }
if (class is "ci") { alias mars.system = systemNumber; }
if (class is "od" || class is "me" || class is "en" ||
class is "c3" || class is "ci")
{
alias mars.system = systemNumber;
}
alias mars.number = perturbationNumber;
alias mars.method = methodNumber;
if (!(class is "gw")) { # ECC-1448
if (class isnot "gw") { # ECC-1448
alias mars.origin = centre;
}
@ -23,4 +24,3 @@ if (centre == 80 && subCentre == 98 && class is "c3") {
}
if (class is "ci") { unalias mars.method; }