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

.gitignore

@@ -81,6 +81,7 @@ examples/C/bufr_subset
 examples/C/*.sh.log
 examples/C/*.sh.trs
 examples/F90/f_bufr_expanded
+examples/F90/f_bufr_read_temp
 examples/F90/f_bufr_attributes
 examples/F90/f_bufr_set_keys
 examples/F90/f_bufr_get_keys

examples/C/CMakeLists.txt

@@ -39,8 +39,8 @@ list( APPEND test_bins
       bufr_get_keys
       bufr_keys_iterator
       bufr_missing
-      bufr_print_header
-      bufr_print_data
+      bufr_read_header
+      bufr_read_synop
       bufr_read_temp
       bufr_set_keys
       bufr_subset
@@ -78,8 +78,8 @@ list( APPEND tests
    bufr_get_keys
    bufr_keys_iterator
    bufr_missing
-   bufr_print_header
-   bufr_print_data
+   bufr_read_header
+   bufr_read_synop
    bufr_read_temp
    bufr_set_keys
    bufr_subset

examples/C/Makefile.am

@@ -4,7 +4,7 @@ AM_CFLAGS =  @WARN_PEDANTIC@ @WERROR@
 TESTS = iterator.sh get.sh print_data.sh set.sh keys_iterator.sh multi.sh multi_write.sh \
         precision.sh list.sh large_grib1.sh get_data.sh sections_copy.sh set_missing.sh clone.sh set_pv.sh \
         check_gaussian_grids.sh \
-        bufr_attributes.sh bufr_clone.sh bufr_expanded.sh bufr_get_keys.sh bufr_print_header.sh bufr_print_data.sh \
+        bufr_attributes.sh bufr_clone.sh bufr_expanded.sh bufr_get_keys.sh bufr_read_header.sh bufr_read_synop.sh \
         bufr_set_keys.sh bufr_subset.sh bufr_keys_iterator.sh bufr_missing.sh bufr_read_temp.sh \
         get_product_kind.sh
 
@@ -12,7 +12,7 @@ noinst_PROGRAMS  = nearest set_bitmap iterator get print_data set set_missing ke
                    set_data mars_param values_check box multi multi2 multi_write precision \
                    set_pv list sections_copy large_grib1 get_data iterator_bitmap clone new_sample \
                    check_gaussian_grid ensemble_index points \
-                   bufr_attributes bufr_clone bufr_expanded  bufr_get_keys bufr_print_header bufr_print_data \
+                   bufr_attributes bufr_clone bufr_expanded  bufr_get_keys bufr_read_header bufr_read_synop \
                    bufr_get_keys bufr_subset bufr_keys_iterator bufr_set_keys bufr_missing bufr_read_temp \
                    get_product_kind
 
@@ -50,8 +50,8 @@ bufr_expanded_SOURCES 	= bufr_expanded.c
 bufr_get_keys_SOURCES 	= bufr_get_keys.c
 bufr_keys_iterator		= bufr_keys_iterator.c
 bufr_missing			= bufr_missing.c
-bufr_print_header_SOURCES = bufr_print_header.c
-bufr_print_data_SOURCES = bufr_print_data.c
+bufr_read_header_SOURCES = bufr_read_header.c
+bufr_read_synop_SOURCES = bufr_read_synop.c
 bufr_read_temp_SOURCES  = bufr_read_temp.c
 bufr_set_keys_SOURCES 	= bufr_set_keys.c
 bufr_subset_SOURCES 	= bufr_subset.c

examples/C/bufr_read_header.c

@@ -9,7 +9,7 @@
  */
 
 /*
- * C Implementation: bufr_print_header
+ * C Implementation: bufr_read_header
  *
  * Description: how to read the header of BUFR messages.
  *

examples/C/bufr_read_header.sh

@@ -11,7 +11,7 @@
 . ./include.sh
 
 #Define a common label for all the tmp files
-label="bufr_print_header_test_c"
+label="bufr_read_header_test_c"
 
 #Prepare tmp file
 fTmp=${label}.tmp.txt
@@ -28,7 +28,7 @@ fRef=${f}.header.ref
 REDIRECT=/dev/null
 
 #Write the values into a file and compare with reference
-${examples_dir}/bufr_print_header $f 2> $REDIRECT > $fTmp
+${examples_dir}/bufr_read_header $f 2> $REDIRECT > $fTmp
 
 #We compare output to the reference by ignoring the whitespaces 
 diff -w $fRef $fTmp >$REDIRECT 2> $REDIRECT

examples/C/bufr_read_synop.c

@@ -9,9 +9,9 @@
  */
 
 /*
- * C Implementation: bufr_print_data
+ * C Implementation: bufr_read_synop
  *
- * Description: how to read data values from BUFR messages.
+ * Description: how to read SYNOP BUFR messages.
  *
  */
 

examples/C/bufr_read_synop.sh

@@ -12,7 +12,7 @@
 
 
 #Define a common label for all the tmp files
-label="bufr_print_data_test_c"
+label="bufr_read_synop_test_c"
 
 #Define tmp file
 fTmp=${label}".tmp.txt"
@@ -24,7 +24,7 @@ rm -f $fTmp | true
 REDIRECT=/dev/null
 
 #Write the values into a file and compare with reference
-${examples_dir}/bufr_print_data 2> $REDIRECT > $fTmp
+${examples_dir}/bufr_read_synop 2> $REDIRECT > $fTmp
 
 #TODO: check the output