From 87f34c24b880ec1e6b153c87a1547c16faaf2a3a Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Sat, 13 Jan 2024 14:52:25 +0000
Subject: [PATCH] Testing: Sub-hourly with grib_filter (needs fixing - see
 src/grib_accessor_class_optimal_step_units.cc)

---
 src/grib_accessor_class_g2step_range.cc |  2 +-
 tests/grib_sub_hourly.sh                | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/grib_accessor_class_g2step_range.cc b/src/grib_accessor_class_g2step_range.cc
index 2089f493b..e15d195f3 100644
--- a/src/grib_accessor_class_g2step_range.cc
+++ b/src/grib_accessor_class_g2step_range.cc
@@ -44,8 +44,8 @@ or edit "accessor.class" and rerun ./make_class.pl
 static int get_native_type(grib_accessor*);
 static int pack_long(grib_accessor*, const long* val, size_t* len);
 static int pack_string(grib_accessor*, const char*, size_t* len);
-static int unpack_long(grib_accessor*, 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 int unpack_string(grib_accessor*, char*, size_t* len);
 static size_t string_length(grib_accessor*);
 static int value_count(grib_accessor*, long*);
diff --git a/tests/grib_sub_hourly.sh b/tests/grib_sub_hourly.sh
index c9ac1f34e..37799249e 100755
--- a/tests/grib_sub_hourly.sh
+++ b/tests/grib_sub_hourly.sh
@@ -51,9 +51,10 @@ if (set -u; : ${ECCODES_GRIB_SHOW_HOUR_STEPUNIT?}) 2> /dev/null; then
 fi
 
 
-label="grib_ecc-1620"
-temp=temp.$label
-temp2=temp_2.$label
+label="grib_sub_hourly"
+temp=temp.1.$label
+temp2=temp.2.$label
+tempFilt=temp.$label.filt
 samples_dir=$ECCODES_SAMPLES_PATH
 
 instantaneous_field=$data_dir/reduced_gaussian_surface.grib2
@@ -466,7 +467,20 @@ grib_check_key_equals $temp "-p $keys_s" "18$HOUR-24$HOUR 18$HOUR 24$HOUR"
 grib_check_key_equals $temp "-p $keys_i" "24 18 24"
 grib_check_key_equals $temp "-p $keys_d" "24 18 24"
 
-rm -f $temp $temp2
+cat >$tempFilt<<EOF
+    set stepUnits="m"; print "[step]";
+EOF
+${tools_dir}/grib_filter $tempFilt $data_dir/constant_field.grib2
+
+
+cat >$tempFilt<<EOF
+    set stepUnits="s"; print "[step]";
+EOF
+${tools_dir}/grib_filter $tempFilt $data_dir/constant_field.grib2
+
+
+
+rm -f $temp $temp2 $tempFilt
 
 #~/build/eccodes/bin/grib_ls -m /perm/maro/referenceGRIBfiles4MTG2testing/grib1+2_operational_and_rd/151145_s2_enfo_cf_o2d_zos_2002_prod_ecmf_glob.grib2
 #~/build/eccodes/bin/grib_ls -m /perm/maro/referenceGRIBfiles4MTG2testing/grib1+2_operational_and_rd/240023_ce_efas_fc_sfc_dis06_2022_0001_ecmf_lisflood.grib2