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

IEEE Packing: fix test failure

This commit is contained in:
Shahram Najm 2022-03-15 20:30:01 +00:00
parent 6f02e20127
commit bff4ff1df4
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/grib_accessor_class_data_simple_packing.c
View File

@ -387,7 +387,8 @@ static int _unpack_double(grib_accessor* a, double* val, size_t* len, unsigned c
/*Assert(((bits_per_value*n_vals)/8) < (1<<29));*/ /* See GRIB-787 */
/* ECC-941 */
{
if (!a->context->ieee_packing) {
/* Must turn off this check when the environment variable ECCODES_GRIB_IEEE_PACKING is on */
long offsetAfterData = 0;
err = grib_get_long(gh, "offsetAfterData", &offsetAfterData);
if (!err && offsetAfterData > offsetBeforeData) {

21
tests/grib_packing_order.c
View File

@ -24816,7 +24816,7 @@ int main(int argc, char** argv)
outfile_name = argv[3];
printf("Using sample_filename = %s\n", sample_filename);
fprintf(stderr,"Using sample_filename = %s\n", sample_filename);
h = codes_grib_handle_new_from_samples(0, sample_filename);
assert(h);
@ -24826,21 +24826,21 @@ int main(int argc, char** argv)
CODES_CHECK(codes_set_long(h, "bitsPerValue", 16), 0);
if (packing_stage == PACKING_TYPE_BEFORE_VALUES) {
printf("Set packingType to %s\n", packing_type);
fprintf(stderr,"Set packingType to %s\n", packing_type);
CODES_CHECK(codes_set_string(h, "packingType", packing_type, &str_len), 0);
}
printf("Set values. values_len=%lu\n", (unsigned long)values_len);
fprintf(stderr,"Set values. values_len=%lu\n", (unsigned long)values_len);
CODES_CHECK(codes_set_double_array(h, "values", values, values_len), 0);
if (packing_stage == VALUES_BEFORE_PACKING_TYPE) {
printf("Set packingType to %s\n", packing_type);
fprintf(stderr, "Set packingType to %s\n", packing_type);
CODES_CHECK(codes_set_string(h, "packingType", packing_type, &str_len), 0);
}
CODES_CHECK(codes_write_message(h, outfile_name, "w"), 0);
printf("%s checks on decoded values '%s' (%s) ...\n",
fprintf(stderr, "%s checks on decoded values '%s' (%s) ...\n",
(check?"Doing":"Skipping"), packing_type, argv[2]);
if (check) {
size_t i = 0;
@ -24854,10 +24854,19 @@ int main(int argc, char** argv)
return 1;
}
}
if (strcmp(packing_type, "grid_simple")==0 || strcmp(packing_type, "grid_ieee")==0) {
double calc = 0;
long offsetAfterData = 0, offsetBeforeData = 0;
GRIB_CHECK(grib_get_long(h, "offsetAfterData", &offsetAfterData), 0);
GRIB_CHECK(grib_get_long(h, "offsetBeforeData", &offsetBeforeData), 0);
calc = (offsetAfterData - offsetBeforeData) * 8.0 / values_len;
printf("bitsPerValue calculated as = (offsetAfterData - offsetBeforeData)*8/numValues = %g\n", calc);
assert( calc == 16 || calc == 32 || calc == 64 );
}
free(vals);
}
codes_handle_delete(h);
printf("All done\n");
fprintf(stderr,"All done\n");
return 0;
}