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

ECC-1611: C API: Add function to determine if a BUFR key is a coordinate descriptor

This commit is contained in:
Shahram Najm 2023-06-13 20:52:59 +01:00 committed by shahramn
parent 7c08ef63e3
commit 9cccaec4ed
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/grib_accessor_class_bufr_data_array.cc
View File

@ -1961,7 +1961,8 @@ static int adding_extra_key_attributes(grib_handle* h)
} }
static grib_accessor* create_accessor_from_descriptor(const grib_accessor* a, grib_accessor* attribute, grib_section* section, static grib_accessor* create_accessor_from_descriptor(const grib_accessor* a, grib_accessor* attribute, grib_section* section,
long ide, long subset, int add_dump_flag, int count, int add_extra_attributes) long ide, long subset, int add_dump_flag, int add_coord_flag,
int count, int add_extra_attributes)
{ {
grib_accessor_bufr_data_array* self = (grib_accessor_bufr_data_array*)a; grib_accessor_bufr_data_array* self = (grib_accessor_bufr_data_array*)a;
char code[10] = {0,}; char code[10] = {0,};
@ -1989,6 +1990,10 @@ static grib_accessor* create_accessor_from_descriptor(const grib_accessor* a, gr
creator.flags = GRIB_ACCESSOR_FLAG_DUMP; creator.flags = GRIB_ACCESSOR_FLAG_DUMP;
operatorCreator.flags |= GRIB_ACCESSOR_FLAG_DUMP; operatorCreator.flags |= GRIB_ACCESSOR_FLAG_DUMP;
} }
if (add_coord_flag) {
creator.flags |= GRIB_ACCESSOR_FLAG_BUFR_COORD;
operatorCreator.flags |= GRIB_ACCESSOR_FLAG_BUFR_COORD;
}
idx = self->compressedData ? self->elementsDescriptorsIndex->v[0]->v[ide] : self->elementsDescriptorsIndex->v[subset]->v[ide]; idx = self->compressedData ? self->elementsDescriptorsIndex->v[0]->v[ide] : self->elementsDescriptorsIndex->v[subset]->v[ide];
@ -1996,6 +2001,7 @@ static grib_accessor* create_accessor_from_descriptor(const grib_accessor* a, gr
case 0: case 0:
case 1: case 1:
creator.name = grib_context_strdup(a->context, self->expanded->v[idx]->shortName); creator.name = grib_context_strdup(a->context, self->expanded->v[idx]->shortName);
/* ECC-325: store alloc'd string (due to strdup) for clean up later */ /* ECC-325: store alloc'd string (due to strdup) for clean up later */
grib_sarray_push(a->context, self->tempStrings, creator.name); grib_sarray_push(a->context, self->tempStrings, creator.name);
elementAccessor = grib_accessor_factory(section, &creator, 0, NULL); elementAccessor = grib_accessor_factory(section, &creator, 0, NULL);
@ -2466,7 +2472,7 @@ static int create_keys(const grib_accessor* a, long onlySubset, long startSubset
grib_accessor* elementFromBitmap = NULL; grib_accessor* elementFromBitmap = NULL;
grib_handle* hand = grib_handle_of_accessor(a); grib_handle* hand = grib_handle_of_accessor(a);
/*int reuseBitmap=0;*/ /*int reuseBitmap=0;*/
int add_dump_flag = 1, count = 0; int add_dump_flag = 1, add_coord_flag = 0, count = 0;
/*int forceGroupClosure=0;*/ /*int forceGroupClosure=0;*/
creatorGroup.op = (char*)"bufr_group"; creatorGroup.op = (char*)"bufr_group";
@ -2533,11 +2539,13 @@ static int create_keys(const grib_accessor* a, long onlySubset, long startSubset
continue; /* Descriptor does not have an associated key e.g. inside op 203YYY */ continue; /* Descriptor does not have an associated key e.g. inside op 203YYY */
} }
elementFromBitmap = NULL; elementFromBitmap = NULL;
add_coord_flag = 0;
if (descriptor->F == 0 && IS_COORDINATE_DESCRIPTOR(descriptor->X) && if (descriptor->F == 0 && IS_COORDINATE_DESCRIPTOR(descriptor->X) &&
self->unpackMode == CODES_BUFR_UNPACK_STRUCTURE) { self->unpackMode == CODES_BUFR_UNPACK_STRUCTURE) {
const int sidx = descriptor->Y + significanceQualifierIndexArray[descriptor->X] * NUMBER_OF_QUALIFIERS_PER_CATEGORY; const int sidx = descriptor->Y + significanceQualifierIndexArray[descriptor->X] * NUMBER_OF_QUALIFIERS_PER_CATEGORY;
DebugAssert(sidx > 0); DebugAssert(sidx > 0);
groupNumber++; groupNumber++;
add_coord_flag = 1;
if (significanceQualifierGroup[sidx]) { if (significanceQualifierGroup[sidx]) {
groupSection = significanceQualifierGroup[sidx]->parent; groupSection = significanceQualifierGroup[sidx]->parent;
@ -2563,7 +2571,6 @@ static int create_keys(const grib_accessor* a, long onlySubset, long startSubset
gaGroup->sub_section = grib_section_create(hand, gaGroup); gaGroup->sub_section = grib_section_create(hand, gaGroup);
gaGroup->bufr_group_number = groupNumber; gaGroup->bufr_group_number = groupNumber;
//gaGroup->flags |= GRIB_ACCESSOR_FLAG_BUFR_COORD; //??
accessor_constant_set_type(gaGroup, GRIB_TYPE_LONG); accessor_constant_set_type(gaGroup, GRIB_TYPE_LONG);
accessor_constant_set_dval(gaGroup, groupNumber); accessor_constant_set_dval(gaGroup, groupNumber);
grib_push_accessor(gaGroup, groupSection->block); grib_push_accessor(gaGroup, groupSection->block);
@ -2677,7 +2684,8 @@ static int create_keys(const grib_accessor* a, long onlySubset, long startSubset
grib_accessors_list_push(self->dataAccessors, asn, rank); grib_accessors_list_push(self->dataAccessors, asn, rank);
} }
count++; count++;
elementAccessor = create_accessor_from_descriptor(a, associatedFieldAccessor, section, ide, iss, add_dump_flag, count, add_extra_attributes); elementAccessor = create_accessor_from_descriptor(a, associatedFieldAccessor, section, ide, iss,
add_dump_flag, add_coord_flag, count, add_extra_attributes);
if (!elementAccessor) { if (!elementAccessor) {
err = GRIB_DECODING_ERROR; err = GRIB_DECODING_ERROR;
return err; return err;
@ -2736,9 +2744,6 @@ static int create_keys(const grib_accessor* a, long onlySubset, long startSubset
} }
} }
if (add_key) { if (add_key) {
if (descriptor->F == 0 && IS_COORDINATE_DESCRIPTOR(descriptor->X)) { //??
elementAccessor->flags |= GRIB_ACCESSOR_FLAG_BUFR_COORD;
}
grib_push_accessor(elementAccessor, section->block); grib_push_accessor(elementAccessor, section->block);
rank = grib_data_accessors_trie_push(self->dataAccessorsTrie, elementAccessor); rank = grib_data_accessors_trie_push(self->dataAccessorsTrie, elementAccessor);
grib_accessors_list_push(self->dataAccessors, elementAccessor, rank); grib_accessors_list_push(self->dataAccessors, elementAccessor, rank);