Feature/remove shell workflow

scripts/exregional_run_ensgridvx.sh

@@ -133,6 +133,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 export NUM_ENS_MEMBERS 
 export NUM_PAD
 export LOG_SUFFIX

scripts/exregional_run_ensgridvx_mean.sh

@@ -143,6 +143,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 export INPUT_BASE
 export LOG_SUFFIX
 

scripts/exregional_run_ensgridvx_prob.sh

@@ -144,6 +144,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 export LOG_SUFFIX
 
 #

scripts/exregional_run_enspointvx.sh

@@ -135,6 +135,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 export NUM_ENS_MEMBERS
 
 ${METPLUS_PATH}/ush/run_metplus.py \

scripts/exregional_run_enspointvx_mean.sh

@@ -137,6 +137,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 
 ${METPLUS_PATH}/ush/run_metplus.py \
   -c ${METPLUS_CONF}/common.conf \

scripts/exregional_run_enspointvx_prob.sh

@@ -137,6 +137,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 
 ${METPLUS_PATH}/ush/run_metplus.py \
   -c ${METPLUS_CONF}/common.conf \

scripts/exregional_run_fcst.sh

@@ -514,7 +514,6 @@ if [ ${WRITE_DOPOST} = "TRUE" ]; then
   yyyymmdd=${cdate:0:8}
   hh=${cdate:8:2}
   cyc=$hh
-  tmmark="tm00"
   fmn="00"
 
   if [ "${RUN_ENVIR}" = "nco" ]; then
@@ -539,15 +538,15 @@ if [ ${WRITE_DOPOST} = "TRUE" ]; then
     post_mn=${post_time:10:2}
     post_mn_or_null=""
     post_fn_suffix="GrbF${fhr_d}"
-    post_renamed_fn_suffix="f${fhr}${post_mn_or_null}.${tmmark}.grib2"
+    post_renamed_fn_suffix="f${fhr}${post_mn_or_null}.${POST_OUTPUT_DOMAIN_NAME}.grib2"
 
     basetime=$( $DATE_UTIL --date "$yyyymmdd $hh" +%y%j%H%M )
     symlink_suffix="_${basetime}f${fhr}${post_mn}"
     fids=( "prslev" "natlev" )
     for fid in "${fids[@]}"; do
       FID=$(echo_uppercase $fid)
       post_orig_fn="${FID}.${post_fn_suffix}"
-      post_renamed_fn="${NET}.t${cyc}z.${fid}${post_renamed_fn_suffix}"
+      post_renamed_fn="${NET}.t${cyc}z.${fid}.${post_renamed_fn_suffix}"
       mv_vrfy ${run_dir}/${post_orig_fn} ${post_renamed_fn}
       ln_vrfy -fs ${post_renamed_fn} ${FID}${symlink_suffix}
     done

scripts/exregional_run_gridstatvx.sh

@@ -150,6 +150,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 
 #
 #-----------------------------------------------------------------------

scripts/exregional_run_pointstatvx.sh

@@ -140,6 +140,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 
 ${METPLUS_PATH}/ush/run_metplus.py \
   -c ${METPLUS_CONF}/common.conf \

scripts/exregional_run_post.sh

@@ -172,17 +172,6 @@ cyc=$hh
 #
 #-----------------------------------------------------------------------
 #
-# The tmmark is a reference value used in real-time, DA-enabled NCEP models.
-# It represents the delay between the onset of the DA cycle and the free
-# forecast.  With no DA in the SRW App at the moment, it is hard-wired to
-# tm00 for now. 
-#
-#-----------------------------------------------------------------------
-#
-tmmark="tm00"
-#
-#-----------------------------------------------------------------------
-#
 # Create the namelist file (itag) containing arguments to pass to the post-
 # processor's executable.
 #
@@ -300,7 +289,7 @@ if [ "${post_mn}" != "00" ]; then
 fi
 
 post_fn_suffix="GrbF${post_fhr}${dot_post_mn_or_null}"
-post_renamed_fn_suffix="f${fhr}${post_mn_or_null}.${tmmark}.grib2"
+post_renamed_fn_suffix="f${fhr}${post_mn_or_null}.${POST_OUTPUT_DOMAIN_NAME}.grib2"
 #
 # For convenience, change location to postprd_dir (where the final output
 # from UPP will be located).  Then loop through the two files that UPP
@@ -314,7 +303,7 @@ fids=( "prslev" "natlev" )
 for fid in "${fids[@]}"; do
   FID=$(echo_uppercase $fid)
   post_orig_fn="${FID}.${post_fn_suffix}"
