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

Comparison of accessors: bitmap and concept

This commit is contained in:
Shahram Najm 2023-07-24 14:24:08 +00:00
parent f0cbdfd3b3
commit f690fdf798
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/grib_accessor_class_concept.cc
View File

@ -662,6 +662,8 @@ static int compare(grib_accessor* a, grib_accessor* b)
if (alen != blen)
return GRIB_COUNT_MISMATCH;
alen = MAX_CONCEPT_STRING_LENGTH;
blen = MAX_CONCEPT_STRING_LENGTH;
aval = (char*)grib_context_malloc(a->context, alen * sizeof(char));
bval = (char*)grib_context_malloc(b->context, blen * sizeof(char));

48
src/grib_accessor_class_data_apply_bitmap.cc
View File

@ -22,6 +22,7 @@
IMPLEMENTS = pack_double
IMPLEMENTS = value_count
IMPLEMENTS = dump;get_native_type
IMPLEMENTS = compare
MEMBERS=const char* coded_values
MEMBERS=const char* bitmap
MEMBERS=const char* missing_value
@ -48,6 +49,7 @@ static int unpack_float(grib_accessor*, float* val, size_t* len);
static int value_count(grib_accessor*, long*);
static void dump(grib_accessor*, grib_dumper*);
static void init(grib_accessor*, const long, grib_arguments*);
static int compare(grib_accessor*, grib_accessor*);
static int unpack_double_element(grib_accessor*, size_t i, double* val);
static int unpack_double_element_set(grib_accessor*, const size_t* index_array, size_t len, double* val_array);
@ -104,7 +106,7 @@ static grib_accessor_class _grib_accessor_class_data_apply_bitmap = {
0, /* resize */
0, /* nearest_smaller_value */
0, /* next accessor */
0, /* compare vs. another accessor */
&compare, /* compare vs. another accessor */
&unpack_double_element, /* unpack only ith value (double) */
0, /* unpack only ith value (float) */
&unpack_double_element_set, /* unpack a given set of elements (double) */
@ -441,3 +443,47 @@ static int get_native_type(grib_accessor* a)
return GRIB_TYPE_DOUBLE;
}
static int compare(grib_accessor* a, grib_accessor* b)
{
int retval = 0;
double* aval = 0;
double* bval = 0;
size_t alen = 0;
size_t blen = 0;
int err = 0;
long count = 0;
err = grib_value_count(a, &count);
if (err)
return err;
alen = count;
err = grib_value_count(b, &count);
if (err)
return err;
blen = count;
if (alen != blen)
return GRIB_COUNT_MISMATCH;
aval = (double*)grib_context_malloc(a->context, alen * sizeof(double));
bval = (double*)grib_context_malloc(b->context, blen * sizeof(double));
grib_unpack_double(a, aval, &alen);
grib_unpack_double(b, bval, &blen);
retval = GRIB_SUCCESS;
while (alen != 0) {
if (*bval != *aval)
retval = GRIB_DOUBLE_VALUE_MISMATCH;
alen--;
}
grib_context_free(a->context, aval);
grib_context_free(b->context, bval);
return retval;
}