Add POST_OUTPUT_DOMAIN_NAME to WE2E tests for new grids (ufs-communit…

…y#763) * Add new var to we2e tests for new grids * rename we2e tests for custom grid * remove unnecessary $
michelleharrold · May 10, 2022 · 471422c · 471422c
1 parent 0577a62
commit 471422c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/...figs/wflow_features/config.new_ESGgrid.sh → ...s/wflow_features/config.custom_ESGgrid.sh b/...figs/wflow_features/config.new_ESGgrid.sh → ...s/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/...igs/wflow_features/config.new_GFDLgrid.sh → .../wflow_features/config.custom_GFDLgrid.sh b/...igs/wflow_features/config.new_GFDLgrid.sh → .../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/...USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh → ...USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh b/...USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh → ...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/..._USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.sh → ..._USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.sh b/..._USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.sh → ..._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
@@ -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