-  post_renamed_fn="${NET}.t${cyc}z.${fid}${post_renamed_fn_suffix}"
+  post_renamed_fn="${NET}.t${cyc}z.${fid}.${post_renamed_fn_suffix}"
   mv_vrfy ${tmp_dir}/${post_orig_fn} ${post_renamed_fn}
   create_symlink_to_file target="${post_renamed_fn}" \
                          symlink="${FID}${symlink_suffix}" \

tests/WE2E/run_WE2E_tests.sh

@@ -1260,7 +1260,7 @@ exist or is not a directory:
 #
 #-----------------------------------------------------------------------
 #
-  $ushdir/generate_FV3LAM_wflow.sh || \
+  $ushdir/generate_FV3LAM_wflow.py || \
     print_err_msg_exit "\
 Could not generate an experiment for the test specified by test_name:
   test_name = \"${test_name}\""

tests/WE2E/test_configs/wflow_features/config.new_ESGgrid.sh → 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"

tests/WE2E/test_configs/wflow_features/config.new_GFDLgrid.sh → 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"

tests/WE2E/test_configs/wflow_features/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh → 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"

tests/WE2E/test_configs/wflow_features/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.sh → 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"

ush/config_defaults.sh

@@ -4,7 +4,7 @@
 # This file sets the experiment's configuration variables (which are
 # global shell variables) to their default values.  For many of these
 # variables, the valid values that they may take on are defined in the
-# file $USHDIR/valid_param_vals.sh.
+# file $USHDIR/valid_param_vals.py.
 #
 #-----------------------------------------------------------------------
 #
@@ -45,7 +45,7 @@ RUN_ENVIR="nco"
 # supported platform, and you want to use the Rocoto workflow manager,
 # you will need set MACHINE="linux" and WORKFLOW_MANAGER="rocoto". This
 # combination will assume a Slurm batch manager when generating the XML.
-# Please see ush/valid_param_vals.sh for a full list of supported
+# Please see ush/valid_param_vals.py for a full list of supported
 # platforms.
 #
 # MACHINE_FILE:
@@ -411,6 +411,18 @@ WFLOW_LAUNCH_LOG_FN="log.launch_FV3LAM_wflow"
 #
 #-----------------------------------------------------------------------
 #
+# Set output file name. Definitions:
+#
+# POST_OUTPUT_DOMAIN_NAME:
+# Domain name used in naming the output files of run_post by UPP or inline post.
+# Output file name: $NET.tHHz.[var_name].f###.$POST_OUTPUT_DOMAIN_NAME.grib2
+#
+#-----------------------------------------------------------------------
+#
+POST_OUTPUT_DOMAIN_NAME=""
+#
+#-----------------------------------------------------------------------
+#
 # Set forecast parameters.  Definitions:
 #
 # DATE_FIRST_CYCL:
@@ -612,7 +624,7 @@ NDAS_OBS_DIR=""
 # conditions from the GFS started 6 hours earlier, then
 # EXTRN_MDL_LBCS_OFFSET_HRS=6.
 # Note: the default value is model-dependent and set in
-# set_extrn_mdl_params.sh
+# set_extrn_mdl_params.py
 #
 # FV3GFS_FILE_FMT_ICS:
 # If using the FV3GFS model as the source of the ICs (i.e. if EXTRN_MDL_NAME_ICS
@@ -1009,7 +1021,7 @@ GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES=""
 # in generating the files with 0-cell-, 3-cell-, and 4-cell-wide halos;
 # they are not needed by the forecast model.  
 # NOTE: Probably don't need to make ESGgrid_WIDE_HALO_WIDTH a user-specified 
-#       variable.  Just set it in the function set_gridparams_ESGgrid.sh.
+#       variable.  Just set it in the function set_gridparams_ESGgrid.py.
 #
 # Note that:
 #
@@ -1169,7 +1181,7 @@ WRTCMP_dy=""
 # commonly used set of grid-dependent parameters.  The predefined grid 
 # parameters are specified in the script 
 #
-#   $HOMErrfs/ush/set_predef_grid_params.sh
+#   $HOMErrfs/ush/set_predef_grid_params.py
 #
 #-----------------------------------------------------------------------
 #
@@ -1866,7 +1878,7 @@ SPP_TSCALE=( "21600.0" "21600.0" "21600.0" "21600.0" "21600.0" ) #Variable "spp_
 SPP_SIGTOP1=( "0.1" "0.1" "0.1" "0.1" "0.1")
 SPP_SIGTOP2=( "0.025" "0.025" "0.025" "0.025" "0.025" )
 SPP_STDDEV_CUTOFF=( "1.5" "1.5" "2.5" "1.5" "1.5" )
-ISEED_SPP=( "4" "4" "4" "4" "4" )
+ISEED_SPP=( "4" "5" "6" "7" "8" )
 #
 #-----------------------------------------------------------------------
 #