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

This commit is contained in:
Sandor Kertesz 2015-03-17 16:51:07 +00:00
commit de154de860
16 changed files with 34 additions and 31 deletions

6
.gitignore vendored
View File

@ -113,8 +113,8 @@ examples/C/precision
examples/C/grib_print_data examples/C/grib_print_data
examples/C/sections_copy examples/C/sections_copy
examples/C/grib_set_keys examples/C/grib_set_keys
examples/C/set_bitmap examples/C/grib_set_bitmap
examples/C/set_data examples/C/grib_set_data
examples/C/set_missing examples/C/set_missing
examples/C/set_pv examples/C/set_pv
examples/C/values_check examples/C/values_check
@ -278,7 +278,7 @@ examples/F90/f_read_from_file
examples/F90/f_read_message examples/F90/f_read_message
examples/F90/f_samples examples/F90/f_samples
examples/F90/f_grib_set_keys examples/F90/f_grib_set_keys
examples/F90/f_set_bitmap examples/F90/f_grib_set_bitmap
examples/F90/f_set_gvc examples/F90/f_set_gvc
examples/F90/f_set_missing examples/F90/f_set_missing
examples/F90/f_set_pv examples/F90/f_set_pv

View File

@ -13,8 +13,8 @@ GRIB (
grib_nearest grib_nearest
precision precision
grib_print_data grib_print_data
set_bitmap grib_set_bitmap
set_data grib_set_data
set_pv set_pv
grib_set_keys grib_set_keys
) )

View File

@ -18,7 +18,7 @@ defined in a message and how to iterate through them.
\example get_pv.f90 How to get the list of levels. \example get_pv.f90 How to get the list of levels.
\example get_data.f90 How to get latitude/longitude/values. \example get_data.f90 How to get latitude/longitude/values.
\example set.f90 How to set values through the key names. \example set.f90 How to set values through the key names.
\example set_bitmap.f90 How to set and use a bitmap. \example grib_set_bitmap.f90 How to set and use a bitmap.
\example set_missing.f90 How to set a missing value in the header. \example set_missing.f90 How to set a missing value in the header.
\example set_pv.f90 How to set the list of levels. \example set_pv.f90 How to set the list of levels.
\example samples.f90 How to create a new message from a samples. \example samples.f90 How to create a new message from a samples.

View File

@ -26,7 +26,7 @@ that can be taken as a starting point to write more complex programs.\n
- \ref get_pv.f90 "get_pv.f90" how to get the list of levels. - \ref get_pv.f90 "get_pv.f90" how to get the list of levels.
- \ref get_data.f90 "get_data.f90" how to get latitude/longitude/values. - \ref get_data.f90 "get_data.f90" how to get latitude/longitude/values.
- \ref set.f90 "set.f90" how to set values through the key names. - \ref set.f90 "set.f90" how to set values through the key names.
- \ref set_bitmap.f90 "set_bitmap.f90" how to set and use a bitmap. - \ref grib_set_bitmap.f90 "grib_set_bitmap.f90" how to set and use a bitmap.
- \ref set_missing.f90 "set_missing.f90" how to set a missing value in the header. - \ref set_missing.f90 "set_missing.f90" how to set a missing value in the header.
- \ref set_pv.f90 "set_pv.f90" how to set the list of levels. - \ref set_pv.f90 "set_pv.f90" how to set the list of levels.
- \ref samples.f90 "samples.f90" how to create a new message from a template. - \ref samples.f90 "samples.f90" how to create a new message from a template.

View File

