From 8a73f0b71c1da1e872f118a2ba16b8edd0e98123 Mon Sep 17 00:00:00 2001
From: benjamin blake <benjamin.blake@clogin09.cactus.wcoss2.ncep.noaa.gov>
Date: Mon, 28 Oct 2024 15:56:03 +0000
Subject: [PATCH] Update make_ics to use umbrella data and make_lbcs to use
 COMOUT instead of nwges

---
 jobs/JRRFS_BLEND_ICS                          | 17 +++----
 jobs/JRRFS_FSM                                |  3 +-
 jobs/JRRFS_MAKE_ICS                           | 21 ++++-----
 jobs/JRRFS_MAKE_LBCS                          | 32 +++++++------
 parm/FV3LAM_wflow.xml                         | 28 +++++++-----
 parm/FV3LAM_wflow_firewx.xml                  |  3 ++
 parm/FV3LAM_wflow_nonDA.xml                   |  3 ++
 scripts/exrrfs_blend_ics.sh                   | 21 +++------
 scripts/exrrfs_forecast.sh                    | 10 ++---
 scripts/exrrfs_make_ics.sh                    | 36 +++++----------
 scripts/exrrfs_make_lbcs.sh                   | 17 ++++---
 scripts/exrrfs_prep_cyc.sh                    | 45 ++++++++++---------
 ush/config_defaults.sh                        |  6 ++-
 ush/generate_FV3LAM_wflow.sh                  |  1 +
 .../RRFS_A/config.sh_rrfs_a_enkf_n3           |  2 +
 .../RRFS_A/config.sh_rrfs_a_firewx            |  1 +
 ush/sample_configs/RRFS_A/config.sh_rrfs_a_n3 |  3 +-
 17 files changed, 126 insertions(+), 123 deletions(-)

diff --git a/jobs/JRRFS_BLEND_ICS b/jobs/JRRFS_BLEND_ICS
index 4025ec638..e0f962c5c 100755
--- a/jobs/JRRFS_BLEND_ICS
+++ b/jobs/JRRFS_BLEND_ICS
@@ -59,25 +59,21 @@ on the RRFS initial conditions.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
+export outid=${outid:-"LL$job"}
+export jobid=${jobid:-taskid}
 
 export mem_num=m$(echo "${ENSMEM_INDX}")
-export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/ics"
+export umbrella_data="${DATAROOT}/${RUN}_${PDY}${cyc}/${WGF}/${mem_num}/ics"
 
 export DATA=${DATAROOT}/${jobid}
-mkdir -p $DATA
-
-mkdir -p ${DATA}/tmp_ICS
-cd ${DATA}/tmp_ICS
-
-mkdir -p "${NWGES_DIR}"
+mkdir -p $DATA $umbrella_data
+cd ${DATA}
 
 #-----------------------------------------------------------------------
 # Execute the script.
 #-----------------------------------------------------------------------
 
-export pgmout="${DATA}/tmp_ICS/OUTPUT.$$"
+export pgmout="${DATA}/OUTPUT.$$"
 env
 
 $HOMErrfs/scripts/exrrfs_blend_ics.sh
@@ -88,6 +84,7 @@ if [ -e "$pgmout" ]; then
 fi
 
 if [ "${KEEPDATA}" = "NO" ]; then
+  cd ${DATAROOT}
   rm -rf ${DATA}
 fi
 
diff --git a/jobs/JRRFS_FSM b/jobs/JRRFS_FSM
index b6ef06d44..39aa12e17 100755
--- a/jobs/JRRFS_FSM
+++ b/jobs/JRRFS_FSM
@@ -13,7 +13,8 @@ export EXECrrfs=${EXECrrfs:-${HOMErrfs}/exec}
 export FIXrrfs=${FIXrrfs:-${HOMErrfs}/fix}
 
 export DATAROOT="${DATAROOT:-${DATAROOT_dfv}}"
-export DATA=${DATA:-${DATAROOT}/${jobid}}
+export umbrella_data=${DATAROOT}/${RUN}_${PDY}${cyc}
+export DATA=${DATA:-${umbrella_data}/${jobid}}
 
 mkdir -p ${DATA}
 cd ${DATA}
diff --git a/jobs/JRRFS_MAKE_ICS b/jobs/JRRFS_MAKE_ICS
index 98eb83395..f0c2564d6 100755
--- a/jobs/JRRFS_MAKE_ICS
+++ b/jobs/JRRFS_MAKE_ICS
@@ -134,33 +134,29 @@ extrn_mdl_fns_on_disk_str="( "$( printf "\"%s\" " "${fns_on_disk[@]}" )")"
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
+export outid=${outid:-"LL$job"}
+export jobid=${jobid:-taskid}
 
 export mem_num=m$(echo "${ENSMEM_INDX}")
 if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
-  export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/ics"
+  export umbrella_data="${DATAROOT}/${RUN}_${PDY}${cyc}/${WGF}/${mem_num}/ics"
 else
-  export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/ics"
+  export umbrella_data="${DATAROOT}/${RUN}_${PDY}${cyc}/${WGF}/ics"
 fi
 
 export DATA=${DATAROOT}/${jobid}
-mkdir -p $DATA
-
-mkdir -p ${DATA}/tmp_ICS
-cd ${DATA}/tmp_ICS
-
-mkdir -p "${NWGES_DIR}"
+mkdir -p $DATA $umbrella_data
+cd ${DATA}
 
 export use_user_staged_extrn_files="${USE_USER_STAGED_EXTRN_FILES}"
 export extrn_mdl_source_dir="${extrn_mdl_sysdir}"
