WIP

Use UW-compliant YAML for var_defns.sh file.
Update loading tasks script for not having all required variables in
environment.

jobs/JREGIONAL_CHECK_POST_OUTPUT

@@ -3,7 +3,19 @@
 #
 #-----------------------------------------------------------------------
 #
+# The J-Job script for checking the post output.
 #
+# Run-time environment variables:
+#
+# GLOBAL_VAR_DEFNS_FP
+# ENSMEM_INDX
+# CDATE
+#
+# Experiment variables
+#
+# user.SCRIPTSdir
+# user.USHdir
+# workflow.EXPTDIR
 #
 #-----------------------------------------------------------------------
 #
@@ -16,7 +28,12 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-source_config_for_task "" ${GLOBAL_VAR_DEFNS_FP}
+for sect in (user workflow) ; do
+ for var in $(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
+ --output-block ${sect}) ; do
+ export $var
+ done
+done
 . $USHdir/job_preamble.sh
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_GET_EXTRN_MDL_FILES

@@ -3,20 +3,49 @@
 #
 #-----------------------------------------------------------------------
 #
-# This script gets either from the system directory or from mass store
-# (HPSS) the files generated by the external model (specified by the 
-# variable EXTRN_MDL_NAME) for either the initial conditions (ICs) or the
-# lateral boundary conditions (LBCs). Which of these we are considering
-# depends on the value of the variable ICS_OR_LBCS, which should be defined
-# in the environment (when calling this script from a rocoto workflow, 
-# the workflow should define this variable, e.g. using rocoto's <envar> 
-# tag).
-#
-# Note that when we refer to ICs, we are referring to not only the atmospheric 
-# fields at the initial time but also various surface fields (which are 
-# for now time-independent) as well as the 0-th forecast hour LBCs. Also, 
-# when we refer to LBCs, we are referring to the LBCs excluding the one 
-# at the 0-th hour. 
+# The J-Job script for getting the model files that will be used for
+# either initial conditions or lateral boundary conditions for the
+# experiment.
+#
+# Run-time environment variables:
+#
+# GLOBAL_VAR_DEFNS_FP
+# ICS_OR_LBCS
+# PDY
+# cyc
+# CDATE
+# DATA
+# COMIN
+# EXTRN_MDL_STAGING_DIR (optional; default is DATA)
+#
+# Experiment variables
+#
+# user:
+# SCRIPTSdir
+# USHdir
+# workflow:
+# EXPTDIR
+#
+# Depending on ICS_or_LBCS:
+#
+# task_get_extrn_ics:
+# EXTRN_MDL_NAME_ICS
+# EXTRN_MDL_ICS_OFFSET_HRS
+# FV3GFS_FILE_FMT_ICS
+# EXTRN_MDL_SYSBASEDIR_ICS
+# USE_USER_STAGED_EXTRN_FILES
+# EXTRN_MDL_SOURCE_BASEDIR_ICS
+# EXTRN_MDL_FILES_ICS
+#
+# task_get_extrn_lbcs:
+# EXTRN_MDL_NAME_LBCS
+# LBC_SPEC_INTVL_HRS
+# EXTRN_MDL_LBCS_OFFSET_HRS
+# FV3GFS_FILE_FMT_LBCS
+# EXTRN_MDL_SYSBASEDIR_LBCS
+# USE_USER_STAGED_EXTRN_FILES
+# EXTRN_MDL_SOURCE_BASEDIR_LBCS
+# EXTRN_MDL_FILES_LBCS
 #
 #-----------------------------------------------------------------------
 #
@@ -29,8 +58,14 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-source_config_for_task "task_get_extrn_ics|task_get_extrn_lbcs" ${GLOBAL_VAR_DEFNS_FP}
-. $USHdir/job_preamble.sh "TRUE"
+for sect in (user workflow task_get_extrn_ics task_get_extrn_lbcs) ; do
+ --output-block ${sect}) ; do
+ export $var
+ done
+done
+. $USHdir/job_preamble.sh
+
+
 #
 #-----------------------------------------------------------------------
 #

jobs/JREGIONAL_GET_VERIF_OBS

@@ -3,7 +3,19 @@
 #
 #-----------------------------------------------------------------------
 #
-# This script checks, pulls, and stages observation data for model verification.
+# The J-Job script that checks, pulls, and stages observation data for
+# model verification.
+#
+# Run-time environment variables:
+#
+# GLOBAL_VAR_DEFNS_FP
+# CDATE
+#
+# Experiment variables
+#
+# user:
+# SCRIPTSdir
+# USHdir
 #
 #-----------------------------------------------------------------------
 #
@@ -16,7 +28,12 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-source_config_for_task " " ${GLOBAL_VAR_DEFNS_FP}
+for sect in (user) ; do
+ for var in $(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
+ --output-block ${sect}) ; do
+ export $var
+ done
+done
 . $USHdir/job_preamble.sh
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_INTEGRATION_TEST

@@ -1,5 +1,49 @@
 #!/bin/bash
 
