From 5897f28895f241ef0f1e119e63bf14ebbd3aa4e7 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Fri, 21 Jan 2022 14:16:07 -0700 Subject: [PATCH 01/15] For #1546, update the unit test XML files to explicitly list the prerequisite(s) for each in a comment that starts with Requires. --- test/xml/unit_aeronet.xml | 2 ++ test/xml/unit_airnow.xml | 2 ++ test/xml/unit_ascii2nc.xml | 12 +++++---- test/xml/unit_climatology.xml | 3 ++- test/xml/unit_duplicate_flag.xml | 4 +-- test/xml/unit_ensemble_stat.xml | 3 ++- test/xml/unit_gaussian.xml | 3 ++- test/xml/unit_gen_ens_prod.xml | 5 ++-- test/xml/unit_gen_vx_mask.xml | 2 ++ test/xml/unit_grid_diag.xml | 2 ++ test/xml/unit_grid_stat.xml | 2 ++ test/xml/unit_grid_weight.xml | 2 ++ test/xml/unit_gsi_tools.xml | 4 +-- test/xml/unit_hira.xml | 2 ++ test/xml/unit_interp_shape.xml | 2 ++ test/xml/unit_ioda2nc.xml | 41 ++-------------------------- test/xml/unit_lidar2nc.xml | 2 ++ test/xml/unit_madis2nc.xml | 2 ++ test/xml/unit_met_test_scripts.xml | 2 ++ test/xml/unit_mode.xml | 4 +++ test/xml/unit_mode_analysis.xml | 4 +-- test/xml/unit_mode_graphics.xml | 43 +----------------------------- test/xml/unit_modis.xml | 2 ++ test/xml/unit_mtd.xml | 2 ++ test/xml/unit_netcdf.xml | 4 ++- test/xml/unit_obs_summary.xml | 6 +++-- test/xml/unit_pb2nc.xml | 2 ++ test/xml/unit_pcp_combine.xml | 2 ++ test/xml/unit_perc_thresh.xml | 2 ++ test/xml/unit_plot_data_plane.xml | 4 +-- test/xml/unit_plot_point_obs.xml | 3 ++- test/xml/unit_plot_tc.xml | 4 +-- test/xml/unit_point2grid.xml | 4 +++ test/xml/unit_point_stat.xml | 2 ++ test/xml/unit_python.xml | 4 ++- test/xml/unit_quality_filter.xml | 7 ++--- test/xml/unit_ref_config.xml | 2 ++ test/xml/unit_regrid.xml | 2 ++ test/xml/unit_rmw_analysis.xml | 2 ++ test/xml/unit_series_analysis.xml | 2 ++ test/xml/unit_shift_data_plane.xml | 2 ++ test/xml/unit_stat_analysis.xml | 4 +-- test/xml/unit_tc_dland.xml | 2 ++ test/xml/unit_tc_gen.xml | 2 ++ test/xml/unit_tc_pairs.xml | 2 ++ test/xml/unit_tc_rmw.xml | 2 ++ test/xml/unit_tc_stat.xml | 2 ++ test/xml/unit_test_grib_tables.xml | 18 +++++++------ test/xml/unit_trmm2nc.xml | 2 ++ test/xml/unit_wavelet_stat.xml | 2 ++ test/xml/unit_wwmca_plot.xml | 2 ++ test/xml/unit_wwmca_regrid.xml | 2 ++ 52 files changed, 125 insertions(+), 121 deletions(-) diff --git a/test/xml/unit_aeronet.xml b/test/xml/unit_aeronet.xml index 4d1fd80ec5..0892c623ad 100644 --- a/test/xml/unit_aeronet.xml +++ b/test/xml/unit_aeronet.xml @@ -10,6 +10,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_airnow.xml b/test/xml/unit_airnow.xml index 9c616e5872..9afa68d292 100644 --- a/test/xml/unit_airnow.xml +++ b/test/xml/unit_airnow.xml @@ -10,6 +10,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_ascii2nc.xml b/test/xml/unit_ascii2nc.xml index 2edb2bf9b7..15b367563a 100644 --- a/test/xml/unit_ascii2nc.xml +++ b/test/xml/unit_ascii2nc.xml @@ -11,6 +11,8 @@ ]> + + &TEST_DIR; @@ -68,23 +70,23 @@ &MET_BIN;/ascii2nc \ &DATA_DIR_OBS;/ascii/qc_out_2012-09-07_00:00:00.GRM_P+FCST \ - &OUTPUT_DIR;/ascii2nc/qc_out_2012-09-07_00:00:00.GRM_P+FCST.nc \ + &OUTPUT_DIR;/ascii2nc/qc_out_2012-09-07_00:00:00.GRM_P_FCST.nc \ -v 1 - &OUTPUT_DIR;/ascii2nc/qc_out_2012-09-07_00:00:00.GRM_P+FCST.nc + &OUTPUT_DIR;/ascii2nc/qc_out_2012-09-07_00:00:00.GRM_P_FCST.nc &MET_BIN;/ascii2nc \ - &DATA_DIR_OBS;/ascii/OBS:2015080700_bad_record \ - &OUTPUT_DIR;/ascii2nc/OBS:2015080700_bad_record.nc \ + &DATA_DIR_OBS;/ascii/OBS_2015080700_bad_record \ + &OUTPUT_DIR;/ascii2nc/OBS_2015080700_bad_record.nc \ -v 1 - &OUTPUT_DIR;/ascii2nc/OBS:2015080700_bad_record.nc + &OUTPUT_DIR;/ascii2nc/OBS_2015080700_bad_record.nc diff --git a/test/xml/unit_climatology.xml b/test/xml/unit_climatology.xml index c3a946072e..d50dc86ccf 100644 --- a/test/xml/unit_climatology.xml +++ b/test/xml/unit_climatology.xml @@ -11,12 +11,13 @@ ]> + + &TEST_DIR; true - &MET_BIN;/point_stat diff --git a/test/xml/unit_duplicate_flag.xml b/test/xml/unit_duplicate_flag.xml index 51de6cecc0..92ca55ce3b 100644 --- a/test/xml/unit_duplicate_flag.xml +++ b/test/xml/unit_duplicate_flag.xml @@ -10,9 +10,9 @@ ]> - + - + &TEST_DIR; false diff --git a/test/xml/unit_ensemble_stat.xml b/test/xml/unit_ensemble_stat.xml index 93ec40b228..784c318185 100644 --- a/test/xml/unit_ensemble_stat.xml +++ b/test/xml/unit_ensemble_stat.xml @@ -10,6 +10,8 @@ ]> + + &TEST_DIR; @@ -18,7 +20,6 @@ - diff --git a/test/xml/unit_gaussian.xml b/test/xml/unit_gaussian.xml index ef6f74e49d..0c024e76d2 100644 --- a/test/xml/unit_gaussian.xml +++ b/test/xml/unit_gaussian.xml @@ -8,6 +8,8 @@ ]> + + &TEST_DIR; @@ -25,5 +27,4 @@ - diff --git a/test/xml/unit_gen_ens_prod.xml b/test/xml/unit_gen_ens_prod.xml index 91f2321431..3c014a08f2 100644 --- a/test/xml/unit_gen_ens_prod.xml +++ b/test/xml/unit_gen_ens_prod.xml @@ -10,6 +10,8 @@ ]> + + &TEST_DIR; @@ -17,7 +19,6 @@ - @@ -120,7 +121,7 @@ \ -ens &DATA_DIR_MODEL;/grib2/gefs/enspost_grb2.t00z.prmsl \ -config &CONFIG_DIR;/GenEnsProdConfig_single_file_grib \ - -ctrl &DATA_DIR_MODEL;/grib2/gefs/enspost_grb2.t00z.prmsl \ + -ctrl &DATA_DIR_MODEL;/grib2/gefs/enspost_grb2.t00z.prmsl \ -out &OUTPUT_DIR;/gen_ens_prod/gen_ens_prod_SINGLE_FILE_GRIB_WITH_CTRL.nc \ -v 2 diff --git a/test/xml/unit_gen_vx_mask.xml b/test/xml/unit_gen_vx_mask.xml index 6416d0a048..e9664fe0f9 100644 --- a/test/xml/unit_gen_vx_mask.xml +++ b/test/xml/unit_gen_vx_mask.xml @@ -12,6 +12,8 @@ ]> + + diff --git a/test/xml/unit_grid_diag.xml b/test/xml/unit_grid_diag.xml index 0da3a2bd95..10049144ac 100644 --- a/test/xml/unit_grid_diag.xml +++ b/test/xml/unit_grid_diag.xml @@ -11,6 +11,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_grid_stat.xml b/test/xml/unit_grid_stat.xml index c31455c0ce..9d154a91a6 100644 --- a/test/xml/unit_grid_stat.xml +++ b/test/xml/unit_grid_stat.xml @@ -11,6 +11,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_grid_weight.xml b/test/xml/unit_grid_weight.xml index 2c2949b920..f355401441 100644 --- a/test/xml/unit_grid_weight.xml +++ b/test/xml/unit_grid_weight.xml @@ -11,6 +11,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_gsi_tools.xml b/test/xml/unit_gsi_tools.xml index e80505d2fd..2447a76d3c 100644 --- a/test/xml/unit_gsi_tools.xml +++ b/test/xml/unit_gsi_tools.xml @@ -10,13 +10,13 @@ ]> + + &TEST_DIR; true - - &MET_BIN;/gsid2mpr diff --git a/test/xml/unit_hira.xml b/test/xml/unit_hira.xml index 696199ce98..13d9888216 100644 --- a/test/xml/unit_hira.xml +++ b/test/xml/unit_hira.xml @@ -10,6 +10,8 @@ ]> + + diff --git a/test/xml/unit_interp_shape.xml b/test/xml/unit_interp_shape.xml index 962adf2a6e..be8aba9bd3 100644 --- a/test/xml/unit_interp_shape.xml +++ b/test/xml/unit_interp_shape.xml @@ -10,6 +10,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_ioda2nc.xml b/test/xml/unit_ioda2nc.xml index b519a08d4d..91f2a7cbb4 100644 --- a/test/xml/unit_ioda2nc.xml +++ b/test/xml/unit_ioda2nc.xml @@ -12,49 +12,12 @@ ]> + + &TEST_DIR; true - &MET_BIN;/ioda2nc diff --git a/test/xml/unit_lidar2nc.xml b/test/xml/unit_lidar2nc.xml index dc46dab4bc..4fedf5c895 100644 --- a/test/xml/unit_lidar2nc.xml +++ b/test/xml/unit_lidar2nc.xml @@ -10,6 +10,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_madis2nc.xml b/test/xml/unit_madis2nc.xml index 802eebc3c7..550b793ff0 100644 --- a/test/xml/unit_madis2nc.xml +++ b/test/xml/unit_madis2nc.xml @@ -11,6 +11,8 @@ ]> + + + diff --git a/test/xml/unit_mode.xml b/test/xml/unit_mode.xml index 113eac7934..721b3e3a6d 100644 --- a/test/xml/unit_mode.xml +++ b/test/xml/unit_mode.xml @@ -11,11 +11,15 @@ ]> + + &TEST_DIR; true + + &MET_BIN;/pcp_combine \ diff --git a/test/xml/unit_mode_analysis.xml b/test/xml/unit_mode_analysis.xml index 12bb7b871c..f0815df484 100644 --- a/test/xml/unit_mode_analysis.xml +++ b/test/xml/unit_mode_analysis.xml @@ -10,13 +10,13 @@ ]> + + &TEST_DIR; true - - &MET_BIN;/mode_analysis \ diff --git a/test/xml/unit_mode_graphics.xml b/test/xml/unit_mode_graphics.xml index 824ba86907..65a66d27e6 100644 --- a/test/xml/unit_mode_graphics.xml +++ b/test/xml/unit_mode_graphics.xml @@ -10,54 +10,13 @@ ]> - + &TEST_DIR; true - - &MET_BIN;/plot_mode_field \ diff --git a/test/xml/unit_modis.xml b/test/xml/unit_modis.xml index d5e1faf2a7..3f28d132e5 100644 --- a/test/xml/unit_modis.xml +++ b/test/xml/unit_modis.xml @@ -15,6 +15,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_mtd.xml b/test/xml/unit_mtd.xml index 0190dd2080..367bc6991a 100644 --- a/test/xml/unit_mtd.xml +++ b/test/xml/unit_mtd.xml @@ -9,6 +9,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_netcdf.xml b/test/xml/unit_netcdf.xml index b0e6e2fe48..5c0b255240 100644 --- a/test/xml/unit_netcdf.xml +++ b/test/xml/unit_netcdf.xml @@ -10,10 +10,12 @@ ]> + + diff --git a/test/xml/unit_obs_summary.xml b/test/xml/unit_obs_summary.xml index eb150fdaf1..44ac155471 100644 --- a/test/xml/unit_obs_summary.xml +++ b/test/xml/unit_obs_summary.xml @@ -10,9 +10,11 @@ ]> - + + + - + &TEST_DIR; false diff --git a/test/xml/unit_pb2nc.xml b/test/xml/unit_pb2nc.xml index 3c7c6175fb..d6d79def22 100644 --- a/test/xml/unit_pb2nc.xml +++ b/test/xml/unit_pb2nc.xml @@ -12,6 +12,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_pcp_combine.xml b/test/xml/unit_pcp_combine.xml index 6d44e95b9b..fe261351ae 100644 --- a/test/xml/unit_pcp_combine.xml +++ b/test/xml/unit_pcp_combine.xml @@ -10,6 +10,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_perc_thresh.xml b/test/xml/unit_perc_thresh.xml index 893dedf3cf..366b32e3d7 100644 --- a/test/xml/unit_perc_thresh.xml +++ b/test/xml/unit_perc_thresh.xml @@ -12,6 +12,8 @@ ]> + + diff --git a/test/xml/unit_plot_data_plane.xml b/test/xml/unit_plot_data_plane.xml index f7642b24c2..25d47c1397 100644 --- a/test/xml/unit_plot_data_plane.xml +++ b/test/xml/unit_plot_data_plane.xml @@ -11,13 +11,13 @@ ]> + + &TEST_DIR; true - - &MET_BIN;/plot_data_plane \ diff --git a/test/xml/unit_plot_point_obs.xml b/test/xml/unit_plot_point_obs.xml index 31e2489b72..9daac9a880 100644 --- a/test/xml/unit_plot_point_obs.xml +++ b/test/xml/unit_plot_point_obs.xml @@ -10,12 +10,13 @@ ]> + + &TEST_DIR; true - diff --git a/test/xml/unit_plot_tc.xml b/test/xml/unit_plot_tc.xml index c4f308adb4..d67ade00f0 100644 --- a/test/xml/unit_plot_tc.xml +++ b/test/xml/unit_plot_tc.xml @@ -7,9 +7,9 @@ ]> - + - + &TEST_DIR; true diff --git a/test/xml/unit_point2grid.xml b/test/xml/unit_point2grid.xml index 1ab073e20a..c7d5c91625 100644 --- a/test/xml/unit_point2grid.xml +++ b/test/xml/unit_point2grid.xml @@ -10,6 +10,8 @@ ]> + + &TEST_DIR; @@ -104,6 +106,8 @@ + + &MET_BIN;/point2grid \ diff --git a/test/xml/unit_point_stat.xml b/test/xml/unit_point_stat.xml index 8750e1ee68..d5446343cd 100644 --- a/test/xml/unit_point_stat.xml +++ b/test/xml/unit_point_stat.xml @@ -11,6 +11,8 @@ ]> + + diff --git a/test/xml/unit_python.xml b/test/xml/unit_python.xml index 35993ed441..698f550f69 100644 --- a/test/xml/unit_python.xml +++ b/test/xml/unit_python.xml @@ -6,7 +6,7 @@ - + @@ -15,6 +15,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_quality_filter.xml b/test/xml/unit_quality_filter.xml index 912f52bda3..237ec5aff3 100644 --- a/test/xml/unit_quality_filter.xml +++ b/test/xml/unit_quality_filter.xml @@ -10,16 +10,13 @@ ]> + + &TEST_DIR; true - - - - - &MET_BIN;/point_stat diff --git a/test/xml/unit_ref_config.xml b/test/xml/unit_ref_config.xml index 648da522a9..5f9320ba5d 100644 --- a/test/xml/unit_ref_config.xml +++ b/test/xml/unit_ref_config.xml @@ -11,6 +11,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_regrid.xml b/test/xml/unit_regrid.xml index 8fdc3cb7a6..512b4f0a6c 100644 --- a/test/xml/unit_regrid.xml +++ b/test/xml/unit_regrid.xml @@ -10,6 +10,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_rmw_analysis.xml b/test/xml/unit_rmw_analysis.xml index f5d871e61d..14f7328957 100644 --- a/test/xml/unit_rmw_analysis.xml +++ b/test/xml/unit_rmw_analysis.xml @@ -6,6 +6,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_series_analysis.xml b/test/xml/unit_series_analysis.xml index 8a1e2f7e6a..c1e64416b3 100644 --- a/test/xml/unit_series_analysis.xml +++ b/test/xml/unit_series_analysis.xml @@ -11,6 +11,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_shift_data_plane.xml b/test/xml/unit_shift_data_plane.xml index 3d05e4879b..c8339e089e 100644 --- a/test/xml/unit_shift_data_plane.xml +++ b/test/xml/unit_shift_data_plane.xml @@ -10,6 +10,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_stat_analysis.xml b/test/xml/unit_stat_analysis.xml index 93ef98b5bc..66c64c8617 100644 --- a/test/xml/unit_stat_analysis.xml +++ b/test/xml/unit_stat_analysis.xml @@ -10,13 +10,13 @@ ]> + + &TEST_DIR; true - - diff --git a/test/xml/unit_tc_dland.xml b/test/xml/unit_tc_dland.xml index baa53b8cb8..3a294af977 100644 --- a/test/xml/unit_tc_dland.xml +++ b/test/xml/unit_tc_dland.xml @@ -6,6 +6,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_tc_gen.xml b/test/xml/unit_tc_gen.xml index 6146f1d3ec..85357e6bb3 100644 --- a/test/xml/unit_tc_gen.xml +++ b/test/xml/unit_tc_gen.xml @@ -9,6 +9,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_tc_pairs.xml b/test/xml/unit_tc_pairs.xml index c0e22dcf37..d35465237a 100644 --- a/test/xml/unit_tc_pairs.xml +++ b/test/xml/unit_tc_pairs.xml @@ -9,6 +9,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_tc_rmw.xml b/test/xml/unit_tc_rmw.xml index c45d71f10e..347ef88d87 100644 --- a/test/xml/unit_tc_rmw.xml +++ b/test/xml/unit_tc_rmw.xml @@ -9,6 +9,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_tc_stat.xml b/test/xml/unit_tc_stat.xml index 7353d72f68..5029a1f9a8 100644 --- a/test/xml/unit_tc_stat.xml +++ b/test/xml/unit_tc_stat.xml @@ -10,6 +10,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_test_grib_tables.xml b/test/xml/unit_test_grib_tables.xml index 41d3886867..88e8370e23 100644 --- a/test/xml/unit_test_grib_tables.xml +++ b/test/xml/unit_test_grib_tables.xml @@ -1,14 +1,16 @@ - - - + + + + - - - - ]> + + + +]> + + diff --git a/test/xml/unit_trmm2nc.xml b/test/xml/unit_trmm2nc.xml index bbd9e136cf..0aca61588e 100644 --- a/test/xml/unit_trmm2nc.xml +++ b/test/xml/unit_trmm2nc.xml @@ -11,6 +11,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_wavelet_stat.xml b/test/xml/unit_wavelet_stat.xml index 9e5f6efdd9..f1de40fa53 100644 --- a/test/xml/unit_wavelet_stat.xml +++ b/test/xml/unit_wavelet_stat.xml @@ -10,6 +10,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_wwmca_plot.xml b/test/xml/unit_wwmca_plot.xml index 2e2a304495..2ea1da991b 100644 --- a/test/xml/unit_wwmca_plot.xml +++ b/test/xml/unit_wwmca_plot.xml @@ -10,6 +10,8 @@ ]> + + &TEST_DIR; diff --git a/test/xml/unit_wwmca_regrid.xml b/test/xml/unit_wwmca_regrid.xml index 86e225718c..1f5b19f9be 100644 --- a/test/xml/unit_wwmca_regrid.xml +++ b/test/xml/unit_wwmca_regrid.xml @@ -10,6 +10,8 @@ ]> + + &TEST_DIR; From 183af66a15732f4aac7a7231662179520b075db2 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Fri, 21 Jan 2022 14:19:33 -0700 Subject: [PATCH 02/15] Per #1546, since we're updating some unit tests anyway, change the OBS_ERROR output files to OBSERR to make them more easy to ignore when looking for errors in the unit test output. This isn't a requirement... just getting past a minor annoyance. --- test/xml/unit_ensemble_stat.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/test/xml/unit_ensemble_stat.xml b/test/xml/unit_ensemble_stat.xml index 784c318185..98a97a4779 100644 --- a/test/xml/unit_ensemble_stat.xml +++ b/test/xml/unit_ensemble_stat.xml @@ -217,7 +217,7 @@ - + echo "&DATA_DIR_MODEL;/grib1/arw-fer-gep1/arw-fer-gep1_2012040912_F024.grib \ &DATA_DIR_MODEL;/grib1/arw-fer-gep5/arw-fer-gep5_2012040912_F024.grib \ &DATA_DIR_MODEL;/grib1/arw-sch-gep2/arw-sch-gep2_2012040912_F024.grib \ @@ -227,10 +227,10 @@ > &OUTPUT_DIR;/ensemble_stat/input_file_list; \ &MET_BIN;/ensemble_stat - DESC OBS_ERROR + DESC OBSERR OBS_ERROR_FLAG TRUE SKIP_CONST TRUE - OUTPUT_PREFIX OBS_ERROR + OUTPUT_PREFIX OBSERR \ &OUTPUT_DIR;/ensemble_stat/input_file_list \ @@ -240,14 +240,14 @@ -outdir &OUTPUT_DIR;/ensemble_stat -v 1 - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V.stat - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_ecnt.txt - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_rhist.txt - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_phist.txt - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_orank.txt - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_ssvar.txt - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_ens.nc - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_orank.nc + &OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V.stat + &OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_ecnt.txt + &OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_rhist.txt + &OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_phist.txt + &OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_orank.txt + &OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_ssvar.txt + &OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_ens.nc + &OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_orank.nc From 5546b587dcd7ce5fe730108c210bac8f5e2f8776 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Fri, 21 Jan 2022 14:24:38 -0700 Subject: [PATCH 03/15] Per #1546, update unit_obs_summary.xml to write to an obs_summary output directory. --- test/xml/unit_obs_summary.xml | 78 +++++++++++++++++------------------ 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/test/xml/unit_obs_summary.xml b/test/xml/unit_obs_summary.xml index 44ac155471..eb98b3099b 100644 --- a/test/xml/unit_obs_summary.xml +++ b/test/xml/unit_obs_summary.xml @@ -12,8 +12,6 @@ - - &TEST_DIR; @@ -23,11 +21,11 @@ &MET_BIN;/ascii2nc \ &DATA_DIR_OBS;/ascii/obs_sum_test_qty.txt \ - &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc \ + &OUTPUT_DIR;/obs_summary/obs_sum_test.nc \ -v 1 - &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc + &OUTPUT_DIR;/obs_summary/obs_sum_test.nc @@ -40,13 +38,13 @@ \ &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \ - &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc \ + &OUTPUT_DIR;/obs_summary/obs_sum_test.nc \ &CONFIG_DIR;/PointStatConfig_obs_summary \ - -outdir &OUTPUT_DIR;/point_stat -v 3 + -outdir &OUTPUT_DIR;/obs_summary -v 3 - &OUTPUT_DIR;/point_stat/point_stat_OS_NONE_120000L_20120409_120000V.stat - &OUTPUT_DIR;/point_stat/point_stat_OS_NONE_120000L_20120409_120000V_mpr.txt + &OUTPUT_DIR;/obs_summary/point_stat_OS_NONE_120000L_20120409_120000V.stat + &OUTPUT_DIR;/obs_summary/point_stat_OS_NONE_120000L_20120409_120000V_mpr.txt @@ -59,13 +57,13 @@ \ &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \ - &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc \ + &OUTPUT_DIR;/obs_summary/obs_sum_test.nc \ &CONFIG_DIR;/PointStatConfig_obs_summary \ - -outdir &OUTPUT_DIR;/point_stat -v 3 + -outdir &OUTPUT_DIR;/obs_summary -v 3 - &OUTPUT_DIR;/point_stat/point_stat_OS_NEAREST_120000L_20120409_120000V.stat - &OUTPUT_DIR;/point_stat/point_stat_OS_NEAREST_120000L_20120409_120000V_mpr.txt + &OUTPUT_DIR;/obs_summary/point_stat_OS_NEAREST_120000L_20120409_120000V.stat + &OUTPUT_DIR;/obs_summary/point_stat_OS_NEAREST_120000L_20120409_120000V_mpr.txt @@ -78,13 +76,13 @@ \ &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \ - &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc \ + &OUTPUT_DIR;/obs_summary/obs_sum_test.nc \ &CONFIG_DIR;/PointStatConfig_obs_summary \ - -outdir &OUTPUT_DIR;/point_stat -v 3 + -outdir &OUTPUT_DIR;/obs_summary -v 3 - &OUTPUT_DIR;/point_stat/point_stat_OS_MIN_120000L_20120409_120000V.stat - &OUTPUT_DIR;/point_stat/point_stat_OS_MIN_120000L_20120409_120000V_mpr.txt + &OUTPUT_DIR;/obs_summary/point_stat_OS_MIN_120000L_20120409_120000V.stat + &OUTPUT_DIR;/obs_summary/point_stat_OS_MIN_120000L_20120409_120000V_mpr.txt @@ -97,13 +95,13 @@ \ &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \ - &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc \ + &OUTPUT_DIR;/obs_summary/obs_sum_test.nc \ &CONFIG_DIR;/PointStatConfig_obs_summary \ - -outdir &OUTPUT_DIR;/point_stat -v 3 + -outdir &OUTPUT_DIR;/obs_summary -v 3 - &OUTPUT_DIR;/point_stat/point_stat_OS_MAX_120000L_20120409_120000V.stat - &OUTPUT_DIR;/point_stat/point_stat_OS_MAX_120000L_20120409_120000V_mpr.txt + &OUTPUT_DIR;/obs_summary/point_stat_OS_MAX_120000L_20120409_120000V.stat + &OUTPUT_DIR;/obs_summary/point_stat_OS_MAX_120000L_20120409_120000V_mpr.txt @@ -116,13 +114,13 @@ \ &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \ - &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc \ + &OUTPUT_DIR;/obs_summary/obs_sum_test.nc \ &CONFIG_DIR;/PointStatConfig_obs_summary \ - -outdir &OUTPUT_DIR;/point_stat -v 3 + -outdir &OUTPUT_DIR;/obs_summary -v 3 - &OUTPUT_DIR;/point_stat/point_stat_OS_UW_MEAN_120000L_20120409_120000V.stat - &OUTPUT_DIR;/point_stat/point_stat_OS_UW_MEAN_120000L_20120409_120000V_mpr.txt + &OUTPUT_DIR;/obs_summary/point_stat_OS_UW_MEAN_120000L_20120409_120000V.stat + &OUTPUT_DIR;/obs_summary/point_stat_OS_UW_MEAN_120000L_20120409_120000V_mpr.txt @@ -135,13 +133,13 @@ \ &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \ - &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc \ + &OUTPUT_DIR;/obs_summary/obs_sum_test.nc \ &CONFIG_DIR;/PointStatConfig_obs_summary \ - -outdir &OUTPUT_DIR;/point_stat -v 3 + -outdir &OUTPUT_DIR;/obs_summary -v 3 - &OUTPUT_DIR;/point_stat/point_stat_OS_DW_MEAN_120000L_20120409_120000V.stat - &OUTPUT_DIR;/point_stat/point_stat_OS_DW_MEAN_120000L_20120409_120000V_mpr.txt + &OUTPUT_DIR;/obs_summary/point_stat_OS_DW_MEAN_120000L_20120409_120000V.stat + &OUTPUT_DIR;/obs_summary/point_stat_OS_DW_MEAN_120000L_20120409_120000V_mpr.txt @@ -154,13 +152,13 @@ \ &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \ - &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc \ + &OUTPUT_DIR;/obs_summary/obs_sum_test.nc \ &CONFIG_DIR;/PointStatConfig_obs_summary \ - -outdir &OUTPUT_DIR;/point_stat -v 3 + -outdir &OUTPUT_DIR;/obs_summary -v 3 - &OUTPUT_DIR;/point_stat/point_stat_OS_MEDIAN_120000L_20120409_120000V.stat - &OUTPUT_DIR;/point_stat/point_stat_OS_MEDIAN_120000L_20120409_120000V_mpr.txt + &OUTPUT_DIR;/obs_summary/point_stat_OS_MEDIAN_120000L_20120409_120000V.stat + &OUTPUT_DIR;/obs_summary/point_stat_OS_MEDIAN_120000L_20120409_120000V_mpr.txt @@ -173,13 +171,13 @@ \ &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \ - &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc \ + &OUTPUT_DIR;/obs_summary/obs_sum_test.nc \ &CONFIG_DIR;/PointStatConfig_obs_summary \ - -outdir &OUTPUT_DIR;/point_stat -v 3 + -outdir &OUTPUT_DIR;/obs_summary -v 3 - &OUTPUT_DIR;/point_stat/point_stat_OS_PERC_120000L_20120409_120000V.stat - &OUTPUT_DIR;/point_stat/point_stat_OS_PERC_120000L_20120409_120000V_mpr.txt + &OUTPUT_DIR;/obs_summary/point_stat_OS_PERC_120000L_20120409_120000V.stat + &OUTPUT_DIR;/obs_summary/point_stat_OS_PERC_120000L_20120409_120000V_mpr.txt @@ -190,13 +188,13 @@ \ &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \ - &OUTPUT_DIR;/ascii2nc/obs_sum_test.nc \ + &OUTPUT_DIR;/obs_summary/obs_sum_test.nc \ &CONFIG_DIR;/PointStatConfig_obs_summary_all \ - -outdir &OUTPUT_DIR;/point_stat -v 3 + -outdir &OUTPUT_DIR;/obs_summary -v 3 - &OUTPUT_DIR;/point_stat/point_stat_OS_UNIQUE_ALL_120000L_20120409_120000V.stat - &OUTPUT_DIR;/point_stat/point_stat_OS_UNIQUE_ALL_120000L_20120409_120000V_mpr.txt + &OUTPUT_DIR;/obs_summary/point_stat_OS_UNIQUE_ALL_120000L_20120409_120000V.stat + &OUTPUT_DIR;/obs_summary/point_stat_OS_UNIQUE_ALL_120000L_20120409_120000V_mpr.txt From 1e5929317727768a027264fc00ca64f2a0e3006a Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Fri, 21 Jan 2022 14:27:23 -0700 Subject: [PATCH 04/15] Per #1546, update unit_point2grid.xml to write all of its output to an point2grid output directory. --- test/xml/unit_point2grid.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/xml/unit_point2grid.xml b/test/xml/unit_point2grid.xml index c7d5c91625..bff6e870e3 100644 --- a/test/xml/unit_point2grid.xml +++ b/test/xml/unit_point2grid.xml @@ -106,19 +106,17 @@ - - &MET_BIN;/point2grid \ &DATA_DIR_OBS;/point_obs/prepbufr.gdas.2017060300.nc \ G212 \ - &OUTPUT_DIR;/regrid/pb2nc_TMP_big_input.nc \ + &OUTPUT_DIR;/point2grid/pb2nc_TMP_big_input.nc \ -field 'name="TMP"; level="Z2";' \ -v 1 - &OUTPUT_DIR;/regrid/pb2nc_TMP_big_input.nc + &OUTPUT_DIR;/point2grid/pb2nc_TMP_big_input.nc From c265457aa08fc471abcd29c3dfe7145ad3fc19de Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Fri, 21 Jan 2022 14:32:04 -0700 Subject: [PATCH 05/15] Per #1546, move a call to pcp_combine from unit_mode.xml to unit_pcp_combine.xml. The pcp_combine/arw-tom-gep0_2012040912_F030_APCP06.nc output file is actually use by unit_mode.xml, unit_perc_thresh.xml, and unit_python.xml. --- test/xml/unit_mode.xml | 36 ----------------------------------- test/xml/unit_pcp_combine.xml | 13 +++++++++++++ 2 files changed, 13 insertions(+), 36 deletions(-) diff --git a/test/xml/unit_mode.xml b/test/xml/unit_mode.xml index 721b3e3a6d..c13e74676f 100644 --- a/test/xml/unit_mode.xml +++ b/test/xml/unit_mode.xml @@ -18,21 +18,6 @@ &TEST_DIR; true - - - - &MET_BIN;/pcp_combine - \ - -subtract \ - &DATA_DIR_MODEL;/grib1/arw-tom-gep0/arw-tom-gep0_2012040912_F030.grib 30 \ - &DATA_DIR_MODEL;/grib1/arw-tom-gep0/arw-tom-gep0_2012040912_F024.grib 24 \ - &OUTPUT_DIR;/pcp_combine/arw-tom-gep0_2012040912_F030_APCP06.nc - - - &OUTPUT_DIR;/pcp_combine/arw-tom-gep0_2012040912_F030_APCP06.nc - - - &MET_BIN;/mode @@ -129,27 +114,6 @@ - - &MET_BIN;/mode diff --git a/test/xml/unit_pcp_combine.xml b/test/xml/unit_pcp_combine.xml index fe261351ae..4a1c39b76b 100644 --- a/test/xml/unit_pcp_combine.xml +++ b/test/xml/unit_pcp_combine.xml @@ -142,6 +142,19 @@ + + &MET_BIN;/pcp_combine + \ + -subtract \ + &DATA_DIR_MODEL;/grib1/arw-tom-gep0/arw-tom-gep0_2012040912_F030.grib 30 \ + &DATA_DIR_MODEL;/grib1/arw-tom-gep0/arw-tom-gep0_2012040912_F024.grib 24 \ + &OUTPUT_DIR;/pcp_combine/arw-tom-gep0_2012040912_F030_APCP06.nc + + + &OUTPUT_DIR;/pcp_combine/arw-tom-gep0_2012040912_F030_APCP06.nc + + + &MET_BIN;/pcp_combine \ From 13b0736a33c0ebb026fb412df55d670dd294987b Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Fri, 21 Jan 2022 14:36:52 -0700 Subject: [PATCH 06/15] Per #1546, rename unit_test_grib_tables.xml to unit_grib_tables.xml to enforce a consistent naming convention between unit test name and the output directory to which those tests write. --- test/bin/unit_test.sh | 2 +- test/xml/{unit_test_grib_tables.xml => unit_grib_tables.xml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename test/xml/{unit_test_grib_tables.xml => unit_grib_tables.xml} (100%) diff --git a/test/bin/unit_test.sh b/test/bin/unit_test.sh index 5e48e3bb44..27992abf39 100755 --- a/test/bin/unit_test.sh +++ b/test/bin/unit_test.sh @@ -67,7 +67,7 @@ UNIT_XML="unit_ascii2nc.xml \ unit_shift_data_plane.xml \ unit_mtd.xml \ unit_climatology.xml \ - unit_test_grib_tables.xml \ + unit_grib_tables.xml \ unit_grid_weight.xml \ unit_netcdf.xml \ unit_hira.xml \ diff --git a/test/xml/unit_test_grib_tables.xml b/test/xml/unit_grib_tables.xml similarity index 100% rename from test/xml/unit_test_grib_tables.xml rename to test/xml/unit_grib_tables.xml From bb17e28d3954011299aba1633f515599003241f7 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Fri, 21 Jan 2022 14:39:16 -0700 Subject: [PATCH 07/15] Per #1546, update unit_quality_filter.xml to write to a quality_filter output directory. --- test/xml/unit_quality_filter.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/test/xml/unit_quality_filter.xml b/test/xml/unit_quality_filter.xml index 237ec5aff3..cbf086e4d5 100644 --- a/test/xml/unit_quality_filter.xml +++ b/test/xml/unit_quality_filter.xml @@ -30,13 +30,13 @@ &DATA_DIR_MODEL;/grib1/nam/nam_2012040900_F012.grib \ &OUTPUT_DIR;/pb2nc/gdas1.20120409.t12z.prepbufr.nc \ &CONFIG_DIR;/PointStatConfig_qty_inc_exc \ - -outdir &OUTPUT_DIR;/point_stat -v 3 + -outdir &OUTPUT_DIR;/quality_filter -v 3 - &OUTPUT_DIR;/point_stat/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V.stat - &OUTPUT_DIR;/point_stat/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V_ctc.txt - &OUTPUT_DIR;/point_stat/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V_sl1l2.txt - &OUTPUT_DIR;/point_stat/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V_mpr.txt + &OUTPUT_DIR;/quality_filter/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V.stat + &OUTPUT_DIR;/quality_filter/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V_ctc.txt + &OUTPUT_DIR;/quality_filter/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V_sl1l2.txt + &OUTPUT_DIR;/quality_filter/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V_mpr.txt @@ -54,14 +54,14 @@ &DATA_DIR_MODEL;/grib1/arw-tom-gep3/arw-tom-gep3_2012040900_F012.grib \ &CONFIG_DIR;/EnsembleStatConfig_qty_inc_exc \ -point_obs &OUTPUT_DIR;/madis2nc/metar_2012040912_F000.nc \ - -outdir &OUTPUT_DIR;/ensemble_stat -v 3 + -outdir &OUTPUT_DIR;/quality_filter -v 3 - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V.stat - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_ecnt.txt - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_rhist.txt - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_orank.txt - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_ens.nc + &OUTPUT_DIR;/quality_filter/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V.stat + &OUTPUT_DIR;/quality_filter/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_ecnt.txt + &OUTPUT_DIR;/quality_filter/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_rhist.txt + &OUTPUT_DIR;/quality_filter/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_orank.txt + &OUTPUT_DIR;/quality_filter/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_ens.nc From f383e3874c317ba9e48654685494308a2c194874 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Fri, 21 Jan 2022 14:42:05 -0700 Subject: [PATCH 08/15] Per #1546, update unit_mode_graphics.xml to write to a mode_graphics output directory. --- test/xml/unit_mode_graphics.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/xml/unit_mode_graphics.xml b/test/xml/unit_mode_graphics.xml index 65a66d27e6..485d4fe22e 100644 --- a/test/xml/unit_mode_graphics.xml +++ b/test/xml/unit_mode_graphics.xml @@ -26,9 +26,9 @@ &OUTPUT_DIR;/met_test_scripts/mode/mode_*_obj.nc - &OUTPUT_DIR;/plot_mode_field/mode_120000L_20050807_120000V_000000A_obj_obs_simple.png - &OUTPUT_DIR;/plot_mode_field/mode_120000L_20050807_120000V_120000A_obj_obs_simple.png - &OUTPUT_DIR;/plot_mode_field/mode_240000L_20050808_000000V_240000A_obj_obs_simple.png + &OUTPUT_DIR;/mode_graphics/mode_120000L_20050807_120000V_000000A_obj_obs_simple.png + &OUTPUT_DIR;/mode_graphics/mode_120000L_20050807_120000V_120000A_obj_obs_simple.png + &OUTPUT_DIR;/mode_graphics/mode_240000L_20050808_000000V_240000A_obj_obs_simple.png From 3d6616cdf587a79bb203037890177895bfb29a6d Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Fri, 21 Jan 2022 14:45:50 -0700 Subject: [PATCH 09/15] Per #1546, update unit_duplicate_flag.xml to write to a duplicate_flag output directory. --- test/xml/unit_duplicate_flag.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/xml/unit_duplicate_flag.xml b/test/xml/unit_duplicate_flag.xml index 92ca55ce3b..dcd287f59b 100644 --- a/test/xml/unit_duplicate_flag.xml +++ b/test/xml/unit_duplicate_flag.xml @@ -27,11 +27,11 @@ &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \ &OUTPUT_DIR;/ascii2nc/dup_test.nc \ &CONFIG_DIR;/PointStatConfig_dup \ - -outdir &OUTPUT_DIR;/point_stat -v 3 + -outdir &OUTPUT_DIR;/duplicate_flag -v 3 - &OUTPUT_DIR;/point_stat/point_stat_DUP_NONE_120000L_20120409_120000V.stat - &OUTPUT_DIR;/point_stat/point_stat_DUP_NONE_120000L_20120409_120000V_mpr.txt + &OUTPUT_DIR;/duplicate_flag/point_stat_DUP_NONE_120000L_20120409_120000V.stat + &OUTPUT_DIR;/duplicate_flag/point_stat_DUP_NONE_120000L_20120409_120000V_mpr.txt @@ -45,11 +45,11 @@ &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \ &OUTPUT_DIR;/ascii2nc/dup_test.nc \ &CONFIG_DIR;/PointStatConfig_dup \ - -outdir &OUTPUT_DIR;/point_stat -v 3 + -outdir &OUTPUT_DIR;/duplicate_flag -v 3 - &OUTPUT_DIR;/point_stat/point_stat_DUP_UNIQUE_120000L_20120409_120000V.stat - &OUTPUT_DIR;/point_stat/point_stat_DUP_UNIQUE_120000L_20120409_120000V_mpr.txt + &OUTPUT_DIR;/duplicate_flag/point_stat_DUP_UNIQUE_120000L_20120409_120000V.stat + &OUTPUT_DIR;/duplicate_flag/point_stat_DUP_UNIQUE_120000L_20120409_120000V_mpr.txt From 816a0cef119801608a3a4e502ca539e26ffd9281 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Fri, 21 Jan 2022 14:49:34 -0700 Subject: [PATCH 10/15] Per #1546, update unit_gsi_tools.xml to write to a gsi_tools output directory. --- test/xml/unit_gsi_tools.xml | 48 ++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/test/xml/unit_gsi_tools.xml b/test/xml/unit_gsi_tools.xml index 2447a76d3c..78ec34ce56 100644 --- a/test/xml/unit_gsi_tools.xml +++ b/test/xml/unit_gsi_tools.xml @@ -23,11 +23,11 @@ \ &INPUT_DIR;/gsi_data/GSIdiags4EnKF/diag_conv_ges.mem001 \ -set_hdr MODEL GSI_MEM001 \ - -outdir &OUTPUT_DIR;/gsid2mpr \ + -outdir &OUTPUT_DIR;/gsi_tools/gsid2mpr \ -swap -v 1 - &OUTPUT_DIR;/gsid2mpr/diag_conv_ges.mem001.stat + &OUTPUT_DIR;/gsi_tools/gsid2mpr/diag_conv_ges.mem001.stat @@ -37,11 +37,11 @@ \ &INPUT_DIR;/gsi_data/GSIdiags4EnKF/diag_conv_ges.mem001 \ -set_hdr MODEL GSI_MEM001 \ - -outdir &OUTPUT_DIR;/gsid2mpr \ + -outdir &OUTPUT_DIR;/gsi_tools/gsid2mpr \ -swap -no_check_dup -suffix _DUP_mpr.txt -v 1 - &OUTPUT_DIR;/gsid2mpr/diag_conv_ges.mem001_DUP_mpr.txt + &OUTPUT_DIR;/gsi_tools/gsid2mpr/diag_conv_ges.mem001_DUP_mpr.txt @@ -51,13 +51,13 @@ \ &INPUT_DIR;/gsi_data/GSIdiags4EnKF/diag_amsua_n18_ges.mem001 \ &INPUT_DIR;/gsi_data/GSIdiags4EnKF/diag_amsua_n18_ges.mem002 \ - -outdir &OUTPUT_DIR;/gsid2mpr \ + -outdir &OUTPUT_DIR;/gsi_tools/gsid2mpr \ -suffix _mpr.txt \ -swap -v 1 - &OUTPUT_DIR;/gsid2mpr/diag_amsua_n18_ges.mem001_mpr.txt - &OUTPUT_DIR;/gsid2mpr/diag_amsua_n18_ges.mem002_mpr.txt + &OUTPUT_DIR;/gsi_tools/gsid2mpr/diag_amsua_n18_ges.mem001_mpr.txt + &OUTPUT_DIR;/gsi_tools/gsid2mpr/diag_amsua_n18_ges.mem002_mpr.txt @@ -66,11 +66,11 @@ &MET_BIN;/gsidens2orank \ &INPUT_DIR;/gsi_data/GSIdiags4EnKF/diag_conv_ges.mem* \ - -out &OUTPUT_DIR;/gsidens2orank/diag_conv_ges_no_mean_orank.txt \ + -out &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_conv_ges_no_mean_orank.txt \ -swap -v 1 - &OUTPUT_DIR;/gsidens2orank/diag_conv_ges_no_mean_orank.txt + &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_conv_ges_no_mean_orank.txt @@ -80,11 +80,11 @@ \ &INPUT_DIR;/gsi_data/GSIdiags4EnKF/diag_conv_ges.mem* \ -ens_mean &INPUT_DIR;/gsi_data/GSIdiags4EnKF/diag_conv_ges.ensmean \ - -out &OUTPUT_DIR;/gsidens2orank/diag_conv_ges_ens_mean_orank.txt \ + -out &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_conv_ges_ens_mean_orank.txt \ -swap -v 1 - &OUTPUT_DIR;/gsidens2orank/diag_conv_ges_ens_mean_orank.txt + &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_conv_ges_ens_mean_orank.txt @@ -93,11 +93,11 @@ &MET_BIN;/gsidens2orank \ &INPUT_DIR;/gsi_data/GSIdiags4EnKF/diag_amsua_n18_ges.mem* \ - -out &OUTPUT_DIR;/gsidens2orank/diag_amsua_n18_ges_all_channels_orank.txt \ + -out &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_amsua_n18_ges_all_channels_orank.txt \ -swap -v 1 - &OUTPUT_DIR;/gsidens2orank/diag_amsua_n18_ges_all_channels_orank.txt + &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_amsua_n18_ges_all_channels_orank.txt @@ -108,11 +108,11 @@ &INPUT_DIR;/gsi_data/GSIdiags4EnKF/diag_amsua_n18_ges.mem* \ -ens_mean &INPUT_DIR;/gsi_data/GSIdiags4EnKF/diag_amsua_n18_ges.ensmean \ -channel 2,7,10 \ - -out &OUTPUT_DIR;/gsidens2orank/diag_amsua_n18_ges_some_channels_orank.txt \ + -out &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_amsua_n18_ges_some_channels_orank.txt \ -swap -v 1 - &OUTPUT_DIR;/gsidens2orank/diag_amsua_n18_ges_some_channels_orank.txt + &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_amsua_n18_ges_some_channels_orank.txt @@ -120,14 +120,14 @@ &MET_BIN;/stat_analysis \ - -lookin &OUTPUT_DIR;/gsid2mpr/diag_conv_ges.mem001.stat \ + -lookin &OUTPUT_DIR;/gsi_tools/gsid2mpr/diag_conv_ges.mem001.stat \ -job aggregate_stat -line_type MPR -out_line_type CNT -by fcst_var \ -column_thresh ANLY_USE ==1 \ - -out_stat &OUTPUT_DIR;/gsid2mpr/diag_conv_ges.mem001_cnt.txt \ + -out_stat &OUTPUT_DIR;/gsi_tools/gsid2mpr/diag_conv_ges.mem001_cnt.txt \ -v 1 - &OUTPUT_DIR;/gsid2mpr/diag_conv_ges.mem001_cnt.txt + &OUTPUT_DIR;/gsi_tools/gsid2mpr/diag_conv_ges.mem001_cnt.txt @@ -135,14 +135,14 @@ &MET_BIN;/stat_analysis \ - -lookin &OUTPUT_DIR;/gsidens2orank/diag_conv_ges_ens_mean_orank.txt \ + -lookin &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_conv_ges_ens_mean_orank.txt \ -job aggregate_stat -line_type ORANK -out_line_type RHIST -by fcst_var \ -column_thresh N_USE ==20 \ - -out_stat &OUTPUT_DIR;/gsidens2orank/diag_conv_ges_ens_mean_rhist.txt \ + -out_stat &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_conv_ges_ens_mean_rhist.txt \ -v 1 - &OUTPUT_DIR;/gsidens2orank/diag_conv_ges_ens_mean_rhist.txt + &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_conv_ges_ens_mean_rhist.txt @@ -150,14 +150,14 @@ &MET_BIN;/stat_analysis \ - -lookin &OUTPUT_DIR;/gsidens2orank/diag_conv_ges_ens_mean_orank.txt \ + -lookin &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_conv_ges_ens_mean_orank.txt \ -job aggregate_stat -line_type ORANK -out_line_type SSVAR -by fcst_var \ -column_thresh N_USE ==20 -out_bin_size 0.10 \ - -out_stat &OUTPUT_DIR;/gsidens2orank/diag_conv_ges_ens_mean_ssvar.txt \ + -out_stat &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_conv_ges_ens_mean_ssvar.txt \ -v 1 - &OUTPUT_DIR;/gsidens2orank/diag_conv_ges_ens_mean_ssvar.txt + &OUTPUT_DIR;/gsi_tools/gsidens2orank/diag_conv_ges_ens_mean_ssvar.txt From 665d67a1d31ea7f178c1464a0cf26dc414eea6dc Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Fri, 21 Jan 2022 15:58:47 -0700 Subject: [PATCH 11/15] Per #1546, fix unit_ascii2nc.xml. I'd renamed OBS: to OBS_ throughout but the input file is still named using a semicolon. --- test/xml/unit_ascii2nc.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/xml/unit_ascii2nc.xml b/test/xml/unit_ascii2nc.xml index 15b367563a..11c46a3ea5 100644 --- a/test/xml/unit_ascii2nc.xml +++ b/test/xml/unit_ascii2nc.xml @@ -81,7 +81,7 @@ &MET_BIN;/ascii2nc \ - &DATA_DIR_OBS;/ascii/OBS_2015080700_bad_record \ + &DATA_DIR_OBS;/ascii/OBS:2015080700_bad_record \ &OUTPUT_DIR;/ascii2nc/OBS_2015080700_bad_record.nc \ -v 1 From 7c207281063c9c53920e8b55283f5bb5353a905c Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Fri, 21 Jan 2022 16:54:39 -0700 Subject: [PATCH 12/15] Per #1546, fix unit_stat_analysis.xml after changing OBS_ERORR to OBSERR. --- test/xml/unit_stat_analysis.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/xml/unit_stat_analysis.xml b/test/xml/unit_stat_analysis.xml index 66c64c8617..078b76e072 100644 --- a/test/xml/unit_stat_analysis.xml +++ b/test/xml/unit_stat_analysis.xml @@ -147,7 +147,7 @@ &MET_BIN;/stat_analysis \ - -lookin &OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V.stat \ + -lookin &OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V.stat \ -job aggregate_stat -line_type ORANK -out_line_type ECNT \ -fcst_var APCP_24 -by VX_MASK \ -set_hdr DESC VX_MASK \ From c9acfc1f44663405878b66ee1fd2bd14f6d0c6db Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Sun, 23 Jan 2022 23:45:57 -0700 Subject: [PATCH 13/15] Per #1546, update the output directory for the plot_mode_field tool. --- test/config/PlotModeFieldConfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/config/PlotModeFieldConfig b/test/config/PlotModeFieldConfig index f6915f4c4a..816535ff25 100644 --- a/test/config/PlotModeFieldConfig +++ b/test/config/PlotModeFieldConfig @@ -9,7 +9,7 @@ plot_info = { - output_directory = "${MET_TEST_OUTPUT}/plot_mode_field"; + output_directory = "${MET_TEST_OUTPUT}/mode_graphics"; size = 4; From 24b0ad050fcaeb771dcf4e5489a555354fdc9d6c Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Sun, 23 Jan 2022 23:52:14 -0700 Subject: [PATCH 14/15] Per #1546, fix typo in unit_point2grid.xml --- test/xml/unit_point2grid.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/xml/unit_point2grid.xml b/test/xml/unit_point2grid.xml index bff6e870e3..dd1792ccf0 100644 --- a/test/xml/unit_point2grid.xml +++ b/test/xml/unit_point2grid.xml @@ -10,7 +10,7 @@ ]> - + From ada3089672e55261f32ce1bb2f5943f4ce511070 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Mon, 24 Jan 2022 13:12:06 -0700 Subject: [PATCH 15/15] Per #1546, port setting of MET_TEST_MET_PYTHON_EXE over from the feature_1546_ci_testing branch. --- test/bin/unit_test.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/bin/unit_test.sh b/test/bin/unit_test.sh index 27992abf39..fd1c7149cb 100755 --- a/test/bin/unit_test.sh +++ b/test/bin/unit_test.sh @@ -19,6 +19,11 @@ else echo "export MET_TEST_OUTPUT=${MET_TEST_OUTPUT}" fi +# if MET_TEST_MET_PYTHON_EXE is not set, use default value +if [[ -z "${MET_TEST_MET_PYTHON_EXE}" ]] ; then + export MET_TEST_MET_PYTHON_EXE=/usr/local/python3/bin/python3 +fi + PERL_UNIT_OPTS="" for arg in $@; do [ $arg == "-memchk" -o $arg == "memchk" ] && PERL_UNIT_OPTS="$PERL_UNIT_OPTS -memchk"