Reorganize the way external model files are obtained

jobs/JREGIONAL_GET_EXTRN_MDL_FILES

@@ -33,15 +33,6 @@
 #
 #-----------------------------------------------------------------------
 #
-# Source the file defining the function that will be used to set various
-# external-model-associated variables.
-#
-#-----------------------------------------------------------------------
-#
-. $USHDIR/get_extrn_mdl_file_dir_info.sh
-#
-#-----------------------------------------------------------------------
-#
 # Save current shell options (in a global array).  Then set new options
 # for this script/function.
 #
@@ -167,128 +158,28 @@ check_var_valid_value "ICS_OR_LBCS" "valid_vals_ICS_OR_LBCS"
 #
 #-----------------------------------------------------------------------
 #
-# Set the parameter anl_or_fcst that determines whether we want to get 
-# analysis or forecast files.  This depends on whether we want these files 
-# to generate initial condition and surface field files or lateral boundary 
-# condition files.  Also, set time_offset_hrs, which is the offset in 
-# hours between the current cycle's starting time and the starting time 
-# of the external model providing the LBCs.
+# Set the name of the directory in which to stage the external model 
+# files (or symlinks to such files) for the current cycle.  Then create 
+# the directory (if it doesn't already exist) and change location to it.
 #
 #-----------------------------------------------------------------------
 #
-if [ "${ICS_OR_LBCS}" = "ICS" ]; then
-  anl_or_fcst="ANL"
-  time_offset_hrs="0"
-elif [ "${ICS_OR_LBCS}" = "LBCS" ]; then
-  anl_or_fcst="FCST"
-  time_offset_hrs="${EXTRN_MDL_LBCS_OFFSET_HRS}"
-fi
-#
-#-----------------------------------------------------------------------
-#
-# Set the name of and then create the directory in which to stage the 
-# external model files for the current cycle (if it doesn't already exist).  
-# Then change location to that directory.
-#
-#-----------------------------------------------------------------------
-#
-extrn_mdl_staging_dir="${CYCLE_DIR}/${EXTRN_MDL_NAME}/for_${ICS_OR_LBCS}"
-mkdir_vrfy -p "${extrn_mdl_staging_dir}"
-cd_vrfy "${extrn_mdl_staging_dir}"
-#
-#-----------------------------------------------------------------------
-#
-# Call the function that sets various external-model-associated variables.
-# See the function defintion file for the definitions of these variables.
-#
-#-----------------------------------------------------------------------
-#
-get_extrn_mdl_file_dir_info \
-  extrn_mdl_name="${EXTRN_MDL_NAME}" \
-  anl_or_fcst="${anl_or_fcst}" \
-  cdate_FV3LAM="${CDATE}" \
-  time_offset_hrs="${time_offset_hrs}" \
-  varname_extrn_mdl_cdate="extrn_mdl_cdate" \
-  varname_extrn_mdl_lbc_spec_fhrs="extrn_mdl_lbc_spec_fhrs" \
-  varname_extrn_mdl_fns_on_disk="extrn_mdl_fns_on_disk" \
-  varname_extrn_mdl_fns_in_arcv="extrn_mdl_fns_in_arcv" \
-  varname_extrn_mdl_sysdir="extrn_mdl_sysdir" \
-  varname_extrn_mdl_arcv_fmt="extrn_mdl_arcv_fmt" \
-  varname_extrn_mdl_arcv_fns="extrn_mdl_arcv_fns" \
-  varname_extrn_mdl_arcv_fps="extrn_mdl_arcv_fps" \
-  varname_extrn_mdl_arcvrel_dir="extrn_mdl_arcvrel_dir" || \
-print_err_msg_exit "\
-Call to function get_extrn_mdl_file_dir_info failed."
-#
-#-----------------------------------------------------------------------
-#
-# Set the directory in which to check for the external model files (which
-# we refer to here as the "source" directory) to the default one set above 
-# for the current machine and external model.
-#
-#-----------------------------------------------------------------------
-#
-extrn_mdl_source_dir="${extrn_mdl_sysdir}"
-#
-#-----------------------------------------------------------------------
-#
-# If the user has specified that the external model files to be used for
-# generating ICs or LBCs are staged, then reset extrn_mdl_source_dir to 
-# the user-specified directory in which these files are staged, and reset 
-# extrn_mdl_fns_on_disk to the user-specified array containing the names 
-# of the files.
-#
-#-----------------------------------------------------------------------
-#
-if [ "${USE_USER_STAGED_EXTRN_FILES}" = "TRUE" ]; then
-
-  if [ "${ICS_OR_LBCS}" = "ICS" ]; then
-    extrn_mdl_source_dir="${EXTRN_MDL_SOURCE_BASEDIR_ICS}/$CDATE"
-    extrn_mdl_fns_on_disk=( $( printf "%s " "${EXTRN_MDL_FILES_ICS[@]}" ))
-  elif [ "${ICS_OR_LBCS}" = "LBCS" ]; then
-    extrn_mdl_source_dir="${EXTRN_MDL_SOURCE_BASEDIR_LBCS}/$CDATE"
-    extrn_mdl_fns_on_disk=( $( printf "%s " "${EXTRN_MDL_FILES_LBCS[@]}" ))
-  fi
-
-  if [ ! -d "${extrn_mdl_source_dir}" ]; then
-    print_err_msg_exit "\
-The directory extrn_mdl_source_dir containing the user-staged external
-model files does not exist:
-  extrn_mdl_source_dir = \"${extrn_mdl_source_dir}\"
-Please ensure that the directory specified by extrn_mdl_source_dir exists
-and that all the files specified in the array extrn_mdl_fns_on_disk exist
-within it:
-  extrn_mdl_source_dir = \"${extrn_mdl_source_dir}\"
-  extrn_mdl_fns_on_disk = ( $( printf "\"%s\" " "${extrn_mdl_fns_on_disk[@]}" ))"
-  fi
-
-fi
+staging_dir="${CYCLE_DIR}/${EXTRN_MDL_NAME}/for_${ICS_OR_LBCS}"
+mkdir_vrfy -p "${staging_dir}"
+cd_vrfy "${staging_dir}"
 #
 #-----------------------------------------------------------------------
 #
 # Call the ex-script for this J-job and pass to it the necessary variables.
 #
 #-----------------------------------------------------------------------
 #
