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

Merge branch 'feature/grid_complex_encoding' of github.com:joobog/eccodes into feature/grid_complex_encoding

This commit is contained in:
Eugen Betke 2023-03-31 11:11:57 +00:00
parent 56dc6f3536 f4ded028af
commit ff0b750f35
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/grib_accessor_class_data_g22order_packing.cc
View File

@ -780,12 +780,12 @@ static int unpack(grib_accessor* a, T* val, const size_t* len)
/*de_spatial_difference (a->context, sec_val, n_vals, orderOfSpatialDifferencing, bias);*/
}
binary_s = grib_power(binary_scale_factor, 2);
decimal_s = grib_power(-decimal_scale_factor, 10);
binary_s = (T)grib_power(binary_scale_factor, 2);
decimal_s = (T)grib_power(-decimal_scale_factor, 10);
for (i = 0; i < n_vals; i++) {
if (sec_val[i] == LONG_MAX) {
val[i] = missingValue;
val[i] = (T)missingValue;
}
else {
val[i] = (T)((((T)sec_val[i]) * binary_s) + reference_value) * decimal_s;
@ -796,7 +796,6 @@ static int unpack(grib_accessor* a, T* val, const size_t* len)
return err;
}
static int find_nbits(unsigned int i)
{
#if !defined __GNUC__ || __GNUC__ < 4
@ -942,7 +941,6 @@ static void move_one_left(struct section* s, int* v)
t->mn = k;
return;
}
return;
}
static void move_one_right(struct section* s, int* v)
@ -1356,8 +1354,9 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len)
return err;
if ((err = grib_set_long_internal(gh, self->primaryMissingValueSubstitute, grib_ieee_to_long(static_cast<float>(9.999e20)))) != GRIB_SUCCESS)
return err;
if ((err = grib_set_long_internal(gh, self->secondaryMissingValueSubstitute, 0xFFFFFFFF)) != GRIB_SUCCESS)
return err;
//if ((err = grib_set_long_internal(gh, self->secondaryMissingValueSubstitute, 0xFFFFFFFF)) != GRIB_SUCCESS)
// return err;
if ((err = grib_set_long_internal(gh, self->numberOfGroupsOfDataValues, 1)) != GRIB_SUCCESS)
return err;
if ((err = grib_set_long_internal(gh, self->referenceForGroupWidths, 0)) != GRIB_SUCCESS)
@ -1785,8 +1784,8 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len)
return err;
if ((err = grib_set_long_internal(gh, self->primaryMissingValueSubstitute, grib_ieee_to_long(static_cast<float>(9.999e20)))) != GRIB_SUCCESS)
return err;
if ((err = grib_set_long_internal(gh, self->secondaryMissingValueSubstitute, 0xFFFFFFFF)) != GRIB_SUCCESS)
return err;
// if ((err = grib_set_long_internal(gh, self->secondaryMissingValueSubstitute, 0xFFFFFFFF)) != GRIB_SUCCESS) return err;
if ((err = grib_set_long_internal(gh, self->numberOfGroupsOfDataValues, ngroups)) != GRIB_SUCCESS)
return err;
if ((err = grib_set_long_internal(gh, self->referenceForGroupWidths, gwidmn)) != GRIB_SUCCESS)
@ -1819,7 +1818,7 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len)
if ((err = grib_set_long_internal(gh, self->orderOfSpatialDifferencing, 2)) != GRIB_SUCCESS)
return err;
}
if (packing_mode != 1) {
if (packing_mode > 1) {
if ((err = grib_set_long_internal(gh, self->numberOfOctetsExtraDescriptors, sec5_48)) != GRIB_SUCCESS)
return err;
}