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

Testing: element access for doubles

This commit is contained in:
Shahram Najm 2023-10-26 15:42:51 +01:00
parent bd77969bd9
commit 0114346e40
3 changed files with 110 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/grib_accessor_class_element.cc
View File

@ -8,11 +8,6 @@
* virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
*/
/**************************************
* Enrico Fucile
**************************************/
#include "grib_api_internal.h"
/*
This is used by make_class.pl
@ -21,6 +16,7 @@
CLASS = accessor
SUPER = grib_accessor_class_long
IMPLEMENTS = unpack_long;pack_long;
IMPLEMENTS = unpack_double
IMPLEMENTS = init
MEMBERS=const char* array
MEMBERS=long element
@ -39,6 +35,7 @@ or edit "accessor.class" and rerun ./make_class.pl
*/
static int pack_long(grib_accessor*, const long* val, size_t* len);
static int unpack_double(grib_accessor*, double* val, size_t* len);
static int unpack_long(grib_accessor*, long* val, size_t* len);
static void init(grib_accessor*, const long, grib_arguments*);
@ -77,7 +74,7 @@ static grib_accessor_class _grib_accessor_class_element = {
&unpack_long, /* unpack_long */
0, /* pack_double */
0, /* pack_float */
0, /* unpack_double */
&unpack_double, /* unpack_double */
0, /* unpack_float */
0, /* pack_string */
0, /* unpack_string */
@ -110,10 +107,11 @@ grib_accessor_class* grib_accessor_class_element = &_grib_accessor_class_element
static void init(grib_accessor* a, const long l, grib_arguments* c)
{
grib_accessor_element* self = (grib_accessor_element*)a;
int n = 0;
grib_handle* hand = grib_handle_of_accessor(a);
self->array = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
self->element = grib_arguments_get_long(grib_handle_of_accessor(a), c, n++);
int n = 0;
self->array = grib_arguments_get_name(hand, c, n++);
self->element = grib_arguments_get_long(hand, c, n++);
}
static int unpack_long(grib_accessor* a, long* val, size_t* len)
@ -123,26 +121,27 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
size_t size = 0;
long* ar = NULL;
grib_context* c = a->context;
grib_handle* hand = grib_handle_of_accessor(a);
if (*len < 1) {
ret = GRIB_ARRAY_TOO_SMALL;
return ret;
}
if ((ret = grib_get_size(grib_handle_of_accessor(a), self->array, &size)) != GRIB_SUCCESS)
if ((ret = grib_get_size(hand, self->array, &size)) != GRIB_SUCCESS)
return ret;
ar = (long*)grib_context_malloc_clear(c, size * sizeof(long));
if (!ar) {
grib_context_log(c, GRIB_LOG_ERROR, "unable to allocate %zu bytes", size * sizeof(long));
grib_context_log(c, GRIB_LOG_ERROR, "Error allocating %zu bytes", size * sizeof(long));
return GRIB_OUT_OF_MEMORY;
}
if ((ret = grib_get_long_array_internal(grib_handle_of_accessor(a), self->array, ar, &size)) != GRIB_SUCCESS)
if ((ret = grib_get_long_array_internal(hand, self->array, ar, &size)) != GRIB_SUCCESS)
return ret;
if (self->element < 0 || self->element >= size) {
grib_context_log(c, GRIB_LOG_ERROR, "Invalid element %ld for array '%s'. Value must be between 0 and %lu",
grib_context_log(c, GRIB_LOG_ERROR, "Invalid element %ld for array '%s'. Value must be between 0 and %zu",
self->element, self->array, size - 1);
ret = GRIB_INVALID_ARGUMENT;
goto the_end;
@ -162,29 +161,70 @@ static int pack_long(grib_accessor* a, const long* val, size_t* len)
size_t size = 0;
long* ar = NULL;
grib_context* c = a->context;
grib_handle* hand = grib_handle_of_accessor(a);
if (*len < 1) {
ret = GRIB_ARRAY_TOO_SMALL;
return ret;
}
if ((ret = grib_get_size(grib_handle_of_accessor(a), self->array, &size)) != GRIB_SUCCESS)
if ((ret = grib_get_size(hand, self->array, &size)) != GRIB_SUCCESS)
return ret;
ar = (long*)grib_context_malloc_clear(c, size * sizeof(long));
if (!ar) {
grib_context_log(c, GRIB_LOG_ERROR, "unable to allocate %zu bytes", size * sizeof(long));
grib_context_log(c, GRIB_LOG_ERROR, "Error allocating %zu bytes", size * sizeof(long));
return GRIB_OUT_OF_MEMORY;
}
if ((ret = grib_get_long_array_internal(grib_handle_of_accessor(a), self->array, ar, &size)) != GRIB_SUCCESS)
if ((ret = grib_get_long_array_internal(hand, self->array, ar, &size)) != GRIB_SUCCESS)
return ret;
ar[self->element] = *val;
if ((ret = grib_set_long_array_internal(grib_handle_of_accessor(a), self->array, ar, size)) != GRIB_SUCCESS)
if ((ret = grib_set_long_array_internal(hand, self->array, ar, size)) != GRIB_SUCCESS)
return ret;
grib_context_free(c, ar);
return ret;
}
static int unpack_double(grib_accessor* a, double* val, size_t* len)
{
grib_accessor_element* self = (grib_accessor_element*)a;
int ret = 0;
size_t size = 0;
double* ar = NULL;
grib_context* c = a->context;
grib_handle* hand = grib_handle_of_accessor(a);
if (*len < 1) {
ret = GRIB_ARRAY_TOO_SMALL;
return ret;
}
if ((ret = grib_get_size(hand, self->array, &size)) != GRIB_SUCCESS)
return ret;
ar = (double*)grib_context_malloc_clear(c, size * sizeof(double));
if (!ar) {
grib_context_log(c, GRIB_LOG_ERROR, "Error allocating %zu bytes", size * sizeof(double));
return GRIB_OUT_OF_MEMORY;
}
if ((ret = grib_get_double_array_internal(hand, self->array, ar, &size)) != GRIB_SUCCESS)
return ret;
if (self->element < 0 || self->element >= size) {
grib_context_log(c, GRIB_LOG_ERROR, "Invalid element %ld for array '%s'. Value must be between 0 and %zu",
self->element, self->array, size - 1);
ret = GRIB_INVALID_ARGUMENT;
goto the_end;
}
*val = ar[self->element];
the_end:
grib_context_free(c, ar);
return ret;
}

1
tests/CMakeLists.txt
View File

@ -127,6 +127,7 @@ if( HAVE_BUILD_TOOLS )
grib_ecc-1560
grib_ecc-1571
grib_ecc-1654
grib_ecc-1671
grib_ecc-1691
bufr_ecc-1028
bufr_ecc-1195

52
tests/grib_ecc-1671.sh Executable file
View File

@ -0,0 +1,52 @@
#!/bin/sh
# (C) Copyright 2005- ECMWF.
#
# This software is licensed under the terms of the Apache Licence Version 2.0
# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
#
# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
#
. ./include.ctest.sh
label="grib_ecc-1671_test"
tempGrib=temp.$label.grib
tempFilt=temp.${label}.filt
tempOut=temp.${label}.txt
sample2="$samp_dir/GRIB2.tmpl"
cat > $tempFilt <<EOF
set numberOfDataPoints = 5400000;
set numberOfValues = 5400000;
set Ni = 3600;
set Nj = 1500;
set latitudeOfFirstGridPoint = 89950000;
set longitudeOfFirstGridPoint = 180050000;
set latitudeOfLastGridPoint = -59950000;
set longitudeOfLastGridPoint = 539950000;
set iDirectionIncrement = 100000;
set jDirectionIncrement = 100000;
write;
EOF
${tools_dir}/grib_filter -o $tempGrib $tempFilt $sample2
# ${tools_dir}/grib_ls -j -n geography $tempGrib
cat > $tempFilt <<EOF
meta last_elem element(distinctLongitudes, 3599);
# print "[last_elem:d]";
if ( last_elem - 179.95 > 0.001 ) {
print "Error: last longitude is [last_elem:d] but should be 179.95";
assert(0);
}
EOF
${tools_dir}/grib_filter $tempFilt $tempGrib
# ${tools_dir}/grib_get_data $tempGrib > $tempOut
# cat $tempOut
# ${tools_dir}/grib_ls -l 37.5,16.0,1 $tempGrib > $tempOut
rm -f $tempGrib $tempFilt $tempOut