From 3c9171ed9793cf168ab42743d888e12a0c40984a Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Tue, 25 Jul 2023 10:43:50 +0000
Subject: [PATCH] ECC-530: GRIB2: Order of setting keys creates a failure

---
 tests/CMakeLists.txt  |  1 +
 tests/grib_ecc-530.sh | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100755 tests/grib_ecc-530.sh

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index fc4711efc..63a004fd9 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -95,6 +95,7 @@ if( HAVE_BUILD_TOOLS )
         grib_suppressed
         grib_2nd_order_numValues
         grib_ecc-136
+        grib_ecc-530
         grib_ecc-922
         grib_ecc-966
         grib_ecc-967
diff --git a/tests/grib_ecc-530.sh b/tests/grib_ecc-530.sh
new file mode 100755
index 000000000..79c48321b
--- /dev/null
+++ b/tests/grib_ecc-530.sh
@@ -0,0 +1,38 @@
+#!/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="grid_ecc-530_test"
+tempGrib=temp.$label.grib
+tempFilt=temp.${label}.filt
+
+sample_grib2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
+
+cat > $tempFilt <<EOF
+ set tablesVersion = 30;
+ set typeOfFirstFixedSurface = 160;
+ set scaleFactorOfFirstFixedSurface = 3;
+ set scaledValueOfFirstFixedSurface = 200;
+
+ set scaleFactorOfSecondFixedSurface = 4;
+ set scaledValueOfSecondFixedSurface = 300;
+ set typeOfSecondFixedSurface = 165; # intentionally put at the end
+ write;
+EOF
+
+${tools_dir}/grib_filter -o $tempGrib $tempFilt $sample_grib2
+grib_check_key_equals $tempGrib scaleFactorOfFirstFixedSurface  3
+grib_check_key_equals $tempGrib scaledValueOfFirstFixedSurface  200
+grib_check_key_equals $tempGrib scaleFactorOfSecondFixedSurface 4
+grib_check_key_equals $tempGrib scaledValueOfSecondFixedSurface 300
+
+# Clean up
+rm -f $tempFilt $tempGrib