From a499cafd18e34be6260b74513666f36a7a56ac5d Mon Sep 17 00:00:00 2001 From: Seth Linden Date: Wed, 15 Sep 2021 14:03:11 -0600 Subject: [PATCH] Per issue #1858: Modified: Don't need to run separate tests for obs_quality_inc and obs_quality_exc, these are now combined into one test via the updated config files: PointStatConfig_qty_inc_exc and EnsembleStatConfig_qty_inc_exc. SL --- test/xml/unit_quality_filter.xml | 92 +++++++++----------------------- 1 file changed, 24 insertions(+), 68 deletions(-) diff --git a/test/xml/unit_quality_filter.xml b/test/xml/unit_quality_filter.xml index e8178187a5..b3db881fc4 100644 --- a/test/xml/unit_quality_filter.xml +++ b/test/xml/unit_quality_filter.xml @@ -20,65 +20,45 @@ - + &MET_BIN;/point_stat OBS_QUALITY_INC_SFC "8" OBS_QUALITY_INC_UPA "2" - OUTPUT_PREFIX QTY_PB - - \ - &DATA_DIR_MODEL;/grib1/nam/nam_2012040900_F012.grib \ - &OUTPUT_DIR;/pb2nc/gdas1.20120409.t12z.prepbufr.nc \ - &CONFIG_DIR;/PointStatConfig_qty_inc \ - -outdir &OUTPUT_DIR;/point_stat -v 3 - - - &OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V.stat - &OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_fho.txt - &OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_ctc.txt - &OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_cts.txt - &OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_cnt.txt - &OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_sl1l2.txt - &OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_mpr.txt - - - - - &MET_BIN;/point_stat - OBS_QUALITY_EXC_SFC "9" OBS_QUALITY_EXC_UPA "9" - OUTPUT_PREFIX QTY_PB + OUTPUT_PREFIX QTY_INC_EXC_PB \ &DATA_DIR_MODEL;/grib1/nam/nam_2012040900_F012.grib \ &OUTPUT_DIR;/pb2nc/gdas1.20120409.t12z.prepbufr.nc \ - &CONFIG_DIR;/PointStatConfig_qty_exc \ + &CONFIG_DIR;/PointStatConfig_qty_inc_exc \ -outdir &OUTPUT_DIR;/point_stat -v 3 - &OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V.stat - &OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_fho.txt - &OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_ctc.txt - &OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_cts.txt - &OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_cnt.txt - &OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_sl1l2.txt - &OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_mpr.txt + &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_fho.txt + &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_cts.txt + &OUTPUT_DIR;/point_stat/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V_cnt.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 - + &MET_BIN;/point_stat OBS_QUALITY_INC_SFC OBS_QUALITY_INC_UPA - OUTPUT_PREFIX QTY_PB + OBS_QUALITY_EXC_SFC + OBS_QUALITY_EXC_UPA + OUTPUT_PREFIX QTY_PB \ &DATA_DIR_MODEL;/grib1/nam/nam_2012040900_F012.grib \ &OUTPUT_DIR;/pb2nc/gdas1.20120409.t12z.prepbufr.nc \ - &CONFIG_DIR;/PointStatConfig_qty_inc \ + &CONFIG_DIR;/PointStatConfig_qty_inc_exc \ -outdir &OUTPUT_DIR;/point_stat -v 3 @@ -92,53 +72,29 @@ - + &MET_BIN;/ensemble_stat OBS_QUALITY_INC "V", "G", "S" - OUTPUT_PREFIX QTY_MADIS_VGS - - \ - 3 \ - &DATA_DIR_MODEL;/grib1/arw-fer-gep1/arw-fer-gep1_2012040900_F012.grib \ - &DATA_DIR_MODEL;/grib1/arw-sch-gep2/arw-sch-gep2_2012040900_F012.grib \ - &DATA_DIR_MODEL;/grib1/arw-tom-gep3/arw-tom-gep3_2012040900_F012.grib \ - &CONFIG_DIR;/EnsembleStatConfig_qty_inc \ - -point_obs &OUTPUT_DIR;/madis2nc/metar_2012040912_F000.nc \ - -outdir &OUTPUT_DIR;/ensemble_stat -v 3 - - - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V.stat - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V_ecnt.txt - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V_rhist.txt - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V_phist.txt - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V_orank.txt - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V_ens.nc - - - - - &MET_BIN;/ensemble_stat - OBS_QUALITY_EXC "C" - OUTPUT_PREFIX QTY_MADIS_VGS + OUTPUT_PREFIX QTY_INC_EXC_MADIS_VGS \ 3 \ &DATA_DIR_MODEL;/grib1/arw-fer-gep1/arw-fer-gep1_2012040900_F012.grib \ &DATA_DIR_MODEL;/grib1/arw-sch-gep2/arw-sch-gep2_2012040900_F012.grib \ &DATA_DIR_MODEL;/grib1/arw-tom-gep3/arw-tom-gep3_2012040900_F012.grib \ - &CONFIG_DIR;/EnsembleStatConfig_qty_exc \ + &CONFIG_DIR;/EnsembleStatConfig_qty_inc_exc \ -point_obs &OUTPUT_DIR;/madis2nc/metar_2012040912_F000.nc \ -outdir &OUTPUT_DIR;/ensemble_stat -v 3 - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V.stat - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V_ecnt.txt - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V_rhist.txt - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V_phist.txt - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V_orank.txt - &OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V_ens.nc + &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_phist.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