Enable ensemble forecasts

jobs/JREGIONAL_GET_EXTRN_MDL_FILES

@@ -192,7 +192,7 @@ fi
 #
 #-----------------------------------------------------------------------
 #
-extrn_mdl_staging_dir="${CYCLE_DIR}/${EXTRN_MDL_NAME}/${ICS_OR_LBCS}"
+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}"
 #

jobs/JREGIONAL_MAKE_ICS

@@ -106,7 +106,7 @@ Directory in which the wgrib2 executable is located could not be found:
 #
 #-----------------------------------------------------------------------
 #
-ics_dir="${CYCLE_DIR}/INPUT"
+ics_dir="${CYCLE_DIR}${SLASH_ENSMEM_SUBDIR}/INPUT"
 mkdir_vrfy -p "${ics_dir}"
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_MAKE_LBCS

@@ -107,7 +107,7 @@ Directory in which the wgrib2 executable is located could not be found:
 #
 #-----------------------------------------------------------------------
 #
-lbcs_dir="${CYCLE_DIR}/INPUT"
+lbcs_dir="${CYCLE_DIR}${SLASH_ENSMEM_SUBDIR}/INPUT"
 mkdir_vrfy -p "${lbcs_dir}"
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_RUN_FCST

@@ -58,12 +58,13 @@ the specified cycle.
 #
 #-----------------------------------------------------------------------
 #
-# Create the INPUT and RESTART directories under the cycle directory.
+# Create the INPUT and RESTART directories under the run directory.
 #
 #-----------------------------------------------------------------------
 #
-mkdir_vrfy -p ${CYCLE_DIR}/INPUT
-mkdir_vrfy -p ${CYCLE_DIR}/RESTART
+run_dir="${CYCLE_DIR}${SLASH_ENSMEM_SUBDIR}"
+mkdir_vrfy -p ${run_dir}/INPUT
+mkdir_vrfy -p ${run_dir}/RESTART
 #
 #-----------------------------------------------------------------------
 #
@@ -73,7 +74,9 @@ mkdir_vrfy -p ${CYCLE_DIR}/RESTART
 #-----------------------------------------------------------------------
 #
 $SCRIPTSDIR/exregional_run_fcst.sh \
-  CYCLE_DIR="${CYCLE_DIR}" || \
+  cycle_dir="${CYCLE_DIR}" \
+  ensmem_indx="${ENSMEM_INDX}" \
+  slash_ensmem_subdir="${SLASH_ENSMEM_SUBDIR}" || \
 print_err_msg_exit "\
 Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
 #

jobs/JREGIONAL_RUN_POST

@@ -57,13 +57,21 @@ on the output files corresponding to a specified forecast hour.
 #
 #-----------------------------------------------------------------------
 #
+# Set the run directory.
+#
+#-----------------------------------------------------------------------
+#
+run_dir="${CYCLE_DIR}${SLASH_ENSMEM_SUBDIR}"
+#
+#-----------------------------------------------------------------------
+#
 # If it doesn't already exist, create the directory (postprd_dir) in which 
 # to store post-processing output.  (Note that postprd_dir may already 
 # have been created by this post-processing script run for a different 
-# forecast hour.)  Also, create a temporary work directory (fhr_dir) for 
-# the current forecast hour being processed.  fhr_dir will be deleted 
-# later after the processing for the current forecast hour is complete.  
-# Then change location to fhr_dir.
+# forecast hour of the same cycle and/or ensemble member.)  Also, create 
+# a temporary work directory (fhr_dir) for the current forecast hour.  
+# fhr_dir will be deleted later after the processing for the current 
+# forecast hour is complete.  Then change location to fhr_dir.
 #
 # Note that there may be a preexisting version of fhr_dir from previous 
 # runs of this script for the current forecast hour (and current cycle), 
@@ -73,10 +81,10 @@ on the output files corresponding to a specified forecast hour.
 #-----------------------------------------------------------------------
 #
 if [ "${RUN_ENVIR}" = "nco" ]; then
-  COMOUT="${COMOUT_BASEDIR}/$RUN.$PDY/$cyc"
+  COMOUT="${COMOUT_BASEDIR}/$RUN.$PDY/$cyc${SLASH_ENSMEM_SUBDIR}"
   postprd_dir="$COMOUT"
 else
