Skip to content

Commit

Permalink
Per #1858, made the existing unit_quality_filter.xml tests a bit more…
Browse files Browse the repository at this point in the history 
… concise. Call Point-Stat and Ensemble-Stat only once each time. But for each, test 3 things: all qty, obs_quality_inc, and obs_quality_exc.
  • Loading branch information
John Halley Gotway committed Sep 15, 2021
1 parent 5a3bd3d commit cd21f90
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 51 deletions.
14 changes: 11 additions & 3 deletions test/config/EnsembleStatConfig_qty_inc_exc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@ fcst = {
sid_exc = [];

field = [
{
name = "TMP";
level = [ "Z2" ];
obs_quality_inc = [];
obs_quality_exc = [];
desc = "ALL_QTY";
},

{
name = "TMP";
level = [ "Z2" ];
Expand Down Expand Up @@ -196,10 +204,10 @@ output_flag = {
ecnt = BOTH;
rps = NONE;
rhist = BOTH;
phist = BOTH;
phist = NONE;
orank = BOTH;
ssvar = BOTH;
relp = BOTH;
ssvar = NONE;
relp = NONE;
}

////////////////////////////////////////////////////////////////////////////////
Expand Down
35 changes: 25 additions & 10 deletions test/config/PointStatConfig_qty_inc_exc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,32 @@ eclv_points = 0.05;
// Forecast and observation fields to be verified
//
fcst = {
sid_inc = [];
sid_exc = [];
sid_inc = [];
sid_exc = [];
cat_thresh = [ <=273, >273 ];

field = [
{
name = "TMP";
level = [ "Z2" ];
cat_thresh = [ <=273, >273 ];
message_type = [ "ADPSFC" ];
obs_quality_inc = [];
obs_quality_exc = [];
desc = "ALL_QTY";
},

{
name = "TMP";
level = [ "P500" ];
message_type = [ "ADPUPA" ];
obs_quality_inc = [];
obs_quality_exc = [];
desc = "ALL_QTY";
},

{
name = "TMP";
level = [ "Z2" ];
message_type = [ "ADPSFC" ];
obs_quality_inc = [ ${OBS_QUALITY_INC_SFC} ];
obs_quality_exc = [];
Expand All @@ -57,7 +75,6 @@ fcst = {
{
name = "TMP";
level = [ "P500" ];
cat_thresh = [ <=273, >273 ];
message_type = [ "ADPUPA" ];
obs_quality_inc = [ ${OBS_QUALITY_INC_UPA} ];
obs_quality_exc = [];
Expand All @@ -67,7 +84,6 @@ fcst = {
{
name = "TMP";
level = [ "Z2" ];
cat_thresh = [ <=273, >273 ];
message_type = [ "ADPSFC" ];
obs_quality_inc = [];
obs_quality_exc = [ ${OBS_QUALITY_EXC_SFC} ];
Expand All @@ -77,7 +93,6 @@ fcst = {
{
name = "TMP";
level = [ "P500" ];
cat_thresh = [ <=273, >273 ];
message_type = [ "ADPUPA" ];
obs_quality_inc = [];
obs_quality_exc = [ ${OBS_QUALITY_EXC_UPA} ];
Expand Down Expand Up @@ -161,12 +176,12 @@ hira = {
// Statistical output types
//
output_flag = {
fho = BOTH;
fho = NONE;
ctc = BOTH;
cts = BOTH;
cts = NONE;
mctc = NONE;
mcts = NONE;
cnt = BOTH;
cnt = NONE;
sl1l2 = BOTH;
sal1l2 = NONE;
vl1l2 = NONE;
Expand All @@ -179,7 +194,7 @@ output_flag = {
ecnt = NONE;
orank = NONE;
rps = NONE;
eclv = BOTH;
eclv = NONE;
mpr = BOTH;
}

Expand Down
46 changes: 8 additions & 38 deletions test/xml/unit_quality_filter.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
<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>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_INC_EXC_PB</value></pair>
<pair><name>OBS_QUALITY_INC_SFC</name> <value>"8"</value></pair>
<pair><name>OBS_QUALITY_INC_UPA</name> <value>"2"</value></pair>
<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_INC_EXC_PB</value></pair>
</env>
<param> \
&DATA_DIR_MODEL;/grib1/nam/nam_2012040900_F012.grib \
Expand All @@ -37,47 +37,18 @@
</param>
<output>
<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>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_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>
</output>
</test>

<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>OBS_QUALITY_EXC</name> <value>"C"</value></pair>
<pair><name>OUTPUT_PREFIX</name> <value>QTY_INC_EXC_MADIS_VGS</value></pair>
<pair><name>OBS_QUALITY_INC</name> <value>"V", "G", "S"</value></pair>
<pair><name>OBS_QUALITY_EXC</name> <value>"C"</value></pair>
<pair><name>OUTPUT_PREFIX</name> <value>QTY_INC_EXC_MADIS_VGS</value></pair>
</env>
<param> \
3 \
Expand All @@ -92,7 +63,6 @@
<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>
Expand Down

0 comments on commit cd21f90

Please sign in to comment.