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

This commit is contained in:
Sandor Kertesz 2015-03-17 17:42:06 +00:00
commit 262420431f
6 changed files with 39 additions and 10 deletions

11
.gitignore vendored
View File

@ -81,21 +81,19 @@ examples/C/bufr_subset
examples/C/*.sh.log examples/C/*.sh.log
examples/C/*.sh.trs examples/C/*.sh.trs
examples/F90/f_bufr_expanded examples/F90/f_bufr_expanded
examples/F90/f_bufr_read_synop
examples/F90/f_bufr_read_temp examples/F90/f_bufr_read_temp
examples/F90/f_bufr_attributes examples/F90/f_bufr_attributes
examples/F90/f_bufr_set_keys examples/F90/f_bufr_set_keys
examples/F90/f_bufr_get_keys examples/F90/f_bufr_get_keys
examples/F90/f_bufr_print_data
examples/F90/f_bufr_keys_iterator examples/F90/f_bufr_keys_iterator
examples/F90/f_bufr_subset examples/F90/f_bufr_subset
examples/F90/*.sh.log examples/F90/*.sh.log
examples/F90/*.sh.trs examples/F90/*.sh.trs
examples/F90/test-suite.log examples/F90/test-suite.log
examples/C/bufr_read_header examples/C/bufr_read_header
examples/C/bufr_read_synop
examples/C/bufr_read_temp examples/C/bufr_read_temp
examples/C/bufr_print_data examples/C/bufr_read_synop
examples/C/bufr_print_header
examples/C/grib_get_keys examples/C/grib_get_keys
examples/C/get_data examples/C/get_data
examples/C/get_product_kind examples/C/get_product_kind
@ -223,6 +221,8 @@ data/bufr/*.ref
data/bufr/*.test data/bufr/*.test
data/bufr/*.json data/bufr/*.json
data/bufr/*.no data/bufr/*.no
data/gts/*.DAT
data/gts/*.ref
data/.downloaded data/.downloaded
data/budg data/budg
data/*.grib data/*.grib
@ -253,9 +253,8 @@ examples/C/grib_ensemble_index
examples/C/grib_clone examples/C/grib_clone
examples/C/grib_iterator_bitmap examples/C/grib_iterator_bitmap
examples/C/new_sample examples/C/new_sample
examples/F90/f_bufr_read_header
examples/F90/f_bufr_clone examples/F90/f_bufr_clone
examples/F90/f_bufr_print_header examples/F90/f_bufr_read_header
examples/F90/f_grib_clone examples/F90/f_grib_clone
examples/F90/f_copy_message examples/F90/f_copy_message
examples/F90/f_copy_namespace examples/F90/f_copy_namespace

View File

@ -1,6 +1,7 @@
# data/CMakeLists.txt # data/CMakeLists.txt
add_subdirectory(tigge) add_subdirectory(tigge)
add_subdirectory(bufr) add_subdirectory(bufr)
add_subdirectory(gts)
# Download all the binary GRIB data from website # Download all the binary GRIB data from website

View File

@ -36,11 +36,12 @@ if [ -z "$DATA_DIR" ]; then
exit 1 exit 1
fi fi
gfiles=`cat $DATA_DIR/grib_data_files.txt` grib_files=`cat $DATA_DIR/grib_data_files.txt`
tfiles=`cat $DATA_DIR/tigge/tigge_data_files.txt | sed -e 's:^:tigge/:'` tigge_files=`cat $DATA_DIR/tigge/tigge_data_files.txt | sed -e 's:^:tigge/:'`
bfiles=`cat $DATA_DIR/bufr/bufr_data_files.txt $DATA_DIR/bufr/bufr_ref_files.txt | sed -e 's:^:bufr/:'` bufr_files=`cat $DATA_DIR/bufr/bufr_data_files.txt $DATA_DIR/bufr/bufr_ref_files.txt | sed -e 's:^:bufr/:'`
gts_files=`cat $DATA_DIR/gts/gts_data_files.txt $DATA_DIR/gts/gts_ref_files.txt | sed -e 's:^:gts/:'`
files="$gfiles $tfiles $bfiles" files="$grib_files $tigge_files $bufr_files $gts_files"
if [ $CLEAN -eq 1 ]; then if [ $CLEAN -eq 1 ]; then
for f in $files; do for f in $files; do

26
data/gts/CMakeLists.txt Normal file
View File

@ -0,0 +1,26 @@
# data/gts/CMakeLists.txt
# Download all the GTS data and reference files from website
#
FILE(READ "gts_data_files.txt" gts_files_to_download)
STRING(REGEX REPLACE "\n" ";" gts_files_to_download "${gts_files_to_download}")
FILE(READ "gts_ref_files.txt" gts_refs_to_download)
STRING(REGEX REPLACE "\n" ";" gts_refs_to_download "${gts_refs_to_download}")
ecbuild_get_test_multidata(
TARGET get_gts
NOCHECK
NAMES ${gts_files_to_download} ${gts_refs_to_download}
)
# Copy other files - e.g. text files etc from the source data/gts dir
LIST(APPEND other_files
gts_data_files.txt
gts_ref_files.txt
)
foreach( file ${other_files} )
execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR} )
endforeach()

View File

@ -0,0 +1 @@
EGRR20150317121020_00493212.DAT

View File

@ -0,0 +1 @@
EGRR20150317121020_00493212.DAT.ls.ref