deleted metar and taf tools and defintions

definitions/CMakeLists.txt

@@ -8,7 +8,7 @@ install( FILES ${definition_files} ${table_files}
 install( FILES installDefinitions.sh
          DESTINATION share/${PROJECT_NAME}/definitions)
 
-install(  DIRECTORY budg bufr cdf common grib1 grib2 gts mars metar taf tide hdf5 wrap
+install(  DIRECTORY budg bufr cdf common grib1 grib2 gts mars tide hdf5 wrap
           DESTINATION share/${PROJECT_NAME}/definitions
           FILES_MATCHING 
           PATTERN "*.def"

definitions/Makefile.am

@@ -9204,139 +9204,6 @@ dist_definitionsmars_eswi_DATA = \
 	mars/eswi/type.table\
 	mars/eswi/wave_domain.def
 
-definitionsmetardir = @ECCODES_DEFINITION_PATH@/metar
-dist_definitionsmetar_DATA = \
-	metar/CCCC.txt\
-	metar/boot.def\
-	metar/boot.flexible.def\
-	metar/cccc.def\
-	metar/clouds.def\
-	metar/clouds.table\
-	metar/clouds_Trend1.def\
-	metar/clouds_Trend2.def\
-	metar/clouds_Trend3.def\
-	metar/clouds_Trend4.def\
-	metar/colour.def\
-	metar/direction.table\
-	metar/horizontalVisibility.def\
-	metar/horizontalVisibility_Trend1.def\
-	metar/horizontalVisibility_Trend2.def\
-	metar/horizontalVisibility_Trend3.def\
-	metar/horizontalVisibility_Trend4.def\
-	metar/missing_field.def\
-	metar/nsd_cccc.txt\
-	metar/present_weather.def\
-	metar/present_weather.list\
-	metar/present_weather_Trend1.def\
-	metar/present_weather_Trend2.def\
-	metar/present_weather_Trend3.def\
-	metar/present_weather_Trend4.def\
-	metar/qnh.def\
-	metar/recent_weather.def\
-	metar/remark.def\
-	metar/runwayDepthOfDeposit.table\
-	metar/runwayFrictionCoefficient.table\
-	metar/runwayState.def\
-	metar/runwayState1.def\
-	metar/runwayState2.def\
-	metar/runwayState3.def\
-	metar/runwayState4.def\
-	metar/runwayStateDeposit.table\
-	metar/runwayStateExtentOfContamination.table\
-	metar/rvr1.def\
-	metar/rvr2.def\
-	metar/rvr3.def\
-	metar/rvr4.def\
-	metar/seaState.table\
-	metar/sea_state.def\
-	metar/temperature.def\
-	metar/temperature.list\
-	metar/trend1.def\
-	metar/trend2.def\
-	metar/trend3.def\
-	metar/trend4.def\
-	metar/weatherCodes-forecasters.txt\
-	metar/weatherCodes-full.txt\
-	metar/weatherCodes-metar-template.txt\
-	metar/weatherCodes-trend-template.txt\
-	metar/wind.def\
-	metar/wind_Trend1.def\
-	metar/wind_Trend2.def\
-	metar/wind_Trend3.def\
-	metar/wind_Trend4.def\
-	metar/wind_shear.def\
-	metar/wrong_delayed.def
-
-definitionsmetar_stationsdir = @ECCODES_DEFINITION_PATH@/metar/stations
-dist_definitionsmetar_stations_DATA = \
-	metar/stations/nsd_cccc.txt
-
-definitionstafdir = @ECCODES_DEFINITION_PATH@/taf
-dist_definitionstaf_DATA = \
-	taf/CCCC.txt\
-	taf/boot.def\
-	taf/cccc.def\
-	taf/clouds.def\
-	taf/clouds.table\
-	taf/clouds_Trend1.def\
-	taf/clouds_Trend2.def\
-	taf/clouds_Trend3.def\
-	taf/clouds_Trend4.def\
-	taf/colour.def\
-	taf/direction.table\
-	taf/horizontalVisibility.def\
-	taf/horizontalVisibility_Trend1.def\
-	taf/horizontalVisibility_Trend2.def\
-	taf/horizontalVisibility_Trend3.def\
-	taf/horizontalVisibility_Trend4.def\
-	taf/missing_field.def\
-	taf/nsd_cccc.txt\
-	taf/present_weather.def\
-	taf/present_weather.list\
-	taf/present_weather_Trend1.def\
-	taf/present_weather_Trend2.def\
-	taf/present_weather_Trend3.def\
-	taf/present_weather_Trend4.def\
-	taf/qnh.def\
-	taf/recent_weather.def\
-	taf/remark.def\
-	taf/runwayDepthOfDeposit.table\
-	taf/runwayFrictionCoefficient.table\
-	taf/runwayState.def\
-	taf/runwayState1.def\
-	taf/runwayState2.def\
-	taf/runwayState3.def\
-	taf/runwayState4.def\
-	taf/runwayStateDeposit.table\
-	taf/runwayStateExtentOfContamination.table\
-	taf/rvr1.def\
-	taf/rvr2.def\
-	taf/rvr3.def\
-	taf/rvr4.def\
-	taf/seaState.table\
-	taf/sea_state.def\
-	taf/temperature.def\
-	taf/temperature.list\
-	taf/trend1.def\
-	taf/trend2.def\
-	taf/trend3.def\
-	taf/trend4.def\
-	taf/weatherCodes-forecasters.txt\
-	taf/weatherCodes-full.txt\
-	taf/weatherCodes-metar-template.txt\
-	taf/weatherCodes-trend-template.txt\
-	taf/wind.def\
-	taf/wind_Trend1.def\
-	taf/wind_Trend2.def\
-	taf/wind_Trend3.def\
-	taf/wind_Trend4.def\
-	taf/wind_shear.def\
-	taf/wrong_delayed.def
-
-definitionstaf_stationsdir = @ECCODES_DEFINITION_PATH@/taf/stations
-dist_definitionstaf_stations_DATA = \
-	taf/stations/nsd_cccc.txt
-
 definitionstidedir = @ECCODES_DEFINITION_PATH@/tide
 dist_definitionstide_DATA = \
 	tide/boot.def\

tools/CMakeLists.txt

@@ -13,8 +13,6 @@ list( APPEND grib_tools_bins
              grib_compare parser grib_index_build
              bufr_filter bufr_ls bufr_dump bufr_set bufr_get
              bufr_copy bufr_compare bufr_index_build
-             taf_dump taf_ls taf_get taf_filter
-             metar_dump metar_ls metar_get metar_filter
              gts_copy gts_dump gts_filter gts_ls
              )
 

tools/Makefile.am

@@ -19,8 +19,6 @@ bin_PROGRAMS = grib_histogram big2gribex \
                gg_sub_area_check grib_to_netcdf grib_to_json \
                bufr_count bufr_filter bufr_ls bufr_dump bufr_set bufr_get \
                bufr_copy bufr_compare bufr_index_build \
-               taf_dump taf_ls taf_get taf_filter \
-               metar_dump metar_ls metar_get metar_filter \
                gts_copy gts_dump gts_filter gts_ls
 
 noinst_PROGRAMS =  gaussian grib_diff mars_request xref all_keys #compile #dumpload grib_compare_old
@@ -69,16 +67,6 @@ bufr_copy_SOURCES   = bufr_copy.c
 bufr_compare_SOURCES   = bufr_compare.c
 bufr_index_build_SOURCES   = bufr_index_build.c
 
-metar_dump_SOURCES   = metar_dump.c
-metar_ls_SOURCES   = metar_ls.c
-metar_get_SOURCES   = metar_get.c
-metar_filter_SOURCES   = metar_filter.c
-
-taf_dump_SOURCES   = taf_dump.c
-taf_ls_SOURCES   = taf_ls.c
-taf_get_SOURCES   = taf_get.c
-taf_filter_SOURCES   = taf_filter.c
-
 gts_copy_SOURCES = gts_copy.c
 gts_dump_SOURCES = gts_dump.c
 gts_filter_SOURCES = gts_filter.c

tools/grib_options.c

@@ -95,7 +95,7 @@ grib_options_help grib_options_help_list[] ={
 "\n\t\tall=relative_error will compare all the floating point keys using relative_error. Default all=0.\n"},
   {"S",0,"Strict. Only grib messages matching all the constraints are copied to"
    "\n\t\tthe output file\n"},
-  {"T:","T | B | A","Message type. T->GTS, B->BUFR, A->Any (Experimental). The input file is interpreted according to the message type.\n"},
+  {"T:","T | B | M | A","Message type. T->GTS, B->BUFR, M->METAR (Experimental),A->Any (Experimental). The input file is interpreted according to the message type.\n"},
   {"V",0,"Version.\n"},
   {"W:","width","\n\t\tMinimum width of each column in output. Default is 10.\n"},
   {"X:","offset","\n\t\tInput file offset in bytes. Processing of the input file will start from \"offset\".\n"},
@@ -201,6 +201,7 @@ int grib_process_runtime_options(grib_context* context,int argc,char** argv,grib
         char* x=grib_options_get_option("T:");
         if ( *x == 'T' ) options->mode=MODE_GTS;
         else if ( *x == 'B' ) options->mode=MODE_BUFR;
+        else if ( *x == 'M' ) options->mode=MODE_METAR;
         else if ( *x == 'A' ) options->mode=MODE_ANY;
         else options->mode=MODE_GRIB;
     }