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

ECC-1416: Further tests

This commit is contained in:
Shahram Najm 2022-06-29 12:12:15 +01:00
parent 31cd6af1ad
commit 33d66201e4
2 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/grib_accessor_class_from_scale_factor_scaled_value.c
View File

@ -8,11 +8,6 @@
* virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
*/ */
/**************************************
* Enrico Fucile
**************************************/
#include "grib_api_internal.h" #include "grib_api_internal.h"
#include <math.h> #include <math.h>
#ifdef ECCODES_ON_WINDOWS #ifdef ECCODES_ON_WINDOWS
@ -191,9 +186,6 @@ static int get_scaled_value_and_scale_factor_algorithm1(
int64_t value = 0; int64_t value = 0;
factor = floor(log10(maximum_value)) - floor(log10(input < 0 ? -input : input)); factor = floor(log10(maximum_value)) - floor(log10(input < 0 ? -input : input));
if (factor > maximum_factor) {
return GRIB_INTERNAL_ERROR;
}
value = (int64_t)round(input * pow(10, factor)); value = (int64_t)round(input * pow(10, factor));
while ((value % 10 == 0) && (factor > 0)) { while ((value % 10 == 0) && (factor > 0)) {
value /= 10; value /= 10;
@ -201,7 +193,7 @@ static int get_scaled_value_and_scale_factor_algorithm1(
} }
if (value >= maximum_value) if (value >= maximum_value)
return GRIB_INTERNAL_ERROR; return GRIB_INTERNAL_ERROR;
if (factor >= maximum_factor) if (factor > maximum_factor)
return GRIB_INTERNAL_ERROR; return GRIB_INTERNAL_ERROR;
*ret_factor = factor; *ret_factor = factor;
@ -258,7 +250,7 @@ static int get_scaled_value_and_scale_factor_algorithm2(
static int pack_double(grib_accessor* a, const double* val, size_t* len) static int pack_double(grib_accessor* a, const double* val, size_t* len)
{ {
/* See ECC-979 */ /* See ECC-979 and ECC-1416 */
/* Evaluate self->scaleFactor and self->scaledValue from input double '*val' */ /* Evaluate self->scaleFactor and self->scaledValue from input double '*val' */
grib_accessor_from_scale_factor_scaled_value* self = (grib_accessor_from_scale_factor_scaled_value*)a; grib_accessor_from_scale_factor_scaled_value* self = (grib_accessor_from_scale_factor_scaled_value*)a;
grib_handle* hand = grib_handle_of_accessor(a); grib_handle* hand = grib_handle_of_accessor(a);
@ -267,7 +259,8 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len)
int64_t value = 0; int64_t value = 0;
double exact = *val; /*the input*/ double exact = *val; /*the input*/
int64_t maxval_value, maxval_factor; /*maximum allowable values*/ int64_t maxval_value, maxval_factor; /*maximum allowable values*/
grib_accessor *accessor_factor, *accessor_value; int value_accessor_num_bits = 0, factor_accessor_num_bits = 0;
grib_accessor *factor_accessor, *value_accessor;
if (exact == 0) { if (exact == 0) {
if ((err = grib_set_long_internal(hand, self->scaleFactor, 0)) != GRIB_SUCCESS) if ((err = grib_set_long_internal(hand, self->scaleFactor, 0)) != GRIB_SUCCESS)
@ -285,14 +278,19 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len)
return GRIB_SUCCESS; return GRIB_SUCCESS;
} }
accessor_factor = grib_find_accessor(hand, self->scaleFactor); factor_accessor = grib_find_accessor(hand, self->scaleFactor);
accessor_value = grib_find_accessor(hand, self->scaledValue); value_accessor = grib_find_accessor(hand, self->scaledValue);
if (!accessor_factor || !accessor_value) { if (!factor_accessor || !value_accessor) {
grib_context_log(a->context, GRIB_LOG_ERROR, "Could not access keys %s and %s", self->scaleFactor, self->scaledValue); grib_context_log(a->context, GRIB_LOG_ERROR, "Could not access keys %s and %s", self->scaleFactor, self->scaledValue);
return GRIB_ENCODING_ERROR; return GRIB_ENCODING_ERROR;
} }
maxval_value = (1UL << (accessor_value->length * 8)) - 2; /* exclude missing */ value_accessor_num_bits = value_accessor->length * 8;
maxval_factor = (1UL << (accessor_factor->length * 8)) - 2; /* exclude missing */ factor_accessor_num_bits = factor_accessor->length * 8;
maxval_value = (1UL << value_accessor_num_bits) - 2; /* exclude missing */
maxval_factor = (1UL << factor_accessor_num_bits) - 2; /* exclude missing */
if (strcmp(factor_accessor->cclass->name,"signed")==0) {
maxval_factor = (1UL << (factor_accessor_num_bits - 1)) - 1;
}
err = get_scaled_value_and_scale_factor_algorithm1(exact, maxval_value, maxval_factor, &value, &factor); err = get_scaled_value_and_scale_factor_algorithm1(exact, maxval_value, maxval_factor, &value, &factor);
if (err) { if (err) {
@ -360,14 +358,14 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
static int is_missing(grib_accessor* a) static int is_missing(grib_accessor* a)
{ {
grib_accessor_from_scale_factor_scaled_value* self = (grib_accessor_from_scale_factor_scaled_value*)a; grib_accessor_from_scale_factor_scaled_value* self = (grib_accessor_from_scale_factor_scaled_value*)a;
int err = 0; grib_handle* hand = grib_handle_of_accessor(a);
long scaleFactor = 0; int err = 0;
long scaledValue = 0; long scaleFactor = 0, scaledValue = 0;
if ((err = grib_get_long_internal(grib_handle_of_accessor(a), self->scaleFactor, &scaleFactor)) != GRIB_SUCCESS) if ((err = grib_get_long_internal(hand, self->scaleFactor, &scaleFactor)) != GRIB_SUCCESS)
return err; return err;
if ((err = grib_get_long_internal(grib_handle_of_accessor(a), self->scaledValue, &scaledValue)) != GRIB_SUCCESS) if ((err = grib_get_long_internal(hand, self->scaledValue, &scaledValue)) != GRIB_SUCCESS)
return err; return err;
return ((scaleFactor == GRIB_MISSING_LONG) || (scaledValue == GRIB_MISSING_LONG)); return ((scaleFactor == GRIB_MISSING_LONG) || (scaledValue == GRIB_MISSING_LONG));

41
tests/grib_ecc-1150.sh
View File

@ -88,25 +88,28 @@ ${tools_dir}/grib_set -s lowerLimit=-6.6,upperLimit=-1.02 $tempGrib $temp2
grib_check_key_equals $temp2 scaleFactorOfLowerLimit,scaledValueOfLowerLimit,lowerLimit "1 -66 -6.6" grib_check_key_equals $temp2 scaleFactorOfLowerLimit,scaledValueOfLowerLimit,lowerLimit "1 -66 -6.6"
grib_check_key_equals $temp2 scaleFactorOfUpperLimit,scaledValueOfUpperLimit,upperLimit "2 -102 -1.02" grib_check_key_equals $temp2 scaleFactorOfUpperLimit,scaledValueOfUpperLimit,upperLimit "2 -102 -1.02"
# input factor value # input factor value
set_lowerLimit_and_check 0 0 0 set_lowerLimit_and_check 0 0 0
set_lowerLimit_and_check 1 0 1 set_lowerLimit_and_check 1 0 1
set_lowerLimit_and_check 550 0 550 set_lowerLimit_and_check 550 0 550
set_lowerLimit_and_check -99 0 -99 set_lowerLimit_and_check -99 0 -99
set_lowerLimit_and_check 6.77 2 677 set_lowerLimit_and_check 6.77 2 677
set_lowerLimit_and_check 0.001 3 1 set_lowerLimit_and_check 0.001 3 1
set_lowerLimit_and_check -6.6 1 -66 set_lowerLimit_and_check -6.6 1 -66
set_lowerLimit_and_check -1.02 2 -102 set_lowerLimit_and_check -1.02 2 -102
set_lowerLimit_and_check 3e-05 5 3 set_lowerLimit_and_check 3e-05 5 3
set_lowerLimit_and_check -3.9e-05 6 -39 set_lowerLimit_and_check -3.9e-05 6 -39
set_lowerLimit_and_check 3.14e-06 8 314 set_lowerLimit_and_check 3.14e-06 8 314
set_lowerLimit_and_check 3.14e-07 9 314 set_lowerLimit_and_check 3.14e-07 9 314
set_lowerLimit_and_check 3e-08 8 3 set_lowerLimit_and_check 3e-08 8 3
set_lowerLimit_and_check -3e-08 8 -3 set_lowerLimit_and_check -3e-08 8 -3
set_lowerLimit_and_check 1e-10 10 1 set_lowerLimit_and_check 1e-10 10 1
set_lowerLimit_and_check 3.14e-09 11 314 set_lowerLimit_and_check 3.14e-09 11 314
set_lowerLimit_and_check 1.23e-05 7 123 set_lowerLimit_and_check 1.23e-05 7 123
set_lowerLimit_and_check -3.1456e-09 13 -31456 set_lowerLimit_and_check -3.1456e-09 13 -31456
set_lowerLimit_and_check 9e-126 126 9
set_lowerLimit_and_check 6e-127 127 6
# Clean up # Clean up
rm -f $tempGrib $tempFilt $temp2 rm -f $tempGrib $tempFilt $temp2