Merge branch 'develop' of ssh://software.ecmwf.int:7999/eccodes/eccodes into develop

.gitignore

@@ -307,7 +307,6 @@ include
 data/bufr/*diff
 data/bufr/*decode
 data/bufr/*test
-data/bufr/set_unexpandedDescriptors.filter
 
 *.sublime-workspace
 *.old

data/bufr/bufr_ref_files.txt

@@ -377,7 +377,6 @@ new_temp_106.bufr.ref
 new_tmr7_129.bufr.ref
 new_tros_31.bufr.ref
 new_wavb_134.bufr.ref
-set_unexpandedDescriptors.filter
 311001.bufr.ref
 uegabe.bufr.num.ref
 syno.bufr.out.ref

tests/bufr_dump_fortran.sh

@@ -22,23 +22,7 @@ tempBufr=outfile.bufr
 tempSrc=$label.temp.f90
 tempExe=$label.temp.exe
 
-# Not all BUFR files generate correct Fortran. So here we select a subset
-# bufr_files=`cat ${data_dir}/bufr/bufr_data_files.txt`
-bufr_files="207003.bufr PraticaTemp.bufr aaen_55.bufr aben_55.bufr ahws_139.bufr airc_142.bufr airc_144.bufr airs_57.bufr alws_139.bufr
-amda_144.bufr amsa_55.bufr amsb_55.bufr amse_55.bufr amsu_55.bufr amv2_87.bufr amv3_87.bufr asbh_139.bufr asbl_139.bufr
-asca_139.bufr asch_139.bufr ascs_139.bufr aseh_139.bufr asel_139.bufr ashs_139.bufr atap_55.bufr ateu_155.bufr atms_201.bufr
-atov_55.bufr avhm_87.bufr avhn_87.bufr avhr_58.bufr b002_95.bufr b002_96.bufr b003_56.bufr b004_145.bufr b005_87.bufr
-b005_89.bufr b006_96.bufr b007_31.bufr bssh_170.bufr bssh_176.bufr bssh_178.bufr bssh_180.bufr btem_109.bufr buoy_27.bufr
-cmwi_87.bufr cmwn_87.bufr cnow_28.bufr cori_156.bufr crit_202.bufr csrh_189.bufr emsg_189.bufr emsg_87.bufr euwv_87.bufr
-fy3a_154.bufr fy3b_154.bufr g2nd_208.bufr g2to_206.bufr go15_87.bufr goee_87.bufr goes_87.bufr goga_89.bufr gosat.bufr
-grst_26.bufr gsd1_208.bufr gsd2_208.bufr gsd3_208.bufr gst4_26.bufr hirb_55.bufr hirs_55.bufr iasi_241.bufr ifco_208.bufr
-ikco_217.bufr itrg_208.bufr itwt_233.bufr j2eo_216.bufr j2nb_216.bufr jaso_214.bufr kond_209.bufr maer_207.bufr meta_140.bufr
-mhen_55.bufr mhsa_55.bufr mhsb_55.bufr mhse_55.bufr mloz_206.bufr modi_87.bufr modw_87.bufr monw_87.bufr new.bufr nomi_206.bufr
-nos1_208.bufr nos2_208.bufr nos3_208.bufr nos4_208.bufr nos5_208.bufr nos6_208.bufr nos7_208.bufr nos8_208.bufr ocea_131.bufr
-ocea_132.bufr ocea_133.bufr ocea_21.bufr pgps_110.bufr pilo_91.bufr profiler_european.bufr rada_250.bufr rado_250.bufr s4kn_165.bufr
-sb19_206.bufr sbu8_206.bufr ship_11.bufr ship_12.bufr ship_13.bufr ship_14.bufr ship_19.bufr ship_9.bufr smin_49.bufr smis_49.bufr
-smiu_49.bufr smos_203.bufr sn4k_165.bufr soil_7.bufr ssbt_127.bufr stuk_7.bufr syno_1.bufr syno_2.bufr syno_3.bufr syno_4.bufr
-synop_multi_subset.bufr temp_101.bufr temp_102.bufr temp_106.bufr tmr7_129.bufr tros_31.bufr uegabe.bufr wavb_134.bufr"
+bufr_files=`cat ${data_dir}/bufr/bufr_data_files.txt`
 
 # If FORTRAN is enabled, then the pkgconfig should be one level above the test dir
 PKGCONFIG_FILE=../eccodes_f90.pc
@@ -78,6 +62,11 @@ do
     # The executable always creates a file called outfile.bufr
     ./$tempExe
     ${tools_dir}bufr_compare ${data_dir}/bufr/$file $tempBufr
+
+    ${tools_dir}bufr_dump -jf ${data_dir}/bufr/$file > $file.json
+    ${tools_dir}bufr_dump -jf $tempBufr              > $tempBufr.json
+    #diff $file.json $tempBufr.json
+    rm -f $file.json $tempBufr.json
   fi
 done
 

tests/bufr_filter.sh

@@ -398,28 +398,25 @@ rm -f ${f}.ref ${f}.log
 #-----------------------------------------------------------
 # Test: set unexpandedDescriptors big test
 #-----------------------------------------------------------
-fRulesReady="set_unexpandedDescriptors.filter"
-f="syno_1.bufr"
-testScript="set_unexpandedDescriptors_test.sh"
-testScript1="set_unexpandedDescriptors_test_1.sh"
-echo "Test: set unexpandedDescriptors big test" >> $fLog
-echo "file: $f" >> $fLog
+#fRulesReady="set_unexpandedDescriptors.filter"
+#f="syno_1.bufr"
+#testScript="set_unexpandedDescriptors_test.sh"
+#testScript1="set_unexpandedDescriptors_test_1.sh"
+#echo "Test: set unexpandedDescriptors big test" >> $fLog
+#echo "file: $f" >> $fLog
 
-cat >$testScript <<EOF
-set -e
+#cat >$testScript <<EOF
+#set -e
+#
+#EOF
+#echo "set -x" > $testScript1
+#chmod +x $testScript1
 
-EOF
-echo "set -x" > $testScript1
-chmod +x $testScript1
-
-${tools_dir}codes_bufr_filter $fRulesReady $f 2>> $fLog 1>> $testScript
-
-sed -e "s:diff:${tools_dir}bufr_compare:" < $testScript >> $testScript1
-
-./$testScript1
-
-rm -f new_*bufr 
-rm -f $testScript $testScript1
+#${tools_dir}codes_bufr_filter $fRulesReady $f 2>> $fLog 1>> $testScript
+#sed -e "s:diff:${tools_dir}bufr_compare:" < $testScript >> $testScript1
+#./$testScript1
+#rm -f new_*bufr 
+#rm -f $testScript $testScript1
 
 #-----------------------------------------------------------
 # Test:  packing