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

ECC-441: MeteoFrance contribution: GRIB1 second order packing

This commit is contained in:
Shahram Najm 2017-04-04 15:58:00 +01:00
parent b62efc9db4
commit c1bfa3e19b
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/grib_accessor_class_data_g1second_order_general_extended_packing.c
View File

@ -1271,10 +1271,10 @@ static int pack_double_optimised(grib_accessor* a, const double* val, size_t *le
if (val[i] < min ) min = val[i];
}
if((ret=grib_get_long_internal(handle,self->bits_per_value,&bits_per_value)) != GRIB_SUCCESS)
if ((ret=grib_get_long_internal(handle,self->bits_per_value,&bits_per_value)) != GRIB_SUCCESS)
return ret;
if((ret = grib_get_long_internal(handle,self->optimize_scaling_factor, &optimize_scaling_factor))
if ((ret = grib_get_long_internal(handle,self->optimize_scaling_factor, &optimize_scaling_factor))
!= GRIB_SUCCESS)
return ret;
@ -1290,6 +1290,10 @@ static int pack_double_optimised(grib_accessor* a, const double* val, size_t *le
divisor = grib_power(-binary_scale_factor,2);
min = min * decimal;
max = max * decimal;
if((ret = grib_set_long_internal(handle,self->decimal_scale_factor, decimal_scale_factor)) !=
GRIB_SUCCESS)
return ret;
}
else
{
@ -1297,6 +1301,7 @@ static int pack_double_optimised(grib_accessor* a, const double* val, size_t *le
if (min==max) {
grib_set_long_internal(handle,self->decimal_scale_factor, 0);
}
if((ret = grib_get_long_internal(handle,self->decimal_scale_factor, &decimal_scale_factor))
!= GRIB_SUCCESS)
return ret;
@ -1314,16 +1319,8 @@ static int pack_double_optimised(grib_accessor* a, const double* val, size_t *le
binary_scale_factor = grib_get_binary_scale_fact(max,reference_value,bits_per_value,&ret);
divisor = grib_power(-binary_scale_factor,2);
if((ret = grib_set_long_internal(handle,self->binary_scale_factor, binary_scale_factor)) !=
GRIB_SUCCESS)
return ret;
}
if((ret = grib_set_long_internal(handle,self->decimal_scale_factor, decimal_scale_factor)) !=
GRIB_SUCCESS)
return ret;
if((ret = grib_set_long_internal(handle,self->binary_scale_factor, binary_scale_factor)) !=
GRIB_SUCCESS)
return ret;