From 69a86fff3720a802d8c6b0e2a3485fb7566d35a0 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Fri, 10 Jan 2020 15:40:59 +0000
Subject: [PATCH] ECC-1018: Reduced size of sample file

---
 samples/diag.tmpl | Bin 2423 -> 120 bytes
 tests/diag.sh     |  23 ++++++++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/samples/diag.tmpl b/samples/diag.tmpl
index 94b2b629d1ade8f50606e677c63e029ce93be313..e9603d191887997477a7c383d7ab6505f550fc68 100644
GIT binary patch
literal 120
zcmZ?qbaZE6kYGq+WMlw=3@&~i1|S>4(_&y?0f_>65Cr1Df%8KKh6V;E-Bbp1AYd?u
IOAx^T0JDPyo&W#<

literal 2423
zcmYk7yN=sH3`LbklORBfG^ql&>AVXBspZkbgPrw5q%G_sRjPbKJ}sY@OH#w300U>P
zE??u3G~|Bny06{uH*Y$*{(SuWsRQfk!`gN4MSa(GZ#&auxn2E_Z~yu)zrJI6!0&mt
z`#U9G`WGIThusc*S;mx!OW>1pIyXI?T~CA?TdeTO8Hoa)rfcEbveRq2o&t-Gz&m<S
zy|U=n(>V8RdS!-T7`2~kW%RSL_U|nE67o=BizQw{EbaK|X~;zR0;e-7I?u~U_Zh?O
zbrxj~+?Ru_=w6so)xqu&-4^N@#*6!x<Jmdn;gE+z9u9ff^JLEM2fJVNS{Lm8LS$`9
z&p9_<OXTf_&5i@3Gh!b&FnX4i&0ckxJ#ex`o!$MI-8tmp)M7d0!R&fN^2qEKD>GKV
z%pTbNHoN&TyIE}Z#%qb3ZGqV*;zv9>G9&mJ_+fu@{b7&Oym^?OoL~1X_H}=By)S~6
z^H7>zrl#k>)7<n|MT_N>WTm~8z|Vn?fm44Ot3Mrjs=OaYsi1l8nR4Yz%BR4xE9!y%
zSb3V046k|`vrJ~p=SyW?w`WB5bG0)w;VjWQoW)~&Q@?NtdRd!Jx>e@4Z8Ns*F_r;q
zPTd{Jk2C4Dl((E<uch2{uO)h|3-(&z=fYMCJd*tvsKucc*mH8I1#Wt%#i165S{!Qe
zO!BwrTs&(F8(R}J;mmsv%3Ce4_n_Q#??LoBFW7qkdk>;}4@7vZ<g{X+iPF8X{}<3b
z7Vn%w`GmIN&pF*2H~(4+@e$t-c-E5cjgiOoMNZG=iLu@@Vh^+4u{`*as2}Ih_Xq5I
zBKoa)MtMRczvwoAav}Y)DJT2LZMr_Rrf<)$#?sODNAi@wYs+5(`z-MLj1s$UXAE2-
z)5Y^&`qtY`UrW|MbP3kpa5}`Ke9zCmCrrV^ji({IKLy4fdQR-2GxEq_Rtq28jZ3eu
z2i3v$-jn?~^Go&6K+E<Xn2Mj7Sy<Y%*h78ppyP|=x^1(0@bPm!Cyz}<U(f0p>@~bQ
PlyiD2<7wvO?kBGQe1t|H

diff --git a/tests/diag.sh b/tests/diag.sh
index 76b06371a..41509629f 100755
--- a/tests/diag.sh
+++ b/tests/diag.sh
@@ -25,16 +25,14 @@ sample=$ECCODES_SAMPLES_PATH/diag.tmpl
 ${tools_dir}/grib_ls $sample > $REDIRECT
 ${tools_dir}/grib_dump $sample > $REDIRECT
 
-# Check setting keys
-# -------------------
+echo "Check setting integer keys..."
+# ----------------------------------
 echo 'set numberOfIntegers=3; set integerValues={55, 44, 66}; write;' | ${tools_dir}/grib_filter -o $tempOut - $sample
 ${tools_dir}/grib_dump -p numberOfFloats,numberOfIntegers,floatValues,integerValues $tempOut | sed 1d > $tempTxt
 cat > $tempRef <<EOF
-  numberOfFloats = 2;
+  numberOfFloats = 1;
   numberOfIntegers = 3;
-  floatValues(2) =  {
-  3.32, 1.21
-  } 
+  floatValues = 3600;
   integerValues(3) =  {
   55, 44, 66
   } 
@@ -42,6 +40,8 @@ EOF
 diff $tempRef $tempTxt
 
 
+echo "Check setting float keys..."
+# ---------------------------------
 echo 'set numberOfFloats=3; set floatValues={8.8, 9.9, 10.10}; write;' | ${tools_dir}/grib_filter -o $tempOut - $sample
 ${tools_dir}/grib_dump -p numberOfFloats,numberOfIntegers,floatValues,integerValues $tempOut | sed 1d > $tempTxt
 cat > $tempRef <<EOF
@@ -50,11 +50,13 @@ cat > $tempRef <<EOF
   floatValues(3) =  {
   8.8, 9.9, 10.1
   } 
-  integerValues = 66;
+  integerValues = -557;
 EOF
 diff $tempRef $tempTxt
 
 
+echo "Check setting integer & float keys..."
+# ------------------------------------------
 echo 'set numberOfIntegers=4; set integerValues={33, 55, -44, 66}; set numberOfFloats=3; set floatValues={-8.8, 9.9, 10.10}; write;' |\
    ${tools_dir}/grib_filter -o $tempOut - $sample
 ${tools_dir}/grib_dump -p numberOfFloats,numberOfIntegers,floatValues,integerValues $tempOut | sed 1d > $tempTxt
@@ -70,6 +72,13 @@ cat > $tempRef <<EOF
 EOF
 diff $tempRef $tempTxt
 
+
+echo "Check setting charValues (as ints)..."
+# ------------------------------------------
+echo 'set numberOfCharacters=6; set charValues={69,67,77,87,70,32}; write;' | ${tools_dir}/grib_filter -o $tempOut - $sample
+${tools_dir}/grib_dump -O $tempOut > $tempTxt
+grep -q "'E', 'C', 'M', 'W', 'F', ' '" $tempTxt
+
 # TODO encoding of characters not fully working. We are using one-byte integers instead
 #echo 'set numberOfCharacters=4; set charValues={"J","u","m","p"}; write;'| ${tools_dir}/grib_filter -o $tempOut - $sample
 #res=`${tools_dir}/grib_dump $tempOut | grep charValues | tr -d '\n' | tr -d ' '`