-export extrn_mdl_staging_dir="${DATA}/tmp_ICS"
+export extrn_mdl_staging_dir="${DATA}"
 
 #-----------------------------------------------------------------------
 # Execute the script.
 #-----------------------------------------------------------------------
 
-export pgmout="${DATA}/tmp_ICS/OUTPUT.$$"
+export pgmout="${DATA}/OUTPUT.$$"
 env
 
 ${HOMErrfs}/scripts/exrrfs_make_ics.sh \
@@ -172,6 +168,7 @@ if [ -e "$pgmout" ]; then
 fi
 
 if [ "${KEEPDATA}" = "NO" ]; then
+  cd ${DATAROOT}
   rm -rf ${DATA}
 fi
 
diff --git a/jobs/JRRFS_MAKE_LBCS b/jobs/JRRFS_MAKE_LBCS
index 7c5c78e8b..4b1823390 100755
--- a/jobs/JRRFS_MAKE_LBCS
+++ b/jobs/JRRFS_MAKE_LBCS
@@ -173,32 +173,37 @@ extrn_mdl_fns_on_disk_str2="( "$( printf "\"%s\" " "${fns_on_disk2[@]}" )")"
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
+export outid=${outid:-"LL$job"}
+export jobid=${jobid:-taskid}
 
 export mem_num=m$(echo "${ENSMEM_INDX}")
-if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
-  export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/lbcs"
-else
-  export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/lbcs"
-fi
 
 export DATA=${DATAROOT}/${jobid}
 mkdir -p $DATA
+cd ${DATA}
 
-mkdir -p ${DATA}/tmp_LBCS_${bcgrp}
-cd ${DATA}/tmp_LBCS_${bcgrp}
+export use_user_staged_extrn_files="${USE_USER_STAGED_EXTRN_FILES}"
+export extrn_mdl_staging_dir="${DATA}"
 
-mkdir -p "${NWGES_DIR}"
+#-----------------------------------------------------------------------
+# Define COM directories
+#-----------------------------------------------------------------------
+# Send data to COMOUT since the LBCs jobs share data with other jobs
+# outside of the current cycle
 
-export use_user_staged_extrn_files="${USE_USER_STAGED_EXTRN_FILES}"
-export extrn_mdl_staging_dir="${DATA}/tmp_LBCS_${bcgrp}"
+if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+  export COMOUT="${COMOUT:-$(compath.py -o ${NET}/${rrfs_ver}/${RUN}.${PDY}/${cyc}/${mem_num}/lbcs)}"
+else
+  export COMOUT="${COMOUT:-$(compath.py -o ${NET}/${rrfs_ver}/${RUN}.${PDY}/${cyc}/lbcs)}"
+fi
+
+mkdir -p "${COMOUT}"
 
 #-----------------------------------------------------------------------
 # Execute the script.
 #-----------------------------------------------------------------------
 
-export pgmout="${DATA}/tmp_LBCS_${bcgrp}/OUTPUT.$$"
+export pgmout="${DATA}/OUTPUT.$$"
 env
 
 ${HOMErrfs}/scripts/exrrfs_make_lbcs.sh \
@@ -212,6 +217,7 @@ if [ -e "$pgmout" ]; then
 fi
 
 if [ "${KEEPDATA}" = "NO" ]; then
+  cd ${DATAROOT}
   rm -rf ${DATA}
 fi
 
diff --git a/parm/FV3LAM_wflow.xml b/parm/FV3LAM_wflow.xml
index 06537fefc..7ac1515e1 100644
--- a/parm/FV3LAM_wflow.xml
+++ b/parm/FV3LAM_wflow.xml
@@ -42,7 +42,6 @@ Workflow task names.
 <!ENTITY ANALYSIS_GSI_TN         "{{ analysis_gsi }}">
 <!ENTITY ANALYSIS_GSIDIAG_TN     "{{ analysis_gsidiag }}">
 <!ENTITY UPDATE_LBC_SOIL_TN      "{{ update_lbc_soil }}">
-<!ENTITY OBSERVER_GSI_ENSMEAN_TN "{{ observer_gsi_ensmean }}">
 <!ENTITY OBSERVER_GSI_TN         "{{ observer_gsi }}">
 <!ENTITY PREP_CYC_SPINUP_TN      "{{ prep_cyc_spinup }}">
 <!ENTITY PREP_CYC_PROD_TN        "{{ prep_cyc_prod }}">
@@ -68,6 +67,7 @@ Workflow task names.
 <!ENTITY RUN   "{{ run }}">
 <!ENTITY RUNE  "enk{{ run }}">
 <!ENTITY envir "{{ envir }}">
+<!ENTITY WGF "{{ wgf }}">
 
 <!--
 Flags that determine whether to run the specific tasks.
@@ -855,6 +855,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
     <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
     <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
+    <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
     <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
     <envar><name>EXTRN_MDL_NAME</name><value>{{ extrn_mdl_name_lbcs }}</value></envar>
     <envar><name>BOUNDARY_LEN</name><value>{{ boundary_len_hrs }}</value></envar>
@@ -1176,6 +1177,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>HH</name><value><cyclestr>@H</cyclestr></value></envar>
     <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
     <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
