diff --git a/.gitignore b/.gitignore index 75fc964a3..45ccf3aef 100644 --- a/.gitignore +++ b/.gitignore @@ -167,7 +167,7 @@ examples/F90/eccodes_f_grib_print_data examples/F90/eccodes_f_grib_print_data_static examples/F90/eccodes_f_read_from_file examples/F90/eccodes_f_read_message -examples/F90/eccodes_f_samples +examples/F90/eccodes_f_grib_samples examples/F90/eccodes_f_grib_set_keys examples/F90/eccodes_f_grib_set_bitmap examples/F90/eccodes_f_grib_set_gvc diff --git a/doxygen/examples.dox b/doxygen/examples.dox index e23cd0329..b9a77731d 100644 --- a/doxygen/examples.dox +++ b/doxygen/examples.dox @@ -21,7 +21,7 @@ defined in a message and how to iterate through them. \example grib_set_bitmap.f90 How to set and use a bitmap. \example grib_set_missing.f90 How to set a missing value in the header. \example grib_set_pv.f90 How to set the list of levels. -\example samples.f90 How to create a new message from a samples. +\example grib_samples.f90 How to create a new message from a GRIB samples file \example grib_clone.f90 How to clone a message. \example grib_copy_message.f90 How to copy a message in memory and create a new message. \example grib_keys_iterator.f90 How to get the names of all the keys diff --git a/doxygen/grib_examples.dox b/doxygen/grib_examples.dox index 1cf962a41..8da918814 100644 --- a/doxygen/grib_examples.dox +++ b/doxygen/grib_examples.dox @@ -29,7 +29,7 @@ that can be taken as a starting point to write more complex programs.\n - \ref grib_set_bitmap.f90 "grib_set_bitmap.f90" how to set and use a bitmap. - \ref grib_set_missing.f90 "grib_set_missing.f90" how to set a missing value in the header. - \ref grib_set_pv.f90 "grib_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 grib_samples.f90 "grib_samples.f90" how to create a new message from a template. - \ref grib_clone.f90 "grib_clone.f90" how to clone a message. - \ref grib_copy_message.f90 "grib_copy_message.f90" how to copy a message in memory and create a new message. - \ref grib_keys_iterator.f90 "grib_keys_iterator.f90" how to get the names of all the keys diff --git a/doxygen/make_dox.sh b/doxygen/make_dox.sh index c372a9d6a..e8c785692 100755 --- a/doxygen/make_dox.sh +++ b/doxygen/make_dox.sh @@ -24,7 +24,7 @@ doxygen grib_api_wiz.cfg rm -f eccodes.h rm -f ecCodes.py -# Hack. Change the links from any example code to confluence +# Change the links from any example code back to confluence F90_file=../html/classeccodes.html Py_file=../html/namespaceec_codes.html @@ -35,7 +35,7 @@ grib_get_keys grib_clone grib_copy_message count_messages -samples +grib_samples grib_set_missing " diff --git a/examples/F90/CMakeLists.txt b/examples/F90/CMakeLists.txt index 792dd76e7..25b6a4012 100644 --- a/examples/F90/CMakeLists.txt +++ b/examples/F90/CMakeLists.txt @@ -25,7 +25,7 @@ list( APPEND tests grib_set_bitmap grib_set_missing grib_set_pv - samples + grib_samples grib_count_messages grib_count_messages_multi read_message diff --git a/examples/F90/Makefile.am b/examples/F90/Makefile.am index c3efe5600..d90dc1fa3 100644 --- a/examples/F90/Makefile.am +++ b/examples/F90/Makefile.am @@ -4,7 +4,7 @@ AM_CFLAGS = @WARN_PEDANTIC@ @WERROR@ @FORCE_32_CFLAGS@ TESTS = grib_copy_message.sh grib_get_keys.sh get_data.sh get_pl.sh get_pv.sh grib_keys_iterator.sh \ grib_nearest.sh grib_precision.sh grib_multi_write.sh grib_multi.sh \ grib_print_data.sh grib_set_keys.sh \ - grib_set_bitmap.sh grib_set_missing.sh grib_set_pv.sh samples.sh grib_count_messages.sh \ + grib_set_bitmap.sh grib_set_missing.sh grib_set_pv.sh grib_samples.sh grib_count_messages.sh \ read_message.sh grib_count_messages_multi.sh \ read_from_file.sh grib_index.sh get_set_uuid.sh \ bufr_attributes.sh grib_clone.sh bufr_clone.sh \ @@ -31,7 +31,7 @@ noinst_PROGRAMS = eccodes_f_grib_index \ eccodes_f_grib_set_bitmap \ eccodes_f_grib_set_missing \ eccodes_f_grib_set_pv \ - eccodes_f_samples \ + eccodes_f_grib_samples \ eccodes_f_grib_count_messages \ eccodes_f_grib_count_messages_multi \ eccodes_f_read_message \ @@ -73,7 +73,7 @@ eccodes_f_grib_set_keys_SOURCES=grib_set_keys.f90 eccodes_f_grib_set_bitmap_SOURCES=grib_set_bitmap.f90 eccodes_f_grib_set_missing_SOURCES=grib_set_missing.f90 eccodes_f_grib_set_pv_SOURCES=grib_set_pv.f90 -eccodes_f_samples_SOURCES=samples.f90 +eccodes_f_grib_samples_SOURCES=grib_samples.f90 eccodes_f_grib_count_messages_SOURCES=grib_count_messages.f90 eccodes_f_grib_count_messages_multi_SOURCES=grib_count_messages_multi.f90 eccodes_f_read_message_SOURCES=read_message.f90 diff --git a/examples/F90/samples.f90 b/examples/F90/grib_samples.f90 similarity index 97% rename from examples/F90/samples.f90 rename to examples/F90/grib_samples.f90 index de19bac1c..859c78045 100644 --- a/examples/F90/samples.f90 +++ b/examples/F90/grib_samples.f90 @@ -35,7 +35,7 @@ program sample ! setting the environment variable ECCODES_SAMPLES_PATH call codes_grib_new_from_samples(igribsample, "regular_latlon_surface.grib1") - call codes_open_file(outfile, 'out.samples.grib1','w') + call codes_open_file(outfile, 'f_out.samples.grib1','w') call codes_open_file(datafile,'../../data/tp_ecmwf.grib','r') call codes_grib_new_from_file(datafile,igribdata,err) diff --git a/examples/F90/samples.sh b/examples/F90/grib_samples.sh similarity index 88% rename from examples/F90/samples.sh rename to examples/F90/grib_samples.sh index e6cc72bd1..82a0e3f70 100755 --- a/examples/F90/samples.sh +++ b/examples/F90/grib_samples.sh @@ -16,12 +16,12 @@ cp ${data_dir}/regular_latlon_surface.grib1 ${data_dir}/regular_latlon_surface.g # Change the ECCODES_SAMPLES_PATH: put the data dir first ECCODES_SAMPLES_PATH=${data_dir}:${samples_dir} export ECCODES_SAMPLES_PATH -${examples_dir}eccodes_f_samples > /dev/null +${examples_dir}eccodes_f_grib_samples > /dev/null # Extend the ECCODES_SAMPLES_PATH: put the data dir second ECCODES_SAMPLES_PATH=${samples_dir}:${data_dir} export ECCODES_SAMPLES_PATH -${examples_dir}eccodes_f_samples > /dev/null +${examples_dir}eccodes_f_grib_samples > /dev/null -rm -f out.samples.grib1 +rm -f f_out.samples.grib1 rm -f ${data_dir}/regular_latlon_surface.grib1.tmpl diff --git a/fortran/eccodes_f90_tail.f90 b/fortran/eccodes_f90_tail.f90 index 246673b3d..b037d3cb7 100644 --- a/fortran/eccodes_f90_tail.f90 +++ b/fortran/eccodes_f90_tail.f90 @@ -1065,7 +1065,7 @@ end subroutine codes_new_from_message_int4 !> gathered with @ref codes_get_error_string. !> !> - !> \b Examples: \ref samples.f90 "samples.f90" + !> \b Examples: \ref grib_samples.f90 "grib_samples.f90" !> !> @param gribid id of the grib loaded in memory !> @param samplename name of the sample to be used diff --git a/fortran/grib_f90_tail.f90 b/fortran/grib_f90_tail.f90 index 0e6c92aed..b8cd51f28 100644 --- a/fortran/grib_f90_tail.f90 +++ b/fortran/grib_f90_tail.f90 @@ -1413,7 +1413,7 @@ !> gathered with @ref grib_get_error_string. !> !> - !> \b Examples: \ref samples.f90 "samples.f90" + !> \b Examples: \ref grib_samples.f90 "grib_samples.f90" !> !> @param gribid id of the grib loaded in memory !> @param samplename name of the sample to be used