diff --git a/.gitignore b/.gitignore index ac78c8730..7e2f06bf7 100644 --- a/.gitignore +++ b/.gitignore @@ -56,6 +56,7 @@ tools/xref tools/grib1to2 examples/C/.libs/ examples/C/box +examples/C/bufr_read_header examples/C/get examples/C/get_data examples/C/iterator diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ad88ba0f..4200e0a91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -175,8 +175,8 @@ else() set( grib_api_default_data_prefix ${CMAKE_BINARY_DIR} ) endif() -if( NOT DEFINED GRIB_API_DEFINITION_PATH ) - set( GRIB_API_DEFINITION_PATH ${grib_api_default_data_prefix}/share/grib_api/definitions ) +if( NOT DEFINED ECCODES_DEFINITION_PATH ) + set( ECCODES_DEFINITION_PATH ${grib_api_default_data_prefix}/share/grib_api/definitions ) endif() if( NOT DEFINED GRIB_API_SAMPLES_PATH ) set( GRIB_API_SAMPLES_PATH ${grib_api_default_data_prefix}/share/grib_api/samples ) @@ -258,14 +258,14 @@ if( EC_HAVE_FORTRAN ) list( APPEND GRIB_API_LIBRARIES grib_api_f77 grib_api_f90 ) endif() -if( NOT ${PROJECT_NAME} STREQUAL ${CMAKE_PROJECT_NAME} ) - set( GRIB_API_DEFINITIONS ${GRIB_API_DEFINITIONS} PARENT_SCOPE )# includes already TPL definitions - set( GRIB_API_INCLUDE_DIRS ${GRIB_API_INCLUDE_DIRS} ${GRIB_API_EXTRA_INCLUDE_DIRS} PARENT_SCOPE ) - set( GRIB_API_LIBRARIES ${GRIB_API_LIBRARIES} ${GRIB_API_EXTRA_LIBRARIES} ${CMATH_LIBRARIES} PARENT_SCOPE ) - set( GRIB_API_FOUND TRUE PARENT_SCOPE ) +if( NOT ${PROJECT_NAME} STREQUAL ${CMAKE_PROJECT_NAME} ) + set( GRIB_API_DEFINITIONS ${GRIB_API_DEFINITIONS} PARENT_SCOPE )# includes already TPL definitions + set( GRIB_API_INCLUDE_DIRS ${GRIB_API_INCLUDE_DIRS} ${GRIB_API_EXTRA_INCLUDE_DIRS} PARENT_SCOPE ) + set( GRIB_API_LIBRARIES ${GRIB_API_LIBRARIES} ${GRIB_API_EXTRA_LIBRARIES} ${CMATH_LIBRARIES} PARENT_SCOPE ) + set( GRIB_API_FOUND TRUE PARENT_SCOPE ) set( GRIB_API_SAMPLES_PATH ${GRIB_API_SAMPLES_PATH} PARENT_SCOPE ) set( GRIB_API_IFS_SAMPLES_PATH ${GRIB_API_IFS_SAMPLES_PATH} PARENT_SCOPE ) - set( GRIB_API_DEFINITION_PATH ${GRIB_API_DEFINITION_PATH} PARENT_SCOPE ) + set( ECCODES_DEFINITION_PATH ${ECCODES_DEFINITION_PATH} PARENT_SCOPE ) endif() ############################################################################################ diff --git a/configure.ac b/configure.ac index 25272503f..3d942e6e3 100755 --- a/configure.ac +++ b/configure.ac @@ -207,14 +207,11 @@ AC_ARG_WITH(rpm-release, [ --with-rpm-release=NUMBER The rpms will use th RPM_RELEASE="$withval", RPM_RELEASE=1) AC_SUBST(RPM_RELEASE) +ECCODES_SAMPLES_PATH=$samples_files_path +ECCODES_DEFINITION_PATH=$definition_files_path -GRIB_SAMPLES_PATH=$samples_files_path -GRIB_TEMPLATES_PATH=$samples_files_path -GRIB_DEFINITION_PATH=$definition_files_path - -AC_SUBST(GRIB_TEMPLATES_PATH) -AC_SUBST(GRIB_SAMPLES_PATH) -AC_SUBST(GRIB_DEFINITION_PATH) +AC_SUBST(ECCODES_SAMPLES_PATH) +AC_SUBST(ECCODES_DEFINITION_PATH) dnl Fortran interface AC_ARG_ENABLE([fortran], diff --git a/definitions/Makefile.am b/definitions/Makefile.am index 17b69bc20..8b53aac27 100644 --- a/definitions/Makefile.am +++ b/definitions/Makefile.am @@ -1,6 +1,6 @@ #This file is generated by make_makefile_am.pl # DON'T EDIT!!! -definitionsdir = @GRIB_DEFINITION_PATH@ +definitionsdir = @ECCODES_DEFINITION_PATH@ dist_definitions_DATA = \ ./CMakeLists.txt\ ./boot.def\ @@ -13,14 +13,14 @@ dist_definitions_DATA = \ ./stepUnits.table\ ./x.grib -definitionsbudgdir = @GRIB_DEFINITION_PATH@/budg +definitionsbudgdir = @ECCODES_DEFINITION_PATH@/budg dist_definitionsbudg_DATA = \ budg/boot.def\ budg/mars_labeling.def\ budg/section.1.def\ budg/section.4.def -definitionsbufrdir = @GRIB_DEFINITION_PATH@/bufr +definitionsbufrdir = @ECCODES_DEFINITION_PATH@/bufr dist_definitionsbufr_DATA = \ bufr/boot.def\ bufr/boot_edition_1.def\ @@ -42,20 +42,20 @@ dist_definitionsbufr_DATA = \ bufr/section1_flags.table\ bufr/section3_flags.table -definitionsbufr_tablesdir = @GRIB_DEFINITION_PATH@/bufr/tables +definitionsbufr_tablesdir = @ECCODES_DEFINITION_PATH@/bufr/tables dist_definitionsbufr_tables_DATA = \ bufr/tables/operators.table -definitionsbufr_tables_0_local_1_98_0dir = @GRIB_DEFINITION_PATH@/bufr/tables/0/local/1/98/0 +definitionsbufr_tables_0_local_1_98_0dir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/local/1/98/0 dist_definitionsbufr_tables_0_local_1_98_0_DATA = \ bufr/tables/0/local/1/98/0/element.table\ bufr/tables/0/local/1/98/0/sequence.def -definitionsbufr_tables_0_local_1_98_0_6dir = @GRIB_DEFINITION_PATH@/bufr/tables/0/local/1/98/0/6 +definitionsbufr_tables_0_local_1_98_0_6dir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/local/1/98/0/6 dist_definitionsbufr_tables_0_local_1_98_0_6_DATA = \ bufr/tables/0/local/1/98/0/6/element.table -definitionsbufr_tables_0_local_1_98_0_codetablesdir = @GRIB_DEFINITION_PATH@/bufr/tables/0/local/1/98/0/codetables +definitionsbufr_tables_0_local_1_98_0_codetablesdir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/local/1/98/0/codetables dist_definitionsbufr_tables_0_local_1_98_0_codetables_DATA = \ bufr/tables/0/local/1/98/0/codetables/13202.table\ bufr/tables/0/local/1/98/0/codetables/20252.table\ @@ -114,12 +114,12 @@ dist_definitionsbufr_tables_0_local_1_98_0_codetables_DATA = \ bufr/tables/0/local/1/98/0/codetables/8195.table\ bufr/tables/0/local/1/98/0/codetables/8201.table -definitionsbufr_tables_0_local_101_98_0dir = @GRIB_DEFINITION_PATH@/bufr/tables/0/local/101/98/0 +definitionsbufr_tables_0_local_101_98_0dir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/local/101/98/0 dist_definitionsbufr_tables_0_local_101_98_0_DATA = \ bufr/tables/0/local/101/98/0/element.table\ bufr/tables/0/local/101/98/0/sequence.def -definitionsbufr_tables_0_local_101_98_0_codetablesdir = @GRIB_DEFINITION_PATH@/bufr/tables/0/local/101/98/0/codetables +definitionsbufr_tables_0_local_101_98_0_codetablesdir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/local/101/98/0/codetables dist_definitionsbufr_tables_0_local_101_98_0_codetables_DATA = \ bufr/tables/0/local/101/98/0/codetables/13202.table\ bufr/tables/0/local/101/98/0/codetables/20252.table\ @@ -174,12 +174,12 @@ dist_definitionsbufr_tables_0_local_101_98_0_codetables_DATA = \ bufr/tables/0/local/101/98/0/codetables/8193.table\ bufr/tables/0/local/101/98/0/codetables/8195.table -definitionsbufr_tables_0_wmo_13dir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/13 +definitionsbufr_tables_0_wmo_13dir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/13 dist_definitionsbufr_tables_0_wmo_13_DATA = \ bufr/tables/0/wmo/13/element.table\ bufr/tables/0/wmo/13/sequence.def -definitionsbufr_tables_0_wmo_13_codetablesdir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/13/codetables +definitionsbufr_tables_0_wmo_13_codetablesdir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/13/codetables dist_definitionsbufr_tables_0_wmo_13_codetables_DATA = \ bufr/tables/0/wmo/13/codetables/1003.table\ bufr/tables/0/wmo/13/codetables/10063.table\ @@ -522,12 +522,12 @@ dist_definitionsbufr_tables_0_wmo_13_codetables_DATA = \ bufr/tables/0/wmo/13/codetables/8083.table\ bufr/tables/0/wmo/13/codetables/8085.table -definitionsbufr_tables_0_wmo_14dir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/14 +definitionsbufr_tables_0_wmo_14dir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/14 dist_definitionsbufr_tables_0_wmo_14_DATA = \ bufr/tables/0/wmo/14/element.table\ bufr/tables/0/wmo/14/sequence.def -definitionsbufr_tables_0_wmo_14_codetablesdir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/14/codetables +definitionsbufr_tables_0_wmo_14_codetablesdir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/14/codetables dist_definitionsbufr_tables_0_wmo_14_codetables_DATA = \ bufr/tables/0/wmo/14/codetables/1003.table\ bufr/tables/0/wmo/14/codetables/10063.table\ @@ -874,12 +874,12 @@ dist_definitionsbufr_tables_0_wmo_14_codetables_DATA = \ bufr/tables/0/wmo/14/codetables/8083.table\ bufr/tables/0/wmo/14/codetables/8085.table -definitionsbufr_tables_0_wmo_15dir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/15 +definitionsbufr_tables_0_wmo_15dir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/15 dist_definitionsbufr_tables_0_wmo_15_DATA = \ bufr/tables/0/wmo/15/element.table\ bufr/tables/0/wmo/15/sequence.def -definitionsbufr_tables_0_wmo_15_codetablesdir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/15/codetables +definitionsbufr_tables_0_wmo_15_codetablesdir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/15/codetables dist_definitionsbufr_tables_0_wmo_15_codetables_DATA = \ bufr/tables/0/wmo/15/codetables/1003.table\ bufr/tables/0/wmo/15/codetables/10063.table\ @@ -1283,12 +1283,12 @@ dist_definitionsbufr_tables_0_wmo_15_codetables_DATA = \ bufr/tables/0/wmo/15/codetables/8085.table\ bufr/tables/0/wmo/15/codetables/8086.table -definitionsbufr_tables_0_wmo_16dir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/16 +definitionsbufr_tables_0_wmo_16dir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/16 dist_definitionsbufr_tables_0_wmo_16_DATA = \ bufr/tables/0/wmo/16/element.table\ bufr/tables/0/wmo/16/sequence.def -definitionsbufr_tables_0_wmo_16_codetablesdir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/16/codetables +definitionsbufr_tables_0_wmo_16_codetablesdir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/16/codetables dist_definitionsbufr_tables_0_wmo_16_codetables_DATA = \ bufr/tables/0/wmo/16/codetables/1003.table\ bufr/tables/0/wmo/16/codetables/10063.table\ @@ -1697,12 +1697,12 @@ dist_definitionsbufr_tables_0_wmo_16_codetables_DATA = \ bufr/tables/0/wmo/16/codetables/8085.table\ bufr/tables/0/wmo/16/codetables/8086.table -definitionsbufr_tables_0_wmo_17dir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/17 +definitionsbufr_tables_0_wmo_17dir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/17 dist_definitionsbufr_tables_0_wmo_17_DATA = \ bufr/tables/0/wmo/17/element.table\ bufr/tables/0/wmo/17/sequence.def -definitionsbufr_tables_0_wmo_17_codetablesdir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/17/codetables +definitionsbufr_tables_0_wmo_17_codetablesdir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/17/codetables dist_definitionsbufr_tables_0_wmo_17_codetables_DATA = \ bufr/tables/0/wmo/17/codetables/1003.table\ bufr/tables/0/wmo/17/codetables/10063.table\ @@ -2111,12 +2111,12 @@ dist_definitionsbufr_tables_0_wmo_17_codetables_DATA = \ bufr/tables/0/wmo/17/codetables/8085.table\ bufr/tables/0/wmo/17/codetables/8086.table -definitionsbufr_tables_0_wmo_18dir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/18 +definitionsbufr_tables_0_wmo_18dir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/18 dist_definitionsbufr_tables_0_wmo_18_DATA = \ bufr/tables/0/wmo/18/element.table\ bufr/tables/0/wmo/18/sequence.def -definitionsbufr_tables_0_wmo_18_codetablesdir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/18/codetables +definitionsbufr_tables_0_wmo_18_codetablesdir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/18/codetables dist_definitionsbufr_tables_0_wmo_18_codetables_DATA = \ bufr/tables/0/wmo/18/codetables/1003.table\ bufr/tables/0/wmo/18/codetables/10063.table\ @@ -2525,12 +2525,12 @@ dist_definitionsbufr_tables_0_wmo_18_codetables_DATA = \ bufr/tables/0/wmo/18/codetables/8085.table\ bufr/tables/0/wmo/18/codetables/8086.table -definitionsbufr_tables_0_wmo_19dir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/19 +definitionsbufr_tables_0_wmo_19dir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/19 dist_definitionsbufr_tables_0_wmo_19_DATA = \ bufr/tables/0/wmo/19/element.table\ bufr/tables/0/wmo/19/sequence.def -definitionsbufr_tables_0_wmo_19_codetablesdir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/19/codetables +definitionsbufr_tables_0_wmo_19_codetablesdir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/19/codetables dist_definitionsbufr_tables_0_wmo_19_codetables_DATA = \ bufr/tables/0/wmo/19/codetables/1003.table\ bufr/tables/0/wmo/19/codetables/10063.table\ @@ -2946,12 +2946,12 @@ dist_definitionsbufr_tables_0_wmo_19_codetables_DATA = \ bufr/tables/0/wmo/19/codetables/8085.table\ bufr/tables/0/wmo/19/codetables/8086.table -definitionsbufr_tables_0_wmo_20dir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/20 +definitionsbufr_tables_0_wmo_20dir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/20 dist_definitionsbufr_tables_0_wmo_20_DATA = \ bufr/tables/0/wmo/20/element.table\ bufr/tables/0/wmo/20/sequence.def -definitionsbufr_tables_0_wmo_20_codetablesdir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/20/codetables +definitionsbufr_tables_0_wmo_20_codetablesdir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/20/codetables dist_definitionsbufr_tables_0_wmo_20_codetables_DATA = \ bufr/tables/0/wmo/20/codetables/1003.table\ bufr/tables/0/wmo/20/codetables/10063.table\ @@ -3367,12 +3367,12 @@ dist_definitionsbufr_tables_0_wmo_20_codetables_DATA = \ bufr/tables/0/wmo/20/codetables/8085.table\ bufr/tables/0/wmo/20/codetables/8086.table -definitionsbufr_tables_0_wmo_21dir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/21 +definitionsbufr_tables_0_wmo_21dir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/21 dist_definitionsbufr_tables_0_wmo_21_DATA = \ bufr/tables/0/wmo/21/element.table\ bufr/tables/0/wmo/21/sequence.def -definitionsbufr_tables_0_wmo_21_codetablesdir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/21/codetables +definitionsbufr_tables_0_wmo_21_codetablesdir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/21/codetables dist_definitionsbufr_tables_0_wmo_21_codetables_DATA = \ bufr/tables/0/wmo/21/codetables/1003.table\ bufr/tables/0/wmo/21/codetables/10063.table\ @@ -3792,12 +3792,12 @@ dist_definitionsbufr_tables_0_wmo_21_codetables_DATA = \ bufr/tables/0/wmo/21/codetables/8085.table\ bufr/tables/0/wmo/21/codetables/8086.table -definitionsbufr_tables_0_wmo_22dir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/22 +definitionsbufr_tables_0_wmo_22dir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/22 dist_definitionsbufr_tables_0_wmo_22_DATA = \ bufr/tables/0/wmo/22/element.table\ bufr/tables/0/wmo/22/sequence.def -definitionsbufr_tables_0_wmo_22_codetablesdir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/22/codetables +definitionsbufr_tables_0_wmo_22_codetablesdir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/22/codetables dist_definitionsbufr_tables_0_wmo_22_codetables_DATA = \ bufr/tables/0/wmo/22/codetables/1003.table\ bufr/tables/0/wmo/22/codetables/10063.table\ @@ -4224,12 +4224,12 @@ dist_definitionsbufr_tables_0_wmo_22_codetables_DATA = \ bufr/tables/0/wmo/22/codetables/8085.table\ bufr/tables/0/wmo/22/codetables/8086.table -definitionsbufr_tables_0_wmo_23dir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/23 +definitionsbufr_tables_0_wmo_23dir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/23 dist_definitionsbufr_tables_0_wmo_23_DATA = \ bufr/tables/0/wmo/23/element.table\ bufr/tables/0/wmo/23/sequence.def -definitionsbufr_tables_0_wmo_23_codetablesdir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/23/codetables +definitionsbufr_tables_0_wmo_23_codetablesdir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/23/codetables dist_definitionsbufr_tables_0_wmo_23_codetables_DATA = \ bufr/tables/0/wmo/23/codetables/1003.table\ bufr/tables/0/wmo/23/codetables/10063.table\ @@ -4660,12 +4660,12 @@ dist_definitionsbufr_tables_0_wmo_23_codetables_DATA = \ bufr/tables/0/wmo/23/codetables/8086.table\ bufr/tables/0/wmo/23/codetables/8087.table -definitionsbufr_tables_0_wmo_6dir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/6 +definitionsbufr_tables_0_wmo_6dir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/6 dist_definitionsbufr_tables_0_wmo_6_DATA = \ bufr/tables/0/wmo/6/element.table\ bufr/tables/0/wmo/6/sequence.def -definitionsbufr_tables_0_wmo_6_codetablesdir = @GRIB_DEFINITION_PATH@/bufr/tables/0/wmo/6/codetables +definitionsbufr_tables_0_wmo_6_codetablesdir = @ECCODES_DEFINITION_PATH@/bufr/tables/0/wmo/6/codetables dist_definitionsbufr_tables_0_wmo_6_codetables_DATA = \ bufr/tables/0/wmo/6/codetables/1003.table\ bufr/tables/0/wmo/6/codetables/10063.table\ @@ -4871,31 +4871,31 @@ dist_definitionsbufr_tables_0_wmo_6_codetables_DATA = \ bufr/tables/0/wmo/6/codetables/8070.table\ bufr/tables/0/wmo/6/codetables/8072.table -definitionsbufr_tables_3_local_1_98_0dir = @GRIB_DEFINITION_PATH@/bufr/tables/3/local/1/98/0 +definitionsbufr_tables_3_local_1_98_0dir = @ECCODES_DEFINITION_PATH@/bufr/tables/3/local/1/98/0 dist_definitionsbufr_tables_3_local_1_98_0_DATA = \ bufr/tables/3/local/1/98/0/element.table\ bufr/tables/3/local/1/98/0/sequence.def -definitionsbufr_tables_3_wmo_11dir = @GRIB_DEFINITION_PATH@/bufr/tables/3/wmo/11 +definitionsbufr_tables_3_wmo_11dir = @ECCODES_DEFINITION_PATH@/bufr/tables/3/wmo/11 dist_definitionsbufr_tables_3_wmo_11_DATA = \ bufr/tables/3/wmo/11/element.table\ bufr/tables/3/wmo/11/sequence.def -definitionsbufr_tables_3_wmo_6dir = @GRIB_DEFINITION_PATH@/bufr/tables/3/wmo/6 +definitionsbufr_tables_3_wmo_6dir = @ECCODES_DEFINITION_PATH@/bufr/tables/3/wmo/6 dist_definitionsbufr_tables_3_wmo_6_DATA = \ bufr/tables/3/wmo/6/element.table\ bufr/tables/3/wmo/6/sequence.def -definitionscdfdir = @GRIB_DEFINITION_PATH@/cdf +definitionscdfdir = @ECCODES_DEFINITION_PATH@/cdf dist_definitionscdf_DATA = \ cdf/boot.def -definitionscommondir = @GRIB_DEFINITION_PATH@/common +definitionscommondir = @ECCODES_DEFINITION_PATH@/common dist_definitionscommon_DATA = \ common/statistics_grid.def\ common/statistics_spectral.def -definitionsgrib1dir = @GRIB_DEFINITION_PATH@/grib1 +definitionsgrib1dir = @ECCODES_DEFINITION_PATH@/grib1 dist_definitionsgrib1_DATA = \ grib1/0.ecmf.table\ grib1/0.eidb.table\ @@ -5123,37 +5123,37 @@ dist_definitionsgrib1_DATA = \ grib1/typeOfLevel.def\ grib1/units.def -definitionsgrib1_local_ecmfdir = @GRIB_DEFINITION_PATH@/grib1/local/ecmf +definitionsgrib1_local_ecmfdir = @ECCODES_DEFINITION_PATH@/grib1/local/ecmf dist_definitionsgrib1_local_ecmf_DATA = \ grib1/local/ecmf/3.table\ grib1/local/ecmf/5.table -definitionsgrib1_local_edzwdir = @GRIB_DEFINITION_PATH@/grib1/local/edzw +definitionsgrib1_local_edzwdir = @ECCODES_DEFINITION_PATH@/grib1/local/edzw dist_definitionsgrib1_local_edzw_DATA = \ grib1/local/edzw/3.table\ grib1/local/edzw/5.table -definitionsgrib1_local_rjtddir = @GRIB_DEFINITION_PATH@/grib1/local/rjtd +definitionsgrib1_local_rjtddir = @ECCODES_DEFINITION_PATH@/grib1/local/rjtd dist_definitionsgrib1_local_rjtd_DATA = \ grib1/local/rjtd/252.table\ grib1/local/rjtd/3.table\ grib1/local/rjtd/5.table -definitionsgrib1_localConcepts_ammcdir = @GRIB_DEFINITION_PATH@/grib1/localConcepts/ammc +definitionsgrib1_localConcepts_ammcdir = @ECCODES_DEFINITION_PATH@/grib1/localConcepts/ammc dist_definitionsgrib1_localConcepts_ammc_DATA = \ grib1/localConcepts/ammc/name.def\ grib1/localConcepts/ammc/paramId.def\ grib1/localConcepts/ammc/shortName.def\ grib1/localConcepts/ammc/units.def -definitionsgrib1_localConcepts_cnmcdir = @GRIB_DEFINITION_PATH@/grib1/localConcepts/cnmc +definitionsgrib1_localConcepts_cnmcdir = @ECCODES_DEFINITION_PATH@/grib1/localConcepts/cnmc dist_definitionsgrib1_localConcepts_cnmc_DATA = \ grib1/localConcepts/cnmc/name.def\ grib1/localConcepts/cnmc/paramId.def\ grib1/localConcepts/cnmc/shortName.def\ grib1/localConcepts/cnmc/units.def -definitionsgrib1_localConcepts_ecmfdir = @GRIB_DEFINITION_PATH@/grib1/localConcepts/ecmf +definitionsgrib1_localConcepts_ecmfdir = @ECCODES_DEFINITION_PATH@/grib1/localConcepts/ecmf dist_definitionsgrib1_localConcepts_ecmf_DATA = \ grib1/localConcepts/ecmf/cfName.def\ grib1/localConcepts/ecmf/cfVarName.def\ @@ -5164,7 +5164,7 @@ dist_definitionsgrib1_localConcepts_ecmf_DATA = \ grib1/localConcepts/ecmf/typeOfLevel.def\ grib1/localConcepts/ecmf/units.def -definitionsgrib1_localConcepts_edzwdir = @GRIB_DEFINITION_PATH@/grib1/localConcepts/edzw +definitionsgrib1_localConcepts_edzwdir = @ECCODES_DEFINITION_PATH@/grib1/localConcepts/edzw dist_definitionsgrib1_localConcepts_edzw_DATA = \ grib1/localConcepts/edzw/name.def\ grib1/localConcepts/edzw/paramId.def\ @@ -5172,7 +5172,7 @@ dist_definitionsgrib1_localConcepts_edzw_DATA = \ grib1/localConcepts/edzw/stepType.def\ grib1/localConcepts/edzw/units.def -definitionsgrib1_localConcepts_eidbdir = @GRIB_DEFINITION_PATH@/grib1/localConcepts/eidb +definitionsgrib1_localConcepts_eidbdir = @ECCODES_DEFINITION_PATH@/grib1/localConcepts/eidb dist_definitionsgrib1_localConcepts_eidb_DATA = \ grib1/localConcepts/eidb/cfName.def\ grib1/localConcepts/eidb/name.def\ @@ -5181,21 +5181,21 @@ dist_definitionsgrib1_localConcepts_eidb_DATA = \ grib1/localConcepts/eidb/typeOfLevel.def\ grib1/localConcepts/eidb/units.def -definitionsgrib1_localConcepts_ekmidir = @GRIB_DEFINITION_PATH@/grib1/localConcepts/ekmi +definitionsgrib1_localConcepts_ekmidir = @ECCODES_DEFINITION_PATH@/grib1/localConcepts/ekmi dist_definitionsgrib1_localConcepts_ekmi_DATA = \ grib1/localConcepts/ekmi/name.def\ grib1/localConcepts/ekmi/paramId.def\ grib1/localConcepts/ekmi/shortName.def\ grib1/localConcepts/ekmi/units.def -definitionsgrib1_localConcepts_enmidir = @GRIB_DEFINITION_PATH@/grib1/localConcepts/enmi +definitionsgrib1_localConcepts_enmidir = @ECCODES_DEFINITION_PATH@/grib1/localConcepts/enmi dist_definitionsgrib1_localConcepts_enmi_DATA = \ grib1/localConcepts/enmi/name.def\ grib1/localConcepts/enmi/paramId.def\ grib1/localConcepts/enmi/shortName.def\ grib1/localConcepts/enmi/units.def -definitionsgrib1_localConcepts_eswidir = @GRIB_DEFINITION_PATH@/grib1/localConcepts/eswi +definitionsgrib1_localConcepts_eswidir = @ECCODES_DEFINITION_PATH@/grib1/localConcepts/eswi dist_definitionsgrib1_localConcepts_eswi_DATA = \ grib1/localConcepts/eswi/aerosolConcept.def\ grib1/localConcepts/eswi/aerosolbinnumber.table\ @@ -5212,28 +5212,28 @@ dist_definitionsgrib1_localConcepts_eswi_DATA = \ grib1/localConcepts/eswi/typeOfLevel.def\ grib1/localConcepts/eswi/units.def -definitionsgrib1_localConcepts_kwbcdir = @GRIB_DEFINITION_PATH@/grib1/localConcepts/kwbc +definitionsgrib1_localConcepts_kwbcdir = @ECCODES_DEFINITION_PATH@/grib1/localConcepts/kwbc dist_definitionsgrib1_localConcepts_kwbc_DATA = \ grib1/localConcepts/kwbc/name.def\ grib1/localConcepts/kwbc/paramId.def\ grib1/localConcepts/kwbc/shortName.def\ grib1/localConcepts/kwbc/units.def -definitionsgrib1_localConcepts_lfpwdir = @GRIB_DEFINITION_PATH@/grib1/localConcepts/lfpw +definitionsgrib1_localConcepts_lfpwdir = @ECCODES_DEFINITION_PATH@/grib1/localConcepts/lfpw dist_definitionsgrib1_localConcepts_lfpw_DATA = \ grib1/localConcepts/lfpw/name.def\ grib1/localConcepts/lfpw/paramId.def\ grib1/localConcepts/lfpw/shortName.def\ grib1/localConcepts/lfpw/units.def -definitionsgrib1_localConcepts_lowmdir = @GRIB_DEFINITION_PATH@/grib1/localConcepts/lowm +definitionsgrib1_localConcepts_lowmdir = @ECCODES_DEFINITION_PATH@/grib1/localConcepts/lowm dist_definitionsgrib1_localConcepts_lowm_DATA = \ grib1/localConcepts/lowm/name.def\ grib1/localConcepts/lowm/paramId.def\ grib1/localConcepts/lowm/shortName.def\ grib1/localConcepts/lowm/units.def -definitionsgrib1_localConcepts_rjtddir = @GRIB_DEFINITION_PATH@/grib1/localConcepts/rjtd +definitionsgrib1_localConcepts_rjtddir = @ECCODES_DEFINITION_PATH@/grib1/localConcepts/rjtd dist_definitionsgrib1_localConcepts_rjtd_DATA = \ grib1/localConcepts/rjtd/cfVarName.def\ grib1/localConcepts/rjtd/name.def\ @@ -5243,14 +5243,14 @@ dist_definitionsgrib1_localConcepts_rjtd_DATA = \ grib1/localConcepts/rjtd/typeOfLevel.def\ grib1/localConcepts/rjtd/units.def -definitionsgrib1_localConcepts_sbsjdir = @GRIB_DEFINITION_PATH@/grib1/localConcepts/sbsj +definitionsgrib1_localConcepts_sbsjdir = @ECCODES_DEFINITION_PATH@/grib1/localConcepts/sbsj dist_definitionsgrib1_localConcepts_sbsj_DATA = \ grib1/localConcepts/sbsj/name.def\ grib1/localConcepts/sbsj/paramId.def\ grib1/localConcepts/sbsj/shortName.def\ grib1/localConcepts/sbsj/units.def -definitionsgrib2dir = @GRIB_DEFINITION_PATH@/grib2 +definitionsgrib2dir = @ECCODES_DEFINITION_PATH@/grib2 dist_definitionsgrib2_DATA = \ grib2/boot.def\ grib2/boot_multifield.def\ @@ -5472,25 +5472,25 @@ dist_definitionsgrib2_DATA = \ grib2/tigge_suiteName.table\ grib2/units.def -definitionsgrib2_localdir = @GRIB_DEFINITION_PATH@/grib2/local +definitionsgrib2_localdir = @ECCODES_DEFINITION_PATH@/grib2/local dist_definitionsgrib2_local_DATA = \ grib2/local/2.0.table -definitionsgrib2_local_1098dir = @GRIB_DEFINITION_PATH@/grib2/local/1098 +definitionsgrib2_local_1098dir = @ECCODES_DEFINITION_PATH@/grib2/local/1098 dist_definitionsgrib2_local_1098_DATA = \ grib2/local/1098/2.1.table\ grib2/local/1098/centres.table\ grib2/local/1098/models.table\ grib2/local/1098/template.2.0.def -definitionsgrib2_localConcepts_cnmcdir = @GRIB_DEFINITION_PATH@/grib2/localConcepts/cnmc +definitionsgrib2_localConcepts_cnmcdir = @ECCODES_DEFINITION_PATH@/grib2/localConcepts/cnmc dist_definitionsgrib2_localConcepts_cnmc_DATA = \ grib2/localConcepts/cnmc/name.def\ grib2/localConcepts/cnmc/paramId.def\ grib2/localConcepts/cnmc/shortName.def\ grib2/localConcepts/cnmc/units.def -definitionsgrib2_localConcepts_ecmfdir = @GRIB_DEFINITION_PATH@/grib2/localConcepts/ecmf +definitionsgrib2_localConcepts_ecmfdir = @ECCODES_DEFINITION_PATH@/grib2/localConcepts/ecmf dist_definitionsgrib2_localConcepts_ecmf_DATA = \ grib2/localConcepts/ecmf/cfName.def\ grib2/localConcepts/ecmf/cfVarName.def\ @@ -5499,61 +5499,61 @@ dist_definitionsgrib2_localConcepts_ecmf_DATA = \ grib2/localConcepts/ecmf/shortName.def\ grib2/localConcepts/ecmf/units.def -definitionsgrib2_localConcepts_edzwdir = @GRIB_DEFINITION_PATH@/grib2/localConcepts/edzw +definitionsgrib2_localConcepts_edzwdir = @ECCODES_DEFINITION_PATH@/grib2/localConcepts/edzw dist_definitionsgrib2_localConcepts_edzw_DATA = \ grib2/localConcepts/edzw/name.def\ grib2/localConcepts/edzw/paramId.def\ grib2/localConcepts/edzw/shortName.def\ grib2/localConcepts/edzw/units.def -definitionsgrib2_localConcepts_egrrdir = @GRIB_DEFINITION_PATH@/grib2/localConcepts/egrr +definitionsgrib2_localConcepts_egrrdir = @ECCODES_DEFINITION_PATH@/grib2/localConcepts/egrr dist_definitionsgrib2_localConcepts_egrr_DATA = \ grib2/localConcepts/egrr/name.def\ grib2/localConcepts/egrr/paramId.def\ grib2/localConcepts/egrr/shortName.def\ grib2/localConcepts/egrr/units.def -definitionsgrib2_localConcepts_ekmidir = @GRIB_DEFINITION_PATH@/grib2/localConcepts/ekmi +definitionsgrib2_localConcepts_ekmidir = @ECCODES_DEFINITION_PATH@/grib2/localConcepts/ekmi dist_definitionsgrib2_localConcepts_ekmi_DATA = \ grib2/localConcepts/ekmi/name.def\ grib2/localConcepts/ekmi/paramId.def\ grib2/localConcepts/ekmi/shortName.def\ grib2/localConcepts/ekmi/units.def -definitionsgrib2_localConcepts_eswidir = @GRIB_DEFINITION_PATH@/grib2/localConcepts/eswi +definitionsgrib2_localConcepts_eswidir = @ECCODES_DEFINITION_PATH@/grib2/localConcepts/eswi dist_definitionsgrib2_localConcepts_eswi_DATA = \ grib2/localConcepts/eswi/name.def\ grib2/localConcepts/eswi/paramId.def\ grib2/localConcepts/eswi/shortName.def\ grib2/localConcepts/eswi/units.def -definitionsgrib2_localConcepts_kwbcdir = @GRIB_DEFINITION_PATH@/grib2/localConcepts/kwbc +definitionsgrib2_localConcepts_kwbcdir = @ECCODES_DEFINITION_PATH@/grib2/localConcepts/kwbc dist_definitionsgrib2_localConcepts_kwbc_DATA = \ grib2/localConcepts/kwbc/name.def\ grib2/localConcepts/kwbc/paramId.def\ grib2/localConcepts/kwbc/shortName.def\ grib2/localConcepts/kwbc/units.def -definitionsgrib2_localConcepts_lfpwdir = @GRIB_DEFINITION_PATH@/grib2/localConcepts/lfpw +definitionsgrib2_localConcepts_lfpwdir = @ECCODES_DEFINITION_PATH@/grib2/localConcepts/lfpw dist_definitionsgrib2_localConcepts_lfpw_DATA = \ grib2/localConcepts/lfpw/name.def\ grib2/localConcepts/lfpw/paramId.def\ grib2/localConcepts/lfpw/shortName.def\ grib2/localConcepts/lfpw/units.def -definitionsgrib2_localConcepts_lfpw1dir = @GRIB_DEFINITION_PATH@/grib2/localConcepts/lfpw1 +definitionsgrib2_localConcepts_lfpw1dir = @ECCODES_DEFINITION_PATH@/grib2/localConcepts/lfpw1 dist_definitionsgrib2_localConcepts_lfpw1_DATA = \ grib2/localConcepts/lfpw1/name.def\ grib2/localConcepts/lfpw1/paramId.def\ grib2/localConcepts/lfpw1/shortName.def\ grib2/localConcepts/lfpw1/units.def -definitionsgrib2_tablesdir = @GRIB_DEFINITION_PATH@/grib2/tables +definitionsgrib2_tablesdir = @ECCODES_DEFINITION_PATH@/grib2/tables dist_definitionsgrib2_tables_DATA = \ grib2/tables/0.0.table\ grib2/tables/1.0.table -definitionsgrib2_tables_0dir = @GRIB_DEFINITION_PATH@/grib2/tables/0 +definitionsgrib2_tables_0dir = @ECCODES_DEFINITION_PATH@/grib2/tables/0 dist_definitionsgrib2_tables_0_DATA = \ grib2/tables/0/0.0.table\ grib2/tables/0/1.0.table\ @@ -5660,7 +5660,7 @@ dist_definitionsgrib2_tables_0_DATA = \ grib2/tables/0/6.0.table\ grib2/tables/0/stepType.table -definitionsgrib2_tables_1dir = @GRIB_DEFINITION_PATH@/grib2/tables/1 +definitionsgrib2_tables_1dir = @ECCODES_DEFINITION_PATH@/grib2/tables/1 dist_definitionsgrib2_tables_1_DATA = \ grib2/tables/1/0.0.table\ grib2/tables/1/1.0.table\ @@ -5767,7 +5767,7 @@ dist_definitionsgrib2_tables_1_DATA = \ grib2/tables/1/6.0.table\ grib2/tables/1/stepType.table -definitionsgrib2_tables_10dir = @GRIB_DEFINITION_PATH@/grib2/tables/10 +definitionsgrib2_tables_10dir = @ECCODES_DEFINITION_PATH@/grib2/tables/10 dist_definitionsgrib2_tables_10_DATA = \ grib2/tables/10/0.0.table\ grib2/tables/10/1.0.table\ @@ -5891,7 +5891,7 @@ dist_definitionsgrib2_tables_10_DATA = \ grib2/tables/10/6.0.table\ grib2/tables/10/stepType.table -definitionsgrib2_tables_11dir = @GRIB_DEFINITION_PATH@/grib2/tables/11 +definitionsgrib2_tables_11dir = @ECCODES_DEFINITION_PATH@/grib2/tables/11 dist_definitionsgrib2_tables_11_DATA = \ grib2/tables/11/0.0.table\ grib2/tables/11/1.0.table\ @@ -6012,7 +6012,7 @@ dist_definitionsgrib2_tables_11_DATA = \ grib2/tables/11/6.0.table\ grib2/tables/11/stepType.table -definitionsgrib2_tables_12dir = @GRIB_DEFINITION_PATH@/grib2/tables/12 +definitionsgrib2_tables_12dir = @ECCODES_DEFINITION_PATH@/grib2/tables/12 dist_definitionsgrib2_tables_12_DATA = \ grib2/tables/12/0.0.table\ grib2/tables/12/1.0.table\ @@ -6135,7 +6135,7 @@ dist_definitionsgrib2_tables_12_DATA = \ grib2/tables/12/6.0.table\ grib2/tables/12/stepType.table -definitionsgrib2_tables_13dir = @GRIB_DEFINITION_PATH@/grib2/tables/13 +definitionsgrib2_tables_13dir = @ECCODES_DEFINITION_PATH@/grib2/tables/13 dist_definitionsgrib2_tables_13_DATA = \ grib2/tables/13/0.0.table\ grib2/tables/13/1.0.table\ @@ -6259,7 +6259,7 @@ dist_definitionsgrib2_tables_13_DATA = \ grib2/tables/13/6.0.table\ grib2/tables/13/stepType.table -definitionsgrib2_tables_14dir = @GRIB_DEFINITION_PATH@/grib2/tables/14 +definitionsgrib2_tables_14dir = @ECCODES_DEFINITION_PATH@/grib2/tables/14 dist_definitionsgrib2_tables_14_DATA = \ grib2/tables/14/0.0.table\ grib2/tables/14/1.0.table\ @@ -6386,7 +6386,7 @@ dist_definitionsgrib2_tables_14_DATA = \ grib2/tables/14/6.0.table\ grib2/tables/14/stepType.table -definitionsgrib2_tables_2dir = @GRIB_DEFINITION_PATH@/grib2/tables/2 +definitionsgrib2_tables_2dir = @ECCODES_DEFINITION_PATH@/grib2/tables/2 dist_definitionsgrib2_tables_2_DATA = \ grib2/tables/2/0.0.table\ grib2/tables/2/1.0.table\ @@ -6493,7 +6493,7 @@ dist_definitionsgrib2_tables_2_DATA = \ grib2/tables/2/6.0.table\ grib2/tables/2/stepType.table -definitionsgrib2_tables_3dir = @GRIB_DEFINITION_PATH@/grib2/tables/3 +definitionsgrib2_tables_3dir = @ECCODES_DEFINITION_PATH@/grib2/tables/3 dist_definitionsgrib2_tables_3_DATA = \ grib2/tables/3/0.0.table\ grib2/tables/3/1.0.table\ @@ -6601,7 +6601,7 @@ dist_definitionsgrib2_tables_3_DATA = \ grib2/tables/3/6.0.table\ grib2/tables/3/stepType.table -definitionsgrib2_tables_4dir = @GRIB_DEFINITION_PATH@/grib2/tables/4 +definitionsgrib2_tables_4dir = @ECCODES_DEFINITION_PATH@/grib2/tables/4 dist_definitionsgrib2_tables_4_DATA = \ grib2/tables/4/0.0.table\ grib2/tables/4/1.0.table\ @@ -6966,7 +6966,7 @@ dist_definitionsgrib2_tables_4_DATA = \ grib2/tables/4/6.0.table\ grib2/tables/4/stepType.table -definitionsgrib2_tables_5dir = @GRIB_DEFINITION_PATH@/grib2/tables/5 +definitionsgrib2_tables_5dir = @ECCODES_DEFINITION_PATH@/grib2/tables/5 dist_definitionsgrib2_tables_5_DATA = \ grib2/tables/5/0.0.table\ grib2/tables/5/1.0.table\ @@ -7337,7 +7337,7 @@ dist_definitionsgrib2_tables_5_DATA = \ grib2/tables/5/6.0.table\ grib2/tables/5/stepType.table -definitionsgrib2_tables_6dir = @GRIB_DEFINITION_PATH@/grib2/tables/6 +definitionsgrib2_tables_6dir = @ECCODES_DEFINITION_PATH@/grib2/tables/6 dist_definitionsgrib2_tables_6_DATA = \ grib2/tables/6/0.0.table\ grib2/tables/6/1.0.table\ @@ -7710,7 +7710,7 @@ dist_definitionsgrib2_tables_6_DATA = \ grib2/tables/6/6.0.table\ grib2/tables/6/stepType.table -definitionsgrib2_tables_7dir = @GRIB_DEFINITION_PATH@/grib2/tables/7 +definitionsgrib2_tables_7dir = @ECCODES_DEFINITION_PATH@/grib2/tables/7 dist_definitionsgrib2_tables_7_DATA = \ grib2/tables/7/0.0.table\ grib2/tables/7/1.0.table\ @@ -8084,7 +8084,7 @@ dist_definitionsgrib2_tables_7_DATA = \ grib2/tables/7/6.0.table\ grib2/tables/7/stepType.table -definitionsgrib2_tables_8dir = @GRIB_DEFINITION_PATH@/grib2/tables/8 +definitionsgrib2_tables_8dir = @ECCODES_DEFINITION_PATH@/grib2/tables/8 dist_definitionsgrib2_tables_8_DATA = \ grib2/tables/8/0.0.table\ grib2/tables/8/1.0.table\ @@ -8460,7 +8460,7 @@ dist_definitionsgrib2_tables_8_DATA = \ grib2/tables/8/6.0.table\ grib2/tables/8/stepType.table -definitionsgrib2_tables_9dir = @GRIB_DEFINITION_PATH@/grib2/tables/9 +definitionsgrib2_tables_9dir = @ECCODES_DEFINITION_PATH@/grib2/tables/9 dist_definitionsgrib2_tables_9_DATA = \ grib2/tables/9/0.0.table\ grib2/tables/9/1.0.table\ @@ -8839,7 +8839,7 @@ dist_definitionsgrib2_tables_9_DATA = \ grib2/tables/9/6.0.table\ grib2/tables/9/stepType.table -definitionsgrib2_tables_local_ecmfdir = @GRIB_DEFINITION_PATH@/grib2/tables/local/ecmf +definitionsgrib2_tables_local_ecmfdir = @ECCODES_DEFINITION_PATH@/grib2/tables/local/ecmf dist_definitionsgrib2_tables_local_ecmf_DATA = \ grib2/tables/local/ecmf/obstat.1.0.table\ grib2/tables/local/ecmf/obstat.10.0.table\ @@ -8855,19 +8855,19 @@ dist_definitionsgrib2_tables_local_ecmf_DATA = \ grib2/tables/local/ecmf/obstat.reporttype.table\ grib2/tables/local/ecmf/obstat.varno.table -definitionsgrib2_tables_local_ecmf_4dir = @GRIB_DEFINITION_PATH@/grib2/tables/local/ecmf/4 +definitionsgrib2_tables_local_ecmf_4dir = @ECCODES_DEFINITION_PATH@/grib2/tables/local/ecmf/4 dist_definitionsgrib2_tables_local_ecmf_4_DATA = \ grib2/tables/local/ecmf/4/1.2.table -definitionsgtsdir = @GRIB_DEFINITION_PATH@/gts +definitionsgtsdir = @ECCODES_DEFINITION_PATH@/gts dist_definitionsgts_DATA = \ gts/boot.def -definitionshdf5dir = @GRIB_DEFINITION_PATH@/hdf5 +definitionshdf5dir = @ECCODES_DEFINITION_PATH@/hdf5 dist_definitionshdf5_DATA = \ hdf5/boot.def -definitionsmarsdir = @GRIB_DEFINITION_PATH@/mars +definitionsmarsdir = @ECCODES_DEFINITION_PATH@/mars dist_definitionsmars_DATA = \ mars/base.def\ mars/class.table\ @@ -9180,7 +9180,7 @@ dist_definitionsmars_DATA = \ mars/type.table\ mars/wave_domain.def -definitionsmars_eswidir = @GRIB_DEFINITION_PATH@/mars/eswi +definitionsmars_eswidir = @ECCODES_DEFINITION_PATH@/mars/eswi dist_definitionsmars_eswi_DATA = \ mars/eswi/aerosolPackingConcept.def\ mars/eswi/class.table\ @@ -9204,7 +9204,7 @@ dist_definitionsmars_eswi_DATA = \ mars/eswi/type.table\ mars/eswi/wave_domain.def -definitionsmetardir = @GRIB_DEFINITION_PATH@/metar +definitionsmetardir = @ECCODES_DEFINITION_PATH@/metar dist_definitionsmetar_DATA = \ metar/CCCC.txt\ metar/boot.def\ @@ -9267,11 +9267,11 @@ dist_definitionsmetar_DATA = \ metar/wind_shear.def\ metar/wrong_delayed.def -definitionsmetar_stationsdir = @GRIB_DEFINITION_PATH@/metar/stations +definitionsmetar_stationsdir = @ECCODES_DEFINITION_PATH@/metar/stations dist_definitionsmetar_stations_DATA = \ metar/stations/nsd_cccc.txt -definitionstafdir = @GRIB_DEFINITION_PATH@/taf +definitionstafdir = @ECCODES_DEFINITION_PATH@/taf dist_definitionstaf_DATA = \ taf/CCCC.txt\ taf/boot.def\ @@ -9333,18 +9333,18 @@ dist_definitionstaf_DATA = \ taf/wind_shear.def\ taf/wrong_delayed.def -definitionstaf_stationsdir = @GRIB_DEFINITION_PATH@/taf/stations +definitionstaf_stationsdir = @ECCODES_DEFINITION_PATH@/taf/stations dist_definitionstaf_stations_DATA = \ taf/stations/nsd_cccc.txt -definitionstidedir = @GRIB_DEFINITION_PATH@/tide +definitionstidedir = @ECCODES_DEFINITION_PATH@/tide dist_definitionstide_DATA = \ tide/boot.def\ tide/mars_labeling.def\ tide/section.1.def\ tide/section.4.def -definitionswrapdir = @GRIB_DEFINITION_PATH@/wrap +definitionswrapdir = @ECCODES_DEFINITION_PATH@/wrap dist_definitionswrap_DATA = \ wrap/boot.def\ wrap/metadata.0.def diff --git a/definitions/installDefinitions.sh b/definitions/installDefinitions.sh index b76d58188..87145cfed 100755 --- a/definitions/installDefinitions.sh +++ b/definitions/installDefinitions.sh @@ -109,7 +109,7 @@ if [ ${definitions} != $defaultDefinitions ] then echo " ## Please remember to set -## GRIB_DEFINITION_PATH=${definitions} +## ECCODES_DEFINITION_PATH=${definitions} ## to activate the new definition files. " diff --git a/definitions/make_makefile_am.pl b/definitions/make_makefile_am.pl index 993c1c477..9f40503e0 100755 --- a/definitions/make_makefile_am.pl +++ b/definitions/make_makefile_am.pl @@ -54,14 +54,14 @@ sub process { $name = ""; print "#This file is generated by make_makefile_am.pl\n"; print "# DON'T EDIT!!!\n"; - print "definitionsdir = \@GRIB_DEFINITION_PATH\@\n"; + print "definitionsdir = \@ECCODES_DEFINITION_PATH\@\n"; } else { $dir =~ s/^\.\///; $name = "$dir"; $name =~ s/\W/_/g; - print "definitions${name}dir = \@GRIB_DEFINITION_PATH\@/$dir\n"; + print "definitions${name}dir = \@ECCODES_DEFINITION_PATH\@/$dir\n"; } diff --git a/examples/F77/include.sh b/examples/F77/include.sh index 9ca18fd34..037128ec0 100644 --- a/examples/F77/include.sh +++ b/examples/F77/include.sh @@ -9,8 +9,8 @@ then cpath=`pwd` ECCODES_DEFINITION_PATH=$cpath/definitions export ECCODES_DEFINITION_PATH - GRIB_TEMPLATES_PATH=$cpath/templates - export GRIB_TEMPLATES_PATH + ECCODES_SAMPLES_PATH=$cpath/templates + export ECCODES_SAMPLES_PATH tools_dir=$cpath/tools/ examples_dir=$cpath/examples/F77/ data_dir=$cpath/data diff --git a/examples/include.sh b/examples/include.sh index a09781a50..b6f85e323 100644 --- a/examples/include.sh +++ b/examples/include.sh @@ -9,8 +9,8 @@ then cpath=`pwd` ECCODES_DEFINITION_PATH=$cpath/definitions export ECCODES_DEFINITION_PATH - GRIB_TEMPLATES_PATH=$cpath/templates - export GRIB_TEMPLATES_PATH + ECCODES_SAMPLES_PATH=$cpath/templates + export ECCODES_SAMPLES_PATH tools_dir=$cpath/tools/ examples_dir=$cpath/examples/ data_dir=$cpath/data diff --git a/grib_api-import.cmake.in b/grib_api-import.cmake.in index deb4c22fb..c750d33bb 100644 --- a/grib_api-import.cmake.in +++ b/grib_api-import.cmake.in @@ -1,3 +1,3 @@ -set( GRIB_API_SAMPLES_PATH "@GRIB_API_SAMPLES_PATH@" ) -set( GRIB_API_IFS_SAMPLES_PATH "@GRIB_API_IFS_SAMPLES_PATH@" ) -set( GRIB_API_DEFINITION_PATH "@GRIB_API_DEFINITION_PATH@" ) +set( ECCODES_SAMPLES_PATH "@ECCODES_SAMPLES_PATH@" ) +set( ECCODES_IFS_SAMPLES_PATH "@ECCODES_IFS_SAMPLES_PATH@" ) +set( ECCODES_DEFINITION_PATH "@ECCODES_DEFINITION_PATH@" ) diff --git a/grib_api_config.h.in b/grib_api_config.h.in index 49709b036..ee4967c96 100644 --- a/grib_api_config.h.in +++ b/grib_api_config.h.in @@ -21,7 +21,7 @@ #define GRIB_API_MINOR_VERSION @GRIB_API_MINOR_VERSION@ #define GRIB_API_REVISION_VERSION @GRIB_API_PATCH_VERSION@ -#define GRIB_DEFINITION_PATH "@GRIB_API_DEFINITION_PATH@" +#define ECCODES_DEFINITION_PATH "@ECCODES_DEFINITION_PATH@" #ifdef EC_HAVE_C_INLINE #define GRIB_INLINE inline @@ -33,9 +33,7 @@ #define GRIB_PTHREADS @GRIB_PTHREADS@ -#define GRIB_SAMPLES_PATH "@GRIB_API_SAMPLES_PATH@" - -#define GRIB_TEMPLATES_PATH "@GRIB_API_SAMPLES_PATH@" +#define ECCODES_SAMPLES_PATH "@ECCODES_SAMPLES_PATH@" #define GRIB_TIMER @GRIB_TIMER@ diff --git a/parameters/feed_tigge.pl b/parameters/feed_tigge.pl index e189e86af..406518d80 100755 --- a/parameters/feed_tigge.pl +++ b/parameters/feed_tigge.pl @@ -8,9 +8,9 @@ # # the information comes from master.info except for unit # -# an evironmental variable GRIB_DEFINITION_PATH must exist -# master.info is in GRIB_DEFINITION_PATH/../parameters -# the units are taken from GRIB_DEFINITION_PATH/definitions/* +# an evironmental variable ECCODES_DEFINITION_PATH must exist +# master.info is in ECCODES_DEFINITION_PATH/../parameters +# the units are taken from ECCODES_DEFINITION_PATH/definitions/* # # a table parameters with the above columns must exist # diff --git a/samples/Makefile.am b/samples/Makefile.am index e91a8cc13..593bea2f0 100644 --- a/samples/Makefile.am +++ b/samples/Makefile.am @@ -1,5 +1,5 @@ -samplesdir = @GRIB_SAMPLES_PATH@ +samplesdir = @ECCODES_SAMPLES_PATH@ dist_samples_DATA = \ GRIB1.tmpl \ diff --git a/sms/test_gribs/smsfiles/grib_api.sms b/sms/test_gribs/smsfiles/grib_api.sms index e4b1229e8..0b03d4893 100644 --- a/sms/test_gribs/smsfiles/grib_api.sms +++ b/sms/test_gribs/smsfiles/grib_api.sms @@ -3,7 +3,7 @@ name=%FAMILY1% rm -fr /scratch/ma/max/problems/$name -export GRIB_DEFINITION_PATH=/home/ma/mab/src/q/definitions +export ECCODES_DEFINITION_PATH=/home/ma/mab/src/q/definitions here=`pwd` cd /home/ma/mab/src/q test=$(ls *.test) diff --git a/sms/test_gribs/smsfiles/gribex.sms b/sms/test_gribs/smsfiles/gribex.sms index 59dda6f7f..b1f2ea2c2 100644 --- a/sms/test_gribs/smsfiles/gribex.sms +++ b/sms/test_gribs/smsfiles/gribex.sms @@ -1,6 +1,6 @@ %include -export GRIB_DEFINITION_PATH=/home/ma/mab/src/q/definitions +export ECCODES_DEFINITION_PATH=/home/ma/mab/src/q/definitions /home/ma/mab/src/q/gribex data || true diff --git a/sms/test_gribs/smsfiles/sample.sms b/sms/test_gribs/smsfiles/sample.sms index 4a533f5c8..e85e2516e 100644 --- a/sms/test_gribs/smsfiles/sample.sms +++ b/sms/test_gribs/smsfiles/sample.sms @@ -1,6 +1,6 @@ %include -export GRIB_DEFINITION_PATH=/home/ma/mab/src/q/definitions +export ECCODES_DEFINITION_PATH=/home/ma/mab/src/q/definitions /home/ma/mab/src/q/sample data diff --git a/sms/test_gribs/smsfiles/test.sms b/sms/test_gribs/smsfiles/test.sms index e81770f76..01809f9a3 100644 --- a/sms/test_gribs/smsfiles/test.sms +++ b/sms/test_gribs/smsfiles/test.sms @@ -5,7 +5,7 @@ home=/marsdev/data/max/grib_api/tests.ecmwf name=%FAMILY1% rm -fr /scratch/ma/max/problems/$name -# export GRIB_DEFINITION_PATH=/home/ma/mab/src/q/definitions +# export ECCODES_DEFINITION_PATH=/home/ma/mab/src/q/definitions here=`pwd` cd $home diff --git a/sms/test_gribs/smsfiles/test_archive.sms b/sms/test_gribs/smsfiles/test_archive.sms index c531f493b..1376b4e2f 100644 --- a/sms/test_gribs/smsfiles/test_archive.sms +++ b/sms/test_gribs/smsfiles/test_archive.sms @@ -3,7 +3,7 @@ rm -f back -export GRIB_DEFINITION_PATH=/home/ma/mab/src/q/definitions +export ECCODES_DEFINITION_PATH=/home/ma/mab/src/q/definitions /home/ma/mab/src/q/g2r data || true $MARSCMD <<@ diff --git a/src/Makefile.am b/src/Makefile.am index cb16cca81..bad3b5a41 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,9 +2,8 @@ AM_CFLAGS = @WARN_PEDANTIC@ -AM_CPPFLAGS = -DGRIB_TEMPLATES_PATH=\"$(GRIB_TEMPLATES_PATH)\" \ - -DGRIB_SAMPLES_PATH=\"$(GRIB_SAMPLES_PATH)\" \ - -DGRIB_DEFINITION_PATH=\"$(GRIB_DEFINITION_PATH)\" +AM_CPPFLAGS = -DECCODES_SAMPLES_PATH=\"$(ECCODES_SAMPLES_PATH)\" \ + -DECCODES_DEFINITION_PATH=\"$(ECCODES_DEFINITION_PATH)\" # -DUSE_JPEG2000 # -DYYDEBUG diff --git a/src/grib_context.c b/src/grib_context.c index 0eac91a3c..7cb781869 100644 --- a/src/grib_context.c +++ b/src/grib_context.c @@ -381,17 +381,15 @@ grib_context* grib_context_get_default() default_grib_context.log_stream=stdout; } - if (!default_grib_context.grib_samples_path) - default_grib_context.grib_samples_path = getenv("ECCODES_TEMPLATES_PATH"); -#ifdef GRIB_TEMPLATES_PATH +#ifdef ECCODES_SAMPLES_PATH if(!default_grib_context.grib_samples_path) - default_grib_context.grib_samples_path = GRIB_TEMPLATES_PATH ; + default_grib_context.grib_samples_path = ECCODES_SAMPLES_PATH ; #endif default_grib_context.grib_definition_files_path = getenv("ECCODES_DEFINITION_PATH"); -#ifdef GRIB_DEFINITION_PATH +#ifdef ECCODES_DEFINITION_PATH if(!default_grib_context.grib_definition_files_path) { - default_grib_context.grib_definition_files_path = GRIB_DEFINITION_PATH ; + default_grib_context.grib_definition_files_path = ECCODES_DEFINITION_PATH ; } else { /* Temp bug fix when putenv() is called from program that moves getenv() stuff around */ diff --git a/src/grib_templates.c b/src/grib_templates.c index 309334acd..b1a720289 100644 --- a/src/grib_templates.c +++ b/src/grib_templates.c @@ -90,7 +90,6 @@ grib_handle* grib_external_template(grib_context* c,const char* name) char buffer[1024]; char *p = buffer; grib_handle *g = NULL; - /* printf("GRIB_TEMPLATES_PATH=%s\n",base); */ if(!base) return NULL; diff --git a/tools/Makefile.am b/tools/Makefile.am index ef310605a..f40f502f0 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,8 +1,7 @@ AM_CFLAGS = @WARN_PEDANTIC@ @WERROR@ -DYYDEBUG -AM_CPPFLAGS = -DGRIB_TEMPLATES_PATH=\"$(GRIB_TEMPLATES_PATH)\" \ - -DGRIB_SAMPLES_PATH=\"$(GRIB_SAMPLES_PATH)\" \ - -DGRIB_DEFINITION_PATH=\"$(GRIB_DEFINITION_PATH)\" +AM_CPPFLAGS = -DECCODES_SAMPLES_PATH=\"$(ECCODES_SAMPLES_PATH)\" \ + -DECCODES_DEFINITION_PATH=\"$(ECCODES_DEFINITION_PATH)\" AM_YFLAGS = -d diff --git a/tools/codes_info.c b/tools/codes_info.c index 12d499c92..743287389 100644 --- a/tools/codes_info.c +++ b/tools/codes_info.c @@ -71,7 +71,7 @@ int main( int argc,char* argv[]) printf("Definition files path from environment variable"); printf(" ECCODES_DEFINITION_PATH=%s\n",path); } else { - printf("Default definition files path is used: %s\n",GRIB_DEFINITION_PATH); + printf("Default definition files path is used: %s\n",ECCODES_DEFINITION_PATH); printf("Definition files path can be changed setting ECCODES_DEFINITION_PATH environment variable\n"); } printf("\n"); @@ -80,7 +80,7 @@ int main( int argc,char* argv[]) printf("SAMPLES path from environment variable"); printf(" ECCODES_SAMPLES_PATH=%s\n",path); } else { - printf("Default SAMPLES path is used: %s\n",GRIB_SAMPLES_PATH); + printf("Default SAMPLES path is used: %s\n",ECCODES_SAMPLES_PATH); printf("SAMPLES path can be changed setting ECCODES_SAMPLES_PATH environment variable\n"); } printf("\n"); @@ -94,7 +94,7 @@ int main( int argc,char* argv[]) if ((path=getenv("ECCODES_DEFINITION_PATH")) != NULL) { printf("%s",path); } else { - printf("%s",GRIB_DEFINITION_PATH); + printf("%s",ECCODES_DEFINITION_PATH); } } @@ -102,7 +102,7 @@ int main( int argc,char* argv[]) if ((path=getenv("ECCODES_SAMPLES_PATH")) != NULL) { printf("%s",path); } else { - printf("%s",GRIB_SAMPLES_PATH); + printf("%s",ECCODES_SAMPLES_PATH); } }