-extrn_mdl_lbc_spec_fhrs_str="( "$( printf "\"%s\" " "${extrn_mdl_lbc_spec_fhrs[@]}" )")"
-extrn_mdl_fns_on_disk_str="( "$( printf "\"%s\" " "${extrn_mdl_fns_on_disk[@]}" )")"
-extrn_mdl_fns_in_arcv_str="( "$( printf "\"%s\" " "${extrn_mdl_fns_in_arcv[@]}" )")"
-extrn_mdl_arcv_fns_str="( "$( printf "\"%s\" " "${extrn_mdl_arcv_fns[@]}" )")"
-extrn_mdl_arcv_fps_str="( "$( printf "\"%s\" " "${extrn_mdl_arcv_fps[@]}" )")"
+extrn_mdl_data_sources_str="( "$( printf "\"%s\" " "${EXTRN_MDL_DATA_SOURCES[@]}" )")"
 
 $SCRIPTSDIR/exregional_get_extrn_mdl_files.sh \
   ics_or_lbcs="${ICS_OR_LBCS}" \
-  use_user_staged_extrn_files="${USE_USER_STAGED_EXTRN_FILES}" \
-  extrn_mdl_cdate="${extrn_mdl_cdate}" \
-  extrn_mdl_lbc_spec_fhrs="${extrn_mdl_lbc_spec_fhrs_str}" \
-  extrn_mdl_fns_on_disk="${extrn_mdl_fns_on_disk_str}" \
-  extrn_mdl_fns_in_arcv="${extrn_mdl_fns_in_arcv_str}" \
-  extrn_mdl_source_dir="${extrn_mdl_source_dir}" \
-  extrn_mdl_staging_dir="${extrn_mdl_staging_dir}" \
-  extrn_mdl_arcv_fmt="${extrn_mdl_arcv_fmt}" \
-  extrn_mdl_arcv_fns="${extrn_mdl_arcv_fns_str}" \
-  extrn_mdl_arcv_fps="${extrn_mdl_arcv_fps_str}" \
-  extrn_mdl_arcvrel_dir="${extrn_mdl_arcvrel_dir}" || \
+  data_sources="${extrn_mdl_data_sources_str}" \
+  staging_dir="${staging_dir}" || \
 print_err_msg_exit "\
 Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
 #

jobs/JREGIONAL_MAKE_ICS

@@ -17,7 +17,7 @@
 #
 #-----------------------------------------------------------------------
 #
-{ save_shell_opts; set -u -x; } > /dev/null 2>&1
+{ save_shell_opts; set -u +x; } > /dev/null 2>&1
 #
 #-----------------------------------------------------------------------
 #

jobs/JREGIONAL_RUN_POST

@@ -26,7 +26,7 @@
 #
 #-----------------------------------------------------------------------
 #
-{ save_shell_opts; set -u -x; } > /dev/null 2>&1
+{ save_shell_opts; set -u +x; } > /dev/null 2>&1
 #
 #-----------------------------------------------------------------------
 #