+    <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
     <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
     <envar><name>CYCLE_TYPE</name><value><cyclestr>spinup</cyclestr></value></envar>
     <envar><name>CYCLE_SUBTYPE</name><value><cyclestr>ensinit</cyclestr></value></envar>
@@ -1376,7 +1378,7 @@ MODULES_RUN_TASK_FP script.
 ************************************************************************
 ************************************************************************
 -->
-  <task name="&OBSERVER_GSI_ENSMEAN_TN;_spinup" cycledefs="spinupcyc" maxtries="{{ maxtries_analysis_gsi }}">
+  <task name="&OBSERVER_GSI_TN;_spinup_ensmean" cycledefs="spinupcyc" maxtries="{{ maxtries_analysis_gsi }}">
 
     &RSRV_ANALYSIS;
     &WALL_LIMIT_ANALYSIS;
@@ -1386,11 +1388,11 @@ MODULES_RUN_TASK_FP script.
     &NATIVE_ANALYSIS_GSI;
     <walltime>&WALLTIME_ANALYSIS_GSI;</walltime>
     &NODESIZE_ALL;
-    <jobname>&TAG;_&OBSERVER_GSI_ENSMEAN_TN;_spinup</jobname>
-    <join><cyclestr>&LOGDIR;/&OBSERVER_GSI_ENSMEAN_TN;_spinup_&TAG;_@Y@m@d@H.log</cyclestr></join>
+    <jobname>&TAG;_&OBSERVER_GSI_TN;_spinup_ensmean</jobname>
+    <join><cyclestr>&LOGDIR;/&OBSERVER_GSI_TN;_spinup_ensmean_&TAG;_@Y@m@d@H.log</cyclestr></join>
 
     <envar><name>GLOBAL_VAR_DEFNS_FP</name><value>&GLOBAL_VAR_DEFNS_FP;</value></envar>
-    <envar><name>taskid</name><value><cyclestr>&RUN;_&OBSERVER_GSI_ENSMEAN_TN;_spinup_&envir;_@H</cyclestr></value></envar>
+    <envar><name>taskid</name><value><cyclestr>&RUN;_&OBSERVER_GSI_TN;_spinup_ensmean_&envir;_@H</cyclestr></value></envar>
     <envar><name>PDY</name><value><cyclestr>@Y@m@d</cyclestr></value></envar>
     <envar><name>CDATE</name><value><cyclestr>@Y@m@d@H</cyclestr></value></envar>
     <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
@@ -1452,6 +1454,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
     <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
     <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
+    <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
     <envar><name>GSI_TYPE</name><value><cyclestr>OBSERVER</cyclestr></value></envar>
     <envar><name>MEM_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
     <envar><name>CYCLE_TYPE</name><value><cyclestr>spinup</cyclestr></value></envar>
@@ -1461,7 +1464,7 @@ MODULES_RUN_TASK_FP script.
 
     <dependency>
        <and>
-         <taskdep task="&OBSERVER_GSI_ENSMEAN_TN;_spinup"/>
+         <taskdep task="&OBSERVER_GSI_TN;_spinup_ensmean"/>
        </and>
     </dependency>
 
@@ -1957,6 +1960,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
     <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
     <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
+    <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
     <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
     <envar><name>CYCLE_TYPE</name><value><cyclestr>spinup</cyclestr></value></envar>
     <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
@@ -2356,7 +2360,7 @@ MODULES_RUN_TASK_FP script.
 ************************************************************************
 ************************************************************************
 -->
-  <task name="&OBSERVER_GSI_ENSMEAN_TN;" cycledefs="prodcyc,prodcyc_long" maxtries="{{ maxtries_analysis_gsi }}">
+  <task name="&OBSERVER_GSI_TN;_ensmean" cycledefs="prodcyc,prodcyc_long" maxtries="{{ maxtries_analysis_gsi }}">
 
     &RSRV_ANALYSIS;
     &WALL_LIMIT_ANALYSIS;
@@ -2366,11 +2370,11 @@ MODULES_RUN_TASK_FP script.
     &NATIVE_ANALYSIS_GSI;
     <walltime>&WALLTIME_ANALYSIS_GSI;</walltime>
     &NODESIZE_ALL;
-    <jobname>&TAG;_&OBSERVER_GSI_ENSMEAN_TN;</jobname>
-    <join><cyclestr>&LOGDIR;/&OBSERVER_GSI_ENSMEAN_TN;_&TAG;_@Y@m@d@H.log</cyclestr></join>
+    <jobname>&TAG;_&OBSERVER_GSI_TN;_ensmean</jobname>
+    <join><cyclestr>&LOGDIR;/&OBSERVER_GSI_TN;_ensmean_&TAG;_@Y@m@d@H.log</cyclestr></join>
 
     <envar><name>GLOBAL_VAR_DEFNS_FP</name><value>&GLOBAL_VAR_DEFNS_FP;</value></envar>
-    <envar><name>taskid</name><value><cyclestr>&RUN;_&OBSERVER_GSI_ENSMEAN_TN;_&envir;_@H</cyclestr></value></envar>
+    <envar><name>taskid</name><value><cyclestr>&RUN;_&OBSERVER_GSI_TN;_ensmean_&envir;_@H</cyclestr></value></envar>
     <envar><name>PDY</name><value><cyclestr>@Y@m@d</cyclestr></value></envar>
     <envar><name>CDATE</name><value><cyclestr>@Y@m@d@H</cyclestr></value></envar>
     <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
