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

Fix with chem/srcsink id for non chemical parameters

This commit is contained in:
Robert Osinski 2024-06-17 10:17:46 +00:00
parent 6104127361
commit f11e63fda8
2 changed files with 23 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
definitions/grib2/boot.def
View File

@ -20,6 +20,7 @@ constant grib2divider = 1000000;
alias extraDimensionPresent = zero;
transient angleSubdivisions = grib2divider; # micro degrees
transient forceStepUnits = 255 : hidden;
transient minus_one = -1: hidden;
meta gts_header gts_header() : no_copy,hidden,read_only;
meta gts_TTAAii gts_header(20,6) : no_copy,hidden,read_only;

39
definitions/grib2/parameters.def
View File

@ -4,52 +4,36 @@ transient dummyc=0: hidden;
concept paramIdLegacyECMF(defaultParameter,"paramId.legacy.def",conceptsMasterDir,conceptsLocalDirECMF): long_type,no_copy,hidden;
concept paramIdECMF (paramIdLegacyECMF,"paramId.def",conceptsMasterDir,conceptsLocalDirECMF): long_type,no_copy;
concept paramIdFallback (paramIdECMF,"paramId.def",conceptsDir2,conceptsDir1): long_type;
concept paramId (paramIdECMF,"paramId.def",conceptsDir2,conceptsDir1): long_type;
concept shortNameLegacyECMF(defaultShortName,"shortName.legacy.def",conceptsMasterDir,conceptsLocalDirECMF): no_copy,hidden;
concept shortNameECMF (shortNameLegacyECMF,"shortName.def",conceptsMasterDir,conceptsLocalDirECMF): no_copy;
concept shortNameFallback (shortNameECMF,"shortName.def",conceptsDir2,conceptsDir1): no_copy,dump;
concept ls.shortName (shortNameECMF,"shortName.def",conceptsDir2,conceptsDir1): no_copy,dump;
concept unitsLegacyECMF(defaultName,"units.legacy.def",conceptsMasterDir,conceptsLocalDirECMF): no_copy,hidden,read_only;
concept unitsECMF (unitsLegacyECMF,"units.def",conceptsMasterDir,conceptsLocalDirECMF): no_copy, read_only;
concept unitsFallback (unitsECMF,"units.def",conceptsDir2,conceptsDir1): no_copy, read_only;
concept units (unitsECMF,"units.def",conceptsDir2,conceptsDir1): no_copy, read_only;
concept nameLegacyECMF(defaultName,"name.legacy.def",conceptsMasterDir,conceptsLocalDirECMF): no_copy,hidden;
concept nameECMF(nameLegacyECMF,"name.def",conceptsMasterDir,conceptsLocalDirECMF): no_copy;
concept nameFallback (nameECMF,"name.def",conceptsDir2,conceptsDir1): no_copy,dump;
concept name(nameECMF,"name.def",conceptsDir2,conceptsDir1): no_copy,dump;
concept cfNameLegacyECMF(defaultShortName,"cfName.legacy.def",conceptsMasterDir,conceptsLocalDirECMF): no_copy,hidden;
concept cfNameECMF(cfNameLegacyECMF,"cfName.def",conceptsMasterDir,conceptsLocalDirECMF) : no_copy;
concept cfNameFallback (cfNameECMF,"cfName.def",conceptsDir2,conceptsDir1) : no_copy,dump;
concept cfName(cfNameECMF,"cfName.def",conceptsDir2,conceptsDir1) : no_copy,dump;
concept cfVarNameLegacyECMF(defaultShortName,"cfVarName.legacy.def",conceptsMasterDir,conceptsLocalDirECMF): no_copy,hidden;
concept cfVarNameECMF (cfVarNameLegacyECMF,"cfVarName.def",conceptsMasterDir,conceptsLocalDirECMF): no_copy;
concept cfVarNameFallback (cfVarNameECMF,"cfVarName.def",conceptsDir2,conceptsDir1): no_copy,dump;
concept cfVarName (cfVarNameECMF,"cfVarName.def",conceptsDir2,conceptsDir1): no_copy,dump;
if (tablesVersion >= 31 ) {
concept paramId (paramIdFallback,"paramId.def",conceptsDir2,conceptsDir1): long_type;
concept ls.shortName (shortNameFallback,"shortName.def",conceptsDir2,conceptsDir1): no_copy,dump;
concept units (unitsFallback,"units.def",conceptsDir2,conceptsDir1): no_copy, read_only;
concept name(nameFallback,"name.def",conceptsDir2,conceptsDir1): no_copy,dump;
concept cfName(cfNameFallback,"cfName.def",conceptsDir2,conceptsDir1) : no_copy,dump;
concept cfVarName (cfVarNameFallback,"cfVarName.def",conceptsDir2,conceptsDir1): no_copy,dump;
}
else {
alias paramId=paramIdFallback;
alias ls.shortName=shortNameFallback;
alias units=unitsFallback;
alias name=nameFallback;
alias cfName=cfNameFallback;
alias cfVarName=cfVarNameFallback;
}
if (tablesVersion >= 31 ) {
concept chemId (unknown,"chemId.def",conceptsDir2,conceptsDir1): no_copy,long_type,dump;
# Note: 0 is a valid chemId
concept chemId (minus_one,"chemId.def",conceptsDir2,conceptsDir1): no_copy,long_type,dump;
concept chemName (unknown,"chemName.def",conceptsDir2,conceptsDir1): no_copy,dump;
concept chemShortName (unknown,"chemShortName.def",conceptsDir2,conceptsDir1): no_copy,dump;
concept chemFormula (unknown,"chemFormula.def",conceptsDir2,conceptsDir1): no_copy,dump;
if ( !(chemId is "unknown") ) {
if ( !(chemId is minus_one) ) {
alias mars.chem = chemId;
alias parameter.chemId = chemId;
alias ls.chemShortName = chemShortName;
@ -58,11 +42,12 @@ if (tablesVersion >= 31 ) {
}
if (tablesVersion >= 31 ) {
concept srcSinkId (unknown,"srcSinkId.def",conceptsDir2,conceptsDir1): no_copy,long_type,dump;
# Note: 0 is a valid srcSinkId
concept srcSinkId (minus_one,"srcSinkId.def",conceptsDir2,conceptsDir1): no_copy,long_type,dump;
concept srcSinkName (unknown,"srcSinkName.def",conceptsDir2,conceptsDir1): no_copy,dump;
concept srcSinkShortName (unknown,"srcSinkShortName.def",conceptsDir2,conceptsDir1): no_copy,dump;
if ( !(srcSinkId is "unknown") ) {
if ( !(srcSinkId is minus_one) ) {
alias mars.srcSink = srcSinkId;
alias parameter.srcSinkId = srcSinkId;
alias ls.srcSinkShortName = srcSinkShortName;