-  postprd_dir="${CYCLE_DIR}/postprd"
+  postprd_dir="${run_dir}/postprd"
 fi
 mkdir_vrfy -p "${postprd_dir}"
 
@@ -118,7 +126,8 @@ fi
 #-----------------------------------------------------------------------
 #
 $SCRIPTSDIR/exregional_run_post.sh \
-  cycle_dir="${CYCLE_DIR}" \
+  cdate="${CDATE}" \
+  run_dir="${run_dir}" \
   postprd_dir="${postprd_dir}" \
   fhr_dir="${fhr_dir}" \
   fhr="${fhr}" || \

modulefiles/tasks/wcoss_cray/run_fcst.local

@@ -0,0 +1,2 @@
+module unload python/2.7.14
+module load python/3.6.3

modulefiles/tasks/wcoss_dell_p3/run_fcst.local

@@ -0,0 +1,2 @@
+module unload python/2.7.14
+module load python/3.6.3

scripts/exregional_make_grid.sh

@@ -19,6 +19,8 @@
 . $USHDIR/make_grid_mosaic_file.sh
 . $USHDIR/link_fix.sh
 . $USHDIR/set_FV3nml_sfc_climo_filenames.sh
+. $USHDIR/set_FV3nml_stoch_params.sh
+. $USHDIR/create_diag_table_files.sh
 #
 #-----------------------------------------------------------------------
 #
@@ -647,21 +649,46 @@ failed."
 #
 #-----------------------------------------------------------------------
 #
-# Call a function to set the values of those variables in the forecast
-# model's namelist file that specify the paths to the surface climatology 
-# files.  These files will either already be avaialable in a user-specified 
-# directory (SFC_CLIMO_DIR) or will be generated by the MAKE_SFC_CLIMO_TN 
-# task.  They (or symlinks to them) will be placed (or wll already exist)
-# in the FIXsar directory.
+# Call a function (set_FV3nml_sfc_climo_filenames) to set the values of 
+# those variables in the forecast model's namelist file that specify the 
+# paths to the surface climatology files.  These files will either already 
+# be avaialable in a user-specified directory (SFC_CLIMO_DIR) or will be
+# generated by the MAKE_SFC_CLIMO_TN task.  They (or symlinks to them) 
+# will be placed (or wll already exist) in the FIXsar directory.
 #
-# Note this action has to be performed here (instead of earlier during 
-# experiment generation) because the surface climatology file names depend 
-# on the grid resolution variable CRES, and that may not be available 
-# until the above steps in this script have been performed.
+# Also, if running ensemble forecasts, call a function (set_FV3nml_stoch_params) 
+# to create a new FV3 namelist file for each ensemble member that contains 
+# a unique set of stochastic parameters (i.e. relative to the namelist 
+# files of the other members).
+#
+# Note that unless RUN_TASK_MAKE_GRID is set to "FALSE", the call to 
+# set_FV3nml_sfc_climo_filenames has to be performed here instead of 
+# earlier during experiment generation because the surface climatology 
+# file names depend on the grid resolution variable CRES, and that may 
+# not be available until the above steps in this script have been performed.
+#
+# Similarly, unless RUN_TASK_MAKE_GRID is set to "FALSE", the call to 
+# set_FV3nml_stoch_params must be performed here because it uses the 
+# namelist file generated by the call to set_FV3nml_sfc_climo_filenames
+# as a starting point (base) and modifies it to add the stochastic 
+# parameters.  Thus, the changes made by set_FV3nml_sfc_climo_filenames
+# must already be in the base namelist file.
 #
 #-----------------------------------------------------------------------
 #
-set_FV3nml_sfc_climo_filenames
+set_FV3nml_sfc_climo_filenames || print_err_msg_exit "\
+Call to function to set surface climatology file names in the FV3 namelist
+file failed."
+
+if [ "${DO_ENSEMBLE}" = TRUE ]; then
+  set_FV3nml_stoch_params || print_err_msg_exit "\
+Call to function to set stochastic parameters in the FV3 namelist files
+for the various ensemble members failed."
+fi
+
+create_diag_table_files || print_err_msg_exit "\
+Call to function to create a diagnostics table file under each cycle 
+directory failed."
 #
 #-----------------------------------------------------------------------
 #