@@ -2443,7 +2447,7 @@ MODULES_RUN_TASK_FP script.
 
     <dependency>
        <and>
-         <taskdep task="&OBSERVER_GSI_ENSMEAN_TN;"/>
+         <taskdep task="&OBSERVER_GSI_TN;_ensmean"/>
        </and>
     </dependency>
 
@@ -3030,6 +3034,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
     <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
     <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
+    <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
     <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
     <envar><name>CYCLE_TYPE</name><value><cyclestr>prod</cyclestr></value></envar>
     <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
@@ -3110,6 +3115,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
     <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
     <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
+    <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
     <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
     <envar><name>CYCLE_TYPE</name><value><cyclestr>prod</cyclestr></value></envar>
     <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
diff --git a/parm/FV3LAM_wflow_firewx.xml b/parm/FV3LAM_wflow_firewx.xml
index 1b9fa401d..3ef860b12 100644
--- a/parm/FV3LAM_wflow_firewx.xml
+++ b/parm/FV3LAM_wflow_firewx.xml
@@ -38,6 +38,7 @@ Workflow task names.
 <!ENTITY NET                  "{{ net }}">
 <!ENTITY RUN                  "{{ run }}">
 <!ENTITY envir                "{{ envir }}">
+<!ENTITY WGF                  "{{ wgf }}">
 
 <!--
 Flags that specify whether to run the preprocessing tasks.
@@ -336,6 +337,7 @@ MODULES_RUN_TASK_FP script.
       <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
       <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
       <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
+      <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
       <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
       <envar><name>EXTRN_MDL_NAME</name><value>{{ extrn_mdl_name_lbcs }}</value></envar>
       <envar><name>BOUNDARY_LEN</name><value>{{ boundary_len_hrs }}</value></envar>
@@ -381,6 +383,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
     <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
     <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
+    <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
     <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
     <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
     <envar><name>RESTART_HRS</name><value><cyclestr>0</cyclestr></value></envar>
diff --git a/parm/FV3LAM_wflow_nonDA.xml b/parm/FV3LAM_wflow_nonDA.xml
index 71437191d..8aadb11b2 100644
--- a/parm/FV3LAM_wflow_nonDA.xml
+++ b/parm/FV3LAM_wflow_nonDA.xml
@@ -38,6 +38,7 @@ Workflow task names.
 <!ENTITY NET                  "{{ net }}">
 <!ENTITY RUN                  "{{ run }}">
 <!ENTITY envir                "{{ envir }}">
+<!ENTITY WGF                  "{{ wgf }}">
 
 <!--
 Flags that specify whether to run the preprocessing tasks.
@@ -346,6 +347,7 @@ MODULES_RUN_TASK_FP script.
       <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
       <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
       <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
+      <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
       <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
       <envar><name>EXTRN_MDL_NAME</name><value>{{ extrn_mdl_name_lbcs }}</value></envar>
       <envar><name>BOUNDARY_LEN</name><value>{{ boundary_len_hrs }}</value></envar>
@@ -397,6 +399,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
     <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
     <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
+    <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
     <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
     <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
     <envar><name>RESTART_HRS</name><value><cyclestr>0</cyclestr></value></envar>
diff --git a/scripts/exrrfs_blend_ics.sh b/scripts/exrrfs_blend_ics.sh
index 9e64c7761..33275f70f 100755
--- a/scripts/exrrfs_blend_ics.sh
+++ b/scripts/exrrfs_blend_ics.sh
@@ -53,7 +53,7 @@ on the RRFS initial conditions.
 #
 #-----------------------------------------------------------------------
 #
-extrn_mdl_staging_dir="${DATA}/tmp_ICS"
+extrn_mdl_staging_dir="${umbrella_data}"
 extrn_mdl_var_defns_fp="${extrn_mdl_staging_dir}/${EXTRN_MDL_ICS_VAR_DEFNS_FN}"
 . ${extrn_mdl_var_defns_fp}
 #
@@ -179,7 +179,6 @@ if [[ $DO_ENS_BLENDING == "TRUE" ]]; then
      # Required NETCDF files - RRFS
      cpreq -p ${GESROOT}/${RUN}.${yyyymmdd_m1}/${hh_m1}/${mem_num}/forecast/RESTART/${yyyymmdd}.${hh}0000.fv_core.res.tile1.nc ./fv_core.res.tile1.nc
      cpreq -p ${GESROOT}/${RUN}.${yyyymmdd_m1}/${hh_m1}/${mem_num}/forecast/RESTART/${yyyymmdd}.${hh}0000.fv_tracer.res.tile1.nc ./fv_tracer.res.tile1.nc
-     #cpreq -p ${NWGES_BASEDIR}/${cdate_crnt_fhr_m1}${SLASH_ENSMEM_SUBDIR}/fcst_fv3lam/RESTART/${yyyymmdd}.${hh}0000.fv_core.res.nc ./fv_core.res.nc
 
      # Shortcut the file names/arguments.
      Lx=$ENS_BLENDING_LENGTHSCALE
@@ -218,26 +217,18 @@ fi
 #
 if [[ $DO_ENS_BLENDING = "FALSE" || ($DO_ENS_BLENDING = "TRUE" && -f $run_ensinit ) ]]; then
   mv out.atm.tile${TILE_RGNL}.nc \
