From d4a6d4322a3dc9812f6f09322bc58294cd1a9c72 Mon Sep 17 00:00:00 2001
From: "Chan-Hoo.Jeon-NOAA" <60152248+chan-hoo@users.noreply.github.com>
Date: Tue, 10 May 2022 15:20:49 -0400
Subject: [PATCH] Add POST_OUTPUT_DOMAIN_NAME to WE2E tests for new grids
 (#763)

* Add new var to we2e tests for new grids

* rename we2e tests for custom grid

* remove unnecessary $
---
 .../{config.new_ESGgrid.sh => config.custom_ESGgrid.sh}       | 2 ++
 .../{config.new_GFDLgrid.sh => config.custom_GFDLgrid.sh}     | 2 ++
 ...Lgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh} | 2 ++
 ...DLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.sh} | 2 ++
 ush/setup.py                                                  | 4 ++--
 5 files changed, 10 insertions(+), 2 deletions(-)
 rename tests/WE2E/test_configs/wflow_features/{config.new_ESGgrid.sh => config.custom_ESGgrid.sh} (96%)
 rename tests/WE2E/test_configs/wflow_features/{config.new_GFDLgrid.sh => config.custom_GFDLgrid.sh} (98%)
 rename tests/WE2E/test_configs/wflow_features/{config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh => config.custom_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh} (97%)
 rename tests/WE2E/test_configs/wflow_features/{config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.sh => config.custom_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.sh} (97%)

diff --git a/tests/WE2E/test_configs/wflow_features/config.new_ESGgrid.sh b/tests/WE2E/test_configs/wflow_features/config.custom_ESGgrid.sh
similarity index 96%
rename from tests/WE2E/test_configs/wflow_features/config.new_ESGgrid.sh
rename to tests/WE2E/test_configs/wflow_features/config.custom_ESGgrid.sh
index fc34f4a0c..bb8d2bc0c 100644
--- a/tests/WE2E/test_configs/wflow_features/config.new_ESGgrid.sh
+++ b/tests/WE2E/test_configs/wflow_features/config.custom_ESGgrid.sh
@@ -44,6 +44,8 @@ LAYOUT_X="8"
 LAYOUT_Y="12"
 BLOCKSIZE="13"
 
+POST_OUTPUT_DOMAIN_NAME="custom_ESGgrid"
+
 QUILTING="TRUE"
 if [ "$QUILTING" = "TRUE" ]; then
   WRTCMP_write_groups="1"
diff --git a/tests/WE2E/test_configs/wflow_features/config.new_GFDLgrid.sh b/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid.sh
similarity index 98%
rename from tests/WE2E/test_configs/wflow_features/config.new_GFDLgrid.sh
rename to tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid.sh
index d27148de2..66604a549 100644
--- a/tests/WE2E/test_configs/wflow_features/config.new_GFDLgrid.sh
+++ b/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid.sh
@@ -76,6 +76,8 @@ LAYOUT_X="6"
 LAYOUT_Y="6"
 BLOCKSIZE="26"
 
+POST_OUTPUT_DOMAIN_NAME="custom_GFDLgrid"
+
 QUILTING="TRUE"
 if [ "$QUILTING" = "TRUE" ]; then
   WRTCMP_write_groups="1"
diff --git a/tests/WE2E/test_configs/wflow_features/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh b/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh
similarity index 97%
rename from tests/WE2E/test_configs/wflow_features/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh
rename to tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh
index aef2636f2..4c4f0d5c7 100644
--- a/tests/WE2E/test_configs/wflow_features/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh
+++ b/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh
@@ -63,6 +63,8 @@ LAYOUT_X="6"
 LAYOUT_Y="6"
 BLOCKSIZE="26"
 
+POST_OUTPUT_DOMAIN_NAME="custom_GFDLgrid"
+
 QUILTING="TRUE"
 if [ "$QUILTING" = "TRUE" ]; then
   WRTCMP_write_groups="1"
diff --git a/tests/WE2E/test_configs/wflow_features/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.sh b/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.sh
similarity index 97%
rename from tests/WE2E/test_configs/wflow_features/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.sh
rename to tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.sh
index 59ca0925e..3e067ee3d 100644
--- a/tests/WE2E/test_configs/wflow_features/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.sh
+++ b/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.sh
@@ -63,6 +63,8 @@ LAYOUT_X="6"
 LAYOUT_Y="6"
 BLOCKSIZE="26"
 
+POST_OUTPUT_DOMAIN_NAME="custom_GFDLgrid"
+
 QUILTING="TRUE"
 if [ "$QUILTING" = "TRUE" ]; then
   WRTCMP_write_groups="1"
diff --git a/ush/setup.py b/ush/setup.py
index a7621671c..2e6cb912c 100644
--- a/ush/setup.py
+++ b/ush/setup.py
@@ -854,10 +854,10 @@ def setup():
         print_err_msg_exit(f'''
             The domain name used in naming the run_post output files 
             (POST_OUTPUT_DOMAIN_NAME) has not been set:
-            POST_OUTPUT_DOMAIN_NAME = \"${POST_OUTPUT_DOMAIN_NAME}\"
+            POST_OUTPUT_DOMAIN_NAME = \"{POST_OUTPUT_DOMAIN_NAME}\"
             If this experiment is not using a predefined grid (i.e. if 
             PREDEF_GRID_NAME is set to a null string), POST_OUTPUT_DOMAIN_NAME 
-            must be set in the configuration file (\"${EXPT_CONFIG_FN}\"). ''')
+            must be set in the configuration file (\"{EXPT_CONFIG_FN}\"). ''')
 
       POST_OUTPUT_DOMAIN_NAME = PREDEF_GRID_NAME