Skip to content

Commit

Permalink
Per #1942, update the unit tests to actually compute seeps for 24-hou…
Browse files Browse the repository at this point in the history
…r APCP. Modify the PB2NC config file to write out TP24 point observations.
  • Loading branch information
JohnHalleyGotway committed Sep 16, 2022
1 parent a8fb0b5 commit 2b92327
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 11 deletions.
2 changes: 1 addition & 1 deletion internal/test_unit/config/PB2NCConfig
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ level_category = [];
// BUFR variable names to retain or derive.
// If emtpy, process all available variables.
//
obs_bufr_var = [ "QOB", "TOB", "ZOB", "UOB", "VOB",
obs_bufr_var = [ "QOB", "TOB", "ZOB", "UOB", "VOB", "TP24",
"D_DPT", "D_WIND", "D_RH", "D_MIXR" ];

////////////////////////////////////////////////////////////////////////////////
Expand Down
41 changes: 32 additions & 9 deletions internal/test_unit/xml/unit_point_stat.xml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
<pair><name>FCST_FIELD_NAME</name> <value>APCP</value></pair>
<pair><name>FCST_FIELD_LEVEL</name> <value>A3</value></pair>
<pair><name>OBS_DICT</name> <value>fcst</value></pair>
<pair><name>SEEPS_FLAG</name> <value>BOTH</value></pair>
<pair><name>SEEPS_FLAG</name> <value>NONE</value></pair>
<pair><name>OUTPUT_PREFIX</name> <value>GRIB1_NAM_TRMM</value></pair>
</env>
<param> \
Expand All @@ -182,8 +182,6 @@
<stat>&OUTPUT_DIR;/point_stat/point_stat_GRIB1_NAM_TRMM_120000L_20120409_120000V_cts.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_GRIB1_NAM_TRMM_120000L_20120409_120000V_cnt.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_GRIB1_NAM_TRMM_120000L_20120409_120000V_sl1l2.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_GRIB1_NAM_TRMM_120000L_20120409_120000V_seeps.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_GRIB1_NAM_TRMM_120000L_20120409_120000V_seeps_mpr.txt</stat>
</output>
</test>

Expand All @@ -195,7 +193,7 @@
<pair><name>FCST_FIELD_NAME</name> <value>APCP</value></pair>
<pair><name>FCST_FIELD_LEVEL</name> <value>A3</value></pair>
<pair><name>OBS_DICT</name> <value>fcst</value></pair>
<pair><name>SEEPS_FLAG</name> <value>BOTH</value></pair>
<pair><name>SEEPS_FLAG</name> <value>NONE</value></pair>
<pair><name>OUTPUT_PREFIX</name> <value>GRIB2_SREF_TRMM</value></pair>
</env>
<param> \
Expand All @@ -211,8 +209,6 @@
<stat>&OUTPUT_DIR;/point_stat/point_stat_GRIB2_SREF_TRMM_150000L_20120409_120000V_cts.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_GRIB2_SREF_TRMM_150000L_20120409_120000V_cnt.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_GRIB2_SREF_TRMM_150000L_20120409_120000V_sl1l2.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_GRIB2_SREF_TRMM_150000L_20120409_120000V_seeps.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_GRIB2_SREF_TRMM_150000L_20120409_120000V_seeps_mpr.txt</stat>
</output>
</test>

Expand Down Expand Up @@ -243,6 +239,35 @@
</output>
</test>

<test name="point_stat_NCMET_NAM_NDAS_SEEPS">
<exec>&MET_BIN;/point_stat</exec>
<env>
<pair><name>BEG_DS</name> <value>-1800</value></pair>
<pair><name>END_DS</name> <value>1800</value></pair>
<pair><name>FCST_FIELD_NAME</name> <value>APCP_24</value></pair>
<pair><name>FCST_FIELD_LEVEL</name> <value>(*,*)</value></pair>
<pair><name>OBS_DICT</name> <value>{ field = [ { name = "TP24"; level = "L0"; is_precipitation = TRUE; } ]; }</value></pair>
<pair><name>SEEPS_FLAG</name> <value>BOTH</value></pair>
<pair><name>OUTPUT_PREFIX</name> <value>NCMET_NAM_NDAS_SEEPS</value></pair>
</env>
<param> \
&DATA_DIR_MODEL;/met_nc/nam/nam_2012040900_F036_APCP24.nc \
&OUTPUT_DIR;/pb2nc/ndas.20120410.t12z.prepbufr.tm00.nc \
&CONFIG_DIR;/PointStatConfig_APCP \
-outdir &OUTPUT_DIR;/point_stat -v 1
</param>
<output>
<stat>&OUTPUT_DIR;/point_stat/point_stat_NCMET_NAM_NDAS_SEEPS_360000L_20120410_120000V.stat</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_NCMET_NAM_NDAS_SEEPS_360000L_20120410_120000V_fho.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_NCMET_NAM_NDAS_SEEPS_360000L_20120410_120000V_ctc.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_NCMET_NAM_NDAS_SEEPS_360000L_20120410_120000V_cts.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_NCMET_NAM_NDAS_SEEPS_360000L_20120410_120000V_cnt.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_NCMET_NAM_NDAS_SEEPS_360000L_20120410_120000V_sl1l2.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_NCMET_NAM_NDAS_SEEPS_360000L_20120410_120000V_seeps.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_NCMET_NAM_NDAS_SEEPS_360000L_20120410_120000V_seeps_mpr.txt</stat>
</output>
</test>

<test name="point_stat_NCPINT_TRMM">
<exec>&MET_BIN;/point_stat</exec>
<env>
Expand All @@ -251,7 +276,7 @@
<pair><name>FCST_FIELD_NAME</name> <value>RAINNC</value></pair>
<pair><name>FCST_FIELD_LEVEL</name> <value>(0,*,*)</value></pair>
<pair><name>OBS_DICT</name> <value>{ field = [ { name = "APCP"; level = "A3"; } ]; }</value></pair>
<pair><name>SEEPS_FLAG</name> <value>BOTH</value></pair>
<pair><name>SEEPS_FLAG</name> <value>NONE</value></pair>
<pair><name>OUTPUT_PREFIX</name> <value>NCPINT_TRMM</value></pair>
</env>
<param> \
Expand All @@ -267,8 +292,6 @@
<stat>&OUTPUT_DIR;/point_stat/point_stat_NCPINT_TRMM_240000L_20080808_120000V_cts.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_NCPINT_TRMM_240000L_20080808_120000V_cnt.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_NCPINT_TRMM_240000L_20080808_120000V_sl1l2.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_NCPINT_TRMM_240000L_20080808_120000V_seeps.txt</stat>
<stat>&OUTPUT_DIR;/point_stat/point_stat_NCPINT_TRMM_240000L_20080808_120000V_seeps_mpr.txt</stat>
</output>
</test>

Expand Down
2 changes: 1 addition & 1 deletion src/libcode/vx_seeps/seeps.cc
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ void SeepsClimo::read_records(ConcatString filename) {
float matrix_00_buf[SEEPS_MONTH*SEEPS_MATRIX_SIZE];
float matrix_12_buf[SEEPS_MONTH*SEEPS_MATRIX_SIZE];
NcFile *nc_file = open_ncfile(filename.c_str());
const char *method_name = "SeepsClimo::read_seeps_score() -> ";
const char *method_name = "SeepsClimo::read_records() -> ";

// dimensions: month = 12 ; nstn = 5293 ; nmatrix = 9 ;
get_dim(nc_file, dim_name_nstn, nstn, true);
Expand Down

0 comments on commit 2b92327

Please sign in to comment.