@ -8,14 +8,14 @@ configure_file( include.ctest.sh.in include.ctest.sh @ONLY )
################################################ ################################################
list( APPEND test_bins list( APPEND test_bins
grib_nearest grib_nearest
set_bitmap grib_set_bitmap
grib_iterator grib_iterator
grib_get_keys grib_get_keys
grib_print_data grib_print_data
grib_set_keys grib_set_keys
set_missing set_missing
grib_keys_iterator grib_keys_iterator
set_data grib_set_data
mars_param mars_param
values_check values_check
box box

View File

@ -10,8 +10,8 @@ TESTS = grib_iterator.sh grib_get_keys.sh grib_print_data.sh grib_set_keys.sh \
bufr_set_keys.sh bufr_subset.sh bufr_keys_iterator.sh bufr_missing.sh \ bufr_set_keys.sh bufr_subset.sh bufr_keys_iterator.sh bufr_missing.sh \
bufr_read_temp.sh get_product_kind.sh bufr_read_temp.sh get_product_kind.sh
noinst_PROGRAMS = grib_nearest set_bitmap grib_iterator grib_get_keys grib_print_data grib_set_keys set_missing grib_keys_iterator \ noinst_PROGRAMS = grib_nearest grib_set_bitmap grib_iterator grib_get_keys grib_print_data grib_set_keys set_missing grib_keys_iterator \
set_data mars_param values_check box multi multi2 multi_write precision \ grib_set_data mars_param values_check box multi multi2 multi_write precision \
set_pv list sections_copy large_grib1 get_data grib_iterator_bitmap grib_clone new_sample \ set_pv list sections_copy large_grib1 get_data grib_iterator_bitmap grib_clone new_sample \
check_gaussian_grid grib_ensemble_index points \ check_gaussian_grid grib_ensemble_index points \
bufr_attributes bufr_clone bufr_expanded bufr_get_keys bufr_read_header bufr_read_synop \ bufr_attributes bufr_clone bufr_expanded bufr_get_keys bufr_read_header bufr_read_synop \
@ -21,7 +21,7 @@ noinst_PROGRAMS = grib_nearest set_bitmap grib_iterator grib_get_keys grib_prin
#bin_PROGRAMS = points #bin_PROGRAMS = points
box_SOURCES = box.c box_SOURCES = box.c
set_data_SOURCES = set_data.c grib_set_data_SOURCES = grib_set_data.c
mars_param_SOURCES = mars_param.c mars_param_SOURCES = mars_param.c
values_check_SOURCES = values_check.c values_check_SOURCES = values_check.c
grib_nearest_SOURCES = grib_nearest.c grib_nearest_SOURCES = grib_nearest.c
@ -30,7 +30,7 @@ grib_get_keys_SOURCES = grib_get_keys.c
grib_print_data_SOURCES = grib_print_data.c grib_print_data_SOURCES = grib_print_data.c
grib_set_keys_SOURCES = grib_set_keys.c grib_set_keys_SOURCES = grib_set_keys.c
set_missing_SOURCES = set_missing.c set_missing_SOURCES = set_missing.c
set_bitmap_SOURCES = set_bitmap.c grib_set_bitmap_SOURCES = grib_set_bitmap.c
multi_SOURCES = multi.c multi_SOURCES = multi.c
multi2_SOURCES = multi2.c multi2_SOURCES = multi2.c
grib_keys_iterator_SOURCES = grib_keys_iterator.c grib_keys_iterator_SOURCES = grib_keys_iterator.c

View File

@ -9,9 +9,9 @@
*/ */
/* /*
* C Implementation: set_bitmap * C Implementation: grib_set_bitmap
* *
* Description: how to set a bitmap in a grib message * Description: how to set a bitmap in a GRIB message
* *
* *
*/ */

View File

@ -9,7 +9,7 @@
*/ */
/* /*
* C Implementation: set_data * C Implementation: grib_set_data
* *
* Description: set the data contained in a GRIB file * Description: set the data contained in a GRIB file
* *

View File

@ -20,7 +20,7 @@ list( APPEND tests
precision precision
grib_print_data grib_print_data
grib_set_keys grib_set_keys
set_bitmap grib_set_bitmap
set_missing set_missing
set_pv set_pv
samples samples

View File

@ -3,16 +3,17 @@ AM_CFLAGS = @WARN_PEDANTIC@ @WERROR@ @FORCE_32_CFLAGS@
TESTS = copy_message.sh grib_get_keys.sh get_data.sh get_pl.sh get_pv.sh grib_keys_iterator.sh \ TESTS = copy_message.sh grib_get_keys.sh get_data.sh get_pl.sh get_pv.sh grib_keys_iterator.sh \
grib_nearest.sh precision.sh multi_write.sh multi.sh grib_print_data.sh grib_set_keys.sh \ grib_nearest.sh precision.sh multi_write.sh multi.sh grib_print_data.sh grib_set_keys.sh \
set_bitmap.sh set_missing.sh set_pv.sh samples.sh count_messages.sh read_message.sh \ grib_set_bitmap.sh set_missing.sh set_pv.sh samples.sh count_messages.sh read_message.sh \
read_from_file.sh index.sh get_set_uuid.sh bufr_attributes.sh bufr_clone.sh \ read_from_file.sh index.sh get_set_uuid.sh bufr_attributes.sh bufr_clone.sh \
bufr_expanded.sh bufr_get_keys.sh bufr_read_header.sh bufr_read_synop.sh \ bufr_expanded.sh bufr_get_keys.sh bufr_read_header.sh bufr_read_synop.sh \
bufr_set_keys.sh bufr_keys_iterator.sh bufr_subset.sh get_product_kind.sh bufr_read_temp.sh bufr_set_keys.sh bufr_keys_iterator.sh bufr_subset.sh get_product_kind.sh bufr_read_temp.sh
noinst_PROGRAMS = f_index f_copy_message f_grib_get_keys f_get_data f_get_pl f_get_pv f_grib_keys_iterator \ noinst_PROGRAMS = f_index f_copy_message f_grib_get_keys f_get_data f_get_pl f_get_pv f_grib_keys_iterator \
f_multi_write f_multi f_grib_nearest f_precision f_grib_print_data f_grib_set_keys f_set_bitmap f_set_missing \ f_multi_write f_multi f_grib_nearest f_precision f_grib_print_data f_grib_set_keys \
f_set_pv f_samples f_count_messages f_read_message f_read_from_file f_new_from_file \ f_grib_set_bitmap f_set_missing f_set_pv f_samples f_count_messages f_read_message \
f_copy_namespace f_get_set_uuid f_set_gvc f_grib_clone f_bufr_clone f_bufr_expanded f_bufr_get_keys \ f_read_from_file f_new_from_file f_copy_namespace f_get_set_uuid f_set_gvc \
f_bufr_read_header f_bufr_read_synop f_bufr_set_keys f_bufr_keys_iterator f_bufr_subset f_bufr_attributes \ f_grib_clone f_bufr_clone f_bufr_expanded f_bufr_get_keys f_bufr_read_header \
f_bufr_read_synop f_bufr_set_keys f_bufr_keys_iterator f_bufr_subset f_bufr_attributes \
f_get_product_kind f_bufr_read_temp f_get_product_kind f_bufr_read_temp
f_index_SOURCES=index.f90 f_index_SOURCES=index.f90
@ -28,7 +29,7 @@ f_grib_nearest_SOURCES=grib_nearest.f90
f_precision_SOURCES=precision.f90 f_precision_SOURCES=precision.f90
f_grib_print_data_SOURCES=grib_print_data.f90 f_grib_print_data_SOURCES=grib_print_data.f90
f_grib_set_keys_SOURCES=grib_set_keys.f90 f_grib_set_keys_SOURCES=grib_set_keys.f90
f_set_bitmap_SOURCES=set_bitmap.f90 f_grib_set_bitmap_SOURCES=grib_set_bitmap.f90
f_set_missing_SOURCES=set_missing.f90 f_set_missing_SOURCES=set_missing.f90
f_set_pv_SOURCES=set_pv.f90 f_set_pv_SOURCES=set_pv.f90
f_samples_SOURCES=samples.f90 f_samples_SOURCES=samples.f90

View File

@ -8,5 +8,5 @@
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
. ./include.sh . ./include.sh
${examples_dir}f_set_bitmap > /dev/null ${examples_dir}f_grib_set_bitmap > /dev/null
rm -f out.bmp.grib rm -f out.bmp.grib

View File

@ -38,7 +38,7 @@ list( APPEND tests
grib_set_keys grib_set_keys
set_missing set_missing
binary_message binary_message
set_bitmap grib_set_bitmap
bufr_attributes bufr_attributes
bufr_clone bufr_clone
bufr_expanded bufr_expanded

View File

@ -3,7 +3,7 @@ AM_CFLAGS = @WARN_PEDANTIC@ @WERROR@
TESTS = grib_clone.sh count_messages.sh grib_get_keys.sh index.sh grib_iterator.sh \ TESTS = grib_clone.sh count_messages.sh grib_get_keys.sh index.sh grib_iterator.sh \
grib_keys_iterator.sh multi_write.sh grib_nearest.sh grib_print_data.sh \ grib_keys_iterator.sh multi_write.sh grib_nearest.sh grib_print_data.sh \
samples.sh grib_set_keys.sh set_missing.sh binary_message.sh set_bitmap.sh \ samples.sh grib_set_keys.sh set_missing.sh binary_message.sh grib_set_bitmap.sh \
bufr_read_header.sh bufr_read_synop.sh bufr_clone.sh bufr_get_keys.sh \ bufr_read_header.sh bufr_read_synop.sh bufr_clone.sh bufr_get_keys.sh \
bufr_set_keys.sh bufr_expanded.sh bufr_keys_iterator.sh bufr_subset.sh \ bufr_set_keys.sh bufr_expanded.sh bufr_keys_iterator.sh bufr_subset.sh \
bufr_attributes.sh get_product_kind.sh bufr_read_temp.sh bufr_attributes.sh get_product_kind.sh bufr_read_temp.sh
@ -18,10 +18,12 @@ INCLUDES = -I$(top_builddir)/src
LDADD = $(top_builddir)/src/libeccodes.la LDADD = $(top_builddir)/src/libeccodes.la
DEPENDENCIES = $(LDADD) DEPENDENCIES = $(LDADD)
EXTRA_DIST = $(TESTS) include.sh grib_clone.py count_messages.py grib_get_keys.py index.py grib_iterator.py \ EXTRA_DIST = $(TESTS) include.sh grib_clone.py count_messages.py grib_get_keys.py index.py \
grib_keys_iterator.py multi_write.py \ grib_iterator.py grib_keys_iterator.py multi_write.py \
grib_nearest.py grib_print_data.py samples.py grib_set_keys.py set_missing.py binary_message.py set_pv.py set_bitmap.py \ grib_nearest.py grib_print_data.py samples.py grib_set_keys.py \
bufr_read_header.py bufr_read_synop.py bufr_clone.py bufr_get_keys.py bufr_set_keys.py \ set_missing.py binary_message.py set_pv.py grib_set_bitmap.py \
bufr_read_header.py bufr_read_synop.py \
bufr_clone.py bufr_get_keys.py bufr_set_keys.py \
bufr_expanded.py bufr_keys_iterator.py bufr_subset.py bufr_attributes.py \ bufr_expanded.py bufr_keys_iterator.py bufr_subset.py bufr_attributes.py \
get_product_kind.py bufr_read_temp.py \ get_product_kind.py bufr_read_temp.py \
CMakeLists.txt include.ctest.sh.in CMakeLists.txt include.ctest.sh.in

View File

@ -3,5 +3,5 @@
. ./include.sh . ./include.sh
REDIRECT=/dev/null REDIRECT=/dev/null
$PYTHON set_bitmap.py 2> $REDIRECT > $REDIRECT $PYTHON grib_set_bitmap.py 2> $REDIRECT > $REDIRECT
rm out.bmp.grib || true rm out.bmp.grib || true