From 4405b807816b3d73f23d21e9892c5a57bbd1bab4 Mon Sep 17 00:00:00 2001
From: John Halley Gotway <johnhg@ucar.edu>
Date: Wed, 2 Nov 2022 11:43:12 -0600
Subject: [PATCH] Per #2224, reconfigure unit_gen_ens_prod.xml tests to
 elimanate the following types of warnings: WARNING: process_command_line() ->
 control_id is set in the config file but control file is not provided with
 -ctrl argument

---
 .../config/GenEnsProdConfig_single_file_grib         |  2 +-
 .../test_unit/config/GenEnsProdConfig_single_file_nc |  2 +-
 internal/test_unit/xml/unit_gen_ens_prod.xml         | 12 ++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/internal/test_unit/config/GenEnsProdConfig_single_file_grib b/internal/test_unit/config/GenEnsProdConfig_single_file_grib
index 2ed7e5fe09..c3370189fa 100644
--- a/internal/test_unit/config/GenEnsProdConfig_single_file_grib
+++ b/internal/test_unit/config/GenEnsProdConfig_single_file_grib
@@ -64,7 +64,7 @@ ens = {
 // Only set if processing a single file with all ensembles
 //
 ens_member_ids = ["+1", "+2", "+3", "+4", "+5", "+6", "+7", "+8", "+9", "+10", "+11", "+12", "+13", "+14", "+15", "+16", "+17", "+18", "+19", "+20"];
-control_id = "hi_res_ctl";
+control_id = ${CONTROL_ID};
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/internal/test_unit/config/GenEnsProdConfig_single_file_nc b/internal/test_unit/config/GenEnsProdConfig_single_file_nc
index c7adc3c89b..5aca406b54 100644
--- a/internal/test_unit/config/GenEnsProdConfig_single_file_nc
+++ b/internal/test_unit/config/GenEnsProdConfig_single_file_nc
@@ -64,7 +64,7 @@ ens = {
 // Only set if processing a single file with all ensembles
 //
 ens_member_ids = ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23"];
-control_id = "0";
+control_id = ${CONTROL_ID};
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/internal/test_unit/xml/unit_gen_ens_prod.xml b/internal/test_unit/xml/unit_gen_ens_prod.xml
index c0bac636be..771bf3e201 100644
--- a/internal/test_unit/xml/unit_gen_ens_prod.xml
+++ b/internal/test_unit/xml/unit_gen_ens_prod.xml
@@ -78,6 +78,9 @@
 
   <test name="gen_ens_prod_SINGLE_FILE_NC_NO_CTRL">
     <exec>&MET_BIN;/gen_ens_prod</exec>
+    <env>
+      <pair><name>CONTROL_ID</name> <value>""</value></pair>
+    </env>
     <param> \
         -ens    &DATA_DIR_MODEL;/CPC_NMME/CFSv2.tmp2m.198201.fcst.nc \
         -config &CONFIG_DIR;/GenEnsProdConfig_single_file_nc \
@@ -91,6 +94,9 @@
 
   <test name="gen_ens_prod_SINGLE_FILE_NC_WITH_CTRL">
     <exec>&MET_BIN;/gen_ens_prod</exec>
+    <env>
+      <pair><name>CONTROL_ID</name> <value>"0"</value></pair>
+    </env>
     <param> \
         -ens    &DATA_DIR_MODEL;/CPC_NMME/CFSv2.tmp2m.198201.fcst.nc \
         -config &CONFIG_DIR;/GenEnsProdConfig_single_file_nc \
@@ -105,6 +111,9 @@
 
   <test name="gen_ens_prod_SINGLE_FILE_GRIB_NO_CTRL">
     <exec>&MET_BIN;/gen_ens_prod</exec>
+    <env>
+      <pair><name>CONTROL_ID</name> <value>""</value></pair>
+    </env>
     <param> \
         -ens    &DATA_DIR_MODEL;/grib2/gefs/enspost_grb2.t00z.prmsl \
         -config &CONFIG_DIR;/GenEnsProdConfig_single_file_grib \
@@ -118,6 +127,9 @@
 
   <test name="gen_ens_prod_SINGLE_FILE_GRIB_WITH_CTRL">
     <exec>&MET_BIN;/gen_ens_prod</exec>
+    <env>
+      <pair><name>CONTROL_ID</name> <value>"hi_res_ctl"</value></pair>
+    </env>
     <param> \
         -ens    &DATA_DIR_MODEL;/grib2/gefs/enspost_grb2.t00z.prmsl \
         -config &CONFIG_DIR;/GenEnsProdConfig_single_file_grib \