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

ECC-707: Key 'date' printed by grib_ls can be different from 'ls.date'

This commit is contained in:
Shahram Najm 2018-06-25 17:01:42 +01:00
parent a501414622
commit cc04daf388
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
definitions/grib2/local.98.41.def
View File

@ -43,6 +43,7 @@ unsigned[2] anoffsetFrequency = missing(): dump, can_be_missing;
# Boolean # Boolean
transient is_efas = 1; transient is_efas = 1;
transient lsdate_bug = 1: hidden; # See ECC-707
# Note: the key typeOfPostProcessing is in the PDTNs 70, 71, 72 and 73 # Note: the key typeOfPostProcessing is in the PDTNs 70, 71, 72 and 73
concept efas_post_proc { concept efas_post_proc {

20
tools/grib_tools.c
View File

@ -813,6 +813,17 @@ void grib_skip_check(grib_runtime_options* options,grib_handle* h)
} }
} }
/* See ECC-707 */
static int fix_for_lsdate_needed(grib_handle* h)
{
long lsdate_bug = 0;
int err = grib_get_long(h, "lsdate_bug", &lsdate_bug);
if (!err && lsdate_bug == 1) {
return 1;
}
return 0;
}
void grib_print_key_values(grib_runtime_options* options, grib_handle* h) void grib_print_key_values(grib_runtime_options* options, grib_handle* h)
{ {
int i=0; int i=0;
@ -864,15 +875,22 @@ void grib_print_key_values(grib_runtime_options* options, grib_handle* h)
} }
} else { } else {
/* Other products e.g. GRIB */ /* Other products e.g. GRIB */
const int fix_lsdate = (fix_for_lsdate_needed(h) && options->name_space && strcmp(options->name_space,"ls")==0);
if (grib_is_missing(h,options->print_keys[i].name,&ret) && ret==GRIB_SUCCESS) { if (grib_is_missing(h,options->print_keys[i].name,&ret) && ret==GRIB_SUCCESS) {
sprintf(value,"MISSING"); sprintf(value,"MISSING");
} }
else if ( ret == GRIB_SUCCESS ) { else if ( ret == GRIB_SUCCESS ) {
const char* pName = NULL;
if (options->print_keys[i].type == GRIB_TYPE_UNDEFINED) if (options->print_keys[i].type == GRIB_TYPE_UNDEFINED)
grib_get_native_type(h,options->print_keys[i].name,&(options->print_keys[i].type)); grib_get_native_type(h,options->print_keys[i].name,&(options->print_keys[i].type));
switch (options->print_keys[i].type) { switch (options->print_keys[i].type) {
case GRIB_TYPE_STRING: case GRIB_TYPE_STRING:
ret=grib_get_string( h,options->print_keys[i].name,value,&len); pName = options->print_keys[i].name;
if (fix_lsdate && strcmp(pName, "date")==0) { /* ECC-707 */
pName = "ls.date";
}
ret=grib_get_string( h,pName,value,&len);
break; break;
case GRIB_TYPE_DOUBLE: case GRIB_TYPE_DOUBLE:
ret=grib_get_double( h,options->print_keys[i].name,&dvalue); ret=grib_get_double( h,options->print_keys[i].name,&dvalue);