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

TIGGE/S2S/UERRA: Prevent incorrect MARS stream/type being set

This commit is contained in:
Shahram Najm 2022-07-16 13:27:38 +01:00
parent 31992d0f32
commit 2e14caef59
4 changed files with 8 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
definitions/grib2/products_crra.def
View File

@ -45,7 +45,7 @@ if (section2Used == 1) {
} }
# See GRIB-911 re typeOfProcessedData values in UERRA # See GRIB-911 re typeOfProcessedData values in UERRA
concept marsType { concept marsType(unknown) {
fc = { fc = {
typeOfProcessedData = 1; typeOfProcessedData = 1;
@ -73,20 +73,15 @@ concept marsType {
typeOfGeneratingProcess = 0; typeOfGeneratingProcess = 0;
generatingProcessIdentifier = 50; generatingProcessIdentifier = 50;
} }
"default" = {
dummyc = 0;
}
} }
# See GRIB-205 re no_copy # See GRIB-205 re no_copy
# Cannot use typeOfProcessedData for stream. See GRIB-911 # Cannot use typeOfProcessedData for stream. See GRIB-911
concept marsStream { concept marsStream(unknown) {
oper = { oper = {
productDefinitionTemplateNumber = 8; productDefinitionTemplateNumber = 8;
} }
oper = { oper = {
productDefinitionTemplateNumber = 0; productDefinitionTemplateNumber = 0;
} }
@ -94,14 +89,9 @@ concept marsStream {
enda = { enda = {
productDefinitionTemplateNumber = 11; productDefinitionTemplateNumber = 11;
} }
enda = { enda = {
productDefinitionTemplateNumber = 1; productDefinitionTemplateNumber = 1;
} }
"default" = {
dummyc = 0;
}
} : no_copy; } : no_copy;
alias mars.stream = marsStream; alias mars.stream = marsStream;

17
definitions/grib2/products_s2s.def
View File

@ -24,8 +24,7 @@ if (centre is "cnmc" && subCentre == 102) {
unalias mars.domain; unalias mars.domain;
concept marsType { concept marsType(unknown) {
fc = { fc = {
typeOfProcessedData = 2; typeOfProcessedData = 2;
} }
@ -46,19 +45,13 @@ concept marsType {
"11" = { "11" = {
typeOfProcessedData = 4; typeOfProcessedData = 4;
} }
"default" = {
dummyc = 0;
}
} }
# See GRIB-205 re no_copy # See GRIB-205 re no_copy
concept marsStream { concept marsStream(unknown) {
oper = { oper = {
typeOfProcessedData = 0; typeOfProcessedData = 0;
} }
oper = { oper = {
typeOfProcessedData = 2; typeOfProcessedData = 2;
} }
@ -66,18 +59,12 @@ concept marsStream {
enfo = { enfo = {
typeOfProcessedData = 3; typeOfProcessedData = 3;
} }
enfo = { enfo = {
typeOfProcessedData = 4; typeOfProcessedData = 4;
} }
enfo = { enfo = {
typeOfProcessedData = 8; typeOfProcessedData = 8;
} }
"default" = {
dummyc = 0;
}
} : no_copy; } : no_copy;
alias mars.stream = marsStream; alias mars.stream = marsStream;

15
definitions/grib2/products_tigge.def
View File

@ -34,7 +34,7 @@ if (section2Used == 1) {
unalias mars.domain; # No mars domain needed unalias mars.domain; # No mars domain needed
} }
concept marsType { concept marsType(unknown) {
fc = { fc = {
typeOfProcessedData = 2; typeOfProcessedData = 2;
@ -56,19 +56,14 @@ concept marsType {
"11" = { "11" = {
typeOfProcessedData = 4; typeOfProcessedData = 4;
} }
"default" = {
dummyc = 0;
}
} }
# See GRIB-205 re no_copy # See GRIB-205 re no_copy
concept marsStream { concept marsStream(unknown) {
oper = { oper = {
typeOfProcessedData = 0; typeOfProcessedData = 0;
} }
oper = { oper = {
typeOfProcessedData = 2; typeOfProcessedData = 2;
} }
@ -76,18 +71,12 @@ concept marsStream {
enfo = { enfo = {
typeOfProcessedData = 3; typeOfProcessedData = 3;
} }
enfo = { enfo = {
typeOfProcessedData = 4; typeOfProcessedData = 4;
} }
enfo = { enfo = {
typeOfProcessedData = 8; typeOfProcessedData = 8;
} }
"default" = {
dummyc = 0;
}
} : no_copy; } : no_copy;
alias mars.stream = marsStream; alias mars.stream = marsStream;

16
definitions/grib2/products_uerra.def
View File

@ -40,8 +40,7 @@ alias mars.param = paramId;
alias mars.origin = centre; alias mars.origin = centre;
# See GRIB-911 re typeOfProcessedData values in UERRA # See GRIB-911 re typeOfProcessedData values in UERRA
concept marsType { concept marsType(unknown) {
fc = { fc = {
typeOfProcessedData = 1; typeOfProcessedData = 1;
} }
@ -68,20 +67,14 @@ concept marsType {
typeOfGeneratingProcess = 0; typeOfGeneratingProcess = 0;
generatingProcessIdentifier = 50; generatingProcessIdentifier = 50;
} }
"default" = {
dummyc = 0;
}
} }
# See GRIB-205 re no_copy # See GRIB-205 re no_copy
# Cannot use typeOfProcessedData for stream. See GRIB-911 # Cannot use typeOfProcessedData for stream. See GRIB-911
concept marsStream { concept marsStream(unknown) {
oper = { oper = {
productDefinitionTemplateNumber = 8; productDefinitionTemplateNumber = 8;
} }
oper = { oper = {
productDefinitionTemplateNumber = 0; productDefinitionTemplateNumber = 0;
} }
@ -89,14 +82,9 @@ concept marsStream {
enda = { enda = {
productDefinitionTemplateNumber = 11; productDefinitionTemplateNumber = 11;
} }
enda = { enda = {
productDefinitionTemplateNumber = 1; productDefinitionTemplateNumber = 1;
} }
"default" = {
dummyc = 0;
}
} : no_copy; } : no_copy;
alias mars.stream = marsStream; alias mars.stream = marsStream;