Skip to content

Commit

Permalink
Per issue #1858: Modified: Don't need to run separate tests for obs_q…
Browse files Browse the repository at this point in the history 
…uality_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
  • Loading branch information
Seth Linden committed Sep 15, 2021
1 parent 57b59bf commit a499caf
Showing 1 changed file with 24 additions and 68 deletions.
92 changes: 24 additions & 68 deletions test/xml/unit_quality_filter.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,65 +20,45 @@
<!-- NOTE: assumes that the madis2nc and pb2nc unit tests have run -->
<!-- -->

<test name="point_stat_QTY_INC_PB_ON">
<test name="point_stat_QTY_INC_EXC_PB_ON">
<exec>&MET_BIN;/point_stat</exec>
<env>
<pair><name>OBS_QUALITY_INC_SFC</name> <value>"8"</value></pair>
<pair><name>OBS_QUALITY_INC_UPA</name> <value>"2"</value></pair>
<pair><name>OUTPUT_PREFIX</name> <value>QTY_PB</value></pair>
</env>
<param> \
&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
</param>
<output>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V.stat</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_fho.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_ctc.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_cts.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_cnt.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_sl1l2.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_mpr.txt</stat>
</output>
</test>

<test name="point_stat_QTY_EXC_PB_ON">
<exec>&MET_BIN;/point_stat</exec>
<env>
<pair><name>OBS_QUALITY_EXC_SFC</name> <value>"9"</value></pair>
<pair><name>OBS_QUALITY_EXC_UPA</name> <value>"9"</value></pair>
<pair><name>OUTPUT_PREFIX</name> <value>QTY_PB</value></pair>
<pair><name>OUTPUT_PREFIX</name> <value>QTY_INC_EXC_PB</value></pair>
</env>
<param> \
&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
</param>
<output>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V.stat</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_fho.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_ctc.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_cts.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_cnt.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_sl1l2.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_PB_120000L_20120409_120000V_mpr.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V.stat</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V_fho.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V_ctc.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V_cts.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V_cnt.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V_sl1l2.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_QTY_INC_EXC_PB_120000L_20120409_120000V_mpr.txt</stat>
</output>
</test>

<test name="point_stat_QTY_PB_OFF">
<exec>&MET_BIN;/point_stat</exec>
<env>
<pair><name>OBS_QUALITY_INC_SFC</name> <value></value></pair>
<pair><name>OBS_QUALITY_INC_UPA</name> <value></value></pair>
<pair><name>OUTPUT_PREFIX</name> <value>QTY_PB</value></pair>
<pair><name>OBS_QUALITY_EXC_SFC</name> <value></value></pair>
<pair><name>OBS_QUALITY_EXC_UPA</name> <value></value></pair>
<pair><name>OUTPUT_PREFIX</name> <value>QTY_PB</value></pair>
</env>
<param> \
&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
</param>
<output>
Expand All @@ -92,53 +72,29 @@
</output>
</test>

<test name="ensemble_stat_QTY_INC_MADIS_VGS">
<test name="ensemble_stat_QTY_INC_EXC_MADIS_VGS">
<exec>&MET_BIN;/ensemble_stat</exec>
<env>
<pair><name>OBS_QUALITY_INC</name> <value>"V", "G", "S"</value></pair>
<pair><name>OUTPUT_PREFIX</name> <value>QTY_MADIS_VGS</value></pair>
</env>
<param> \
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
</param>
<output>
<stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V.stat</stat>
<stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V_ecnt.txt</stat>
<stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V_rhist.txt</stat>
<stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V_phist.txt</stat>
<stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V_orank.txt</stat>
<grid_nc>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V_ens.nc</grid_nc>
</output>
</test>

<test name="ensemble_stat_QTY_EXC_MADIS_VGS">
<exec>&MET_BIN;/ensemble_stat</exec>
<env>
<pair><name>OBS_QUALITY_EXC</name> <value>"C"</value></pair>
<pair><name>OUTPUT_PREFIX</name> <value>QTY_MADIS_VGS</value></pair>
<pair><name>OUTPUT_PREFIX</name> <value>QTY_INC_EXC_MADIS_VGS</value></pair>
</env>
<param> \
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
</param>
<output>
<stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V.stat</stat>
<stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V_ecnt.txt</stat>
<stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V_rhist.txt</stat>
<stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V_phist.txt</stat>
<stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V_orank.txt</stat>
<grid_nc>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_MADIS_VGS_20120409_120000V_ens.nc</grid_nc>
<stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V.stat</stat>
<stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_ecnt.txt</stat>
<stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_rhist.txt</stat>
<stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_phist.txt</stat>
<stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_orank.txt</stat>
<grid_nc>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_QTY_INC_EXC_MADIS_VGS_20120409_120000V_ens.nc</grid_nc>
</output>
</test>

Expand Down

0 comments on commit a499caf

Please sign in to comment.