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

Remove obsolete GRIB_WARNING part

This commit is contained in:
Shahram Najm 2018-09-26 15:20:51 +01:00
parent a28a066658
commit 6d24a0cb1f
1 changed files with 39 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/grib_accessor_class_number_of_values.c
View File

@ -145,71 +145,49 @@ static void init_class(grib_accessor_class* c)
static void init(grib_accessor* a,const long l, grib_arguments* c)
{
int n=0;
grib_accessor_number_of_values* self = (grib_accessor_number_of_values*)a;
self->values = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
self->bitsPerValue = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
self->numberOfPoints = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
self->bitmapPresent = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
self->bitmap = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
self->numberOfCodedValues = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
a->length=0;
int n=0;
grib_accessor_number_of_values* self = (grib_accessor_number_of_values*)a;
self->values = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
self->bitsPerValue = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
self->numberOfPoints = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
self->bitmapPresent = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
self->bitmap = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
self->numberOfCodedValues = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
a->length=0;
}
static int unpack_long(grib_accessor* a, long* val, size_t *len)
{
grib_accessor_number_of_values* self = (grib_accessor_number_of_values*)a;
int ret=GRIB_SUCCESS,i;
long npoints=0,bitmap_present=0;
size_t size=0;
grib_accessor_number_of_values* self = (grib_accessor_number_of_values*)a;
int ret=GRIB_SUCCESS,i;
long npoints=0,bitmap_present=0;
size_t size=0;
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfPoints,&npoints)) != GRIB_SUCCESS)
return ret;
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->bitmapPresent,&bitmap_present)) != GRIB_SUCCESS)
return ret;
if (bitmap_present) {
double* bitmap;
size=npoints;
bitmap=(double*)grib_context_malloc(a->context,sizeof(double)*size);
if((ret = grib_get_double_array_internal(grib_handle_of_accessor(a),self->bitmap,bitmap,&size))
!= GRIB_SUCCESS) {
grib_context_free(a->context,bitmap);
return ret;
}
*val=0;
for (i=0;i<size;i++)
if (bitmap[i]!=0) (*val)++;
grib_context_free(a->context,bitmap);
} else {
*val=npoints;
}
#if GRIB_WARNING
long numberOfCodedValues=0;
long bpv=0;
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->bitsPerValue,&bpv)) != GRIB_SUCCESS)
return ret;
#endif
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfPoints,&npoints)) != GRIB_SUCCESS)
return ret;
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->bitmapPresent,&bitmap_present)) != GRIB_SUCCESS)
return ret;
if (bitmap_present) {
double* bitmap;
size=npoints;
bitmap=(double*)grib_context_malloc(a->context,sizeof(double)*size);
if((ret = grib_get_double_array_internal(grib_handle_of_accessor(a),self->bitmap,bitmap,&size))
!= GRIB_SUCCESS) {
grib_context_free(a->context,bitmap);
return ret;
}
*val=0;
for (i=0;i<size;i++)
if (bitmap[i]!=0) (*val)++;
grib_context_free(a->context,bitmap);
} else {
*val=npoints;
}
#if GRIB_WARNING
if ( bpv != 0 ) {
if((ret = grib_get_long_internal(grib_handle_of_accessor(a), self->numberOfCodedValues,&numberOfCodedValues)) != GRIB_SUCCESS)
return ret;
if (*val != numberOfCodedValues) {
grib_context_log(a->context,GRIB_LOG_WARNING,
"number of values from data section (%ld) doesn't match geography (%ld)",numberOfCodedValues,*val);
/* *val=numberOfCodedValues; */
}
}
#endif
return ret;
}