+
+#
+#-----------------------------------------------------------------------
+#
+# This J-Job script runs a set of tests at the end of WE2E tests.
+#
+# Run-time environment variables:
+#
+# GLOBAL_VAR_DEFNS_FP
+# CDATE
+# FCST_DIR
+# SLASH_ENSMEM_SUBDIR
+#
+# Experiment variables
+#
+# user:
+# SCRIPTSdir
+# USHdir
+# RUN_ENV
+# workflow:
+# FCST_LEN_HRS
+#
+#
+#-----------------------------------------------------------------------
+#
+
+#
+#-----------------------------------------------------------------------
+#
+# Source the variable definitions file and the bash utility functions.
+#
+#-----------------------------------------------------------------------
+#
+. $USHdir/source_util_funcs.sh
+for sect in (user workflow) ; do
+ for var in $(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
+ --output-block ${sect}) ; do
+ export $var
+ done
+done
+. $USHdir/job_preamble.sh
+
+
+
 #
 #-----------------------------------------------------------------------
 #

jobs/JREGIONAL_MAKE_GRID

@@ -94,6 +94,23 @@
 # orography file generated by orog_fltr_scr down to a width of 4
 # cells and store the result in a new filtered orography file in
 # WORKDIR_SHVE.
+
+# Run-time environment variables:
+#
+# GLOBAL_VAR_DEFNS_FP
+# DATA
+#
+# Experiment variables
+#
+# user:
+# SCRIPTSdir
+# USHdir
+#
+# workflow:
+# PREEXISTING_DIR_METHOD
+#
+# task_make_grid:
+# GRID_DIR
 #
 #-----------------------------------------------------------------------
 #
@@ -106,7 +123,12 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-source_config_for_task "task_make_grid" ${GLOBAL_VAR_DEFNS_FP}
+for sect in (user workflow task_make_grid) ; do
+ for var in $(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
+ --output-block ${sect}) ; do
+ export $var
+ done
+done
 . $USHdir/job_preamble.sh
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_MAKE_ICS

@@ -1,5 +1,28 @@
 #!/usr/bin/env bash
 
+#
+#-----------------------------------------------------------------------
+#
+# The J-job to run chgres_cube for preparing initial conditions for the
+# FV3 forecast
+#
+# Run-time environment variables:
+#
+# GLOBAL_VAR_DEFNS_FP
+# COMIN
+# SLASH_ENSMEM_SUBDIR
+# DATA
+#
+# Experiment variables
+#
+# user:
+# SCRIPTSdir
+# USHdir
+# RUN_ENVIR
+#
+#-----------------------------------------------------------------------
+#
+
 #
 #-----------------------------------------------------------------------
 #
@@ -8,7 +31,12 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-source_config_for_task "task_make_ics" ${GLOBAL_VAR_DEFNS_FP}
+for sect in (user) ; do
+ for var in $(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
+ --output-block ${sect}) ; do
+ export $var
+ done
+done
 . $USHdir/job_preamble.sh
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_MAKE_LBCS

@@ -1,5 +1,29 @@
 #!/usr/bin/env bash
 
+#
+#-----------------------------------------------------------------------
+#
+# The J-job to run chgres_cube for preparing lateral boundary conditions
+# for the FV3 forecast
+#
+# Run-time environment variables:
+#
+# GLOBAL_VAR_DEFNS_FP
+# CDATE
+# COMIN
+# SLASH_ENSMEM_SUBDIR
+# DATA
+#
+# Experiment variables
+#
+# user:
+# SCRIPTSdir
+# USHdir
+# RUN_ENVIR
+#
+#-----------------------------------------------------------------------
+#
+
 #
 #-----------------------------------------------------------------------
 #
@@ -8,7 +32,12 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-source_config_for_task "task_make_lbcs" ${GLOBAL_VAR_DEFNS_FP}
+for sect in (user) ; do
+ for var in $(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
+ --output-block ${sect}) ; do
+ export $var
+ done
+done
 . $USHdir/job_preamble.sh
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_MAKE_OROG

@@ -1,5 +1,27 @@
 #!/usr/bin/env bash
 
+#
+#-----------------------------------------------------------------------
+#
+# The J-job to run chgres_cube for preparing lateral boundary conditions
+# for the FV3 forecast
+#
+# Run-time environment variables:
+#
+# GLOBAL_VAR_DEFNS_FP
+#
+# Experiment variables
+#
+# user:
+# SCRIPTSdir
+# USHdir
+#
+# task_make_orog:
+# OROG_DIR
+#
+#-----------------------------------------------------------------------
+#
+
 #
 #-----------------------------------------------------------------------
 #
@@ -8,7 +30,12 @@
 #-----------------------------------------------------------------------
 #
 . $USHdir/source_util_funcs.sh
-source_config_for_task "task_make_orog" ${GLOBAL_VAR_DEFNS_FP}
+for sect in (user task_make_orog) ; do
+ for var in $(uw config realize -i ${GLOBAL_VAR_DEFNS_FP} --output-format sh \
+ --output-block ${sect}) ; do
+ export $var
+ done
+done
 . $USHdir/job_preamble.sh
 #
 #-----------------------------------------------------------------------