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

Single-precision support: Array of reals

This commit is contained in:
Shahram Najm 2023-04-28 11:16:52 +01:00
parent 4f8d151dc3
commit 6489aa6d46
3 changed files with 24 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/F90/grib_get_pv.sh
View File

@ -9,4 +9,4 @@
. ./include.ctest.sh . ./include.ctest.sh
${examples_dir}/eccodes_f_grib_get_pv > /dev/null ${examples_dir}/eccodes_f_grib_get_pv

36
src/grib_accessor_class_ibmfloat.cc
View File

@ -137,13 +137,16 @@ static void init(grib_accessor* a, const long len, grib_arguments* arg)
Assert(a->length >= 0); Assert(a->length >= 0);
} }
static int unpack_double(grib_accessor* a, double* val, size_t* len) template <typename T>
static int unpack(grib_accessor* a, T* val, size_t* len)
{ {
static_assert(std::is_floating_point<T>::value, "Requires floating point numbers");
unsigned long rlen = 0; unsigned long rlen = 0;
long count = 0; long count = 0;
int err = 0; int err = 0;
unsigned long i = 0; unsigned long i = 0;
long bitp = a->offset * 8; long bitp = a->offset * 8;
grib_handle* hand = grib_handle_of_accessor(a);
err = grib_value_count(a, &count); err = grib_value_count(a, &count);
if (err) if (err)
@ -157,37 +160,20 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
} }
for (i = 0; i < rlen; i++) for (i = 0; i < rlen; i++)
val[i] = grib_long_to_ibm(grib_decode_unsigned_long(grib_handle_of_accessor(a)->buffer->data, &bitp, 32)); val[i] = (T)grib_long_to_ibm(grib_decode_unsigned_long(hand->buffer->data, &bitp, 32));
*len = rlen; *len = rlen;
return GRIB_SUCCESS; return GRIB_SUCCESS;
} }
// ECC-1572: TODO(masn) use templates static int unpack_double(grib_accessor* a, double* val, size_t* len)
{
return unpack<double>(a, val, len);
}
static int unpack_float(grib_accessor* a, float* val, size_t* len) static int unpack_float(grib_accessor* a, float* val, size_t* len)
{ {
unsigned long rlen = 0; return unpack<float>(a, val, len);
long count = 0;
int err = 0;
unsigned long i = 0;
long bitp = a->offset * 8;
err = grib_value_count(a, &count);
if (err)
return err;
rlen = count;
if (*len < rlen) {
grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size (%zu) for %s, it contains %lu values", *len, a->name, rlen);
*len = 0;
return GRIB_ARRAY_TOO_SMALL;
}
for (i = 0; i < rlen; i++)
val[i] = (float)grib_long_to_ibm(grib_decode_unsigned_long(grib_handle_of_accessor(a)->buffer->data, &bitp, 32));
*len = rlen;
return GRIB_SUCCESS;
} }
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)

34
src/grib_accessor_class_ieeefloat.cc
View File

@ -183,12 +183,15 @@ static int pack_double(grib_accessor* a, const double* val, size_t* len)
return ret; return ret;
} }
static int unpack_double(grib_accessor* a, double* val, size_t* len) template <typename T>
static int unpack(grib_accessor* a, T* val, size_t* len)
{ {
static_assert(std::is_floating_point<T>::value, "Requires floating point numbers");
long rlen = 0; long rlen = 0;
int err = 0; int err = 0;
long i = 0; long i = 0;
long bitp = a->offset * 8; long bitp = a->offset * 8;
grib_handle* hand = grib_handle_of_accessor(a);
err = grib_value_count(a, &rlen); err = grib_value_count(a, &rlen);
if (err) if (err)
@ -199,35 +202,22 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
*len = 0; *len = 0;
return GRIB_ARRAY_TOO_SMALL; return GRIB_ARRAY_TOO_SMALL;
} }
for (i = 0; i < rlen; i++) for (i = 0; i < rlen; i++)
val[i] = grib_long_to_ieee(grib_decode_unsigned_long(grib_handle_of_accessor(a)->buffer->data, &bitp, 32)); val[i] = (T)grib_long_to_ieee(grib_decode_unsigned_long(hand->buffer->data, &bitp, 32));
*len = rlen; *len = rlen;
return GRIB_SUCCESS; return GRIB_SUCCESS;
} }
// ECC-1572: TODO(masn) use templates static int unpack_double(grib_accessor* a, double* val, size_t* len)
{
return unpack<double>(a, val, len);
}
static int unpack_float(grib_accessor* a, float* val, size_t* len) static int unpack_float(grib_accessor* a, float* val, size_t* len)
{ {
long rlen = 0; return unpack<float>(a, val, len);
int err = 0;
long i = 0;
long bitp = a->offset * 8;
err = grib_value_count(a, &rlen);
if (err)
return err;
if (*len < (size_t)rlen) {
grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size (%zu) for %s, it contains %ld values", *len, a->name, rlen);
*len = 0;
return GRIB_ARRAY_TOO_SMALL;
}
for (i = 0; i < rlen; i++)
val[i] = (float)grib_long_to_ieee(grib_decode_unsigned_long(grib_handle_of_accessor(a)->buffer->data, &bitp, 32));
*len = rlen;
return GRIB_SUCCESS;
} }
static void update_size(grib_accessor* a, size_t s) static void update_size(grib_accessor* a, size_t s)