[production/AQM.v7] Add ecFlow option to production branch for AQM

.gitignore

@@ -1,11 +1,11 @@
 bin/
+ecf/
 exec/
 build/
 fix/
 include/
 lib/
 share/
-modulefiles/extrn_comp_build/
 sorc/*/
 tests/WE2E/WE2E_tests_*.yaml
 tests/WE2E/*.txt

jobs/JAQM_MANAGER

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+#
+#-----------------------------------------------------------------------
+#
+# This script copies files from various directories into the experiment
+# directory, creates links to some of them, and modifies others (e.g.
+# templates) to customize them for the current experiment setup.
+#
+#-----------------------------------------------------------------------
+#
+
+#
+#-----------------------------------------------------------------------
+#
+# Source the variable definitions file and the bash utility functions.
+#
+#-----------------------------------------------------------------------
+#
+. $USHdir/source_util_funcs.sh
+. ${GLOBAL_VAR_DEFNS_FP}
+. $USHdir/job_preamble.sh
+#
+#-----------------------------------------------------------------------
+#
+# Save current shell options (in a global array).  Then set new options
+# for this script/function.
+#
+#-----------------------------------------------------------------------
+#
+{ save_shell_opts; . $USHdir/preamble.sh; } > /dev/null 2>&1
+#
+#-----------------------------------------------------------------------
+#
+# Get the full path to the file in which this script/function is located
+# (scrfunc_fp), the name of that file (scrfunc_fn), and the directory in
+# which the file is located (scrfunc_dir).
+#
+#-----------------------------------------------------------------------
+#
+scrfunc_fp=$( $READLINK -f "${BASH_SOURCE[0]}" )
+scrfunc_fn=$( basename "${scrfunc_fp}" )
+scrfunc_dir=$( dirname "${scrfunc_fp}" )
+#
+#-----------------------------------------------------------------------
+#
+# Print message indicating entry into script.
+#
+#-----------------------------------------------------------------------
+#
+print_info_msg "
+========================================================================
+Entering script:  \"${scrfunc_fn}\"
+In directory:     \"${scrfunc_dir}\"
+
+This is the J-job script for the task that runs a forecast with FV3 for
+the specified cycle.
+========================================================================"
+#
+export PS4='$SECONDS + '
+date
+
+##############################################
+# Set variables used in the script
+##############################################
+${HOMEaqm}/scripts/exaqm_manager.sh
+status=$?
+[[ $status -ne 0 ]] && exit $status
+
+##########################################
+# Remove the Temporary working directory
+##########################################
+cd $DATAROOT
+[[ $KEEPDATA = "FALSE" ]] && rm -rf $DATA
+
+date
+exit 0

jobs/JDATA_CLEANUP

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+#
+#-----------------------------------------------------------------------
+#
+# This script copies files from various directories into the experiment
+# directory, creates links to some of them, and modifies others (e.g.
+# templates) to customize them for the current experiment setup.
+#
+#-----------------------------------------------------------------------
+#
+
+#
+#-----------------------------------------------------------------------
+#
+# Source the variable definitions file and the bash utility functions.
+#
+#-----------------------------------------------------------------------
+#
+. $USHdir/source_util_funcs.sh
+. ${GLOBAL_VAR_DEFNS_FP}
+. $USHdir/job_preamble.sh
+#
+#-----------------------------------------------------------------------
+#
+# Save current shell options (in a global array).  Then set new options
+# for this script/function.
+#
+#-----------------------------------------------------------------------
+#
+{ save_shell_opts; . $USHdir/preamble.sh; } > /dev/null 2>&1
+#
+#-----------------------------------------------------------------------
+#
+# Get the full path to the file in which this script/function is located
+# (scrfunc_fp), the name of that file (scrfunc_fn), and the directory in
+# which the file is located (scrfunc_dir).
+#
+#-----------------------------------------------------------------------
+#
+scrfunc_fp=$( $READLINK -f "${BASH_SOURCE[0]}" )
+scrfunc_fn=$( basename "${scrfunc_fp}" )
+scrfunc_dir=$( dirname "${scrfunc_fp}" )
+#
+#-----------------------------------------------------------------------
+#
+# Print message indicating entry into script.
+#
+#-----------------------------------------------------------------------
+#
+print_info_msg "
+========================================================================
+Entering script:  \"${scrfunc_fn}\"
+In directory:     \"${scrfunc_dir}\"
+
+This is the J-job script for the task that runs a forecast with FV3 for
+the specified cycle.
+========================================================================"
+#
+export PS4='$SECONDS + '
+date
+
+##############################################
+# Set variables used in the script
+##############################################
+${HOMEaqm}/scripts/exdata_cleanup.sh
+status=$?
+[[ $status -ne 0 ]] && exit $status
+
+##########################################
+# Remove the Temporary working directory
+##########################################
+cd $DATAROOT
+[[ $KEEPDATA = "FALSE" ]] && rm -rf $DATA
+
+date
+exit 0

jobs/JREGIONAL_RUN_POST

@@ -141,7 +141,9 @@ if [ ${#FCST_LEN_CYCL[@]} -gt 1 ]; then
   cyc_mod=$(( ${cyc} - ${DATE_FIRST_CYCL:8:2} ))
   CYCLE_IDX=$(( ${cyc_mod} / ${INCR_CYCL_FREQ} ))
   FCST_LEN_HRS=${FCST_LEN_CYCL[$CYCLE_IDX]}
+fi
 
+if [ "${WORKFLOW_MANAGER}" = "rocoto" ]; then 
   fcst_len_hrs=$( printf "%03d" "${FCST_LEN_HRS}" ) 
   if [ "${fhr}" = "${fcst_len_hrs}" ]; then
     touch "${COMIN}/post_${PDY}${cyc}_task_complete.txt"

modulefiles/tasks/wcoss2/aqm_manager.local.lua

@@ -0,0 +1 @@
+load("python_regional_workflow")

modulefiles/tasks/wcoss2/data_cleanup.local.lua

@@ -0,0 +1 @@
+load("python_regional_workflow")

modulefiles/tasks/wcoss2/python_regional_workflow.lua

@@ -1,3 +1,5 @@
+load(pathJoin("PrgEnv-intel", os.getenv("PrgEnv_intel_ver")))
+load(pathJoin("craype", os.getenv("craype_ver")))
 load(pathJoin("intel", os.getenv("intel_ver")))
 load(pathJoin("python", os.getenv("python_ver")))
 load(pathJoin("prod_util", os.getenv("prod_util_ver")))

parm/FV3LAM_wflow.xml

@@ -108,24 +108,24 @@ Directories and files.
 
 {%- if run_envir == "nco"  %}
 {%- if do_ensemble %}
-<!ENTITY DYN_DIR  "{{ dataroot }}/run_fcst_{{ ensmem_indx_name }}#{{ ensmem_indx_name }}#.{{ workflow_id }}_<cyclestr>@Y@m@d@H</cyclestr>/dyn">
-<!ENTITY PHY_DIR  "{{ dataroot }}/run_fcst_{{ ensmem_indx_name }}#{{ ensmem_indx_name }}#.{{ workflow_id }}_<cyclestr>@Y@m@d@H</cyclestr>/phy">
+<!ENTITY DYN_DIR  "{{ dataroot_dfv }}/run_fcst_{{ ensmem_indx_name }}#{{ ensmem_indx_name }}#.{{ workflow_id }}_<cyclestr>@Y@m@d@H</cyclestr>/dyn">
+<!ENTITY PHY_DIR  "{{ dataroot_dfv }}/run_fcst_{{ ensmem_indx_name }}#{{ ensmem_indx_name }}#.{{ workflow_id }}_<cyclestr>@Y@m@d@H</cyclestr>/phy">
 {%- else %}
-<!ENTITY DYN_DIR  "{{ dataroot }}/run_fcst.{{ workflow_id }}_<cyclestr>@Y@m@d@H</cyclestr>/dyn">
-<!ENTITY PHY_DIR  "{{ dataroot }}/run_fcst.{{ workflow_id }}_<cyclestr>@Y@m@d@H</cyclestr>/phy">
+<!ENTITY DYN_DIR  "{{ dataroot_dfv }}/run_fcst.{{ workflow_id }}_<cyclestr>@Y@m@d@H</cyclestr>/dyn">
+<!ENTITY PHY_DIR  "{{ dataroot_dfv }}/run_fcst.{{ workflow_id }}_<cyclestr>@Y@m@d@H</cyclestr>/phy">
 {%- endif %}
-<!ENTITY COMIN_DIR "{{ comin_basedir }}/{{ run }}.@Y@m@d/@H">
+<!ENTITY COMIN_DIR "{{ comin_basedir }}/{{ run_dfv }}.@Y@m@d/@H">
 {%- else %}
 <!ENTITY DYN_DIR  "{{ comout_basedir }}/<cyclestr>@Y@m@d@H</cyclestr>{{ slash_ensmem_subdir }}/dyn">
 <!ENTITY PHY_DIR  "{{ comout_basedir }}/<cyclestr>@Y@m@d@H</cyclestr>{{ slash_ensmem_subdir }}/phy">
 <!ENTITY COMIN_DIR "{{ comin_basedir }}/@Y@m@d@H{{ slash_ensmem_subdir }}">
 {%- endif %}
 
 {%- if run_envir == "nco"  %}
-<!ENTITY LOGDIR                   "{{ logbasedir }}/<cyclestr>@Y@m@d</cyclestr>">
+<!ENTITY LOGDIR                   "{{ logbasedir_dfv }}/<cyclestr>@Y@m@d</cyclestr>">
 <!ENTITY LOGEXT                   ".{{ workflow_id }}.log" >
 {%- else %}
-<!ENTITY LOGDIR                   "{{ logbasedir }}">
+<!ENTITY LOGDIR                   "{{ logbasedir_dfv }}">
 <!ENTITY LOGEXT                   ".log" >
 {%- endif %}
 <!ENTITY CMPEXT                   "_task_complete.txt">