ECC-1467: GRIB: Support data values array decoded as floats (Part 04)

src/grib_accessor.c

@@ -226,6 +226,7 @@ int grib_unpack_float(grib_accessor* a, float* v, size_t* len)
 {
     grib_accessor_class* c = a->cclass;
     while (c) {
+        /* printf("grib_accessor.c grib_unpack_float:: c->name=%s\n",c->name); */
         if (c->unpack_float) {
             return c->unpack_float(a, v, len);
         }

src/grib_accessor_class_bitmap.c

@@ -18,6 +18,7 @@
 
    IMPLEMENTS = next_offset
    IMPLEMENTS = unpack_double;unpack_double_element;unpack_double_element_set
+   IMPLEMENTS = unpack_float
    IMPLEMENTS = unpack_long
    IMPLEMENTS = unpack_string
    IMPLEMENTS = init;dump;update_size
@@ -40,6 +41,7 @@ or edit "accessor.class" and rerun ./make_class.pl
 */
 
 static int unpack_double(grib_accessor*, double* val, size_t* len);
+static int unpack_float(grib_accessor*, float* val, size_t* len);
 static int unpack_long(grib_accessor*, long* val, size_t* len);
 static int unpack_string(grib_accessor*, char*, size_t* len);
 static long next_offset(grib_accessor*);
@@ -88,7 +90,7 @@ static grib_accessor_class _grib_accessor_class_bitmap = {
     0,                /* grib_pack procedures double */
     0,                 /* grib_pack procedures float */
     &unpack_double,              /* grib_unpack procedures double */
-    0,               /* grib_unpack procedures float */
+    &unpack_float,               /* grib_unpack procedures float */
     0,                /* grib_pack procedures string */
     &unpack_string,              /* grib_unpack procedures string */
     0,          /* grib_pack array procedures string */
@@ -127,7 +129,6 @@ static void init_class(grib_accessor_class* c)
     c->pack_long    =    (*(c->super))->pack_long;
     c->pack_double    =    (*(c->super))->pack_double;
     c->pack_float    =    (*(c->super))->pack_float;
-    c->unpack_float    =    (*(c->super))->unpack_float;
     c->pack_string    =    (*(c->super))->pack_string;
     c->pack_string_array    =    (*(c->super))->pack_string_array;
     c->unpack_string_array    =    (*(c->super))->unpack_string_array;
@@ -267,6 +268,32 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
+//TODO: ECC-1467: Copied the 'double' version and reused by copy/paste!
+static int unpack_float(grib_accessor* a, float* val, size_t* len)
+{
+    long pos = a->offset * 8;
+    long tlen;
+    long i;
+    int err           = 0;
+    grib_handle* hand = grib_handle_of_accessor(a);
+
+    err = grib_value_count(a, &tlen);
+    if (err)
+        return err;
+
+    if (*len < tlen) {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "Wrong size for %s it contains %ld values", a->name, tlen);
+        *len = 0;
+        return GRIB_ARRAY_TOO_SMALL;
+    }
+
+    for (i = 0; i < tlen; i++) {
+        val[i] = (float)grib_decode_unsigned_long(hand->buffer->data, &pos, 1);
+    }
+    *len = tlen;
+    return GRIB_SUCCESS;
+}
+//
 static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
 {
     long pos = a->offset * 8;

src/grib_accessor_class_data_apply_bitmap.c

@@ -265,8 +265,8 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     return err;
 }
 
-// TODO: Not ideal!! First attempt at unpacking floats...
-//       Should be merged with unpack_double and refactored! Most probably using C++ templates
+//TODO: ECC-1467: Copied the 'double' version and reused by copy/paste!
+//      Should be merged with unpack_double and refactored! Most probably using C++ templates
 static int unpack_float(grib_accessor* a, float* val, size_t* len)
 {
     grib_accessor_data_apply_bitmap* self = (grib_accessor_data_apply_bitmap*)a;

src/grib_accessor_class_data_ccsds_packing.c

@@ -330,8 +330,8 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
     return err;
 }
 
-// TODO: Not ideal!! First attempt at unpacking floats...
-//       Should be merged with unpack_double and refactored! Most probably using C++ templates
+//TODO: ECC-1467: Copied the 'double' version and reused by copy/paste!
+//      Should be merged with unpack_double and refactored! Most probably using C++ templates
 static int unpack_float(grib_accessor* a, float* val, size_t* len)
 {
     grib_accessor_data_ccsds_packing* self = (grib_accessor_data_ccsds_packing*)a;

src/grib_accessor_class_data_simple_packing.c

@@ -317,7 +317,9 @@ static int unpack_double_element_set(grib_accessor* a, const size_t* index_array
     return GRIB_SUCCESS;
 }
 
-// unpack an array of double or single precision real numbers. As doubles if dval!= NULL or floats if fval!=NULL
+// unpack an array of double-precision (double) or single-precision (float) real numbers.
+// As doubles if dval!=NULL
+// As floats  if fval!=NULL
 static int _unpack_real(grib_accessor* a, double* dval, float* fval, size_t* len, unsigned char* buf, long pos, size_t n_vals)
 {
     grib_accessor_data_simple_packing* self = (grib_accessor_data_simple_packing*)a;
@@ -335,6 +337,8 @@ static int _unpack_real(grib_accessor* a, double* dval, float* fval, size_t* len
     double d            = 0;
     double units_factor = 1.0;
     double units_bias   = 0.0;
+
+    // Either decode as double or float: cannot have both!
     Assert( ! (fval && dval) );
 
     if (*len < n_vals) {

src/grib_accessor_class_gen.c

@@ -341,28 +341,9 @@ static int unpack_double(grib_accessor* a, double* v, size_t* len)
     return GRIB_NOT_IMPLEMENTED;
 }
 
+//TODO: ECC-1467: Copied the 'double' version and reused by copy/paste!
 static int unpack_float(grib_accessor* a, float* v, size_t* len)
 {
-    /* int type = GRIB_TYPE_UNDEFINED;
-    printf("grib_accessor_class_gen.c unpack_float a->name        =%s\n",a->name);
-    printf("grib_accessor_class_gen.c unpack_float a->cclass->name=%s\n",a->cclass->name);
-    printf("grib_accessor_class_gen.c unpack_float alen=%zu\n",*len);
-    printf("DEBUG unpack_float::  a->cclass->unpack_double=%p\n", (void*)a->cclass->unpack_double);
-    printf("DEBUG unpack_float::            &unpack_double=%p\n", (void*)&unpack_double);
-    if (a->cclass->unpack_double && a->cclass->unpack_double != &unpack_double) {
-        double val = 0.0;
-        size_t l = 1;
-        grib_unpack_double(a, &val, &l);
-        *v = val;
-        grib_context_log(a->context, GRIB_LOG_DEBUG, "Casting double %s to float", a->name);
-        return GRIB_SUCCESS;
-    }
-
-    grib_context_log(a->context, GRIB_LOG_ERROR, "Cannot unpack %s as float", a->name);
-    if (grib_get_native_type(grib_handle_of_accessor(a), a->name, &type) == GRIB_SUCCESS) {
-        grib_context_log(a->context, GRIB_LOG_ERROR, "Hint: Try unpacking as %s", grib_get_type_name(type));
-    } */
-
     return GRIB_NOT_IMPLEMENTED;
 }
 

src/grib_value.c

@@ -1318,6 +1318,7 @@ int grib_get_double_array(const grib_handle* h, const char* name, double* val, s
     }
 }
 
+//TODO: ECC-1467: Copied the 'double' version and reused by copy/paste!
 int grib_get_float_array(const grib_handle* h, const char* name, float* val, size_t *length)
 {
     size_t len = *length;