-        ${DATA}/gfs_data.tile${TILE_RGNL}.halo${NH0}.nc
+        ${umbrella_data}/gfs_data.tile${TILE_RGNL}.halo${NH0}.nc
 
   mv out.sfc.tile${TILE_RGNL}.nc \
-        ${DATA}/sfc_data.tile${TILE_RGNL}.halo${NH0}.nc
+        ${umbrella_data}/sfc_data.tile${TILE_RGNL}.halo${NH0}.nc
 
-  mv gfs_ctrl.nc ${DATA}
+  mv gfs_ctrl.nc ${umbrella_data}
 
-  mv gfs.bndy.nc ${DATA}/gfs_bndy.tile${TILE_RGNL}.000.nc
+  mv gfs.bndy.nc ${umbrella_data}/gfs_bndy.tile${TILE_RGNL}.000.nc
 fi
-#
-#-----------------------------------------------------------------------
-#
-# copy results to nwges for longer time disk storage.
-#
-#-----------------------------------------------------------------------
-#
-cp ${DATA}/*.nc ${NWGES_DIR}/.
 
 if [ $DO_ENS_BLENDING = "TRUE" ] && [ -f $run_blending ] && [ ! -f $run_ensinit ]; then
-  cp ${DATA}/coupler.res ${NWGES_DIR}/.
+  cp ${DATA}/coupler.res ${umbrella_data}/.
 fi
 #
 #-----------------------------------------------------------------------
diff --git a/scripts/exrrfs_forecast.sh b/scripts/exrrfs_forecast.sh
index 476539c4b..7725a7170 100755
--- a/scripts/exrrfs_forecast.sh
+++ b/scripts/exrrfs_forecast.sh
@@ -278,7 +278,7 @@ n_iolayouty=$(($IO_LAYOUT_Y-1))
 list_iolayout=$(seq 0 $n_iolayouty)
 
 if [ "${DO_NON_DA_RUN}" = "TRUE" ]; then
-  target="${DATAROOT}/${RUN}_make_ics_${envir}_${cyc}/gfs_data.tile${TILE_RGNL}.halo${NH0}.nc"
+  target="${DATAROOT}/${RUN}_${PDY}${cyc}/${WGF}/ics/gfs_data.tile${TILE_RGNL}.halo${NH0}.nc"
 else
   if [ ${BKTYPE} -eq 1 ]; then
     target="gfs_data.tile${TILE_RGNL}.halo${NH0}.nc"
@@ -310,20 +310,20 @@ else
 fi
 
 if [ "${DO_NON_DA_RUN}" = "TRUE" ]; then
-  target="${DATAROOT}/${RUN}_make_ics_${envir}_${cyc}/sfc_data.tile${TILE_RGNL}.halo${NH0}.nc"
+  target="${DATAROOT}/${RUN}_${PDY}${cyc}/${WGF}/ics/sfc_data.tile${TILE_RGNL}.halo${NH0}.nc"
   symlink="sfc_data.nc"
   ln -sf ${relative_or_null} $target $symlink
 
-  target="${DATAROOT}/${RUN}_make_ics_${envir}_${cyc}/gfs_ctrl.nc"
+  target="${DATAROOT}/${RUN}_${PDY}${cyc}/${WGF}/ics/gfs_ctrl.nc"
   symlink="gfs_ctrl.nc"
   ln -sf ${relative_or_null} $target $symlink
 
-  target="${DATAROOT}/${RUN}_make_ics_${envir}_${cyc}/gfs_bndy.tile${TILE_RGNL}.000.nc"
+  target="${DATAROOT}/${RUN}_${PDY}${cyc}/${WGF}/ics/gfs_bndy.tile${TILE_RGNL}.000.nc"
   symlink="gfs_bndy.tile${TILE_RGNL}.000.nc"
   ln -sf ${relative_or_null} $target $symlink
 
   for fhr in $(seq -f "%03g" ${LBC_SPEC_INTVL_HRS} ${LBC_SPEC_INTVL_HRS} ${FCST_LEN_HRS}); do
-    target="${DATAROOT}/${RUN}_make_lbcs_${envir}_${cyc}/gfs_bndy.tile${TILE_RGNL}.${fhr}.nc"
+    target="$(compath.py -o ${NET}/${rrfs_ver}/${RUN}.${PDY}/${cyc})/lbcs/gfs_bndy.tile${TILE_RGNL}.${fhr}.nc"
     symlink="gfs_bndy.tile${TILE_RGNL}.${fhr}.nc"
     ln -sf ${relative_or_null} $target $symlink
   done
diff --git a/scripts/exrrfs_make_ics.sh b/scripts/exrrfs_make_ics.sh
index 9c63a0f16..421da1933 100755
--- a/scripts/exrrfs_make_ics.sh
+++ b/scripts/exrrfs_make_ics.sh
@@ -213,7 +213,7 @@ extrn_mdl_staging_dir = \"${extrn_mdl_staging_dir}\"
 extrn_mdl_source_dir = \"${extrn_mdl_source_dir}\"
 extrn_mdl_fns_on_disk = ${extrn_mdl_fns_on_disk_str}"
 
-ln -sf -t ${extrn_mdl_staging_dir} ${extrn_mdl_fps_on_disk[@]}
+cpreq -p ${extrn_mdl_fps_on_disk[@]} ${extrn_mdl_staging_dir}
 #
 #-----------------------------------------------------------------------
 #
@@ -576,7 +576,7 @@ settings="
 # Call the python script to create the namelist file.
 #
 nml_fn="fort.41"
-${USHrrfs}/set_namelist.py -q -u "$settings" -o ${nml_fn} || \
+${USHrrfs}/set_namelist.py -u "$settings" -o ${nml_fn} || \
   err_exit "\
 Call to python script set_namelist.py to set the variables in the namelist
 file read in by the ${exec_fn} executable failed.  Parameters passed to
@@ -602,6 +602,7 @@ if [ ${PREDEF_GRID_NAME} = "RRFS_FIREWX_1.5km" ]; then
 
   wgrib2 ${extrn_mdl_staging_dir}/${fn_grib2} -set_grib_type c3b -new_grid_winds grid \
     -new_grid ${gridspecs} ${extrn_mdl_staging_dir}/${fn_grib2_subset}
+  export err=$?; err_chk
   mv ${extrn_mdl_staging_dir}/${fn_grib2_subset} ${extrn_mdl_staging_dir}/${fn_grib2}
 fi
 #
@@ -727,32 +728,13 @@ fi
 #-----------------------------------------------------------------------
 #
 # Move initial condition, surface, control, and 0-th hour lateral bound-
-# ary files to ICs_BCs directory. Only do this if blending is off or on-
-# ly for the first DA cycle if blending is on inorder to coldstart the
-# system.
+# ary files to umbrella data directory.
 #-----------------------------------------------------------------------
 #
-if [[ $DO_ENS_BLENDING = "FALSE" ]]; then
-  mv out.atm.tile${TILE_RGNL}.nc \
-        ${DATA}/gfs_data.tile${TILE_RGNL}.halo${NH0}.nc
-
-  mv out.sfc.tile${TILE_RGNL}.nc \
-        ${DATA}/sfc_data.tile${TILE_RGNL}.halo${NH0}.nc
-
-  mv gfs_ctrl.nc ${DATA}
-
-  mv gfs.bndy.nc ${DATA}/gfs_bndy.tile${TILE_RGNL}.000.nc
-fi
-#
-#-----------------------------------------------------------------------
-#
-# copy results to nwges for longer time disk storage.
-#
-#-----------------------------------------------------------------------
-#
-if [ $DO_ENS_BLENDING = "FALSE" ]; then
-  cp ${DATA}/*.nc ${NWGES_DIR}/.
-fi
+mv out.atm.tile${TILE_RGNL}.nc ${umbrella_data}/gfs_data.tile${TILE_RGNL}.halo${NH0}.nc
+mv out.sfc.tile${TILE_RGNL}.nc ${umbrella_data}/sfc_data.tile${TILE_RGNL}.halo${NH0}.nc
+mv gfs_ctrl.nc ${umbrella_data}
+mv gfs.bndy.nc ${umbrella_data}/gfs_bndy.tile${TILE_RGNL}.000.nc
 #
 #-----------------------------------------------------------------------
 #
@@ -795,6 +777,8 @@ with the external model from which to generate ${ics_or_lbcs} returned with a
 nonzero status.  The full path to this variable definitions file is:
   extrn_mdl_var_defns_fp = \"${extrn_mdl_var_defns_fp}\""
 fi
+
+mv ${extrn_mdl_var_defns_fp} ${umbrella_data}
 #
 #-----------------------------------------------------------------------
 #
diff --git a/scripts/exrrfs_make_lbcs.sh b/scripts/exrrfs_make_lbcs.sh
index da532623f..56fb98438 100755
--- a/scripts/exrrfs_make_lbcs.sh
+++ b/scripts/exrrfs_make_lbcs.sh
@@ -597,7 +597,7 @@ list file has not specified for this external LBC model (EXTRN_MDL_NAME_LBCS):
 # Call the python script to create the namelist file.
 #
   nml_fn="fort.41"
-  ${USHrrfs}/set_namelist.py -q -u "$settings" -o ${nml_fn} || \
+  ${USHrrfs}/set_namelist.py -u "$settings" -o ${nml_fn} || \
     err_exit "\
 Call to python script set_namelist.py to set the variables in the namelist
 file read in by the ${exec_fn} executable failed.  Parameters passed to
@@ -623,9 +623,12 @@ $settings"
     fcst_hhh=$(( ${lbc_spec_fhrs} - ${EXTRN_MDL_LBCS_OFFSET_HRS} ))
     fcst_hhh_FV3LAM=`printf %3.3i $fcst_hhh`
     fn_grib2_subset=rrfs.t${hh}z.natlev.f${fcst_hhh_FV3LAM}.subset.grib2
-
+    if [ ! -s ${extrn_mdl_staging_dir}/${fn_grib2} ]; then
+      echo "FATAL ERROR: FIREWX LBCS file not found ${extrn_mdl_staging_dir}/${fn_grib2}"
+    fi
     wgrib2 ${extrn_mdl_staging_dir}/${fn_grib2} -set_grib_type c3b \
       -new_grid_winds grid -new_grid ${gridspecs} ${extrn_mdl_staging_dir}/${fn_grib2_subset}
+    export err=$?; err_chk
     mv ${extrn_mdl_staging_dir}/${fn_grib2_subset} ${extrn_mdl_staging_dir}/${fn_grib2}
   fi
 #
@@ -649,9 +652,13 @@ $settings"
   lbc_spec_fhrs=( "${EXTRN_MDL_LBC_SPEC_FHRS[$i]}" ) 
   fcst_hhh=$(( ${lbc_spec_fhrs} - ${EXTRN_MDL_LBCS_OFFSET_HRS} ))
   fcst_hhh_FV3LAM=`printf %3.3i $fcst_hhh`
-# copy results to nwges for longer time disk storage.
-  mv gfs.bndy.nc ${DATA}/gfs_bndy.tile7.${fcst_hhh_FV3LAM}.nc
-  cpreq ${DATA}/gfs_bndy.tile7.${fcst_hhh_FV3LAM}.nc ${NWGES_DIR}/gfs_bndy.tile7.${fcst_hhh_FV3LAM}.nc
+
+# Preserve the OUTPUT and errfile
+  mv ${pgmout} ${pgmout}_${fcst_hhh_FV3LAM}
+  mv errfile errfile_${fcst_hhh_FV3LAM}
+
+# move results to COMOUT for longer time disk storage.
+  mv gfs.bndy.nc ${COMOUT}/gfs_bndy.tile7.${fcst_hhh_FV3LAM}.nc
 
   fi
 done
diff --git a/scripts/exrrfs_prep_cyc.sh b/scripts/exrrfs_prep_cyc.sh
index 621362b64..67c580713 100755
--- a/scripts/exrrfs_prep_cyc.sh
+++ b/scripts/exrrfs_prep_cyc.sh
@@ -250,31 +250,32 @@ fi
 
 if [ ${BKTYPE} -eq 1 ] ; then  # cold start, use prepare cold strat initial files from ics
     if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
-      bkpath=${LBCS_ROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/ics
+      bkpath=${DATAROOT}/${RUN}_${PDY}${cyc}/${WGF}/${mem_num}/ics
     else
-      bkpath=${LBCS_ROOT}/${RUN}.${PDY}/${cyc}/ics
+      bkpath=${DATAROOT}/${RUN}_${PDY}${cyc}/${WGF}/ics
     fi
-    if [ -r "${bkpath}/gfs_data.tile7.halo0.nc" ]; then
-      cpreq -p ${bkpath}/gfs_bndy.tile7.000.nc gfs_bndy.tile7.000.nc        
-      cpreq -p ${bkpath}/gfs_ctrl.nc gfs_ctrl.nc        
-      cpreq -p ${bkpath}/gfs_data.tile7.halo0.nc gfs_data.tile7.halo0.nc        
-      cpreq -p ${bkpath}/sfc_data.tile7.halo0.nc sfc_data.tile7.halo0.nc        
-      ln -s ${bkpath}/gfs_bndy.tile7.000.nc bk_gfs_bndy.tile7.000.nc
-      ln -s ${bkpath}/gfs_data.tile7.halo0.nc bk_gfs_data.tile7.halo0.nc
-      ln -s ${bkpath}/sfc_data.tile7.halo0.nc bk_sfc_data.tile7.halo0.nc
-      print_info_msg "$VERBOSE" "cold start from $bkpath"
-      if [ "${SAVE_CYCLE_LOG}" = "TRUE" ] ; then
-        echo "${YYYYMMDDHH}(${CYCLE_TYPE}): cold start at ${current_time} from $bkpath " >> ${EXPTDIR}/log.cycles
-      fi
-    else
-      err_exit "Cannot find cold start initial condition from : ${bkpath}"
+    if [ ! -d ${bkpath} ]; then
+      echo "FATAL ERROR: cold start initial files from ics can not be found"
+      exit 9
+    fi
+    
+    cpreq -p ${bkpath}/gfs_bndy.tile7.000.nc gfs_bndy.tile7.000.nc        
+    cpreq -p ${bkpath}/gfs_ctrl.nc gfs_ctrl.nc        
+    cpreq -p ${bkpath}/gfs_data.tile7.halo0.nc gfs_data.tile7.halo0.nc        
+    cpreq -p ${bkpath}/sfc_data.tile7.halo0.nc sfc_data.tile7.halo0.nc        
+    ln -s ${bkpath}/gfs_bndy.tile7.000.nc bk_gfs_bndy.tile7.000.nc
+    ln -s ${bkpath}/gfs_data.tile7.halo0.nc bk_gfs_data.tile7.halo0.nc
+    ln -s ${bkpath}/sfc_data.tile7.halo0.nc bk_sfc_data.tile7.halo0.nc
+    print_info_msg "$VERBOSE" "cold start from $bkpath"
+    if [ "${SAVE_CYCLE_LOG}" = "TRUE" ] ; then
+      echo "${YYYYMMDDHH}(${CYCLE_TYPE}): cold start at ${current_time} from $bkpath " >> ${EXPTDIR}/log.cycles
     fi
 
 elif [[ $BKTYPE == 3 ]]; then
     if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
-      bkpath=${LBCS_ROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/ics
+      bkpath=${DATAROOT}/${RUN}_${PDY}${cyc}/${WGF}/${mem_num}/ics
     else
-      bkpath=${LBCS_ROOT}/${RUN}.${PDY}/${cyc}/ics
+      bkpath=${DATAROOT}/${RUN}_${PDY}${cyc}/${WGF}/ics
     fi
     if [ -r "${bkpath}/coupler.res" ]; then
       cpreq -p ${bkpath}/fv_core.res.nc fv_core.res.nc
@@ -988,9 +989,9 @@ else
   YYYYMMDDInterv=`echo ${YYYYMMDDHHmInterv} | cut -c1-8`
   HHInterv=`echo ${YYYYMMDDHHmInterv} | cut -c9-10`
   if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
-    lbcs_path=${LBCS_ROOT}/${RUN}.${YYYYMMDDInterv}/${HHInterv}/${mem_num}/lbcs
+    lbcs_path=${COMROOT}/${NET}/${rrfs_ver}/${RUN}.${YYYYMMDDInterv}/${HHInterv}/${mem_num}/lbcs
   else
-    lbcs_path=${LBCS_ROOT}/${RUN}.${YYYYMMDDInterv}/${HHInterv}/lbcs
+    lbcs_path=${COMROOT}/${NET}/${rrfs_ver}/${RUN}.${YYYYMMDDInterv}/${HHInterv}/lbcs
   fi
   while [[ $n -le ${end_search_hr} ]] ; do
     last_bdy_time=$(( n + ${FCST_LEN_HRS_thiscycle} ))
@@ -1005,9 +1006,9 @@ else
       YYYYMMDDInterv=`echo ${YYYYMMDDHHmInterv} | cut -c1-8`
       HHInterv=`echo ${YYYYMMDDHHmInterv} | cut -c9-10`
       if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
-        lbcs_path=${LBCS_ROOT}/${RUN}.${YYYYMMDDInterv}/${HHInterv}/${mem_num}/lbcs
+        lbcs_path=${COMROOT}/${NET}/${rrfs_ver}/${RUN}.${YYYYMMDDInterv}/${HHInterv}/${mem_num}/lbcs
       else
-        lbcs_path=${LBCS_ROOT}/${RUN}.${YYYYMMDDInterv}/${HHInterv}/lbcs
+        lbcs_path=${COMROOT}/${NET}/${rrfs_ver}/${RUN}.${YYYYMMDDInterv}/${HHInterv}/lbcs
       fi
     fi
   done
diff --git a/ush/config_defaults.sh b/ush/config_defaults.sh
index 7146ed0f2..dd9c73866 100644
--- a/ush/config_defaults.sh
+++ b/ush/config_defaults.sh
@@ -251,7 +251,7 @@ EXPT_SUBDIR=""
 #
 #   $STMP/tmpnwprd/$RUN/$cdate
 #
-# NET, envir, RUN:
+# NET, envir, RUN, WGF:
 # Variables used in forming the path to the directory that will contain
 # the output files from the post-processor (UPP) for a given cycle (see
 # definition of PTMP below).  These are defined in the WCOSS Implementation
@@ -267,6 +267,9 @@ EXPT_SUBDIR=""
 #   RUN:
 #   Name of model run (third level of com directory structure).
 #
+#   WGF:
+#   Working group function ("det", "enkf", "ensf", "firewx")
+#
 # PTMP:
 # The beginning portion of the directory that will contain the output 
 # files from the post-processor (UPP) for a given cycle.  For a cycle 
@@ -330,6 +333,7 @@ envir="para"
 RUN="experiment_name"
 RUN_ensctrl="experiment_name"
 TAG="dev_grid"
+WGF="det"
 PTMP="/base/path/of/directory/containing/postprocessed/output/files"
 ENSCTRL_PTMP="/base/path/of/directory/containing/postprocessed/output/files"
 GESROOT="/base/path/of/directory/containing/model/output/files"
diff --git a/ush/generate_FV3LAM_wflow.sh b/ush/generate_FV3LAM_wflow.sh
index 78fca563a..ee0ae3e6f 100755
--- a/ush/generate_FV3LAM_wflow.sh
+++ b/ush/generate_FV3LAM_wflow.sh
@@ -215,6 +215,7 @@ settings="\
   'net': ${NET}
   'run': ${RUN}
   'envir': ${envir}
+  'wgf': ${WGF}
 #
 # Number of nodes to use for each task.
 #
diff --git a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_n3 b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_n3
index 42e5466d3..09961d5a9 100644
--- a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_n3
+++ b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_n3
@@ -201,9 +201,11 @@ LNDPINT=180
 RUN_ensctrl="rrfs"
 RUN="enkfrrfs"
 TAG="n3enkf91"
+WGF="enkf"
 if [[ ${DO_ENSFCST} == "TRUE" ]] ; then
   RUN="refs"
   TAG="n3enfcst91"
+  WGF="ensf"
 fi
 
 . set_rrfs_config.sh
diff --git a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_firewx b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_firewx
index a7f9fe447..d7fc5c9c6 100644
--- a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_firewx
+++ b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_firewx
@@ -10,6 +10,7 @@ NET="rrfs"
 TAG="n3v91"
 MODEL="rrfs"
 RUN="rrfs"
+WGF="firewx"
 
 STMP="/lfs/f2/t2o/ptmp/emc/stmp/emc.lam/rrfsfw/${version}"
 PTMP="/lfs/h2/emc/ptmp/emc.lam/rrfs/${version}"
diff --git a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_n3 b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_n3
index 5a327f1b2..a0b1affd2 100644
--- a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_n3
+++ b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_n3
@@ -117,12 +117,11 @@ EXTRN_MDL_NAME_ICS="GFS"
 EXTRN_MDL_NAME_LBCS="GFS"
 
 envir="para"
-
 NET="rrfs_a"
 TAG="n3v91"
-
 MODEL="rrfs_a"
 RUN="rrfs"
+WGF="det"
 
 . set_rrfs_config.sh