Per #2893, tweak Point-Stat configuration to also write HIRA ORANK an…

…d PCT outputs.
dtcenter · Oct 16, 2024 · 1c1fe7f · 1c1fe7f
1 parent 82565f7
commit 1c1fe7f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/internal/test_unit/config/PointStatConfig_MPR_OBTYPE b/internal/test_unit/config/PointStatConfig_MPR_OBTYPE
@@ -112,12 +112,12 @@ interp = {
 ////////////////////////////////////////////////////////////////////////////////
 
 hira = {
-   flag            = FALSE;
-   width           = [ 2, 3, 4, 5 ];
+   flag            = TRUE;
+   width           = [ 3 ];
    vld_thresh      = 1.0;
    cov_thresh      = [ ==0.25 ];
    shape           = SQUARE;
-   prob_cat_thresh = [];
+   prob_cat_thresh = [ >273 ];
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -134,13 +134,13 @@ output_flag = {
    vl1l2  = NONE;
    val1l2 = NONE;
    vcnt   = NONE;
-   pct    = NONE;
+   pct    = STAT;
    pstd   = NONE;
    pjc    = NONE;
    prc    = NONE;
-   ecnt   = NONE;
+   ecnt   = STAT;
    rps    = NONE;
-   orank  = NONE;
+   orank  = STAT;
    eclv   = NONE;
    mpr    = STAT;
    seeps  = NONE;

diff --git a/internal/test_unit/xml/unit_point_stat.xml b/internal/test_unit/xml/unit_point_stat.xml
@@ -75,8 +75,8 @@
   <test name="point_stat_GRIB1_NAM_GDAS_MPR_OBTYPE">
     <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>BEG_DS</name>         <value>-300</value></pair>
+      <pair><name>END_DS</name>         <value>300</value></pair>
       <pair><name>OUTPUT_PREFIX</name>  <value>GRIB1_NAM_GDAS_MPR_OBTYPE</value></pair>
       <pair><name>CONFIG_DIR</name>     <value>&CONFIG_DIR;</value></pair>
       <pair><name>CLIMO_FILE</name>     <value>"&DATA_DIR_MODEL;/grib1/gfs/gfs_2012040900_F012_gNam.grib"</value></pair>

diff --git a/src/libcode/vx_statistics/pair_data_ensemble.cc b/src/libcode/vx_statistics/pair_data_ensemble.cc
@@ -1305,11 +1305,10 @@ void VxPairDataEnsemble::add_point_obs(float *hdr_arr, int *hdr_typ_arr,
             // Add the observation value
             // Weight is from the nearest grid point
             int n = three_to_one(i_msg_typ, i_mask, i_interp);
-
 	    if(!pd[n].add_point_obs(hdr_typ_str, hdr_sid_str,
                   hdr_lat, hdr_lon, obs_x, obs_y,
                   hdr_ut, obs_lvl, obs_hgt,
-                  obs_v, obs_qty, cpi, wgt_v)) {
+                  obs_v, obs_qty, cpi, default_weight)) {
 
                if(mlog.verbosity_level() >= REJECT_DEBUG_LEVEL) {
                   mlog << Debug(REJECT_DEBUG_LEVEL)

diff --git a/src/tools/core/point_stat/point_stat.cc b/src/tools/core/point_stat/point_stat.cc
@@ -1982,7 +1982,7 @@ void do_hira_ens(int i_vx, const PairDataPoint *pd_ptr) {
             conf_info.obtype_as_group_val_flag);
 
          // Reset the obtype column
-         shc.set_obtype(conf_info.vx_opt[i_vx].msg_typ[i_msg_typ].c_str());
+         shc.set_obtype(pd_ptr->msg_typ.c_str());
 
          // Reset the observation valid time
          shc.set_obs_valid_beg(conf_info.vx_opt[i_vx].vx_pd.beg_ut);
@@ -2179,7 +2179,7 @@ void do_hira_prob(int i_vx, const PairDataPoint *pd_ptr) {
                false);
 
             // Reset the obtype column
-            shc.set_obtype(conf_info.vx_opt[i_vx].msg_typ[i_msg_typ].c_str());
+            shc.set_obtype(pd_ptr->msg_typ.c_str());
 
             // Reset the observation valid time
             shc.set_obs_valid_beg(conf_info.vx_opt[i_vx].vx_pd.beg_ut);