From 4564a75cdbd89c202679dcc40a2592da748c5411 Mon Sep 17 00:00:00 2001
From: John Halley Gotway <johnhg@ucar.edu>
Date: Wed, 14 Apr 2021 16:52:11 -0600
Subject: [PATCH] Per #1735, update unit_stat_analysis.xml to consolidate jobs
 stat_analysis_AGG_STAT_ORANK_RHIST and stat_analysis_AGG_STAT_ORANK_PHIST
 down into 1 job with 2 output line types. Rename the output files
 accordingly.

---
 test/xml/unit_stat_analysis.xml | 34 ++++++++-------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)

diff --git a/test/xml/unit_stat_analysis.xml b/test/xml/unit_stat_analysis.xml
index 1558d101fd..93ef98b5bc 100644
--- a/test/xml/unit_stat_analysis.xml
+++ b/test/xml/unit_stat_analysis.xml
@@ -90,39 +90,21 @@
     </output>
   </test>
 
-  <test name="stat_analysis_AGG_STAT_ORANK_RHIST">
+  <test name="stat_analysis_AGG_STAT_ORANK_RHIST_PHIST">
     <exec>&MET_BIN;/stat_analysis</exec>
     <param> \
       -lookin &OUTPUT_DIR;/ensemble_stat/ensemble_stat_CMD_LINE_20120410_120000V.stat \
-      -job aggregate_stat -line_type ORANK -out_line_type RHIST \
-      -fcst_var APCP_24 -vx_mask NWC -vx_mask GRB \
-      -dump_row &OUTPUT_DIR;/stat_analysis/AGG_STAT_ORANK_RHIST_dump.stat \
-      -out_stat &OUTPUT_DIR;/stat_analysis/AGG_STAT_ORANK_RHIST_out.stat \
-      -out &OUTPUT_DIR;/stat_analysis/AGG_STAT_ORANK_RHIST.out \
-      -v 1
-    </param>
-    <output>
-      <stat>&OUTPUT_DIR;/stat_analysis/AGG_STAT_ORANK_RHIST_dump.stat</stat>
-      <stat>&OUTPUT_DIR;/stat_analysis/AGG_STAT_ORANK_RHIST_out.stat</stat>
-      <exist>&OUTPUT_DIR;/stat_analysis/AGG_STAT_ORANK_RHIST.out</exist>
-    </output>
-  </test>
-
-  <test name="stat_analysis_AGG_STAT_ORANK_PHIST">
-    <exec>&MET_BIN;/stat_analysis</exec>
-    <param> \
-      -lookin &OUTPUT_DIR;/ensemble_stat/ensemble_stat_CMD_LINE_20120410_120000V.stat \
-      -job aggregate_stat -line_type ORANK -out_line_type PHIST \
+      -job aggregate_stat -line_type ORANK -out_line_type RHIST,PHIST \
       -fcst_var APCP_24 -vx_mask NWC -vx_mask GRB -out_bin_size 0.10 \
-      -dump_row &OUTPUT_DIR;/stat_analysis/AGG_STAT_ORANK_PHIST_dump.stat \
-      -out_stat &OUTPUT_DIR;/stat_analysis/AGG_STAT_ORANK_PHIST_out.stat \
-      -out &OUTPUT_DIR;/stat_analysis/AGG_STAT_ORANK_PHIST.out \
+      -dump_row &OUTPUT_DIR;/stat_analysis/AGG_STAT_ORANK_RHIST_PHIST_dump.stat \
+      -out_stat &OUTPUT_DIR;/stat_analysis/AGG_STAT_ORANK_RHIST_PHIST_out.stat \
+      -out &OUTPUT_DIR;/stat_analysis/AGG_STAT_ORANK_RHIST_PHIST.out \
       -v 1
     </param>
     <output>
-      <stat>&OUTPUT_DIR;/stat_analysis/AGG_STAT_ORANK_PHIST_dump.stat</stat>
-      <stat>&OUTPUT_DIR;/stat_analysis/AGG_STAT_ORANK_PHIST_out.stat</stat>
-      <exist>&OUTPUT_DIR;/stat_analysis/AGG_STAT_ORANK_PHIST.out</exist>
+      <stat>&OUTPUT_DIR;/stat_analysis/AGG_STAT_ORANK_RHIST_PHIST_dump.stat</stat>
+      <stat>&OUTPUT_DIR;/stat_analysis/AGG_STAT_ORANK_RHIST_PHIST_out.stat</stat>
+      <exist>&OUTPUT_DIR;/stat_analysis/AGG_STAT_ORANK_RHIST_PHIST.out</exist>
     </output>
   </test>