diff --git a/jobs/JRRFS_ANALYSIS_ENKF b/jobs/JRRFS_ANALYSIS_ENKF
index cfcd3b40c..2c446d315 100755
--- a/jobs/JRRFS_ANALYSIS_ENKF
+++ b/jobs/JRRFS_ANALYSIS_ENKF
@@ -61,17 +61,21 @@ specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
 if [ "${CYCLE_TYPE}" = "spinup" ]; then
+  export jobid=${RUN}_enkfupdt_${OB_TYPE}_spinup_${envir}_${cyc}
   export COMOUT=${COMOUT:-$(compath.py -o ${NET}/${rrfs_ver}/${RUN}.${PDY}/${cyc}_spinup)}
 else
+  export jobid=${RUN}_enkfupdt_${OB_TYPE}_${envir}_${cyc}
   export COMOUT=${COMOUT:-$(compath.py -o ${NET}/${rrfs_ver}/${RUN}.${PDY}/${cyc})}
 fi
 
-export DATA=${DATAROOT}/${jobid}
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+fi
+
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 rm -fr ${DATA}
 mkdir -p ${DATA}
 cd ${DATA}
diff --git a/jobs/JRRFS_ANALYSIS_GSI b/jobs/JRRFS_ANALYSIS_GSI
index d90559cd7..5070d2e25 100755
--- a/jobs/JRRFS_ANALYSIS_GSI
+++ b/jobs/JRRFS_ANALYSIS_GSI
@@ -62,10 +62,11 @@ for the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
-export mem_num=m$(echo "${ENSMEM_INDX}")
+if [ ! "${MEM_TYPE}" = "MEAN" ] && [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+  export ENSMEM_INDX=${ENSMEM_INDX:-${MEMBER_NAME}}
+  export mem_num=m$(echo "${ENSMEM_INDX}")
+fi
 
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
 export observer_nwges_dir=""
@@ -80,15 +81,31 @@ if [[ ! -v OB_TYPE ]]; then
   OB_TYPE="conv"
 fi
 
-if [ "${MEM_TYPE}" = "MEAN" ]; then
-  observer_nwges_dir="${GESROOT}/${RUN}.${PDY}/${cyc}/ensmean/observer_${workname}"
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
 else
-# GSI_TYPE = OBSERVER is only for EnKF (ensemble forecasts do not have ANALYSIS tasks)
-  observer_nwges_dir="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/observer_${workname}"
+  if [ "${GSI_TYPE}" = "OBSERVER" ]; then
+    if [ "${MEM_TYPE}" = "MEAN" ]; then
+      export jobid=${RUN}_observer_${workname}_ensmean_${envir}_${cyc}
+    else
+      export jobid=${RUN}_observer_${workname}_${mem_num}_${envir}_${cyc}
+    fi
+  else	# For control member, GSI_TYPE is always ANALYSIS
+    export jobid=${RUN}_analysis_${OB_TYPE}_${workname}_${envir}_${cyc}
+  fi
+fi
+
+if [ "${GSI_TYPE}" = "OBSERVER" ]; then
+  if [ "${MEM_TYPE}" = "MEAN" ]; then
+    observer_nwges_dir="${GESROOT}/${RUN}.${PDY}/${cyc}/ensmean/observer_${workname}"
+  else
+  # GSI_TYPE = OBSERVER is only for EnKF (ensemble forecasts do not have ANALYSIS tasks)
+    observer_nwges_dir="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/observer_${workname}"
+  fi
+  mkdir -p ${observer_nwges_dir}
 fi
-mkdir -p ${observer_nwges_dir}
 
-export DATA=${DATAROOT}/${jobid}
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 rm -fr ${DATA}
 mkdir -p ${DATA}
 cd ${DATA}
@@ -117,7 +134,7 @@ export OB_TYPE=${OB_TYPE}
 #-----------------------------------------------------------------------
 
 if [ "${CYCLE_TYPE}" = "spinup" ]; then
-  if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+  if [ "${DO_ENSEMBLE}" = "TRUE" ] && [ ! "${MEM_TYPE}" = "MEAN" ]; then
     export COMOUT=${COMOUT:-$(compath.py -o ${NET}/${rrfs_ver}/${RUN}.${PDY}/${cyc}_spinup/${mem_num})}
   else
     export COMOUT=${COMOUT:-$(compath.py -o ${NET}/${rrfs_ver}/${RUN}.${PDY}/${cyc}_spinup)}
diff --git a/jobs/JRRFS_ANALYSIS_GSIDIAG b/jobs/JRRFS_ANALYSIS_GSIDIAG
index 8188fb3b4..dcf219232 100755
--- a/jobs/JRRFS_ANALYSIS_GSIDIAG
+++ b/jobs/JRRFS_ANALYSIS_GSIDIAG
@@ -61,12 +61,20 @@ the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
 
-export DATA="${DATAROOT}/${jobid}"
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+else
+  if [ "${CYCLE_TYPE}" = "spinup" ]; then
+    export jobid=${RUN}_analysis_conv_dbz_gsi_spinup_${envir}_${cyc}
+  else
+    export jobid=${RUN}_analysis_conv_dbz_gsi_${envir}_${cyc}
+  fi
+fi
+
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 if [ ! -d "${DATA}" ]; then
   echo "WARNING: ${DATA} does not exist" 
 fi
diff --git a/jobs/JRRFS_ANALYSIS_NONVARCLD b/jobs/JRRFS_ANALYSIS_NONVARCLD
index 49c00f3fd..e10999d55 100755
--- a/jobs/JRRFS_ANALYSIS_NONVARCLD
+++ b/jobs/JRRFS_ANALYSIS_NONVARCLD
@@ -61,12 +61,30 @@ analysis with RRFS for the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
-export mem_num=m$(echo "${ENSMEM_INDX}")
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+else
+  if [ "${CYCLE_TYPE}" = "spinup" ]; then
+    export workname="nonvar_cldanl_spinup"
+  else
+    export workname="nonvar_cldanl"
+  fi
+  if [ ${MEM_TYPE} = "MEAN" ]; then
+    export jobid=${RUN}_${workname}_ensmean_${envir}_${cyc}
+  else
+    if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+      export ENSMEM_INDX=${ENSMEM_INDX:-${MEMBER_NAME}}
+      export mem_num=m$(echo "${ENSMEM_INDX}")
+      export jobid=${RUN}_${workname}_${mem_num}_${envir}_${cyc}
+    else
+      export jobid=${RUN}_${workname}_${envir}_${cyc}
+    fi
+  fi
+fi
+export mem_num=${mem_num:-}
 
-export DATA=${DATAROOT}/${jobid}
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 rm -fr ${DATA}
 mkdir -p ${DATA}
 cd ${DATA}
diff --git a/jobs/JRRFS_BLEND_ICS b/jobs/JRRFS_BLEND_ICS
index 4025ec638..25104206c 100755
--- a/jobs/JRRFS_BLEND_ICS
+++ b/jobs/JRRFS_BLEND_ICS
@@ -59,13 +59,18 @@ on the RRFS initial conditions.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
+export ENSMEM_INDX=${ENSMEM_INDX:-${MEMBER_NAME}}
 export mem_num=m$(echo "${ENSMEM_INDX}")
 export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/ics"
 
-export DATA=${DATAROOT}/${jobid}
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+else
+  export jobid=${RUN}_make_ics_${mem_num}_${envir}_${cyc}
+fi
+
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 mkdir -p $DATA
 
 mkdir -p ${DATA}/tmp_ICS
diff --git a/jobs/JRRFS_BUFRSND b/jobs/JRRFS_BUFRSND
index 3db1d3982..39c5bcd64 100755
--- a/jobs/JRRFS_BUFRSND
+++ b/jobs/JRRFS_BUFRSND
@@ -62,13 +62,14 @@ on the output files corresponding to a specified forecast hour.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
 export fhr=01
 export tmmark=tm00
 
-export mem_num=m$(echo "${ENSMEM_INDX}")
+if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+  export ENSMEM_INDX=${ENSMEM_INDX:-${MEMBER_NAME}}
+  export mem_num=m$(printf "%03d" "$((10#${ENSMEM_INDX}))")
+fi
 
 CYCLE_TYPE=${CYCLE_TYPE:-prod}
 if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
@@ -82,7 +83,17 @@ fi
 mkdir -p "${NWGES_DIR}/RESTART"
 mkdir -p "${NWGES_DIR}/INPUT"
 
-export DATA=${DATAROOT}/${jobid}
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+else
+  if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+    export jobid=${RUN}_bufrsnd_${mem_num}_${envir}_${cyc}
+  else
+    export jobid=${RUN}_bufrsnd_${envir}_${cyc}
+  fi
+fi
+
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 rm -rf ${DATA}
 mkdir -p ${DATA}
 cd ${DATA}
diff --git a/jobs/JRRFS_CALC_ENSMEAN b/jobs/JRRFS_CALC_ENSMEAN
index 1635f099e..5ff23c743 100755
--- a/jobs/JRRFS_CALC_ENSMEAN
+++ b/jobs/JRRFS_CALC_ENSMEAN
@@ -59,14 +59,20 @@ RRFS for the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
-
-#export mem_num=m$(echo "${ENSMEM_INDX}")
 
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
 
-export DATA=${DATAROOT}/${jobid}
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+else
+  if [ "${CYCLE_TYPE}" = "spinup" ]; then
+    export jobid=${RUN}_calc_ensmean_spinup_${envir}_${cyc}
+  else
+    export jobid=${RUN}_calc_ensmean_${envir}_${cyc}
+  fi
+fi
+
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 rm -fr ${DATA}
 mkdir -p ${DATA}
 cd ${DATA}
diff --git a/jobs/JRRFS_FORECAST b/jobs/JRRFS_FORECAST
index 7ac6e7740..eaea69fbf 100755
--- a/jobs/JRRFS_FORECAST
+++ b/jobs/JRRFS_FORECAST
@@ -64,15 +64,42 @@ the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
-export mem_num=m$(echo "${ENSMEM_INDX}")
+if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+  export ENSMEM_INDX=${ENSMEM_INDX:-${MEMBER_NAME}}
+  # export mem_num=m$(echo "${ENSMEM_INDX}")
+  export mem_num=m$(printf "%03d" "$((10#${ENSMEM_INDX}))")
+fi
 
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
 export CYCLE_SUBTYPE=${CYCLE_SUBTYPE:-empty}
 
-export DATA=${DATAROOT}/${jobid}
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+else
+  if [ ${CYCLE_TYPE} == "spinup" ]; then
+    if [ "${DO_ENSEMBLE}" = "TRUE" ]; then	# EnKF has spinup forecasts
+      export jobid=${RUN}_forecast_spinup_${mem_num}_${envir}_${cyc}
+      if  [ ${CYCLE_SUBTYPE} == "ensinit" ]; then
+        export jobid=${RUN}_forecast_ensinit_${mem_num}_${envir}_${cyc}
+      fi
+    else
+      export jobid=${RUN}_forecast_spinup_${envir}_${cyc}
+    fi
+  else
+    if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+      export jobid=${RUN}_forecast_${mem_num}_${envir}_${cyc}
+    else
+      if [ ${WGF} == "firewx" ]; then
+        export jobid=firewx_forecast_${envir}_${cyc}
+      else
+        export jobid=${RUN}_forecast_${envir}_${cyc}
+      fi
+    fi
+  fi
+fi
+
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 mkdir -p ${DATA}
 
 mkdir -p ${DATA}/INPUT
diff --git a/jobs/JRRFS_MAKE_GRID b/jobs/JRRFS_MAKE_GRID
index 9f0215ec9..b7f89d37d 100755
--- a/jobs/JRRFS_MAKE_GRID
+++ b/jobs/JRRFS_MAKE_GRID
@@ -61,10 +61,14 @@ This is the J-job script for the task that generates grid files.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
-export DATA=${DATAROOT}/${jobid}
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+else
+  export jobid=${RUN}_make_grid_${envir}_${cyc}
+fi
+
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 mkdir -p ${DATA}
 cd ${DATA}
 
diff --git a/jobs/JRRFS_MAKE_ICS b/jobs/JRRFS_MAKE_ICS
index 98eb83395..354c93002 100755
--- a/jobs/JRRFS_MAKE_ICS
+++ b/jobs/JRRFS_MAKE_ICS
@@ -62,7 +62,7 @@ for the RRFS (in NetCDF format).
 # Set the parameters for the external model files.
 #-----------------------------------------------------------------------
 
-extrn_mdl_name="${EXTRN_MDL_NAME}"
+extrn_mdl_name="${EXTRN_MDL_NAME_ICS}"
 sysbasedir="${EXTRN_MDL_SYSBASEDIR_ICS}"
 gfs_file_fmt="${GFS_FILE_FMT_ICS}"
 time_offset_hrs="${EXTRN_MDL_ICS_OFFSET_HRS}"
@@ -118,7 +118,7 @@ case "${extrn_mdl_name}" in
     else
       sysdir="$sysbasedir/rrfs.${yyyymmdd}/${hh}"
     fi
-    fns_on_disk=( "rrfs.t${hh}z.natlev.f0${fcst_hh}.grib2" )
+    fns_on_disk=( "rrfs.t${hh}z.natlev.3km.f0${fcst_hh}.na.grib2" )
     ;;
 
   *)
@@ -134,17 +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 mem_num=m$(echo "${ENSMEM_INDX}")
+if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+  export ENSMEM_INDX=${ENSMEM_INDX:-${MEMBER_NAME}}
+  export mem_num=m$(echo "${ENSMEM_INDX}")
+fi
+
 if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
   export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/ics"
 else
   export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/ics"
 fi
 
-export DATA=${DATAROOT}/${jobid}
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+else
+  if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+    export jobid=${RUN}_make_ics_${mem_num}_${envir}_${cyc}
+  else
+    export jobid=${RUN}_make_ics_${envir}_${cyc}
+  fi
+fi
+
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 mkdir -p $DATA
 
 mkdir -p ${DATA}/tmp_ICS
diff --git a/jobs/JRRFS_MAKE_LBCS b/jobs/JRRFS_MAKE_LBCS
index 7c5c78e8b..ea533613c 100755
--- a/jobs/JRRFS_MAKE_LBCS
+++ b/jobs/JRRFS_MAKE_LBCS
@@ -61,7 +61,7 @@ hour zero).
 # Set the parameters for the external model files.
 #-----------------------------------------------------------------------
 
-export extrn_mdl_name="${EXTRN_MDL_NAME}"
+export extrn_mdl_name="${EXTRN_MDL_NAME_LBCS}"
 sysbasedir="${EXTRN_MDL_SYSBASEDIR_LBCS}"
 gfs_file_fmt="${GFS_FILE_FMT_LBCS}"
 extrn_mdl_memhead="${GEFS_INPUT_SUBDIR}"
@@ -149,9 +149,9 @@ case "${extrn_mdl_name}" in
     fi
     sysdir2=""
     fcst_hhh=( $( printf "%03d " "${lbc_spec_fhrs[@]}" ) )
-    prefix="rrfs.t${hh}z.natlev.f"
+    prefix="rrfs.t${hh}z.natlev.3km.f"
     fns=( "${fcst_hhh[@]/#/$prefix}" )
-    suffix=".grib2"
+    suffix=".na.grib2"
     fns_on_disk=( "${fns[@]/%/$suffix}" )
     ;;
 
@@ -173,17 +173,26 @@ 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 mem_num=m$(echo "${ENSMEM_INDX}")
 if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+  export ENSMEM_INDX=${ENSMEM_INDX:-${MEMBER_NAME}}
+  export mem_num=m$(echo "${ENSMEM_INDX}")
   export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/lbcs"
 else
   export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/lbcs"
 fi
 
-export DATA=${DATAROOT}/${jobid}
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+else
+  if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+    export jobid=${RUN}_make_lbcs_${mem_num}_${envir}_${cyc}
+  else
+    export jobid=${RUN}_make_lbcs_${envir}_${cyc}
+  fi
+fi
+
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 mkdir -p $DATA
 
 mkdir -p ${DATA}/tmp_LBCS_${bcgrp}
diff --git a/jobs/JRRFS_MAKE_OROG b/jobs/JRRFS_MAKE_OROG
index 92fb59e17..740f78d60 100755
--- a/jobs/JRRFS_MAKE_OROG
+++ b/jobs/JRRFS_MAKE_OROG
@@ -61,10 +61,14 @@ This is the J-job script for the task that generates orography files.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
-export DATA=${DATAROOT}/${jobid}
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+else
+  export jobid=${RUN}_make_orog_${envir}_${cyc}
+fi
+
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 mkdir -p ${DATA}
 
 mkdir -p "${DATA}/raw_topo"
diff --git a/jobs/JRRFS_MAKE_SFC_CLIMO b/jobs/JRRFS_MAKE_SFC_CLIMO
index 99cacd97a..d1618d9b9 100755
--- a/jobs/JRRFS_MAKE_SFC_CLIMO
+++ b/jobs/JRRFS_MAKE_SFC_CLIMO
@@ -61,10 +61,15 @@ climatology.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
-export DATA=${DATAROOT}/${jobid}
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+else
+  export jobid=${RUN}_make_sfc_climo_${envir}_${cyc}
+fi
+
+export DATA=${DATA:-${DATAROOT}/${jobid}}
+[[ -d ${DATA} ]]&& mv ${DATA} ${DATA}_old_$$
 mkdir -p ${DATA}
 cd ${DATA}
 
diff --git a/jobs/JRRFS_POST b/jobs/JRRFS_POST
index 462658c79..ba5ba48d8 100755
--- a/jobs/JRRFS_POST
+++ b/jobs/JRRFS_POST
@@ -62,23 +62,36 @@ on the output files corresponding to a specified forecast hour.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
-export mem_num=m$(echo "${ENSMEM_INDX}")
+if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+  export ENSMEM_INDX=${ENSMEM_INDX:-${MEMBER_NAME}}
+  export mem_num=m$(echo "${ENSMEM_INDX}")
+fi
 
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
 if [ ${CYCLE_TYPE} == "spinup" ]; then
   export INPUT_DATA="${DATAROOT}/${RUN}_forecast_spinup_${envir}_${cyc}"
+  export jobid=${RUN}_post_spinup_${envir}_${cyc}_f${fhr}
 else
   if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
     export INPUT_DATA="${DATAROOT}/${RUN}_forecast_${mem_num}_${envir}_${cyc}"
+    export jobid=${RUN}_post_${mem_num}_${envir}_${cyc}_f${fhr}
   else
-    export INPUT_DATA="${DATAROOT}/${RUN}_forecast_${envir}_${cyc}"
+    if [ ${WGF} == "firewx" ]; then
+      export INPUT_DATA="${DATAROOT}/firewx_forecast_${envir}_${cyc}"
+      export jobid=${WGF}_post_${envir}_${cyc}_f${fhr}
+    else
+      export INPUT_DATA="${DATAROOT}/${RUN}_forecast_${envir}_${cyc}"
+      export jobid=${RUN}_post_${envir}_${cyc}_f${fhr}
+    fi
   fi
 fi
 
-export DATA=${DATAROOT}/${jobid}
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+fi
+
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 mkdir -p ${DATA}
 cd ${DATA}
 
diff --git a/jobs/JRRFS_PRDGEN b/jobs/JRRFS_PRDGEN
index 1ae7fe361..f01299e28 100755
--- a/jobs/JRRFS_PRDGEN
+++ b/jobs/JRRFS_PRDGEN
@@ -62,13 +62,33 @@ files corresponding to a specified forecast hour.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
-export mem_num=m$(echo "${ENSMEM_INDX}")
+if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+  export ENSMEM_INDX=${ENSMEM_INDX:-${MEMBER_NAME}}
+  export mem_num=m$(echo "${ENSMEM_INDX}")
+fi
+
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
 
-export DATA=${DATAROOT}/${jobid}
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+else
+  if [ "${CYCLE_TYPE}" = "spinup" ]; then
+    jobid=${RUN}_post_spinup_${envir}_${cyc}_f${fhr}
+  else
+    if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+      jobid=${RUN}_post_${mem_num}_${envir}_${cyc}_f${fhr}
+    else
+      if [ ${WGF} == "firewx" ]; then
+        jobid=${WGF}_post_${envir}_${cyc}_f${fhr}
+      else
+        jobid=${RUN}_post_${envir}_${cyc}_f${fhr}
+      fi
+    fi
+  fi
+fi
+
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 mkdir -p ${DATA}
 cd ${DATA}
 
diff --git a/jobs/JRRFS_PREP_CYC b/jobs/JRRFS_PREP_CYC
index 599f7fcf7..ffb412c66 100755
--- a/jobs/JRRFS_PREP_CYC
+++ b/jobs/JRRFS_PREP_CYC
@@ -62,15 +62,39 @@ This is the J-job script for the prep_cyc tasks for the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
-export mem_num=m$(echo "${ENSMEM_INDX}")
+if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+  number_tmp_BCGRP=$(echo $BCGRP | cut -c4-6)
+  MEMBER_NAME=${MEMBER_NAME:-$number_tmp_BCGRP}
+  export ENSMEM_INDX=${ENSMEM_INDX:-${MEMBER_NAME}}
+  export mem_num=m$(echo "${ENSMEM_INDX}")
+fi
 
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
 export CYCLE_SUBTYPE=${CYCLE_SUBTYPE:-empty}
-export INPUT_DATA=${DATAROOT}/${taskid}/INPUT
 
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+else
+  if [ ${CYCLE_TYPE} == "spinup" ]; then
+    if [ "${DO_ENSEMBLE}" = "TRUE" ]; then      # EnKF has spinup forecasts
+      export jobid=${RUN}_forecast_spinup_${mem_num}_${envir}_${cyc}
+      if  [ ${CYCLE_SUBTYPE} == "ensinit" ]; then
+        export jobid=${RUN}_forecast_ensinit_${mem_num}_${envir}_${cyc}
+      fi
+    else
+      export jobid=${RUN}_forecast_spinup_${envir}_${cyc}
+    fi
+  else
+    if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+      export jobid=${RUN}_forecast_${mem_num}_${envir}_${cyc}
+    else
+      export jobid=${RUN}_forecast_${envir}_${cyc}
+    fi
+  fi
+fi
+
+export INPUT_DATA=${DATAROOT}/${jobid}/INPUT
 mkdir -p ${INPUT_DATA}
 cd ${INPUT_DATA}
 
diff --git a/jobs/JRRFS_PROCESS_BUFR b/jobs/JRRFS_PROCESS_BUFR
index 9487b59cc..92e60ec97 100755
--- a/jobs/JRRFS_PROCESS_BUFR
+++ b/jobs/JRRFS_PROCESS_BUFR
@@ -61,10 +61,18 @@ the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
-export DATA=${DATAROOT}/${jobid}
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+else
+  if [ "${CYCLE_TYPE}" = "spinup" ]; then
+    export jobid=${RUN}_process_bufr_spinup_${envir}_${cyc}
+  else
+    export jobid=${RUN}_process_bufr_prod_${envir}_${cyc}
+  fi
+fi
+
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 mkdir -p ${DATA}
 cd ${DATA}
 
diff --git a/jobs/JRRFS_PROCESS_LIGHTNING b/jobs/JRRFS_PROCESS_LIGHTNING
index c8baa3579..d87c24b85 100755
--- a/jobs/JRRFS_PROCESS_LIGHTNING
+++ b/jobs/JRRFS_PROCESS_LIGHTNING
@@ -58,10 +58,18 @@ preprocess with RRFS for the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
-export DATA=${DATAROOT}/${jobid}
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+else
+  if [ "${CYCLE_TYPE}" = "spinup" ]; then
+    export jobid=${RUN}_process_lightning_spinup_${envir}_${cyc}
+  else
+    export jobid=${RUN}_process_lightning_prod_${envir}_${cyc}
+  fi
+fi
+
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 mkdir -p ${DATA}
 cd ${DATA}
 
diff --git a/jobs/JRRFS_PROCESS_RADAR b/jobs/JRRFS_PROCESS_RADAR
index 30de4bf9e..654b2d58a 100755
--- a/jobs/JRRFS_PROCESS_RADAR
+++ b/jobs/JRRFS_PROCESS_RADAR
@@ -61,10 +61,18 @@ preprocessing with RRFS for the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
-export DATA=${DATAROOT}/${jobid}
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+else
+  if [ "${CYCLE_TYPE}" = "spinup" ]; then
+    export jobid=${RUN}_process_radar_spinup_${envir}_${cyc}
+  else
+    export jobid=${RUN}_process_radar_prod_${envir}_${cyc}
+  fi
+fi
+
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 mkdir -p ${DATA}
 cd ${DATA}
 
diff --git a/jobs/JRRFS_PROCESS_SMOKE b/jobs/JRRFS_PROCESS_SMOKE
index 8baf53fd8..095fe0a9a 100755
--- a/jobs/JRRFS_PROCESS_SMOKE
+++ b/jobs/JRRFS_PROCESS_SMOKE
@@ -61,10 +61,18 @@ for the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
-export DATA=${DATAROOT}/${jobid}
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+else
+  if [ "${CYCLE_TYPE}" = "spinup" ]; then
+    export jobid=${RUN}_process_smoke_spinup_${envir}_${cyc}
+  else
+    export jobid=${RUN}_process_smoke_prod_${envir}_${cyc}
+  fi
+fi
+
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 mkdir -p ${DATA}
 cd ${DATA}
 
diff --git a/jobs/JRRFS_RECENTER b/jobs/JRRFS_RECENTER
index 0fc0cee10..40cf5c479 100755
--- a/jobs/JRRFS_RECENTER
+++ b/jobs/JRRFS_RECENTER
@@ -59,13 +59,20 @@ with RRFS for the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
-#export mem_num=m$(echo "${ENSMEM_INDX}")
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
 
-export DATA=${DATAROOT}/${jobid}
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+else
+  if [ "${CYCLE_TYPE}" = "spinup" ]; then
+    export jobid=${RUN}_recenter_spinup_${envir}_${cyc}
+  else
+    export jobid=${RUN}_recenter_${envir}_${cyc}
+  fi
+fi
+
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 rm -fr ${DATA}
 mkdir -p ${DATA}
 cd ${DATA}
@@ -85,11 +92,7 @@ mkdir -p "${COMOUT}"
 # Specify the control anaylsis file location
 #-----------------------------------------------------------------------
 
-if [ "${DO_ENSFCST}" = "TRUE" ]; then
-  export ctrlpath=${ENSCTRL_GESROOT}
-else
-  export ctrlpath=${ENSCTRL_DATAROOT}
-fi
+export ctrlpath=${ENSCTRL_GESROOT}
 
 #-----------------------------------------------------------------------
 # Execute the script.
diff --git a/jobs/JRRFS_SAVE_DA_OUTPUT b/jobs/JRRFS_SAVE_DA_OUTPUT
index 43c2a6a6d..7f06b78e5 100755
--- a/jobs/JRRFS_SAVE_DA_OUTPUT
+++ b/jobs/JRRFS_SAVE_DA_OUTPUT
@@ -58,28 +58,34 @@ This is the J-job script for the task that saves DA analysis files to nwges.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
-export mem_num=m$(echo "${ENSMEM_INDX}")
+if [ ${DO_ENSEMBLE} = "TRUE" ] || [ ${CYCLE_TYPE} == "enfcst" ]; then
+  export ENSMEM_INDX=${ENSMEM_INDX:-${MEMBER_NAME}}
+  export mem_num=m$(echo "${ENSMEM_INDX}")
+fi
 
 # NWGES_DIR is the directory in which the model IC file (DA analysis) will be saved
 
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
 if [ "${CYCLE_TYPE}" = "prod" ]; then
   if [ ${DO_ENSEMBLE} = "TRUE" ]; then
-    export DATA="${DATAROOT}/${jobid}"
+    export jobid=${RUN}_forecast_${mem_num}_${envir}_${cyc}
     export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/forecast"
   else
-    export DATA="${DATAROOT}/${jobid}"
+    export jobid=${RUN}_forecast_${envir}_${cyc}
     export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/forecast"
   fi
 fi
 if [ ${CYCLE_TYPE} == "enfcst" ]; then
-  export DATA="${DATAROOT}/${jobid}"
+  export jobid=${RUN}_forecast_${mem_num}_${envir}_${cyc}
   export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/forecast_enfcst"
 fi
 
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+fi
+
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 mkdir -p "${NWGES_DIR}/DA_OUTPUT"
 cd "${NWGES_DIR}/DA_OUTPUT"
 
diff --git a/jobs/JRRFS_SAVE_RESTART b/jobs/JRRFS_SAVE_RESTART
index 9905d70a1..917ffb398 100755
--- a/jobs/JRRFS_SAVE_RESTART
+++ b/jobs/JRRFS_SAVE_RESTART
@@ -58,36 +58,42 @@ This is the J-job script for the task that saves restart files to nwges.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
-export mem_num=m$(echo "${ENSMEM_INDX}")
+if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+  export ENSMEM_INDX=${ENSMEM_INDX:-${MEMBER_NAME}}
+  export mem_num=m$(echo "${ENSMEM_INDX}")
+fi
 
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
 export CYCLE_SUBTYPE=${CYCLE_SUBTYPE:-empty}
 export SURFACE_DIR=${SURFACE_DIR:-empty}
 if [ "${CYCLE_TYPE}" = "spinup" ]; then
   if [ "${DO_ENSEMBLE}" = "TRUE" ]; then	# EnKF has spinup forecasts
-    export DATA="${DATAROOT}/${jobid}"
+    export jobid=${RUN}_forecast_spinup_${mem_num}_${envir}_${cyc}
     export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/forecast_spinup"
     if [ "${CYCLE_SUBTYPE}" = "ensinit" ]; then
-      export DATA="${DATAROOT}/${jobid}"
+      export jobid=${RUN}_forecast_ensinit_${mem_num}_${envir}_${cyc}
       export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/forecast_ensinit"
     fi
   else
-    export DATA="${DATAROOT}/${jobid}"
+    export jobid=${RUN}_forecast_spinup_${envir}_${cyc}
     export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/forecast_spinup"
   fi
 else
   if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
-    export DATA="${DATAROOT}/${jobid}"
+    export jobid=${RUN}_forecast_${mem_num}_${envir}_${cyc}
     export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/forecast"
   else
-    export DATA="${DATAROOT}/${jobid}"
+    export jobid=${RUN}_forecast_${envir}_${cyc}
     export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/forecast"
   fi
 fi
 
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+fi
+export DATA=${DATA:-${DATAROOT}/${jobid}}
+
 mkdir -p "${NWGES_DIR}/RESTART"
 mkdir -p "${NWGES_DIR}/INPUT"
 if [ "${SURFACE_DIR}" != "empty" ]; then
diff --git a/jobs/JRRFS_UPDATE_LBC_SOIL b/jobs/JRRFS_UPDATE_LBC_SOIL
index ed56c366c..22a29e004 100755
--- a/jobs/JRRFS_UPDATE_LBC_SOIL
+++ b/jobs/JRRFS_UPDATE_LBC_SOIL
@@ -61,14 +61,39 @@ analysis with RRFS for the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-#export jobid=${jobid:-${taskid}}
-export jobid=${taskid}
 
-export mem_num=m$(echo "${ENSMEM_INDX}")
+if [ ! "${MEM_TYPE}" = "MEAN" ] || [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+  export ENSMEM_INDX=${ENSMEM_INDX:-${MEMBER_NAME}}
+  export mem_num=m$(echo "${ENSMEM_INDX}")
+fi
+
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
 
-export DATA=${DATAROOT}/${jobid}
+if [ "${CYCLE_TYPE}" = "spinup" ]; then
+  workname="gsi_spinup"
+else
+  workname="gsi"
+fi
+
+if [[ ! -v OB_TYPE ]]; then
+  OB_TYPE="conv"
+fi
+
+if [ "${GSI_TYPE}" = "OBSERVER" ]; then
+  if [ "${MEM_TYPE}" = "MEAN" ]; then
+    export jobid=${RUN}_observer_${workname}_ensmean_${envir}_${cyc}
+  else
+    export jobid=${RUN}_observer_${workname}_${mem_num}_${envir}_${cyc}
+  fi
+else
+  export jobid=${RUN}_analysis_${OB_TYPE}_${workname}_${envir}_${cyc}
+fi
+
+if [ ${WORKFLOW_MANAGER} == "rocoto" ] && [[ ! -z ${taskid} ]]; then
+  export jobid=${taskid}
+fi
 
+export DATA=${DATA:-${DATAROOT}/${jobid}}
 if [[ ! -d ${DATA} ]]; then
   echo "cannot find analysis run directory"
   exit 
diff --git a/parm/FV3LAM_wflow.xml b/parm/FV3LAM_wflow.xml
index 06537fefc..a241078c0 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 }}">
@@ -66,8 +65,9 @@ Workflow task names.
 <!ENTITY TAG   "{{ tag }}">
 <!ENTITY NET   "{{ net }}">
 <!ENTITY RUN   "{{ run }}">
-<!ENTITY RUNE  "enk{{ run }}">
+<!ENTITY RUNE  "enkfrrfs">
 <!ENTITY envir "{{ envir }}">
+<!ENTITY WGF   "{{ wgf }}">
 
 <!--
 Flags that determine whether to run the specific tasks.
@@ -674,7 +674,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
     <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
     <envar><name>FG_ROOT</name><value><cyclestr>&FG_ROOT;</cyclestr></value></envar>
-    <envar><name>EXTRN_MDL_NAME</name><value>{{ extrn_mdl_name_ics }}</value></envar>
+    <envar><name>EXTRN_MDL_NAME_ICS</name><value>{{ extrn_mdl_name_ics }}</value></envar>
     <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
     <envar><name>GEFS_INPUT_SUBDIR</name><value>#subdirGE#</value></envar>
     <envar><name>WRF_MEM_NAME</name><value>#memNameWRF#</value></envar>
@@ -856,7 +856,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
     <envar><name>DATAROOT</name><value>&DATAROOT;</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>EXTRN_MDL_NAME_LBCS</name><value>{{ extrn_mdl_name_lbcs }}</value></envar>
     <envar><name>BOUNDARY_LEN</name><value>{{ boundary_len_hrs }}</value></envar>
     <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
     <envar><name>GEFS_INPUT_SUBDIR</name><value>#subdirGE#</value></envar>
@@ -1376,7 +1376,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 +1386,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 +1452,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 +1462,7 @@ MODULES_RUN_TASK_FP script.
 
     <dependency>
        <and>
-         <taskdep task="&OBSERVER_GSI_ENSMEAN_TN;_spinup"/>
+         <taskdep task="&OBSERVER_GSI_TN;_spinup_ensmean"/>
        </and>
     </dependency>
 
@@ -2193,7 +2194,7 @@ MODULES_RUN_TASK_FP script.
     <dependency>
      {%- if do_ensfcst %}
        <and>
-         <datadep age="00:00:05:00"><cyclestr>&FG_ROOT;/&RUN;.@Y@m@d/@H/m#mem#/forecast/DA_OUTPUT/coupler.res</cyclestr></datadep>
+         <datadep age="00:00:05:00"><cyclestr>&FG_ROOT;/&RUNE;.@Y@m@d/@H/m#mem#/forecast/DA_OUTPUT/coupler.res</cyclestr></datadep>
          <metataskdep metatask="&MAKE_LBCS_TN;{{ uscore_ensmem_name }}"/>
        </and>
      {%- else %}
@@ -2356,7 +2357,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 +2367,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 +2444,7 @@ MODULES_RUN_TASK_FP script.
 
     <dependency>
        <and>
-         <taskdep task="&OBSERVER_GSI_ENSMEAN_TN;"/>
+         <taskdep task="&OBSERVER_GSI_TN;_ensmean"/>
        </and>
     </dependency>
 
@@ -3513,12 +3514,13 @@ MODULES_RUN_TASK_FP script.
     <envar><name>KEEPDATA</name><value>YES</value></envar>
 
     <dependency>
-{%- if postproc_nsout_min > 0 %}
       <and>
+{%- if postproc_nsout_min > 0 %}
         <datadep age="00:02"><cyclestr>&DATAROOT;/&RUN;_forecast_&envir;_@H/log.atm.f000-00-36</cyclestr></datadep>
+{%- else %}
         <datadep age="00:02"><cyclestr>&DATAROOT;/&RUN;_forecast_&envir;_@H/log.atm.f000</cyclestr></datadep>
-      </and>
 {%- endif %}
+      </and>
     </dependency>
 
   </task>
diff --git a/parm/FV3LAM_wflow_firewx.xml b/parm/FV3LAM_wflow_firewx.xml
index 1b9fa401d..f949214dd 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.
@@ -295,7 +296,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
     <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
     <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
-    <envar><name>EXTRN_MDL_NAME</name><value>{{ extrn_mdl_name_ics }}</value></envar>
+    <envar><name>EXTRN_MDL_NAME_ICS</name><value>{{ extrn_mdl_name_ics }}</value></envar>
     <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
     <envar><name>GEFS_INPUT_SUBDIR</name><value>#subdirGE#</value></envar>
     <envar><name>envir</name><value>&envir;</value></envar>
@@ -337,7 +338,7 @@ MODULES_RUN_TASK_FP script.
       <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
       <envar><name>DATAROOT</name><value>&DATAROOT;</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>EXTRN_MDL_NAME_LBCS</name><value>{{ extrn_mdl_name_lbcs }}</value></envar>
       <envar><name>BOUNDARY_LEN</name><value>{{ boundary_len_hrs }}</value></envar>
       <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
       <envar><name>GEFS_INPUT_SUBDIR</name><value>#subdirGE#</value></envar>
diff --git a/parm/FV3LAM_wflow_nonDA.xml b/parm/FV3LAM_wflow_nonDA.xml
index 71437191d..33bf24f54 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.
@@ -297,7 +298,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
     <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
     <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
-    <envar><name>EXTRN_MDL_NAME</name><value>{{ extrn_mdl_name_ics }}</value></envar>
+    <envar><name>EXTRN_MDL_NAME_ICS</name><value>{{ extrn_mdl_name_ics }}</value></envar>
     <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
     <envar><name>GEFS_INPUT_SUBDIR</name><value>#subdirGE#</value></envar>
     <envar><name>envir</name><value>&envir;</value></envar>
@@ -347,7 +348,7 @@ MODULES_RUN_TASK_FP script.
       <envar><name>HOMErrfs</name><value>&HOMErrfs;</value></envar>
       <envar><name>DATAROOT</name><value>&DATAROOT;</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>EXTRN_MDL_NAME_LBCS</name><value>{{ extrn_mdl_name_lbcs }}</value></envar>
       <envar><name>BOUNDARY_LEN</name><value>{{ boundary_len_hrs }}</value></envar>
       <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
       <envar><name>GEFS_INPUT_SUBDIR</name><value>#subdirGE#</value></envar>
diff --git a/parm/config/det/field_table b/parm/config/det/field_table
index 3d4e0afcd..691a27f54 100644
--- a/parm/config/det/field_table
+++ b/parm/config/det/field_table
@@ -63,6 +63,11 @@
            "longname",     "subgrid scale turbulent kinetic energy"
            "units",        "m2/s2"
        "profile_type", "fixed", "surface_value=0.0" /
+# prognostic sigmab tracer
+ "TRACER", "atmos_mod", "sigmab"
+           "longname",     "sigma fraction"
+           "units",        "fraction"
+       "profile_type", "fixed", "surface_value=0.0" /
 # prognostic smoke mixing ratio tracer
   "TRACER", "atmos_mod", "smoke"
             "longname",     "smoke mixing ratio"
diff --git a/parm/config/det/input.nml b/parm/config/det/input.nml
index 63f1deebd..89703d2df 100644
--- a/parm/config/det/input.nml
+++ b/parm/config/det/input.nml
@@ -10,7 +10,7 @@
 &atmos_model_nml
     avg_max_length = 3600.0
     blocksize = 28
-    ccpp_suite = 'FV3_HRRR_gf'
+    ccpp_suite = 'RRFS_sas'
     chksum_debug = .false.
     dycore_only = .false.
     ignore_rst_cksum = .true.
@@ -156,6 +156,7 @@
     addsmoke_flag = 1
     aero_dir_fdb = .true.
     aero_ind_fdb = .false.
+    betadcu = 1.0
     bl_mynn_edmf = 1
     bl_mynn_edmf_mom = 1
     bl_mynn_tkeadvect = .true.
@@ -200,6 +201,7 @@
     frac_ice = .true.
     gwd_opt = 3
     h2o_phys = .true.
+    hwp_method = 1
     hybedmf = .false.
     iaer = 1011
     ialb = 2
@@ -211,7 +213,7 @@
     icloud_bl = 1
     ico2 = 2
     iems = 2
-    imfdeepcnv = 3
+    imfdeepcnv = 2
     imfshalcnv = -1
     imp_physics = 8
     iopt_alb = 2
@@ -259,20 +261,21 @@
     oz_phys_2015 = .true.
     pdfcld = .false.
     plume_wind_eff = 1
-    plumerisefire_frq = 60
+    plumerisefire_frq = 30
     pre_rad = .false.
     print_diff_pgr = .true.
+    progsigma = .true.
     prslrd0 = 0.0
     random_clds = .false.
     redrag = .true.
     rrfs_sd = .true.
     rrfs_smoke_debug = .false.
     satmedmf = .false.
+    sc_factor = 1.0
     seas_opt = 0
     sfclay_compute_flux = .true.
     shal_cnv = .false.
     smoke_conv_wet_coef = 0.5, 0.5, 0.5
-    smoke_forecast = 1
     swhtr = .true.
     thsfc_loc = .false.
     trans_trac = .true.
diff --git a/parm/config/det/input.nml_restart b/parm/config/det/input.nml_restart
index b7bd66463..683f0e5f7 100644
--- a/parm/config/det/input.nml_restart
+++ b/parm/config/det/input.nml_restart
@@ -10,7 +10,7 @@
 &atmos_model_nml
     avg_max_length = 3600.0
     blocksize = 28
-    ccpp_suite = 'FV3_HRRR_gf'
+    ccpp_suite = 'RRFS_sas'
     chksum_debug = .false.
     dycore_only = .false.
     ignore_rst_cksum = .true.
@@ -156,6 +156,7 @@
     addsmoke_flag = 1
     aero_dir_fdb = .true.
     aero_ind_fdb = .false.
+    betadcu = 1.0
     bl_mynn_edmf = 1
     bl_mynn_edmf_mom = 1
     bl_mynn_tkeadvect = .true.
@@ -200,6 +201,7 @@
     frac_ice = .true.
     gwd_opt = 3
     h2o_phys = .true.
+    hwp_method = 1
     hybedmf = .false.
     iaer = 1011
     ialb = 2
@@ -211,7 +213,7 @@
     icloud_bl = 1
     ico2 = 2
     iems = 2
-    imfdeepcnv = 3
+    imfdeepcnv = 2
     imfshalcnv = -1
     imp_physics = 8
     iopt_alb = 2
@@ -259,20 +261,21 @@
     oz_phys_2015 = .true.
     pdfcld = .false.
     plume_wind_eff = 1
-    plumerisefire_frq = 60
+    plumerisefire_frq = 30
     pre_rad = .false.
     print_diff_pgr = .true.
+    progsigma = .true.
     prslrd0 = 0.0
     random_clds = .false.
     redrag = .true.
     rrfs_sd = .true.
     rrfs_smoke_debug = .false.
     satmedmf = .false.
+    sc_factor = 1.0
     seas_opt = 0
     sfclay_compute_flux = .true.
     shal_cnv = .false.
     smoke_conv_wet_coef = 0.5, 0.5, 0.5
-    smoke_forecast = 1
     swhtr = .true.
     thsfc_loc = .false.
     trans_trac = .true.
diff --git a/parm/config/det/var_defns.sh b/parm/config/det/var_defns.sh
index f5ad9ab8a..235bea462 100644
--- a/parm/config/det/var_defns.sh
+++ b/parm/config/det/var_defns.sh
@@ -4,7 +4,7 @@
 # This file sets the experiment's configuration variables (which are
 # global shell variables) to their default values.  For many of these
 # variables, the valid values that they may take on are defined in the
-# file $USHdir/valid_param_vals.sh.
+# file $USHrrfs/valid_param_vals.sh.
 #
 #-----------------------------------------------------------------------
 #
@@ -21,7 +21,7 @@
 #
 #-----------------------------------------------------------------------
 #
-version="v0.9.5"
+version="v0.9.1"
 #
 #-----------------------------------------------------------------------
 #
@@ -58,7 +58,7 @@ version="v0.9.5"
 # If using the slurm job scheduler (i.e. if SCHED is set to "slurm"),
 # the default partition to which to submit workflow tasks.  If a task
 # does not have a specific variable that specifies the partition to which
-# it will be submitted (e.g. PARTITION_HPSS, PARTITION_FCST; see below),
+# it will be submitted (e.g. PARTITION_HPSS, PARTITION_FORECAST; see below),
 # it will be submitted to the partition specified by this variable.  If
 # this is not set or is set to an empty string, it will be (re)set to a
 # machine-dependent value.  This is not used if SCHED is not set to
@@ -68,7 +68,7 @@ version="v0.9.5"
 # The default queue or QOS (if using the slurm job scheduler, where QOS
 # is Quality of Service) to which workflow tasks are submitted.  If a
 # task does not have a specific variable that specifies the queue to which
-# it will be submitted (e.g. QUEUE_HPSS, QUEUE_FCST; see below), it will
+# it will be submitted (e.g. QUEUE_HPSS, QUEUE_FORECAST; see below), it will
 # be submitted to the queue specified by this variable.  If this is not
 # set or is set to an empty string, it will be (re)set to a machine-
 # dependent value.
@@ -95,14 +95,14 @@ version="v0.9.5"
 # wil be (re)set to a machine-dependent value.  This is not used if SCHED
 # is not set to "slurm."
 #
-# PARTITION_FCST:
+# PARTITION_FORECAST:
 # If using the slurm job scheduler (i.e. if SCHED is set to "slurm"),
 # the partition to which the task that runs forecasts is submitted.  If
 # this is not set or set to an empty string, it will be (re)set to a
 # machine-dependent value.  This is not used if SCHED is not set to
 # "slurm".
 #
-# QUEUE_FCST:
+# QUEUE_FORECAST:
 # The queue or QOS to which the task that runs a forecast is submitted.
 # If this is not set or set to an empty string, it will be (re)set to a
 # machine-dependent value.
@@ -157,10 +157,8 @@ QUEUE_DEFAULT="pridev"
 PARTITION_HPSS=""
 QUEUE_HPSS="dev_transfer"
 PARTITION_SFC_CLIMO=""
-PARTITION_FCST=""
-QUEUE_FCST="pridev"
-PARTITION_GRAPHICS=""
-QUEUE_GRAPHICS="pridev"
+PARTITION_FORECAST=""
+QUEUE_FORECAST="pridev"
 PARTITION_ANALYSIS=""
 QUEUE_ANALYSIS="pridev"
 PARTITION_PRDGEN=""
@@ -211,14 +209,14 @@ CRON_RELAUNCH_INTVL_MNTS="03"
 #
 #-----------------------------------------------------------------------
 #
-EXPT_BASEDIR="${HOMErrfs}"
-EXPT_SUBDIR="rrfs_na"
+EXPT_BASEDIR="${HOMErrfs}/parm/config"
+EXPT_SUBDIR="det"
 #
 #-----------------------------------------------------------------------
 #
 # COMINgfs:
 # The beginning portion of the directory containing files generated by
-# the external model (FV3GFS) that the initial and lateral boundary
+# the external model (GFS) that the initial and lateral boundary
 # condition generation tasks need in order to create initial and boundary
 # condition files for a given cycle on the native FV3-LAM grid.  For a
 # cycle that starts on the date specified by the variable yyyymmdd
@@ -253,7 +251,7 @@ EXPT_SUBDIR="rrfs_na"
 #
 #   $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
@@ -269,6 +267,9 @@ EXPT_SUBDIR="rrfs_na"
 #   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
@@ -278,13 +279,13 @@ EXPT_SUBDIR="rrfs_na"
 #
 #   $PTMP/com/$NET/$envir/$RUN.$yyyymmdd/$hh
 #
-# NWGES:
+# GESROOT:
 # The beginning portion of the directory that will contain the output
 # files from the forecast for a given cycle.  For a cycle
 # that starts on the date specified by yyyymmdd and hour specified by hh
 # (where yyyymmdd and hh are as described above), the directory in which
 # the forecast output files will be placed will be:
-#   $NWGES/$NET/$envir/$RUN.$yyyymmdd/$hh
+#   $GESROOT/$RUN.$yyyymmdd/$hh
 #
 # Setup default observation locations for data assimilation:
 #
@@ -326,23 +327,22 @@ COMINgfs=""
 FIXLAM_NCO_BASEDIR="$HOMErrfs/fix/lam"
 STMP="$DATAROOT"
 ENSCTRL_STMP="/base/path/of/directory/containing/model/input/and/raw/output/files"
-RRFSE_NWGES_BASEDIR="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
-NET="rrfs_a"
+RRFSE_NWGES_BASEDIR="/lfs/h3/emc/lam/noscrub/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
+NET="rrfs"
 envir="prod"
 RUN="rrfs"
 RUN_ensctrl="experiment_name"
 TAG="n3v91"
-PTMP="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0"
+WGF="det"
+PTMP="/lfs/h3/emc/lam/noscrub/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0"
 ENSCTRL_PTMP="/base/path/of/directory/containing/postprocessed/output/files"
-NWGES="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
-ENSCTRL_NWGES="/base/path/of/directory/containing/model/restart/files"
-RRFSE_NWGES="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
+#### GESROOT="/lfs/h2/emc/ptmp/emc.lam/rrfs/v0.9.1/nwges"
+GESROOT="/lfs/h3/emc/lam/noscrub/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
+ENSCTRL_GESROOT="/base/path/of/directory/containing/model/restart/files"
+#### RRFSE_GESROOT="/lfs/f2/t2o/ptmp/emc/ptmp/emc.lam/rrfs/v0.9.1/nwges"
+RRFSE_GESROOT="notused"
 
-ARCHIVEDIR="/NCEPDEV/emc-meso/1year/emc.lam/n3v91"
-NCARG_ROOT="/apps/ncl/6.5.0-CentOS6.10_64bit_nodap_gnu447"
-NCL_HOME="/home/rtrr/RRFS/graphics"
-NCL_REGION="conus"
-MODEL="rrfs_a"
+MODEL="rrfs"
 
 OBSTYPE_SOURCE="rap"
 OBSPATH="/lfs/h1/ops/prod/com/obsproc/v1.2"
@@ -438,7 +438,7 @@ RELATIVE_LINK_FLAG="--relative"
 # FV3_EXEC_FN:
 # Name to use for the forecast model executable when it is copied from
 # the directory in which it is created in the build step to the executables
-# directory (EXECdir; this is set during experiment generation).
+# directory (EXECrrfs; this is set in the J-jobs).
 #
 # WFLOW_XML_FN:
 # Name of the rocoto workflow XML file that the experiment generation
@@ -591,14 +591,14 @@ WFLOW_LAUNCH_LOG_FN="log.launch_FV3LAM_wflow"
 #
 #-----------------------------------------------------------------------
 #
-DATE_FIRST_CYCL="20240530"
-DATE_LAST_CYCL="20240531"
+DATE_FIRST_CYCL="20241029"
+DATE_LAST_CYCL="20241031"
 STARTYEAR="2024"
-STARTMONTH="05"
-STARTDAY="30"
+STARTMONTH="10"
+STARTDAY="29"
 STARTHOUR="00"
 ENDYEAR="2024"
-ENDMONTH="05"
+ENDMONTH="10"
 ENDDAY="31"
 ENDHOUR="23"
 CYCL_HRS=( \
@@ -722,13 +722,13 @@ CYCL_HRS_HYB_FV3LAM_ENS=( \
 #
 # SPINUP_CYCLEDEF:
 # cycle definition for spin-up cycle group
-# This group runs: anal_gsi_input_spinup and data process, run_fcst_spinup,
-# run_post_spinup
+# This group runs: anal_gsi_input_spinup and data process, forecast_spinup,
+# post_spinup
 #
 # PROD_CYCLEDEF:
 # cycle definition for product cycle group
-# This group runs: anal_gsi_input and data process, run_fcst, python_skewt,
-# run_post, run_clean
+# This group runs: anal_gsi_input and data process, forecast, python_skewt,
+# post, run_clean
 #
 # SAVEDA_CYCLEDEF:
 # cycle definition for saving DA output files
@@ -741,23 +741,18 @@ CYCL_HRS_HYB_FV3LAM_ENS=( \
 # PRODLONG_CYCLEDEF:
 # same as PROD_CYCLEDEF, but for long forecast
 #
-# ARCHIVE_CYCLEDEF:
-# cycle definition for "archive" group
-# This group runs: run_archive
-#
 #-----------------------------------------------------------------------
 #
-CYCLEDAY="30-31"
-CYCLEMONTH="05"
+CYCLEDAY="29-31"
+CYCLEMONTH="10"
 AT_START_CYCLEDEF="00 01 01 01 2100 *"
-INITIAL_CYCLEDEF="202405300300 202405312300 12:00:00"
-BOUNDARY_CYCLEDEF="202405300000 202405312300 06:00:00"
+INITIAL_CYCLEDEF="202410290300 202410312300 12:00:00"
+BOUNDARY_CYCLEDEF="202410290000 202410312300 06:00:00"
 BOUNDARY_LONG_CYCLEDEF="00 01 01 01 2100 *"
-SPINUP_CYCLEDEF="00 03-08,15-20 30-31 05 2024 *"
-PROD_CYCLEDEF="00 01-05,07-11,13-17,19-23 30-31 05 2024 *"
+SPINUP_CYCLEDEF="00 03-08,15-20 29-31 10 2024 *"
+PROD_CYCLEDEF="00 01-05,07-11,13-17,19-23 29-31 10 2024 *"
 RECENTER_CYCLEDEF="00 01 01 01 2100 *"
-PRODLONG_CYCLEDEF="00 00,06,12,18 30-31 05 2024 *"
-ARCHIVE_CYCLEDEF="202405301400 202405312300 24:00:00"
+PRODLONG_CYCLEDEF="00 00,06,12,18 29-31 10 2024 *"
 SAVEDA_CYCLEDEF="00 01 01 01 2100 *"
 #
 #-----------------------------------------------------------------------
@@ -767,7 +762,7 @@ SAVEDA_CYCLEDEF="00 01 01 01 2100 *"
 # shell variable and assign value in config.sh and give it a default
 # value in config_default.sh In realtime testing, don't need to regenerate
 # the whole workflow, you can tweak $EXPTDIR/var_defns.sh and
-# $FIX_GSI/gsiparm.anl.sh to make sure the change is expected and then
+# $FIXrrfs/gsi/gsiparm.anl.sh to make sure the change is expected and then
 # put it back into config.sh and config_default.sh
 # (need to follow FORTRAN namelist convetion)
 #
@@ -844,7 +839,7 @@ ENKF_ANAVINFO_FN="anavinfo.rrfs"
 ENKF_ANAVINFO_DBZ_FN="anavinfo.enkf.rrfs_dbz"
 CONVINFO_FN="convinfo.rrfs"
 CONVINFO_SD_FN="convinfo.rrfs_sd"
-BERROR_FN="rrfs_glb_berror.l127y770.f77" #under $FIX_GSI
+BERROR_FN="rrfs_glb_berror.l127y770.f77" #under $FIXrrfs/gsi
 BERROR_SD_FN="berror.rrfs_sd" # for test only
 OBERROR_FN="errtable.rrfs"
 HYBENSINFO_FN="hybens_info.rrfs"
@@ -914,14 +909,14 @@ beta_recenter="1.0"
 #              1 means search start at 1-h previous cycle  lbcs directory.
 #              2 means search start at 2-h previous cycle  lbcs directory.
 #
-# FV3GFS_FILE_FMT_ICS:
-# If using the FV3GFS model as the source of the ICs (i.e. if EXTRN_MDL_NAME_ICS
-# is set to "FV3GFS"), this variable specifies the format of the model
+# GFS_FILE_FMT_ICS:
+# If using the GFS model as the source of the ICs (i.e. if EXTRN_MDL_NAME_ICS
+# is set to "GFS"), this variable specifies the format of the model
 # files to use when generating the ICs.
 #
-# FV3GFS_FILE_FMT_LBCS:
-# If using the FV3GFS model as the source of the LBCs (i.e. if
-# EXTRN_MDL_NAME_LBCS is set to "FV3GFS"), this variable specifies the
+# GFS_FILE_FMT_LBCS:
+# If using the GFS model as the source of the LBCs (i.e. if
+# EXTRN_MDL_NAME_LBCS is set to "GFS"), this variable specifies the
 # format of the model files to use when generating the LBCs.
 #
 # EXTRN_MDL_DATE_JULIAN:
@@ -930,16 +925,16 @@ beta_recenter="1.0"
 #
 #-----------------------------------------------------------------------
 #
-EXTRN_MDL_NAME_ICS="FV3GFS"
-EXTRN_MDL_NAME_LBCS="FV3GFS"
+EXTRN_MDL_NAME_ICS="GFS"
+EXTRN_MDL_NAME_LBCS="GFS"
 EXTRN_MDL_SAVETYPE="NONE"
 EXTRN_MDL_ICS_OFFSET_HRS="3"
 LBC_SPEC_INTVL_HRS="1"
 EXTRN_MDL_LBCS_OFFSET_HRS="6"
 EXTRN_MDL_LBCS_SEARCH_OFFSET_HRS="0"
 LBCS_SEARCH_HRS="6"
-FV3GFS_FILE_FMT_ICS="netcdf"
-FV3GFS_FILE_FMT_LBCS="netcdf"
+GFS_FILE_FMT_ICS="netcdf"
+GFS_FILE_FMT_LBCS="netcdf"
 EXTRN_MDL_DATE_JULIAN="FALSE"
 #
 #-----------------------------------------------------------------------
@@ -1018,7 +1013,7 @@ EXTRN_MDL_FILES_LBCS=( \
 #
 #-----------------------------------------------------------------------
 #
-CCPP_PHYS_SUITE="FV3_HRRR_gf"
+CCPP_PHYS_SUITE="RRFS_sas"
 #
 #-----------------------------------------------------------------------
 #
@@ -1399,7 +1394,7 @@ ESGgrid_PAZI="0.0"
 # WRITE_DOPOST:
 # Flag that determines whether or not to use the inline post feature
 # [i.e. calling the Unified Post Processor (UPP) from within the
-# weather model].  If this is set to true, the the run_post task will
+# weather model].  If this is set to true, then the post task will
 # be deactivated.
 #-----------------------------------------------------------------------
 #
@@ -1605,19 +1600,15 @@ SAVE_CYCLE_LOG="TRUE"
 # SFC_CLIMO_DIR:
 # Same as GRID_DIR but for the surface climatology generation task.
 #
-# RUN_TASK_RUN_PRDGEN:
+# RUN_TASK_PRDGEN:
 # Flag that determines whether the product generation task is to run.
 #
-# RUN_TASK_ADD_AEROSOL:
-# Flag that determines whether the task for adding dusk in the GEFS
-# aerosol data to LBCs task is to run.
-#
 # IS_RTMA:
 # If true, some ICs,LBCs,GSI rocoto tasks will be turned off
 #
 # FG_ROOTDIR:
 # First Guess Root Directory, APP will find corresponding first guess
-# fields from this directory. RRFS will find FG under NWGES_BASEDIR,
+# fields from this directory. RRFS will find FG under GESROOT,
 # but we needs to explicitly specify where to find FG for RTMA.
 # So this parameter only matters for RTMA
 #
@@ -1625,10 +1616,6 @@ SAVE_CYCLE_LOG="TRUE"
 # "" or "GSL":  RTMA's observations follow the GSL naming convention
 #       "NCO":  RTMA's observations follow the NCO naming convention
 #
-# PYTHON_GRAPHICS_YML_FN:
-# The name of the yml file under ${PYTHON_GRAPHICS_DIR}/image_lists
-# to be used by current application
-#
 #-----------------------------------------------------------------------
 #
 RUN_TASK_MAKE_GRID="FALSE"
@@ -1640,14 +1627,12 @@ OROG_DIR="$HOMErrfs/fix/lam/RRFS_NA_3km"
 RUN_TASK_MAKE_SFC_CLIMO="FALSE"
 SFC_CLIMO_DIR="$HOMErrfs/fix/lam/RRFS_NA_3km"
 
-RUN_TASK_RUN_PRDGEN="TRUE"
-RUN_TASK_ADD_AEROSOL="FALSE"
+RUN_TASK_PRDGEN="TRUE"
 #
 NCORES_PER_NODE="128" #Jet default value
 IS_RTMA="FALSE"
 FG_ROOTDIR=""
 RTMA_OBS_FEED=""
-PYTHON_GRAPHICS_YML_FN="rrfs_subset.yml"
 #
 #-----------------------------------------------------------------------
 #
@@ -1675,9 +1660,6 @@ SFC_CLIMO_FIELDS=( \
 # System directory in which the majority of fixed (i.e. time-independent)
 # files that are needed to run the FV3-LAM model are located
 #
-# FIXprdgen:
-# directory where prdgen fix files are located
-#
 # TOPO_DIR:
 # The location on disk of the static input files used by the make_orog
 # task (orog.x and shave.x). Can be the same as FIXgsm.
@@ -1687,23 +1669,6 @@ SFC_CLIMO_FIELDS=( \
 # used by sfc_climo_gen. These files are only used if
 # RUN_TASK_MAKE_SFC_CLIMO=TRUE
 #
-# FIX_GSI:
-# System directory in which the fixed files that are needed to run
-# the GSI are located
-#
-# FIX_UPP:
-# System directory in which the fixed files that are needed to run
-# the UPP are located
-#
-# FIX_CRTM:
-# System directory in which the CRTM coefficient files are located
-#
-# FIX_SMOKE_DUST
-# directory in which the smoke and dust fix files are located
-#
-# FIX_BUFRSND
-# directory in which the bufrsnd fix files are located
-#
 # FNGLAC, ..., FNMSKH:
 # Names of (some of the) global data files that are assumed to exist in
 # a system directory specified (this directory is machine-dependent;
@@ -1758,15 +1723,8 @@ SFC_CLIMO_FIELDS=( \
 # to a null string which will then be overwritten in setup.sh unless the
 # user has specified a different value in config.sh
 FIXgsm="$HOMErrfs/fix/am"
-FIXprdgen="$HOMErrfs/fix/prdgen"
 TOPO_DIR="/lfs/h2/emc/lam/noscrub/RRFS_input/fix/fix_orog"
 SFC_CLIMO_INPUT_DIR="/lfs/h2/emc/lam/noscrub/RRFS_input/fix/fix_sfc_climo"
-FIX_GSI="$HOMErrfs/fix/gsi"
-FIX_UPP="$HOMErrfs/fix/upp"
-FIX_CRTM="/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/intel-19.1.3.304/cray-mpich-8.1.12/crtm/2.4.0/fix"
-FIX_UPP_CRTM="/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/intel-19.1.3.304/cray-mpich-8.1.12/crtm/2.4.0/fix"
-FIX_SMOKE_DUST="$HOMErrfs/fix/smoke_dust"
-FIX_BUFRSND="$HOMErrfs/fix/bufrsnd"
 
 FNGLAC="global_glacier.2x2.grb"
 FNMXIC="global_maxice.2x2.grb"
@@ -1904,37 +1862,28 @@ GET_GEFS_LBCS_TN="get_gefs_lbcs"
 MAKE_ICS_TN="make_ics"
 BLEND_ICS_TN="blend_ics"
 MAKE_LBCS_TN="make_lbcs"
-RUN_FCST_TN="run_fcst"
-RUN_POST_TN="run_post"
-RUN_PRDGEN_TN="run_prdgen"
-RUN_BUFRSND_TN="run_bufrsnd"
+FORECAST_TN="forecast"
+POST_TN="post"
+PRDGEN_TN="prdgen"
+BUFRSND_TN="bufrsnd"
 
-ANALYSIS_GSI_TN="analysis_gsi_input"
+ANALYSIS_GSI_TN="analysis_gsi"
 ANALYSIS_GSIDIAG_TN="analysis_gsi_diag"
-ANALYSIS_SD_GSI_TN="analysis_sd_gsi_input"
-POSTANAL_TN="postanal_input"
+UPDATE_LBC_SOIL_TN="update_lbc_soil"
 OBSERVER_GSI_ENSMEAN_TN="observer_gsi_ensmean"
 OBSERVER_GSI_TN="observer_gsi"
-PREP_START_TN="prep_start"
 PREP_CYC_SPINUP_TN="prep_cyc_spinup"
 PREP_CYC_PROD_TN="prep_cyc_prod"
-PREP_CYC_ENSMEAN_TN="prep_cyc_ensmean"
 PREP_CYC_TN="prep_cyc"
 CALC_ENSMEAN_TN="calc_ensmean"
-PROCESS_RADAR_REF_TN="process_radarref"
-PROCESS_LIGHTNING_TN="process_lightning"
+PROCESS_RADAR_TN="process_radar"
 RADAR_REF_THINNING="1"
 PROCESS_BUFR_TN="process_bufr"
 PROCESS_SMOKE_TN="process_smoke"
-PROCESS_PM_TN="process_pm"
-RADAR_REFL2TTEN_TN="radar_refl2tten"
-CLDANL_NONVAR_TN="cldanl_nonvar"
+ANALYSIS_NONVARCLD_TN="analysis_nonvarcld"
 SAVE_RESTART_TN="save_restart"
 SAVE_DA_OUTPUT_TN="save_da_output"
-JEDI_ENVAR_IODA_TN="jedi_envar_ioda"
-IODA_PREPBUFR_TN="ioda_prepbufr"
-PROCESS_GLMFED_TN="process_glmfed"
-ADD_AEROSOL_TN="add_aerosol"
+PROCESS_LIGHTNING_TN="process_lightning"
 #
 # Number of nodes.
 #
@@ -1946,39 +1895,31 @@ NNODES_GET_EXTRN_LBCS="1"
 NNODES_MAKE_ICS="2"
 NNODES_BLEND_ICS="1"
 NNODES_MAKE_LBCS="1"
-NNODES_RUN_PREPSTART="1"
-NNODES_RUN_FCST="52"  # This is calculated in the workflow generation scripts, so no need to set here.
-NNODES_RUN_POST="4"
-NNODES_RUN_PRDGEN="1"
-NNODES_RUN_ANALYSIS="60"
-NNODES_RUN_GSIDIAG="1"
-NNODES_RUN_POSTANAL="1"
-NNODES_RUN_ENKF="10"
-NNODES_RUN_RECENTER="10"
-NNODES_PROC_RADAR="1"
-NNODES_PROC_LIGHTNING="1"
-NNODES_PROC_GLMFED="1"
-NNODES_PROC_BUFR="1"
-NNODES_PROC_SMOKE="1"
-NNODES_PROC_PM="1"
-NNODES_RUN_REF2TTEN="1"
-NNODES_RUN_NONVARCLDANL="1"
-NNODES_RUN_GRAPHICS="1"
-NNODES_RUN_ENSPOST="1"
-NNODES_RUN_BUFRSND="2"
+NNODES_PREP_CYC="1"
+NNODES_FORECAST="52"  # This is calculated in the workflow generation scripts, so no need to set here.
+NNODES_POST="4"
+NNODES_PRDGEN="1"
+NNODES_ANALYSIS_GSI="60"
+NNODES_ANALYSIS_GSIDIAG="1"
+NNODES_UPDATE_LBC_SOIL="1"
+NNODES_ANALYSIS_ENKF="10"
+NNODES_RECENTER="10"
+NNODES_PROCESS_RADAR="1"
+NNODES_PROCESS_LIGHTNING="1"
+NNODES_PROCESS_BUFR="1"
+NNODES_PROCESS_SMOKE="1"
+NNODES_ANALYSIS_NONVARCLD="1"
+NNODES_BUFRSND="2"
 NNODES_SAVE_RESTART="1"
-NNODES_RUN_JEDIENVAR_IODA="1"
-NNODES_RUN_IODA_PREPBUFR="1"
-NNODES_ADD_AEROSOL="1"
 #
 # Number of cores.
 #
-NCORES_RUN_ANALYSIS="360"
+NCORES_ANALYSIS_GSI="360"
 NCORES_RUN_OBSERVER="80"
-NCORES_RUN_ENKF="4"
-NATIVE_RUN_FCST="--cpus-per-task 2 --exclusive"
-NATIVE_RUN_ANALYSIS="--cpus-per-task 2 --exclusive"
-NATIVE_RUN_ENKF="--cpus-per-task 4 --exclusive"
+NCORES_ANALYSIS_ENKF="4"
+NATIVE_FORECAST="--cpus-per-task 2 --exclusive"
+NATIVE_ANALYSIS_GSI="--cpus-per-task 2 --exclusive"
+NATIVE_ANALYSIS_ENKF="--cpus-per-task 4 --exclusive"
 #
 # Number of MPI processes per node.
 #
@@ -1990,40 +1931,32 @@ PPN_GET_EXTRN_LBCS="1"
 PPN_MAKE_ICS="32"
 PPN_BLEND_ICS="8"
 PPN_MAKE_LBCS="64"
-PPN_RUN_PREPSTART="1"
-PPN_RUN_FCST="64"  # This may have to be changed depending on the number of threads used.
-PPN_RUN_POST="32"
-PPN_RUN_PRDGEN="128"
-PPN_RUN_ANALYSIS="8"
-PPN_RUN_GSIDIAG="128"
-PPN_RUN_POSTANAL="8"
-PPN_RUN_ENKF="8"
-PPN_RUN_RECENTER="128"
-PPN_PROC_RADAR="64"
-PPN_PROC_LIGHTNING="1"
-PPN_PROC_GLMFED="1"
-PPN_PROC_BUFR="1"
-PPN_PROC_SMOKE="1"
-PPN_PROC_PM="1"
-PPN_RUN_REF2TTEN="1"
-PPN_RUN_NONVARCLDANL="128"
-PPN_RUN_GRAPHICS="12"
-PPN_RUN_ENSPOST="1"
-PPN_RUN_BUFRSND="64"
+PPN_PREP_CYC="1"
+PPN_FORECAST="64"  # This may have to be changed depending on the number of threads used.
+PPN_POST="32"
+PPN_PRDGEN="128"
+PPN_ANALYSIS_GSI="8"
+PPN_ANALYSIS_GSIDIAG="128"
+PPN_UPDATE_LBC_SOIL="8"
+PPN_ANALYSIS_ENKF="8"
+PPN_RECENTER="128"
+PPN_PROCESS_RADAR="64"
+PPN_PROCESS_LIGHTNING="1"
+PPN_PROCESS_BUFR="1"
+PPN_PROCESS_SMOKE="1"
+PPN_ANALYSIS_NONVARCLD="128"
+PPN_BUFRSND="64"
 PPN_SAVE_RESTART="1"
-PPN_RUN_JEDIENVAR_IODA="1"
-PPN_RUN_IODA_PREPBUFR="1"
-PPN_ADD_AEROSOL="9"
 #
 # Number of TPP for WCOSS2.
 #
 TPP_MAKE_ICS="4"
 TPP_MAKE_LBCS="2"
-TPP_RUN_ANALYSIS="16"
-TPP_RUN_ENKF="16"
-TPP_RUN_FCST="2"
-TPP_RUN_POST="4"
-TPP_RUN_BUFRSND="2"
+TPP_ANALYSIS_GSI="16"
+TPP_ANALYSIS_ENKF="16"
+TPP_FORECAST="2"
+TPP_POST="4"
+TPP_BUFRSND="2"
 #
 # Walltimes.
 #
@@ -2035,32 +1968,24 @@ WTIME_GET_EXTRN_LBCS="00:45:00"
 WTIME_MAKE_ICS="00:30:00"
 WTIME_BLEND_ICS="00:30:00"
 WTIME_MAKE_LBCS="02:30:00"
-WTIME_RUN_PREPSTART="00:20:00"
-WTIME_RUN_PREPSTART_ENSMEAN="00:10:00"
-WTIME_RUN_FCST="02:30:00"
-WTIME_RUN_FCST_LONG="05:30:00"
-WTIME_RUN_FCST_SPINUP="00:30:00"
-WTIME_RUN_POST="00:15:00"
-WTIME_RUN_PRDGEN="00:40:00"
-WTIME_RUN_ANALYSIS="00:50:00"
-WTIME_RUN_GSIDIAG="00:15:00"
-WTIME_RUN_POSTANAL="00:30:00"
-WTIME_RUN_ENKF="01:00:00"
-WTIME_RUN_RECENTER="01:00:00"
-WTIME_PROC_RADAR="00:25:00"
-WTIME_PROC_LIGHTNING="00:25:00"
-WTIME_PROC_GLMFED="00:25:00"
-WTIME_PROC_BUFR="00:25:00"
-WTIME_PROC_SMOKE="00:25:00"
-WTIME_PROC_PM="00:25:00"
-WTIME_RUN_REF2TTEN="00:20:00"
-WTIME_RUN_NONVARCLDANL="00:20:00"
-WTIME_RUN_BUFRSND="04:45:00"
+WTIME_PREP_CYC="00:20:00"
+WTIME_FORECAST="02:30:00"
+WTIME_FORECAST_LONG="05:30:00"
+WTIME_FORECAST_SPINUP="00:30:00"
+WTIME_POST="00:15:00"
+WTIME_PRDGEN="00:40:00"
+WTIME_ANALYSIS_GSI="00:50:00"
+WTIME_ANALYSIS_GSIDIAG="00:15:00"
+WTIME_UPDATE_LBC_SOIL="00:30:00"
+WTIME_ANALYSIS_ENKF="01:00:00"
+WTIME_RECENTER="01:00:00"
+WTIME_PROCESS_RADAR="00:25:00"
+WTIME_PROCESS_LIGHTNING="00:25:00"
+WTIME_PROCESS_BUFR="00:25:00"
+WTIME_PROCESS_SMOKE="00:25:00"
+WTIME_ANALYSIS_NONVARCLD="00:20:00"
+WTIME_BUFRSND="04:45:00"
 WTIME_SAVE_RESTART="00:15:00"
-WTIME_RUN_ENSPOST="00:30:00"
-WTIME_RUN_JEDIENVAR_IODA="00:30:00"
-WTIME_RUN_IODA_PREPBUFR="00:20:00"
-WTIME_ADD_AEROSOL="00:30:00"
 #
 # Start times.
 #
@@ -2070,30 +1995,21 @@ START_TIME_CONVENTIONAL_SPINUP="00:40:00"
 START_TIME_BLENDING="04:00:00"
 START_TIME_LATE_ANALYSIS="01:20:00"
 START_TIME_CONVENTIONAL="00:45:00"
-START_TIME_IODA_PREPBUFR="00:50:00"
 START_TIME_NSSLMOSIAC="00:45:00"
-START_TIME_LIGHTNINGNC="00:55:00"
-START_TIME_GLMFED="00:45:00"
-START_TIME_PROCSMOKE="00:50:00"
-START_TIME_PROCPM="00:45:00"
+START_TIME_PROCESS_LIGHTNING="00:45:00"
+START_TIME_PROCESS_SMOKE="00:50:00"
 #
 # Memory.
 #
-MEMO_RUN_PROCESSBUFR="20G"
-MEMO_RUN_REF2TTEN="20G"
-MEMO_RUN_NONVARCLDANL="256G"
-MEMO_RUN_PREPSTART="120G"
-MEMO_RUN_PRDGEN="256G"
-MEMO_RUN_JEDIENVAR_IODA="20G"
-MEMO_RUN_IODA_PREPBUFR="20G"
-MEMO_PREP_CYC="40G"
+MEMO_PROCESS_BUFR="20G"
+MEMO_ANALYSIS_NONVARCLD="256G"
+MEMO_PRDGEN="256G"
+MEMO_PREP_CYC="120G"
 MEMO_SAVE_RESTART="120G"
 MEMO_SAVE_INPUT="120G"
-MEMO_PROC_SMOKE="256G"
-MEMO_PROC_GLMFED="70G"
-MEMO_PROC_PM="40G"
+MEMO_PROCESS_SMOKE="256G"
+MEMO_PROCESS_LIGHTNING="70G"
 MEMO_SAVE_DA_OUTPUT="40G"
-MEMO_ADD_AEROSOL="70G"
 #
 # Maximum number of attempts.
 #
@@ -2105,29 +2021,23 @@ MAXTRIES_GET_EXTRN_LBCS="2"
 MAXTRIES_MAKE_ICS="1"
 MAXTRIES_BLEND_ICS="1"
 MAXTRIES_MAKE_LBCS="1"
-MAXTRIES_RUN_PREPSTART="1"
-MAXTRIES_RUN_FCST="1"
+MAXTRIES_PREP_CYC="1"
+MAXTRIES_FORECAST="1"
 MAXTRIES_ANALYSIS_GSI="1"
-MAXTRIES_POSTANAL="2"
+MAXTRIES_UPDATE_LBC_SOIL="2"
 MAXTRIES_ANALYSIS_ENKF="1"
-MAXTRIES_RUN_POST="2"
-MAXTRIES_RUN_PRDGEN="1"
-MAXTRIES_RUN_ANALYSIS="2"
-MAXTRIES_RUN_POSTANAL="1"
+MAXTRIES_POST="2"
+MAXTRIES_PRDGEN="1"
+MAXTRIES_ANALYSIS_GSI="1"
+MAXTRIES_UPDATE_LBC_SOIL="2"
 MAXTRIES_RECENTER="1"
-MAXTRIES_PROCESS_RADARREF="1"
+MAXTRIES_PROCESS_RADAR="1"
 MAXTRIES_PROCESS_LIGHTNING="1"
-MAXTRIES_PROC_GLMFED="1"
 MAXTRIES_PROCESS_BUFR="1"
 MAXTRIES_PROCESS_SMOKE="1"
-MAXTRIES_PROCESS_PM="1"
-MAXTRIES_RADAR_REF2TTEN="1"
-MAXTRIES_CLDANL_NONVAR="2"
+MAXTRIES_ANALYSIS_NONVARCLD="2"
 MAXTRIES_SAVE_RESTART="2"
 MAXTRIES_SAVE_DA_OUTPUT="2"
-MAXTRIES_JEDI_ENVAR_IODA="1"
-MAXTRIES_IODA_PREPBUFR="1"
-MAXTRIES_ADD_AEROSOL="1"
 #
 #-----------------------------------------------------------------------
 #
@@ -2277,13 +2187,6 @@ TILE_SETS="full SE,SC,SW NE,NC,NW ATL,CA-NV,CentralCA CHI-DET,DCArea,EastCO
 # DO_GSIDIAG_OFFLINE:
 # Decide whether or not to run GSI diag generation outside of the GSI task
 #
-# DO_ENS_GRAPHICS:
-# Flag to turn on/off ensemble graphics. Turns OFF deterministic
-# graphics.
-#
-# DO_ENSPOST:
-# Flag to turn on/off python ensemble postprocessing for WPC testbeds.
-#
 # DO_ENSINIT:
 # Decide whether or not to do ensemble initialization by running 1
 # timestep ensemble forecast and recentering on the deterministic
@@ -2351,8 +2254,6 @@ DO_ENKF_RADAR_REF="FALSE"
 DO_ENVAR_RADAR_REF="TRUE"
 DO_ENVAR_RADAR_REF_ONCE="TRUE"
 DO_RECENTER="FALSE"
-DO_ENS_GRAPHICS="FALSE"
-DO_ENSPOST="FALSE"
 DO_ENSINIT="FALSE"
 DO_SAVE_DA_OUTPUT="FALSE"
 DO_GSIDIAG_OFFLINE="TRUE"
@@ -2420,7 +2321,6 @@ DO_BUFRSND="TRUE"
 USE_RRFSE_ENS="TRUE"
 DO_SMOKE_DUST="TRUE"
 EBB_DCYCLE="2"
-DO_PM_DA="FALSE"
 USE_CLM="TRUE"
 DO_NON_DA_RUN="FALSE"
 #
@@ -2740,37 +2640,11 @@ GWD_HRRRsuite_BASEDIR="$HOMErrfs/fix/lam"
 #
 #-----------------------------------------------------------------------
 #
-# Parameters for JEDI options
-#
-# DO_JEDI_ENVAR_IODA:
-# Flag turn on the JEDI-IODA converters for EnVAR.  It requires GSI
-# to produce NetCDF diag files
-#-----------------------------------------------------------------------
-#
-DO_JEDI_ENVAR_IODA="FALSE"
-#
-#-----------------------------------------------------------------------
-#
-# Parameters for IODA options
-#
-# DO_IODA_PREPBUFR:
-# Flag turn on the IODA converters for conventional observations in prepbufr files.
-#-----------------------------------------------------------------------
-#
-DO_IODA_PREPBUFR="FALSE"
-#
-#-----------------------------------------------------------------------
-#
 # Parameters for analysis options
 #
-# DO_NONVAR_CLDANAL:
+# DO_ANALYSIS_NONVARCLD:
 # Flag turn on the non-var cloud analysis.
 #
-# DO_REFL2TTEN:
-# Flag turn on the radar reflectivity to temperature tendenecy.
-#
-# DO_NLDN_LGHT
-# Flag turn on processing NLDN NetCDF lightning data
 # DO_GLM_FED_DA
 # Flag turn on processing gridded GLM lightning data
 # GLMFED_DATA_MODE
@@ -2782,15 +2656,12 @@ DO_IODA_PREPBUFR="FALSE"
 #
 #-----------------------------------------------------------------------
 #
-DO_NONVAR_CLDANAL="TRUE"
-DO_REFL2TTEN="FALSE"
-DO_NLDN_LGHT="FALSE"
+DO_ANALYSIS_NONVARCLD="TRUE"
 DO_GLM_FED_DA="TRUE"
 GLMFED_DATA_MODE="PROD"
 PREP_MODEL_FOR_FED="FALSE"
 DO_SMOKE_DUST="TRUE"
 EBB_DCYCLE="2"
-DO_PM_DA="FALSE"
 #
 #-----------------------------------------------------------------------
 #
@@ -2839,12 +2710,12 @@ RADARREFL_TIMELEVEL="0"
 # (current cycle - this hour) will be cleaned
 #-----------------------------------------------------------------------
 #
-CLEAN_OLDPROD_HRS="24"
-CLEAN_OLDLOG_HRS="24"
-CLEAN_OLDRUN_HRS="7"
-CLEAN_OLDFCST_HRS="7"
-CLEAN_OLDSTMPPOST_HRS="7"
-CLEAN_NWGES_HRS="7"
+CLEAN_OLDPROD_HRS="72"
+CLEAN_OLDLOG_HRS="0"
+CLEAN_OLDRUN_HRS="72"
+CLEAN_OLDFCST_HRS="72"
+CLEAN_OLDSTMPPOST_HRS="0"
+CLEAN_NWGES_HRS="72"
 
 #
 #-----------------------------------------------------------------------
@@ -2878,37 +2749,27 @@ CRONTAB_LINE=""
 #-----------------------------------------------------------------------
 #
 HOMErrfs="$HOMErrfs"
-USHdir="$HOMErrfs/ush"
-SCRIPTSdir="$HOMErrfs/scripts"
-JOBSdir="$HOMErrfs/jobs"
-SORCdir="$HOMErrfs/sorc"
-PARMdir="$HOMErrfs/parm"
+USHrrfs="$HOMErrfs/ush"
+SORCrrfs="$HOMErrfs/sorc"
+PARMrrfs="$HOMErrfs/parm"
 MODULES_DIR="$HOMErrfs/modulefiles"
-EXECdir="$HOMErrfs/exec"
 LIB64dir="$HOMErrfs/sorc/build/lib64"
 FIXam="$HOMErrfs/parm/config/det/fix_am"
 FIXLAM="$HOMErrfs/parm/config/det/fix_lam"
 FIXgsm="$HOMErrfs/fix/am"
-FIXprdgen="$HOMErrfs/fix/prdgen"
-COMROOT="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0"
-COMOUT_BASEDIR="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0/prod"
-NWGES_BASEDIR="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
+COMROOT="$COMROOT"
+GESROOT="/lfs/h3/emc/lam/noscrub/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
 UFS_WTHR_MDL_DIR="$HOMErrfs/sorc/ufs-weather-model"
 UFS_UTILS_DIR="$HOMErrfs/sorc/UFS_UTILS"
 SFC_CLIMO_INPUT_DIR="/lfs/h2/emc/lam/noscrub/RRFS_input/fix/fix_sfc_climo"
 TOPO_DIR="/lfs/h2/emc/lam/noscrub/RRFS_input/fix/fix_orog"
 UPP_DIR="$HOMErrfs/sorc/UPP"
-PYTHON_GRAPHICS_DIR="$HOMErrfs/python_graphics"
 
-ARCHIVEDIR="/NCEPDEV/emc-meso/1year/emc.lam/n3v91"
-NCARG_ROOT="/apps/ncl/6.5.0-CentOS6.10_64bit_nodap_gnu447"
-NCL_HOME="/home/rtrr/RRFS/graphics"
-NCL_REGION="conus"
-MODEL="rrfs_a"
+MODEL="rrfs"
 
 EXPTDIR="$HOMErrfs/parm/config/det"
-LOG_BASEDIR="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0/logs"
-CYCLE_BASEDIR="$DATAROOT"
+LOG_BASEDIR="notused"
+DATAROOT="$DATAROOT"
 GRID_DIR="$HOMErrfs/fix/lam/RRFS_NA_3km"
 OROG_DIR="$HOMErrfs/fix/lam/RRFS_NA_3km"
 SFC_CLIMO_DIR="$HOMErrfs/fix/lam/RRFS_NA_3km"
@@ -2927,14 +2788,8 @@ GLMFED_EAST_ROOT="/lfs/h1/ops/prod/dcom/ldmdata/obs/GOES-16/GLM/tiles"
 GLMFED_WEST_ROOT="/lfs/h1/ops/prod/dcom/ldmdata/obs/GOES-17/GLM/tiles"
 ENKF_FCST="/lfs/h1/ops/prod/com/gfs/v16.3"
 
-FIX_GSI="$HOMErrfs/fix/gsi"
-FIX_CRTM="/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/intel-19.1.3.304/cray-mpich-8.1.12/crtm/2.4.0/fix"
-FIX_UPP_CRTM="/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/intel-19.1.3.304/cray-mpich-8.1.12/crtm/2.4.0/fix"
-FIX_SMOKE_DUST="$HOMErrfs/fix/smoke_dust"
-FIX_BUFRSND="$HOMErrfs/fix/bufrsnd"
 AIRCRAFT_REJECT="/lfs/h2/emc/lam/noscrub/emc.lam/FIX_RRFS/gsi"
 SFCOBS_USELIST="/lfs/h2/emc/lam/noscrub/emc.lam/FIX_RRFS/gsi"
-PARM_IODACONV="$HOMErrfs/parm/iodaconv"
 
 RADARREFL_MINS=( "0" "1" "2" "3" )
 RADARREFL_TIMELEVEL=( "0" )
@@ -2946,29 +2801,29 @@ ADDNL_OUTPUT_GRIDS=( "hrrr" "hrrrak" )
 #
 #-----------------------------------------------------------------------
 #
-GLOBAL_VAR_DEFNS_FP="/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/para/packages/rrfs.v1.0.0/parm/config/det/var_defns.sh"
+GLOBAL_VAR_DEFNS_FP="$HOMErrfs/parm/config/det/var_defns.sh"
 # Try this at some point instead of hard-coding it as above; it's a more
 # flexible approach (if it works).
 #GLOBAL_VAR_DEFNS_FP=$HOMErrfs/ush/setup.sh
 
 DATA_TABLE_TMPL_FN="data_table"
-DIAG_TABLE_TMPL_FN="diag_table.FV3_HRRR_gf_clm"
-FIELD_TABLE_TMPL_FN="field_table.FV3_HRRR_gf"
+DIAG_TABLE_TMPL_FN="diag_table.RRFS_sas_clm"
+FIELD_TABLE_TMPL_FN="field_table.RRFS_sas"
 MODEL_CONFIG_TMPL_FN="model_configure"
 UFS_CONFIG_TMPL_FN="ufs.configure"
 
 DATA_TABLE_TMPL_FP="$HOMErrfs/parm/data_table"
-DIAG_TABLE_TMPL_FP="$HOMErrfs/parm/diag_table.FV3_HRRR_gf_clm"
-FIELD_TABLE_TMPL_FP="$HOMErrfs/parm/field_table.FV3_HRRR_gf"
+DIAG_TABLE_TMPL_FP="$HOMErrfs/parm/diag_table.RRFS_sas_clm"
+FIELD_TABLE_TMPL_FP="$HOMErrfs/parm/field_table.RRFS_sas"
 FV3_NML_BASE_SUITE_FP="$HOMErrfs/parm/input.nml.FV3"
 FV3_NML_YAML_CONFIG_FP="$HOMErrfs/parm/FV3.input.yml"
 FV3_NML_BASE_ENS_FP="$HOMErrfs/parm/config/det/input.nml.base_ens"
 MODEL_CONFIG_TMPL_FP="$HOMErrfs/parm/model_configure"
 UFS_CONFIG_TMPL_FP="$HOMErrfs/parm/ufs.configure"
 
-CCPP_PHYS_SUITE_FN="suite_FV3_HRRR_gf.xml"
-CCPP_PHYS_SUITE_IN_CCPP_FP="$HOMErrfs/sorc/ufs-weather-model/FV3/ccpp/suites/suite_FV3_HRRR_gf.xml"
-CCPP_PHYS_SUITE_FP="$HOMErrfs/parm/config/det/suite_FV3_HRRR_gf.xml"
+CCPP_PHYS_SUITE_FN="suite_RRFS_sas.xml"
+CCPP_PHYS_SUITE_IN_CCPP_FP="$HOMErrfs/sorc/ufs-weather-model/FV3/ccpp/suites/suite_RRFS_sas.xml"
+CCPP_PHYS_SUITE_FP="$HOMErrfs/parm/config/det/suite_RRFS_sas.xml"
 
 DATA_TABLE_FP="$HOMErrfs/parm/config/det/data_table"
 FIELD_TABLE_FP="$HOMErrfs/parm/config/det/field_table"
diff --git a/parm/config/enkf/field_table b/parm/config/enkf/field_table
index 3d4e0afcd..691a27f54 100644
--- a/parm/config/enkf/field_table
+++ b/parm/config/enkf/field_table
@@ -63,6 +63,11 @@
            "longname",     "subgrid scale turbulent kinetic energy"
            "units",        "m2/s2"
        "profile_type", "fixed", "surface_value=0.0" /
+# prognostic sigmab tracer
+ "TRACER", "atmos_mod", "sigmab"
+           "longname",     "sigma fraction"
+           "units",        "fraction"
+       "profile_type", "fixed", "surface_value=0.0" /
 # prognostic smoke mixing ratio tracer
   "TRACER", "atmos_mod", "smoke"
             "longname",     "smoke mixing ratio"
diff --git a/parm/config/enkf/input.nml b/parm/config/enkf/input.nml
index a3e6375fe..8e54ee8f8 100644
--- a/parm/config/enkf/input.nml
+++ b/parm/config/enkf/input.nml
@@ -10,7 +10,7 @@
 &atmos_model_nml
     avg_max_length = 3600.0
     blocksize = 28
-    ccpp_suite = 'FV3_HRRR_gf'
+    ccpp_suite = 'RRFS_sas'
     chksum_debug = .false.
     dycore_only = .false.
     ignore_rst_cksum = .true.
@@ -102,7 +102,7 @@
     kord_tm = -9
     kord_tr = 9
     kord_wz = 9
-    layout = 15, 54
+    layout = 16, 48
     make_nh = .true.
     mountain = .false.
     n_split = 5
@@ -156,6 +156,7 @@
     addsmoke_flag = 1
     aero_dir_fdb = .true.
     aero_ind_fdb = .false.
+    betadcu = 1.0
     bl_mynn_edmf = 1
     bl_mynn_edmf_mom = 1
     bl_mynn_tkeadvect = .true.
@@ -200,6 +201,7 @@
     frac_ice = .true.
     gwd_opt = 3
     h2o_phys = .true.
+    hwp_method = 1
     hybedmf = .false.
     iaer = 1011
     ialb = 2
@@ -211,7 +213,7 @@
     icloud_bl = 1
     ico2 = 2
     iems = 2
-    imfdeepcnv = 3
+    imfdeepcnv = 2
     imfshalcnv = -1
     imp_physics = 8
     iopt_alb = 2
@@ -259,20 +261,21 @@
     oz_phys_2015 = .true.
     pdfcld = .false.
     plume_wind_eff = 1
-    plumerisefire_frq = 60
+    plumerisefire_frq = 30
     pre_rad = .false.
     print_diff_pgr = .true.
+    progsigma = .true.
     prslrd0 = 0.0
     random_clds = .false.
     redrag = .true.
     rrfs_sd = .false.
     rrfs_smoke_debug = .false.
     satmedmf = .false.
+    sc_factor = 1.0
     seas_opt = 0
     sfclay_compute_flux = .true.
     shal_cnv = .false.
     smoke_conv_wet_coef = 0.5, 0.5, 0.5
-    smoke_forecast = 1
     swhtr = .true.
     thsfc_loc = .false.
     trans_trac = .true.
diff --git a/parm/config/enkf/input.nml_restart b/parm/config/enkf/input.nml_restart
index c12f95728..9f4c9da8e 100644
--- a/parm/config/enkf/input.nml_restart
+++ b/parm/config/enkf/input.nml_restart
@@ -10,7 +10,7 @@
 &atmos_model_nml
     avg_max_length = 3600.0
     blocksize = 28
-    ccpp_suite = 'FV3_HRRR_gf'
+    ccpp_suite = 'RRFS_sas'
     chksum_debug = .false.
     dycore_only = .false.
     ignore_rst_cksum = .true.
@@ -102,7 +102,7 @@
     kord_tm = -9
     kord_tr = 9
     kord_wz = 9
-    layout = 15, 54
+    layout = 16, 48
     make_nh = .false.
     mountain = .true.
     n_split = 5
@@ -156,6 +156,7 @@
     addsmoke_flag = 1
     aero_dir_fdb = .true.
     aero_ind_fdb = .false.
+    betadcu = 1.0
     bl_mynn_edmf = 1
     bl_mynn_edmf_mom = 1
     bl_mynn_tkeadvect = .true.
@@ -200,6 +201,7 @@
     frac_ice = .true.
     gwd_opt = 3
     h2o_phys = .true.
+    hwp_method = 1
     hybedmf = .false.
     iaer = 1011
     ialb = 2
@@ -211,7 +213,7 @@
     icloud_bl = 1
     ico2 = 2
     iems = 2
-    imfdeepcnv = 3
+    imfdeepcnv = 2
     imfshalcnv = -1
     imp_physics = 8
     iopt_alb = 2
@@ -259,20 +261,21 @@
     oz_phys_2015 = .true.
     pdfcld = .false.
     plume_wind_eff = 1
-    plumerisefire_frq = 60
+    plumerisefire_frq = 30
     pre_rad = .false.
     print_diff_pgr = .true.
+    progsigma = .true.
     prslrd0 = 0.0
     random_clds = .false.
     redrag = .true.
     rrfs_sd = .false.
     rrfs_smoke_debug = .false.
     satmedmf = .false.
+    sc_factor = 1.0
     seas_opt = 0
     sfclay_compute_flux = .true.
     shal_cnv = .false.
     smoke_conv_wet_coef = 0.5, 0.5, 0.5
-    smoke_forecast = 1
     swhtr = .true.
     thsfc_loc = .false.
     trans_trac = .true.
diff --git a/parm/config/enkf/var_defns.sh b/parm/config/enkf/var_defns.sh
index c58c00a37..d81a1e69e 100644
--- a/parm/config/enkf/var_defns.sh
+++ b/parm/config/enkf/var_defns.sh
@@ -4,7 +4,7 @@
 # This file sets the experiment's configuration variables (which are
 # global shell variables) to their default values.  For many of these
 # variables, the valid values that they may take on are defined in the
-# file $USHdir/valid_param_vals.sh.
+# file $USHrrfs/valid_param_vals.sh.
 #
 #-----------------------------------------------------------------------
 #
@@ -21,7 +21,7 @@
 #
 #-----------------------------------------------------------------------
 #
-version="v0.9.5"
+version="v0.9.1"
 #
 #-----------------------------------------------------------------------
 #
@@ -58,7 +58,7 @@ version="v0.9.5"
 # If using the slurm job scheduler (i.e. if SCHED is set to "slurm"),
 # the default partition to which to submit workflow tasks.  If a task
 # does not have a specific variable that specifies the partition to which
-# it will be submitted (e.g. PARTITION_HPSS, PARTITION_FCST; see below),
+# it will be submitted (e.g. PARTITION_HPSS, PARTITION_FORECAST; see below),
 # it will be submitted to the partition specified by this variable.  If
 # this is not set or is set to an empty string, it will be (re)set to a
 # machine-dependent value.  This is not used if SCHED is not set to
@@ -68,7 +68,7 @@ version="v0.9.5"
 # The default queue or QOS (if using the slurm job scheduler, where QOS
 # is Quality of Service) to which workflow tasks are submitted.  If a
 # task does not have a specific variable that specifies the queue to which
-# it will be submitted (e.g. QUEUE_HPSS, QUEUE_FCST; see below), it will
+# it will be submitted (e.g. QUEUE_HPSS, QUEUE_FORECAST; see below), it will
 # be submitted to the queue specified by this variable.  If this is not
 # set or is set to an empty string, it will be (re)set to a machine-
 # dependent value.
@@ -95,14 +95,14 @@ version="v0.9.5"
 # wil be (re)set to a machine-dependent value.  This is not used if SCHED
 # is not set to "slurm."
 #
-# PARTITION_FCST:
+# PARTITION_FORECAST:
 # If using the slurm job scheduler (i.e. if SCHED is set to "slurm"),
 # the partition to which the task that runs forecasts is submitted.  If
 # this is not set or set to an empty string, it will be (re)set to a
 # machine-dependent value.  This is not used if SCHED is not set to
 # "slurm".
 #
-# QUEUE_FCST:
+# QUEUE_FORECAST:
 # The queue or QOS to which the task that runs a forecast is submitted.
 # If this is not set or set to an empty string, it will be (re)set to a
 # machine-dependent value.
@@ -157,10 +157,8 @@ QUEUE_DEFAULT="pridev"
 PARTITION_HPSS=""
 QUEUE_HPSS="dev_transfer"
 PARTITION_SFC_CLIMO=""
-PARTITION_FCST=""
-QUEUE_FCST="pridev"
-PARTITION_GRAPHICS=""
-QUEUE_GRAPHICS="pridev"
+PARTITION_FORECAST=""
+QUEUE_FORECAST="pridev"
 PARTITION_ANALYSIS=""
 QUEUE_ANALYSIS="pridev"
 PARTITION_PRDGEN=""
@@ -211,14 +209,14 @@ CRON_RELAUNCH_INTVL_MNTS="03"
 #
 #-----------------------------------------------------------------------
 #
-EXPT_BASEDIR="${HOMErrfs}"
-EXPT_SUBDIR="rrfs_na"
+EXPT_BASEDIR="${HOMErrfs}/parm/config"
+EXPT_SUBDIR="enkf"
 #
 #-----------------------------------------------------------------------
 #
 # COMINgfs:
 # The beginning portion of the directory containing files generated by
-# the external model (FV3GFS) that the initial and lateral boundary
+# the external model (GFS) that the initial and lateral boundary
 # condition generation tasks need in order to create initial and boundary
 # condition files for a given cycle on the native FV3-LAM grid.  For a
 # cycle that starts on the date specified by the variable yyyymmdd
@@ -253,7 +251,7 @@ EXPT_SUBDIR="rrfs_na"
 #
 #   $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
@@ -269,6 +267,9 @@ EXPT_SUBDIR="rrfs_na"
 #   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
@@ -278,13 +279,13 @@ EXPT_SUBDIR="rrfs_na"
 #
 #   $PTMP/com/$NET/$envir/$RUN.$yyyymmdd/$hh
 #
-# NWGES:
+# GESROOT:
 # The beginning portion of the directory that will contain the output
 # files from the forecast for a given cycle.  For a cycle
 # that starts on the date specified by yyyymmdd and hour specified by hh
 # (where yyyymmdd and hh are as described above), the directory in which
 # the forecast output files will be placed will be:
-#   $NWGES/$NET/$envir/$RUN.$yyyymmdd/$hh
+#   $GESROOT/$RUN.$yyyymmdd/$hh
 #
 # Setup default observation locations for data assimilation:
 #
@@ -325,24 +326,21 @@ EXPT_SUBDIR="rrfs_na"
 COMINgfs=""
 FIXLAM_NCO_BASEDIR="$HOMErrfs/fix/lam"
 STMP="$DATAROOT"
-ENSCTRL_STMP="/base/path/of/directory/containing/model/input/and/raw/output/files"
-RRFSE_NWGES_BASEDIR="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
-NET="rrfs_a"
+ENSCTRL_STMP="notused"
+RRFSE_GESROOT="/base/path/of/directory/containing/model/output/files"
+NET="rrfs"
 envir="prod"
 RUN="enkfrrfs"
 RUN_ensctrl="rrfs"
 TAG="n3enkf91"
-PTMP="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0"
-ENSCTRL_PTMP="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0"
-NWGES="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
-ENSCTRL_NWGES="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
-RRFSE_NWGES="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
+WGF="enkf"
+PTMP="/lfs/h3/emc/lam/noscrub/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0"
+ENSCTRL_PTMP="/lfs/h3/emc/lam/noscrub/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0"
+GESROOT="/lfs/h3/emc/lam/noscrub/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
+ENSCTRL_GESROOT="/lfs/h3/emc/lam/noscrub/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
+RRFSE_GESROOT="/base/path/of/directory/containing/model/output/files"
 
-ARCHIVEDIR="/NCEPDEV/emc-meso/1year/emc.lam/n3v91"
-NCARG_ROOT="/apps/ncl/6.5.0-CentOS6.10_64bit_nodap_gnu447"
-NCL_HOME="/home/rtrr/RRFS/graphics"
-NCL_REGION="na"
-MODEL="RRFS_A"
+MODEL="RRFS"
 
 OBSTYPE_SOURCE="rap"
 OBSPATH="/lfs/h1/ops/prod/com/obsproc/v1.2"
@@ -438,7 +436,7 @@ RELATIVE_LINK_FLAG="--relative"
 # FV3_EXEC_FN:
 # Name to use for the forecast model executable when it is copied from
 # the directory in which it is created in the build step to the executables
-# directory (EXECdir; this is set during experiment generation).
+# directory (EXECrrfs; this is set in the J-jobs).
 #
 # WFLOW_XML_FN:
 # Name of the rocoto workflow XML file that the experiment generation
@@ -591,14 +589,14 @@ WFLOW_LAUNCH_LOG_FN="log.launch_FV3LAM_wflow"
 #
 #-----------------------------------------------------------------------
 #
-DATE_FIRST_CYCL="20240530"
-DATE_LAST_CYCL="20240531"
+DATE_FIRST_CYCL="20241029"
+DATE_LAST_CYCL="20241031"
 STARTYEAR="2024"
-STARTMONTH="05"
-STARTDAY="30"
+STARTMONTH="10"
+STARTDAY="29"
 STARTHOUR="00"
 ENDYEAR="2024"
-ENDMONTH="05"
+ENDMONTH="10"
 ENDDAY="31"
 ENDHOUR="23"
 CYCL_HRS="18"
@@ -694,13 +692,13 @@ CYCL_HRS_HYB_FV3LAM_ENS="99"
 #
 # SPINUP_CYCLEDEF:
 # cycle definition for spin-up cycle group
-# This group runs: anal_gsi_input_spinup and data process, run_fcst_spinup,
-# run_post_spinup
+# This group runs: anal_gsi_input_spinup and data process, forecast_spinup,
+# post_spinup
 #
 # PROD_CYCLEDEF:
 # cycle definition for product cycle group
-# This group runs: anal_gsi_input and data process, run_fcst, python_skewt,
-# run_post, run_clean
+# This group runs: anal_gsi_input and data process, forecast, python_skewt,
+# post, run_clean
 #
 # SAVEDA_CYCLEDEF:
 # cycle definition for saving DA output files
@@ -713,24 +711,19 @@ CYCL_HRS_HYB_FV3LAM_ENS="99"
 # PRODLONG_CYCLEDEF:
 # same as PROD_CYCLEDEF, but for long forecast
 #
-# ARCHIVE_CYCLEDEF:
-# cycle definition for "archive" group
-# This group runs: run_archive
-#
 #-----------------------------------------------------------------------
 #
-CYCLEDAY="30-31"
-CYCLEMONTH="05"
+CYCLEDAY="29-31"
+CYCLEMONTH="10"
 AT_START_CYCLEDEF="00 01 01 01 2100 *"
-INITIAL_CYCLEDEF="202405300700 202405312300 12:00:00"
-BOUNDARY_CYCLEDEF="202405300000 202405312300 06:00:00"
+INITIAL_CYCLEDEF="202410290700 202410312300 12:00:00"
+BOUNDARY_CYCLEDEF="202410290000 202410312300 06:00:00"
 BOUNDARY_LONG_CYCLEDEF="00 01 01 01 2100 *"
-SPINUP_CYCLEDEF="202405300700 202405312300 12:00:00"
-PROD_CYCLEDEF="00 01-05,08-11,13-17,20-23 30-31 05 2024 *"
+SPINUP_CYCLEDEF="202410290700 202410312300 12:00:00"
+PROD_CYCLEDEF="00 01-05,08-11,13-17,20-23 29-31 10 2024 *"
 RECENTER_CYCLEDEF="00 01 01 01 2100 *"
-PRODLONG_CYCLEDEF="202405300000 202405312300 06:00:00"
-ARCHIVE_CYCLEDEF="00 01 01 01 2100 *"
-SAVEDA_CYCLEDEF="202405300000 202405312300 06:00:00"
+PRODLONG_CYCLEDEF="202410290000 202410312300 06:00:00"
+SAVEDA_CYCLEDEF="202410290000 202410312300 06:00:00"
 #
 #-----------------------------------------------------------------------
 #
@@ -739,7 +732,7 @@ SAVEDA_CYCLEDEF="202405300000 202405312300 06:00:00"
 # shell variable and assign value in config.sh and give it a default
 # value in config_default.sh In realtime testing, don't need to regenerate
 # the whole workflow, you can tweak $EXPTDIR/var_defns.sh and
-# $FIX_GSI/gsiparm.anl.sh to make sure the change is expected and then
+# $FIXrrfs/gsi/gsiparm.anl.sh to make sure the change is expected and then
 # put it back into config.sh and config_default.sh
 # (need to follow FORTRAN namelist convetion)
 #
@@ -816,7 +809,7 @@ ENKF_ANAVINFO_FN="anavinfo.rrfs"
 ENKF_ANAVINFO_DBZ_FN="anavinfo.enkf.rrfs_dbz"
 CONVINFO_FN="convinfo.rrfs"
 CONVINFO_SD_FN="convinfo.rrfs_sd"
-BERROR_FN="rrfs_glb_berror.l127y770.f77" #under $FIX_GSI
+BERROR_FN="rrfs_glb_berror.l127y770.f77" #under $FIXrrfs/gsi
 BERROR_SD_FN="berror.rrfs_sd" # for test only
 OBERROR_FN="errtable.rrfs"
 HYBENSINFO_FN="hybens_info.rrfs"
@@ -886,14 +879,14 @@ beta_recenter="1.0"
 #              1 means search start at 1-h previous cycle  lbcs directory.
 #              2 means search start at 2-h previous cycle  lbcs directory.
 #
-# FV3GFS_FILE_FMT_ICS:
-# If using the FV3GFS model as the source of the ICs (i.e. if EXTRN_MDL_NAME_ICS
-# is set to "FV3GFS"), this variable specifies the format of the model
+# GFS_FILE_FMT_ICS:
+# If using the GFS model as the source of the ICs (i.e. if EXTRN_MDL_NAME_ICS
+# is set to "GFS"), this variable specifies the format of the model
 # files to use when generating the ICs.
 #
-# FV3GFS_FILE_FMT_LBCS:
-# If using the FV3GFS model as the source of the LBCs (i.e. if
-# EXTRN_MDL_NAME_LBCS is set to "FV3GFS"), this variable specifies the
+# GFS_FILE_FMT_LBCS:
+# If using the GFS model as the source of the LBCs (i.e. if
+# EXTRN_MDL_NAME_LBCS is set to "GFS"), this variable specifies the
 # format of the model files to use when generating the LBCs.
 #
 # EXTRN_MDL_DATE_JULIAN:
@@ -910,8 +903,8 @@ LBC_SPEC_INTVL_HRS="1"
 EXTRN_MDL_LBCS_OFFSET_HRS="6"
 EXTRN_MDL_LBCS_SEARCH_OFFSET_HRS="0"
 LBCS_SEARCH_HRS="6"
-FV3GFS_FILE_FMT_ICS="netcdf"
-FV3GFS_FILE_FMT_LBCS="grib2"
+GFS_FILE_FMT_ICS="netcdf"
+GFS_FILE_FMT_LBCS="grib2"
 EXTRN_MDL_DATE_JULIAN="FALSE"
 #
 #-----------------------------------------------------------------------
@@ -990,7 +983,7 @@ EXTRN_MDL_FILES_LBCS=( \
 #
 #-----------------------------------------------------------------------
 #
-CCPP_PHYS_SUITE="FV3_HRRR_gf"
+CCPP_PHYS_SUITE="RRFS_sas"
 #
 #-----------------------------------------------------------------------
 #
@@ -1371,13 +1364,13 @@ ESGgrid_PAZI="0.0"
 # WRITE_DOPOST:
 # Flag that determines whether or not to use the inline post feature
 # [i.e. calling the Unified Post Processor (UPP) from within the
-# weather model].  If this is set to true, the the run_post task will
+# weather model].  If this is set to true, then the post task will
 # be deactivated.
 #-----------------------------------------------------------------------
 #
 DT_ATMOS="36"
-LAYOUT_X="15"
-LAYOUT_Y="54"
+LAYOUT_X="16"
+LAYOUT_Y="48"
 IO_LAYOUT_X="1"
 IO_LAYOUT_Y="1"
 BLOCKSIZE="28"
@@ -1438,7 +1431,7 @@ QUILTING="TRUE"
 PRINT_ESMF="FALSE"
 
 WRTCMP_write_groups="1"
-WRTCMP_write_tasks_per_group="22"
+WRTCMP_write_tasks_per_group="64"
 WRTCMP_output_file="netcdf_parallel"
 WRTCMP_zstandard_level="0"
 WRTCMP_ideflate="1"
@@ -1577,19 +1570,15 @@ SAVE_CYCLE_LOG="TRUE"
 # SFC_CLIMO_DIR:
 # Same as GRID_DIR but for the surface climatology generation task.
 #
-# RUN_TASK_RUN_PRDGEN:
+# RUN_TASK_PRDGEN:
 # Flag that determines whether the product generation task is to run.
 #
-# RUN_TASK_ADD_AEROSOL:
-# Flag that determines whether the task for adding dusk in the GEFS
-# aerosol data to LBCs task is to run.
-#
 # IS_RTMA:
 # If true, some ICs,LBCs,GSI rocoto tasks will be turned off
 #
 # FG_ROOTDIR:
 # First Guess Root Directory, APP will find corresponding first guess
-# fields from this directory. RRFS will find FG under NWGES_BASEDIR,
+# fields from this directory. RRFS will find FG under GESROOT,
 # but we needs to explicitly specify where to find FG for RTMA.
 # So this parameter only matters for RTMA
 #
@@ -1597,10 +1586,6 @@ SAVE_CYCLE_LOG="TRUE"
 # "" or "GSL":  RTMA's observations follow the GSL naming convention
 #       "NCO":  RTMA's observations follow the NCO naming convention
 #
-# PYTHON_GRAPHICS_YML_FN:
-# The name of the yml file under ${PYTHON_GRAPHICS_DIR}/image_lists
-# to be used by current application
-#
 #-----------------------------------------------------------------------
 #
 RUN_TASK_MAKE_GRID="FALSE"
@@ -1612,14 +1597,12 @@ OROG_DIR="$HOMErrfs/fix/lam/RRFS_NA_3km"
 RUN_TASK_MAKE_SFC_CLIMO="FALSE"
 SFC_CLIMO_DIR="$HOMErrfs/fix/lam/RRFS_NA_3km"
 
-RUN_TASK_RUN_PRDGEN="TRUE"
-RUN_TASK_ADD_AEROSOL="FALSE"
+RUN_TASK_PRDGEN="TRUE"
 #
 NCORES_PER_NODE="128" #Jet default value
 IS_RTMA="FALSE"
 FG_ROOTDIR=""
 RTMA_OBS_FEED=""
-PYTHON_GRAPHICS_YML_FN="rrfs_subset.yml"
 #
 #-----------------------------------------------------------------------
 #
@@ -1647,9 +1630,6 @@ SFC_CLIMO_FIELDS=( \
 # System directory in which the majority of fixed (i.e. time-independent)
 # files that are needed to run the FV3-LAM model are located
 #
-# FIXprdgen:
-# directory where prdgen fix files are located
-#
 # TOPO_DIR:
 # The location on disk of the static input files used by the make_orog
 # task (orog.x and shave.x). Can be the same as FIXgsm.
@@ -1659,23 +1639,6 @@ SFC_CLIMO_FIELDS=( \
 # used by sfc_climo_gen. These files are only used if
 # RUN_TASK_MAKE_SFC_CLIMO=TRUE
 #
-# FIX_GSI:
-# System directory in which the fixed files that are needed to run
-# the GSI are located
-#
-# FIX_UPP:
-# System directory in which the fixed files that are needed to run
-# the UPP are located
-#
-# FIX_CRTM:
-# System directory in which the CRTM coefficient files are located
-#
-# FIX_SMOKE_DUST
-# directory in which the smoke and dust fix files are located
-#
-# FIX_BUFRSND
-# directory in which the bufrsnd fix files are located
-#
 # FNGLAC, ..., FNMSKH:
 # Names of (some of the) global data files that are assumed to exist in
 # a system directory specified (this directory is machine-dependent;
@@ -1730,15 +1693,8 @@ SFC_CLIMO_FIELDS=( \
 # to a null string which will then be overwritten in setup.sh unless the
 # user has specified a different value in config.sh
 FIXgsm="$HOMErrfs/fix/am"
-FIXprdgen="$HOMErrfs/fix/prdgen"
 TOPO_DIR="/lfs/h2/emc/lam/noscrub/RRFS_input/fix/fix_orog"
 SFC_CLIMO_INPUT_DIR="/lfs/h2/emc/lam/noscrub/RRFS_input/fix/fix_sfc_climo"
-FIX_GSI="$HOMErrfs/fix/gsi"
-FIX_UPP="$HOMErrfs/fix/upp"
-FIX_CRTM="/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/intel-19.1.3.304/cray-mpich-8.1.12/crtm/2.4.0/fix"
-FIX_UPP_CRTM="/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/intel-19.1.3.304/cray-mpich-8.1.12/crtm/2.4.0/fix"
-FIX_SMOKE_DUST="$HOMErrfs/fix/smoke_dust"
-FIX_BUFRSND="$HOMErrfs/fix/bufrsnd"
 
 FNGLAC="global_glacier.2x2.grb"
 FNMXIC="global_maxice.2x2.grb"
@@ -1876,37 +1832,28 @@ GET_GEFS_LBCS_TN="get_gefs_lbcs"
 MAKE_ICS_TN="make_ics"
 BLEND_ICS_TN="blend_ics"
 MAKE_LBCS_TN="make_lbcs"
-RUN_FCST_TN="run_fcst"
-RUN_POST_TN="run_post"
-RUN_PRDGEN_TN="run_prdgen"
-RUN_BUFRSND_TN="run_bufrsnd"
+FORECAST_TN="forecast"
+POST_TN="post"
+PRDGEN_TN="prdgen"
+BUFRSND_TN="bufrsnd"
 
-ANALYSIS_GSI_TN="analysis_gsi_input"
+ANALYSIS_GSI_TN="analysis_gsi"
 ANALYSIS_GSIDIAG_TN="analysis_gsi_diag"
-ANALYSIS_SD_GSI_TN="analysis_sd_gsi_input"
-POSTANAL_TN="postanal_input"
+UPDATE_LBC_SOIL_TN="update_lbc_soil"
 OBSERVER_GSI_ENSMEAN_TN="observer_gsi_ensmean"
 OBSERVER_GSI_TN="observer_gsi"
-PREP_START_TN="prep_start"
 PREP_CYC_SPINUP_TN="prep_cyc_spinup"
 PREP_CYC_PROD_TN="prep_cyc_prod"
-PREP_CYC_ENSMEAN_TN="prep_cyc_ensmean"
 PREP_CYC_TN="prep_cyc"
 CALC_ENSMEAN_TN="calc_ensmean"
-PROCESS_RADAR_REF_TN="process_radarref"
-PROCESS_LIGHTNING_TN="process_lightning"
+PROCESS_RADAR_TN="process_radar"
 RADAR_REF_THINNING="2"
 PROCESS_BUFR_TN="process_bufr"
 PROCESS_SMOKE_TN="process_smoke"
-PROCESS_PM_TN="process_pm"
-RADAR_REFL2TTEN_TN="radar_refl2tten"
-CLDANL_NONVAR_TN="cldanl_nonvar"
+ANALYSIS_NONVARCLD_TN="analysis_nonvarcld"
 SAVE_RESTART_TN="save_restart"
 SAVE_DA_OUTPUT_TN="save_da_output"
-JEDI_ENVAR_IODA_TN="jedi_envar_ioda"
-IODA_PREPBUFR_TN="ioda_prepbufr"
-PROCESS_GLMFED_TN="process_glmfed"
-ADD_AEROSOL_TN="add_aerosol"
+PROCESS_LIGHTNING_TN="process_lightning"
 #
 # Number of nodes.
 #
@@ -1918,39 +1865,31 @@ NNODES_GET_EXTRN_LBCS="1"
 NNODES_MAKE_ICS="2"
 NNODES_BLEND_ICS="1"
 NNODES_MAKE_LBCS="1"
-NNODES_RUN_PREPSTART="1"
-NNODES_RUN_FCST="13"  # This is calculated in the workflow generation scripts, so no need to set here.
-NNODES_RUN_POST="4"
-NNODES_RUN_PRDGEN="1"
-NNODES_RUN_ANALYSIS="1"
-NNODES_RUN_GSIDIAG="1"
-NNODES_RUN_POSTANAL="1"
-NNODES_RUN_ENKF="10"
-NNODES_RUN_RECENTER="10"
-NNODES_PROC_RADAR="1"
-NNODES_PROC_LIGHTNING="1"
-NNODES_PROC_GLMFED="1"
-NNODES_PROC_BUFR="1"
-NNODES_PROC_SMOKE="1"
-NNODES_PROC_PM="1"
-NNODES_RUN_REF2TTEN="1"
-NNODES_RUN_NONVARCLDANL="1"
-NNODES_RUN_GRAPHICS="1"
-NNODES_RUN_ENSPOST="1"
-NNODES_RUN_BUFRSND="2"
+NNODES_PREP_CYC="1"
+NNODES_FORECAST="13"  # This is calculated in the workflow generation scripts, so no need to set here.
+NNODES_POST="4"
+NNODES_PRDGEN="1"
+NNODES_ANALYSIS_GSI="1"
+NNODES_ANALYSIS_GSIDIAG="1"
+NNODES_UPDATE_LBC_SOIL="1"
+NNODES_ANALYSIS_ENKF="10"
+NNODES_RECENTER="10"
+NNODES_PROCESS_RADAR="1"
+NNODES_PROCESS_LIGHTNING="1"
+NNODES_PROCESS_BUFR="1"
+NNODES_PROCESS_SMOKE="1"
+NNODES_ANALYSIS_NONVARCLD="1"
+NNODES_BUFRSND="2"
 NNODES_SAVE_RESTART="1"
-NNODES_RUN_JEDIENVAR_IODA="1"
-NNODES_RUN_IODA_PREPBUFR="1"
-NNODES_ADD_AEROSOL="1"
 #
 # Number of cores.
 #
-NCORES_RUN_ANALYSIS="360"
+NCORES_ANALYSIS_GSI="360"
 NCORES_RUN_OBSERVER="80"
-NCORES_RUN_ENKF="4"
-NATIVE_RUN_FCST="--cpus-per-task 2 --exclusive"
-NATIVE_RUN_ANALYSIS="--cpus-per-task 2 --exclusive"
-NATIVE_RUN_ENKF="--cpus-per-task 4 --exclusive"
+NCORES_ANALYSIS_ENKF="4"
+NATIVE_FORECAST="--cpus-per-task 2 --exclusive"
+NATIVE_ANALYSIS_GSI="--cpus-per-task 2 --exclusive"
+NATIVE_ANALYSIS_ENKF="--cpus-per-task 4 --exclusive"
 #
 # Number of MPI processes per node.
 #
@@ -1962,40 +1901,32 @@ PPN_GET_EXTRN_LBCS="1"
 PPN_MAKE_ICS="32"
 PPN_BLEND_ICS="8"
 PPN_MAKE_LBCS="64"
-PPN_RUN_PREPSTART="1"
-PPN_RUN_FCST="64"  # This may have to be changed depending on the number of threads used.
-PPN_RUN_POST="32"
-PPN_RUN_PRDGEN="128"
-PPN_RUN_ANALYSIS="16"
-PPN_RUN_GSIDIAG="128"
-PPN_RUN_POSTANAL="8"
-PPN_RUN_ENKF="8"
-PPN_RUN_RECENTER="128"
-PPN_PROC_RADAR="64"
-PPN_PROC_LIGHTNING="1"
-PPN_PROC_GLMFED="1"
-PPN_PROC_BUFR="1"
-PPN_PROC_SMOKE="1"
-PPN_PROC_PM="1"
-PPN_RUN_REF2TTEN="1"
-PPN_RUN_NONVARCLDANL="128"
-PPN_RUN_GRAPHICS="12"
-PPN_RUN_ENSPOST="1"
-PPN_RUN_BUFRSND="64"
+PPN_PREP_CYC="1"
+PPN_FORECAST="64"  # This may have to be changed depending on the number of threads used.
+PPN_POST="32"
+PPN_PRDGEN="128"
+PPN_ANALYSIS_GSI="16"
+PPN_ANALYSIS_GSIDIAG="128"
+PPN_UPDATE_LBC_SOIL="8"
+PPN_ANALYSIS_ENKF="8"
+PPN_RECENTER="128"
+PPN_PROCESS_RADAR="64"
+PPN_PROCESS_LIGHTNING="1"
+PPN_PROCESS_BUFR="1"
+PPN_PROCESS_SMOKE="1"
+PPN_ANALYSIS_NONVARCLD="128"
+PPN_BUFRSND="64"
 PPN_SAVE_RESTART="1"
-PPN_RUN_JEDIENVAR_IODA="1"
-PPN_RUN_IODA_PREPBUFR="1"
-PPN_ADD_AEROSOL="9"
 #
 # Number of TPP for WCOSS2.
 #
 TPP_MAKE_ICS="4"
 TPP_MAKE_LBCS="2"
-TPP_RUN_ANALYSIS="8"
-TPP_RUN_ENKF="16"
-TPP_RUN_FCST="2"
-TPP_RUN_POST="4"
-TPP_RUN_BUFRSND="2"
+TPP_ANALYSIS_GSI="8"
+TPP_ANALYSIS_ENKF="16"
+TPP_FORECAST="2"
+TPP_POST="4"
+TPP_BUFRSND="2"
 #
 # Walltimes.
 #
@@ -2007,32 +1938,24 @@ WTIME_GET_EXTRN_LBCS="00:45:00"
 WTIME_MAKE_ICS="00:30:00"
 WTIME_BLEND_ICS="00:30:00"
 WTIME_MAKE_LBCS="02:30:00"
-WTIME_RUN_PREPSTART="00:20:00"
-WTIME_RUN_PREPSTART_ENSMEAN="00:10:00"
-WTIME_RUN_FCST="00:30:00"
-WTIME_RUN_FCST_LONG="04:45:00"
-WTIME_RUN_FCST_SPINUP="00:30:00"
-WTIME_RUN_POST="00:15:00"
-WTIME_RUN_PRDGEN="00:40:00"
-WTIME_RUN_ANALYSIS="00:50:00"
-WTIME_RUN_GSIDIAG="00:15:00"
-WTIME_RUN_POSTANAL="00:30:00"
-WTIME_RUN_ENKF="01:00:00"
-WTIME_RUN_RECENTER="01:00:00"
-WTIME_PROC_RADAR="00:25:00"
-WTIME_PROC_LIGHTNING="00:25:00"
-WTIME_PROC_GLMFED="00:25:00"
-WTIME_PROC_BUFR="00:25:00"
-WTIME_PROC_SMOKE="00:25:00"
-WTIME_PROC_PM="00:25:00"
-WTIME_RUN_REF2TTEN="00:20:00"
-WTIME_RUN_NONVARCLDANL="00:20:00"
-WTIME_RUN_BUFRSND="04:45:00"
+WTIME_PREP_CYC="00:20:00"
+WTIME_FORECAST="00:30:00"
+WTIME_FORECAST_LONG="04:45:00"
+WTIME_FORECAST_SPINUP="00:30:00"
+WTIME_POST="00:15:00"
+WTIME_PRDGEN="00:40:00"
+WTIME_ANALYSIS_GSI="00:50:00"
+WTIME_ANALYSIS_GSIDIAG="00:15:00"
+WTIME_UPDATE_LBC_SOIL="00:30:00"
+WTIME_ANALYSIS_ENKF="01:00:00"
+WTIME_RECENTER="01:00:00"
+WTIME_PROCESS_RADAR="00:25:00"
+WTIME_PROCESS_LIGHTNING="00:25:00"
+WTIME_PROCESS_BUFR="00:25:00"
+WTIME_PROCESS_SMOKE="00:25:00"
+WTIME_ANALYSIS_NONVARCLD="00:20:00"
+WTIME_BUFRSND="04:45:00"
 WTIME_SAVE_RESTART="00:15:00"
-WTIME_RUN_ENSPOST="00:30:00"
-WTIME_RUN_JEDIENVAR_IODA="00:30:00"
-WTIME_RUN_IODA_PREPBUFR="00:20:00"
-WTIME_ADD_AEROSOL="00:30:00"
 #
 # Start times.
 #
@@ -2042,30 +1965,21 @@ START_TIME_CONVENTIONAL_SPINUP="00:40:00"
 START_TIME_BLENDING="04:00:00"
 START_TIME_LATE_ANALYSIS="01:20:00"
 START_TIME_CONVENTIONAL="00:45:00"
-START_TIME_IODA_PREPBUFR="00:50:00"
 START_TIME_NSSLMOSIAC="00:45:00"
-START_TIME_LIGHTNINGNC="00:55:00"
-START_TIME_GLMFED="00:45:00"
-START_TIME_PROCSMOKE="00:50:00"
-START_TIME_PROCPM="00:45:00"
+START_TIME_PROCESS_LIGHTNING="00:45:00"
+START_TIME_PROCESS_SMOKE="00:50:00"
 #
 # Memory.
 #
-MEMO_RUN_PROCESSBUFR="20G"
-MEMO_RUN_REF2TTEN="20G"
-MEMO_RUN_NONVARCLDANL="256G"
-MEMO_RUN_PREPSTART="120G"
-MEMO_RUN_PRDGEN="256G"
-MEMO_RUN_JEDIENVAR_IODA="20G"
-MEMO_RUN_IODA_PREPBUFR="20G"
-MEMO_PREP_CYC="40G"
+MEMO_PROCESS_BUFR="20G"
+MEMO_ANALYSIS_NONVARCLD="256G"
+MEMO_PRDGEN="256G"
+MEMO_PREP_CYC="120G"
 MEMO_SAVE_RESTART="120G"
 MEMO_SAVE_INPUT="120G"
-MEMO_PROC_SMOKE="256G"
-MEMO_PROC_GLMFED="70G"
-MEMO_PROC_PM="40G"
+MEMO_PROCESS_SMOKE="256G"
+MEMO_PROCESS_LIGHTNING="70G"
 MEMO_SAVE_DA_OUTPUT="40G"
-MEMO_ADD_AEROSOL="70G"
 #
 # Maximum number of attempts.
 #
@@ -2077,29 +1991,23 @@ MAXTRIES_GET_EXTRN_LBCS="2"
 MAXTRIES_MAKE_ICS="1"
 MAXTRIES_BLEND_ICS="1"
 MAXTRIES_MAKE_LBCS="1"
-MAXTRIES_RUN_PREPSTART="1"
-MAXTRIES_RUN_FCST="1"
+MAXTRIES_PREP_CYC="1"
+MAXTRIES_FORECAST="1"
 MAXTRIES_ANALYSIS_GSI="1"
-MAXTRIES_POSTANAL="2"
+MAXTRIES_UPDATE_LBC_SOIL="2"
 MAXTRIES_ANALYSIS_ENKF="1"
-MAXTRIES_RUN_POST="2"
-MAXTRIES_RUN_PRDGEN="1"
-MAXTRIES_RUN_ANALYSIS="2"
-MAXTRIES_RUN_POSTANAL="1"
+MAXTRIES_POST="2"
+MAXTRIES_PRDGEN="1"
+MAXTRIES_ANALYSIS_GSI="1"
+MAXTRIES_UPDATE_LBC_SOIL="2"
 MAXTRIES_RECENTER="1"
-MAXTRIES_PROCESS_RADARREF="1"
+MAXTRIES_PROCESS_RADAR="1"
 MAXTRIES_PROCESS_LIGHTNING="1"
-MAXTRIES_PROC_GLMFED="1"
 MAXTRIES_PROCESS_BUFR="1"
 MAXTRIES_PROCESS_SMOKE="1"
-MAXTRIES_PROCESS_PM="1"
-MAXTRIES_RADAR_REF2TTEN="1"
-MAXTRIES_CLDANL_NONVAR="2"
+MAXTRIES_ANALYSIS_NONVARCLD="2"
 MAXTRIES_SAVE_RESTART="2"
 MAXTRIES_SAVE_DA_OUTPUT="2"
-MAXTRIES_JEDI_ENVAR_IODA="1"
-MAXTRIES_IODA_PREPBUFR="1"
-MAXTRIES_ADD_AEROSOL="1"
 #
 #-----------------------------------------------------------------------
 #
@@ -2249,13 +2157,6 @@ TILE_SETS="full SE,SC,SW NE,NC,NW ATL,CA-NV,CentralCA CHI-DET,DCArea,EastCO
 # DO_GSIDIAG_OFFLINE:
 # Decide whether or not to run GSI diag generation outside of the GSI task
 #
-# DO_ENS_GRAPHICS:
-# Flag to turn on/off ensemble graphics. Turns OFF deterministic
-# graphics.
-#
-# DO_ENSPOST:
-# Flag to turn on/off python ensemble postprocessing for WPC testbeds.
-#
 # DO_ENSINIT:
 # Decide whether or not to do ensemble initialization by running 1
 # timestep ensemble forecast and recentering on the deterministic
@@ -2323,8 +2224,6 @@ DO_ENKF_RADAR_REF="TRUE"
 DO_ENVAR_RADAR_REF="FALSE"
 DO_ENVAR_RADAR_REF_ONCE="FALSE"
 DO_RECENTER="FALSE"
-DO_ENS_GRAPHICS="FALSE"
-DO_ENSPOST="FALSE"
 DO_ENSINIT="TRUE"
 DO_SAVE_DA_OUTPUT="TRUE"
 DO_GSIDIAG_OFFLINE="FALSE"
@@ -2392,7 +2291,6 @@ DO_BUFRSND="FALSE"
 USE_RRFSE_ENS="FALSE"
 DO_SMOKE_DUST="FALSE"
 EBB_DCYCLE="2"
-DO_PM_DA="FALSE"
 USE_CLM="TRUE"
 DO_NON_DA_RUN="FALSE"
 #
@@ -2539,8 +2437,8 @@ ISEED_SPP=( \
 "7" \
 "8" \
 )
-LNDPINT="360"
-SPPINT="360"
+LNDPINT="180"
+SPPINT="36"
 #
 #-----------------------------------------------------------------------
 #
@@ -2712,37 +2610,11 @@ GWD_HRRRsuite_BASEDIR="$HOMErrfs/fix/lam"
 #
 #-----------------------------------------------------------------------
 #
-# Parameters for JEDI options
-#
-# DO_JEDI_ENVAR_IODA:
-# Flag turn on the JEDI-IODA converters for EnVAR.  It requires GSI
-# to produce NetCDF diag files
-#-----------------------------------------------------------------------
-#
-DO_JEDI_ENVAR_IODA="FALSE"
-#
-#-----------------------------------------------------------------------
-#
-# Parameters for IODA options
-#
-# DO_IODA_PREPBUFR:
-# Flag turn on the IODA converters for conventional observations in prepbufr files.
-#-----------------------------------------------------------------------
-#
-DO_IODA_PREPBUFR="FALSE"
-#
-#-----------------------------------------------------------------------
-#
 # Parameters for analysis options
 #
-# DO_NONVAR_CLDANAL:
+# DO_ANALYSIS_NONVARCLD:
 # Flag turn on the non-var cloud analysis.
 #
-# DO_REFL2TTEN:
-# Flag turn on the radar reflectivity to temperature tendenecy.
-#
-# DO_NLDN_LGHT
-# Flag turn on processing NLDN NetCDF lightning data
 # DO_GLM_FED_DA
 # Flag turn on processing gridded GLM lightning data
 # GLMFED_DATA_MODE
@@ -2754,15 +2626,12 @@ DO_IODA_PREPBUFR="FALSE"
 #
 #-----------------------------------------------------------------------
 #
-DO_NONVAR_CLDANAL="TRUE"
-DO_REFL2TTEN="FALSE"
-DO_NLDN_LGHT="FALSE"
+DO_ANALYSIS_NONVARCLD="TRUE"
 DO_GLM_FED_DA="TRUE"
 GLMFED_DATA_MODE="PROD"
 PREP_MODEL_FOR_FED="TRUE"
 DO_SMOKE_DUST="FALSE"
 EBB_DCYCLE="2"
-DO_PM_DA="FALSE"
 #
 #-----------------------------------------------------------------------
 #
@@ -2850,45 +2719,35 @@ CRONTAB_LINE=""
 #-----------------------------------------------------------------------
 #
 HOMErrfs="$HOMErrfs"
-USHdir="$HOMErrfs/ush"
-SCRIPTSdir="$HOMErrfs/scripts"
-JOBSdir="$HOMErrfs/jobs"
-SORCdir="$HOMErrfs/sorc"
-PARMdir="$HOMErrfs/parm"
+USHrrfs="$HOMErrfs/ush"
+SORCrrfs="$HOMErrfs/sorc"
+PARMrrfs="$HOMErrfs/parm"
 MODULES_DIR="$HOMErrfs/modulefiles"
-EXECdir="$HOMErrfs/exec"
 LIB64dir="$HOMErrfs/sorc/build/lib64"
 FIXam="$HOMErrfs/parm/config/enkf/fix_am"
 FIXLAM="$HOMErrfs/parm/config/enkf/fix_lam"
 FIXgsm="$HOMErrfs/fix/am"
-FIXprdgen="$HOMErrfs/fix/prdgen"
-COMROOT="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0"
-COMOUT_BASEDIR="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0/prod"
-NWGES_BASEDIR="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
+COMROOT="$COMROOT"
+GESROOT="/lfs/h3/emc/lam/noscrub/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
 UFS_WTHR_MDL_DIR="$HOMErrfs/sorc/ufs-weather-model"
 UFS_UTILS_DIR="$HOMErrfs/sorc/UFS_UTILS"
 SFC_CLIMO_INPUT_DIR="/lfs/h2/emc/lam/noscrub/RRFS_input/fix/fix_sfc_climo"
 TOPO_DIR="/lfs/h2/emc/lam/noscrub/RRFS_input/fix/fix_orog"
 UPP_DIR="$HOMErrfs/sorc/UPP"
-PYTHON_GRAPHICS_DIR="$HOMErrfs/python_graphics"
 
-ARCHIVEDIR="/NCEPDEV/emc-meso/1year/emc.lam/n3v91"
-NCARG_ROOT="/apps/ncl/6.5.0-CentOS6.10_64bit_nodap_gnu447"
-NCL_HOME="/home/rtrr/RRFS/graphics"
-NCL_REGION="na"
 MODEL="RRFS_A"
 
 EXPTDIR="$HOMErrfs/parm/config/enkf"
-LOG_BASEDIR="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0/logs"
-CYCLE_BASEDIR="$DATAROOT"
+LOG_BASEDIR="notused"
+DATAROOT="$DATAROOT"
 GRID_DIR="$HOMErrfs/fix/lam/RRFS_NA_3km"
 OROG_DIR="$HOMErrfs/fix/lam/RRFS_NA_3km"
 SFC_CLIMO_DIR="$HOMErrfs/fix/lam/RRFS_NA_3km"
 GWD_HRRRsuite_DIR="$HOMErrfs/fix/lam/RRFS_NA_3km"
 
-NDIGITS_ENSMEM_NAMES="4"
-ENSMEM_NAMES=( "mem0001" "mem0002" "mem0003" "mem0004" "mem0005" "mem0006" "mem0007" "mem0008" "mem0009" "mem0010" "mem0011" "mem0012" "mem0013" "mem0014" "mem0015" "mem0016" "mem0017" "mem0018" "mem0019" "mem0020" "mem0021" "mem0022" "mem0023" "mem0024" "mem0025" "mem0026" "mem0027" "mem0028" "mem0029" "mem0030" )
-FV3_NML_ENSMEM_FPS=( "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0001" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0002" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0003" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0004" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0005" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0006" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0007" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0008" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0009" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0010" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0011" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0012" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0013" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0014" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0015" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0016" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0017" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0018" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0019" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0020" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0021" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0022" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0023" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0024" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0025" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0026" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0027" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0028" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0029" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enkf/input.nml_mem0030" )
+NDIGITS_ENSMEM_NAMES="3"
+ENSMEM_NAMES=( "mem001" "mem002" "mem003" "mem004" "mem005" "mem006" "mem007" "mem008" "mem009" "mem010" "mem011" "mem012" "mem013" "mem014" "mem015" "mem016" "mem017" "mem018" "mem019" "mem020" "mem021" "mem022" "mem023" "mem024" "mem025" "mem026" "mem027" "mem028" "mem029" "mem030" )
+FV3_NML_ENSMEM_FPS=( "$HOMErrfs/parm/config/enkf/input.nml_mem001" "$HOMErrfs/parm/config/enkf/input.nml_mem002" "$HOMErrfs/parm/config/enkf/input.nml_mem003" "$HOMErrfs/parm/config/enkf/input.nml_mem004" "$HOMErrfs/parm/config/enkf/input.nml_mem005" "$HOMErrfs/parm/config/enkf/input.nml_mem006" "$HOMErrfs/parm/config/enkf/input.nml_mem007" "$HOMErrfs/parm/config/enkf/input.nml_mem008" "$HOMErrfs/parm/config/enkf/input.nml_mem009" "$HOMErrfs/parm/config/enkf/input.nml_mem010" "$HOMErrfs/parm/config/enkf/input.nml_mem011" "$HOMErrfs/parm/config/enkf/input.nml_mem012" "$HOMErrfs/parm/config/enkf/input.nml_mem013" "$HOMErrfs/parm/config/enkf/input.nml_mem014" "$HOMErrfs/parm/config/enkf/input.nml_mem015" "$HOMErrfs/parm/config/enkf/input.nml_mem016" "$HOMErrfs/parm/config/enkf/input.nml_mem017" "$HOMErrfs/parm/config/enkf/input.nml_mem018" "$HOMErrfs/parm/config/enkf/input.nml_mem019" "$HOMErrfs/parm/config/enkf/input.nml_mem020" "$HOMErrfs/parm/config/enkf/input.nml_mem021" "$HOMErrfs/parm/config/enkf/input.nml_mem022" "$HOMErrfs/parm/config/enkf/input.nml_mem023" "$HOMErrfs/parm/config/enkf/input.nml_mem024" "$HOMErrfs/parm/config/enkf/input.nml_mem025" "$HOMErrfs/parm/config/enkf/input.nml_mem026" "$HOMErrfs/parm/config/enkf/input.nml_mem027" "$HOMErrfs/parm/config/enkf/input.nml_mem028" "$HOMErrfs/parm/config/enkf/input.nml_mem029" "$HOMErrfs/parm/config/enkf/input.nml_mem030" )
 
 # for data assimilation
 OBSPATH="/lfs/h1/ops/prod/com/obsproc/v1.2"
@@ -2899,14 +2758,8 @@ GLMFED_EAST_ROOT="/lfs/h1/ops/prod/dcom/ldmdata/obs/GOES-16/GLM/tiles"
 GLMFED_WEST_ROOT="/lfs/h1/ops/prod/dcom/ldmdata/obs/GOES-17/GLM/tiles"
 ENKF_FCST="/lfs/h1/ops/prod/com/gfs/v16.3"
 
-FIX_GSI="$HOMErrfs/fix/gsi"
-FIX_CRTM="/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/intel-19.1.3.304/cray-mpich-8.1.12/crtm/2.4.0/fix"
-FIX_UPP_CRTM="/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/intel-19.1.3.304/cray-mpich-8.1.12/crtm/2.4.0/fix"
-FIX_SMOKE_DUST="$HOMErrfs/fix/smoke_dust"
-FIX_BUFRSND="$HOMErrfs/fix/bufrsnd"
-AIRCRAFT_REJECT="$HOMErrfs/fix/gsi"
-SFCOBS_USELIST="$HOMErrfs/fix/gsi"
-PARM_IODACONV="$HOMErrfs/parm/iodaconv"
+AIRCRAFT_REJECT="/lfs/h2/emc/lam/noscrub/emc.lam/FIX_RRFS/gsi"
+SFCOBS_USELIST="/lfs/h2/emc/lam/noscrub/emc.lam/FIX_RRFS/gsi"
 
 RADARREFL_MINS=( "0" "1" "2" "3" )
 RADARREFL_TIMELEVEL=( "0" )
@@ -2918,29 +2771,29 @@ ADDNL_OUTPUT_GRIDS=( "hrrr" "hrrrak" )
 #
 #-----------------------------------------------------------------------
 #
-GLOBAL_VAR_DEFNS_FP="/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/para/packages/rrfs.v1.0.0/parm/config/enkf/var_defns.sh"
+GLOBAL_VAR_DEFNS_FP="$HOMErrfs/parm/config/enkf/var_defns.sh"
 # Try this at some point instead of hard-coding it as above; it's a more
 # flexible approach (if it works).
 #GLOBAL_VAR_DEFNS_FP=$HOMErrfs/ush/setup.sh
 
 DATA_TABLE_TMPL_FN="data_table"
-DIAG_TABLE_TMPL_FN="diag_table.FV3_HRRR_gf_clm"
-FIELD_TABLE_TMPL_FN="field_table.FV3_HRRR_gf"
+DIAG_TABLE_TMPL_FN="diag_table.RRFS_sas_clm"
+FIELD_TABLE_TMPL_FN="field_table.RRFS_sas"
 MODEL_CONFIG_TMPL_FN="model_configure"
 UFS_CONFIG_TMPL_FN="ufs.configure"
 
 DATA_TABLE_TMPL_FP="$HOMErrfs/parm/data_table"
-DIAG_TABLE_TMPL_FP="$HOMErrfs/parm/diag_table.FV3_HRRR_gf_clm"
-FIELD_TABLE_TMPL_FP="$HOMErrfs/parm/field_table.FV3_HRRR_gf"
+DIAG_TABLE_TMPL_FP="$HOMErrfs/parm/diag_table.RRFS_sas_clm"
+FIELD_TABLE_TMPL_FP="$HOMErrfs/parm/field_table.RRFS_sas"
 FV3_NML_BASE_SUITE_FP="$HOMErrfs/parm/input.nml.FV3"
 FV3_NML_YAML_CONFIG_FP="$HOMErrfs/parm/FV3.input.yml"
 FV3_NML_BASE_ENS_FP="$HOMErrfs/parm/config/enkf/input.nml.base_ens"
 MODEL_CONFIG_TMPL_FP="$HOMErrfs/parm/model_configure"
 UFS_CONFIG_TMPL_FP="$HOMErrfs/parm/ufs.configure"
 
-CCPP_PHYS_SUITE_FN="suite_FV3_HRRR_gf.xml"
-CCPP_PHYS_SUITE_IN_CCPP_FP="$HOMErrfs/sorc/ufs-weather-model/FV3/ccpp/suites/suite_FV3_HRRR_gf.xml"
-CCPP_PHYS_SUITE_FP="$HOMErrfs/parm/config/enkf/suite_FV3_HRRR_gf.xml"
+CCPP_PHYS_SUITE_FN="suite_RRFS_sas.xml"
+CCPP_PHYS_SUITE_IN_CCPP_FP="$HOMErrfs/sorc/ufs-weather-model/FV3/ccpp/suites/suite_RRFS_sas.xml"
+CCPP_PHYS_SUITE_FP="$HOMErrfs/parm/config/enkf/suite_RRFS_sas.xml"
 
 DATA_TABLE_FP="$HOMErrfs/parm/config/enkf/data_table"
 FIELD_TABLE_FP="$HOMErrfs/parm/config/enkf/field_table"
diff --git a/parm/config/ensf/field_table b/parm/config/ensf/field_table
index 3d4e0afcd..691a27f54 100644
--- a/parm/config/ensf/field_table
+++ b/parm/config/ensf/field_table
@@ -63,6 +63,11 @@
            "longname",     "subgrid scale turbulent kinetic energy"
            "units",        "m2/s2"
        "profile_type", "fixed", "surface_value=0.0" /
+# prognostic sigmab tracer
+ "TRACER", "atmos_mod", "sigmab"
+           "longname",     "sigma fraction"
+           "units",        "fraction"
+       "profile_type", "fixed", "surface_value=0.0" /
 # prognostic smoke mixing ratio tracer
   "TRACER", "atmos_mod", "smoke"
             "longname",     "smoke mixing ratio"
diff --git a/parm/config/ensf/input.nml b/parm/config/ensf/input.nml
index 5a635666d..89e2b5a0e 100644
--- a/parm/config/ensf/input.nml
+++ b/parm/config/ensf/input.nml
@@ -10,7 +10,7 @@
 &atmos_model_nml
     avg_max_length = 3600.0
     blocksize = 28
-    ccpp_suite = 'FV3_HRRR_gf'
+    ccpp_suite = 'RRFS_sas'
     chksum_debug = .false.
     dycore_only = .false.
     ignore_rst_cksum = .true.
@@ -156,6 +156,7 @@
     addsmoke_flag = 1
     aero_dir_fdb = .true.
     aero_ind_fdb = .false.
+    betadcu = 1.0
     bl_mynn_edmf = 1
     bl_mynn_edmf_mom = 1
     bl_mynn_tkeadvect = .true.
@@ -200,6 +201,7 @@
     frac_ice = .true.
     gwd_opt = 3
     h2o_phys = .true.
+    hwp_method = 1
     hybedmf = .false.
     iaer = 1011
     ialb = 2
@@ -211,7 +213,7 @@
     icloud_bl = 1
     ico2 = 2
     iems = 2
-    imfdeepcnv = 3
+    imfdeepcnv = 2
     imfshalcnv = -1
     imp_physics = 8
     iopt_alb = 2
@@ -259,20 +261,21 @@
     oz_phys_2015 = .true.
     pdfcld = .false.
     plume_wind_eff = 1
-    plumerisefire_frq = 60
+    plumerisefire_frq = 30
     pre_rad = .false.
     print_diff_pgr = .true.
+    progsigma = .true.
     prslrd0 = 0.0
     random_clds = .false.
     redrag = .true.
     rrfs_sd = .false.
     rrfs_smoke_debug = .false.
     satmedmf = .false.
+    sc_factor = 1.0
     seas_opt = 0
     sfclay_compute_flux = .true.
     shal_cnv = .false.
     smoke_conv_wet_coef = 0.5, 0.5, 0.5
-    smoke_forecast = 1
     swhtr = .true.
     thsfc_loc = .false.
     trans_trac = .true.
diff --git a/parm/config/ensf/input.nml_restart b/parm/config/ensf/input.nml_restart
index 4220c5030..1cb0450dc 100644
--- a/parm/config/ensf/input.nml_restart
+++ b/parm/config/ensf/input.nml_restart
@@ -10,7 +10,7 @@
 &atmos_model_nml
     avg_max_length = 3600.0
     blocksize = 28
-    ccpp_suite = 'FV3_HRRR_gf'
+    ccpp_suite = 'RRFS_sas'
     chksum_debug = .false.
     dycore_only = .false.
     ignore_rst_cksum = .true.
@@ -156,6 +156,7 @@
     addsmoke_flag = 1
     aero_dir_fdb = .true.
     aero_ind_fdb = .false.
+    betadcu = 1.0
     bl_mynn_edmf = 1
     bl_mynn_edmf_mom = 1
     bl_mynn_tkeadvect = .true.
@@ -200,6 +201,7 @@
     frac_ice = .true.
     gwd_opt = 3
     h2o_phys = .true.
+    hwp_method = 1
     hybedmf = .false.
     iaer = 1011
     ialb = 2
@@ -211,7 +213,7 @@
     icloud_bl = 1
     ico2 = 2
     iems = 2
-    imfdeepcnv = 3
+    imfdeepcnv = 2
     imfshalcnv = -1
     imp_physics = 8
     iopt_alb = 2
@@ -259,20 +261,21 @@
     oz_phys_2015 = .true.
     pdfcld = .false.
     plume_wind_eff = 1
-    plumerisefire_frq = 60
+    plumerisefire_frq = 30
     pre_rad = .false.
     print_diff_pgr = .true.
+    progsigma = .true.
     prslrd0 = 0.0
     random_clds = .false.
     redrag = .true.
     rrfs_sd = .false.
     rrfs_smoke_debug = .false.
     satmedmf = .false.
+    sc_factor = 1.0
     seas_opt = 0
     sfclay_compute_flux = .true.
     shal_cnv = .false.
     smoke_conv_wet_coef = 0.5, 0.5, 0.5
-    smoke_forecast = 1
     swhtr = .true.
     thsfc_loc = .false.
     trans_trac = .true.
diff --git a/parm/config/ensf/input.nml_restart_stoch b/parm/config/ensf/input.nml_restart_stoch
index 1df5dfd07..71c634e02 100644
--- a/parm/config/ensf/input.nml_restart_stoch
+++ b/parm/config/ensf/input.nml_restart_stoch
@@ -10,7 +10,7 @@
 &atmos_model_nml
     avg_max_length = 3600.0
     blocksize = 28
-    ccpp_suite = 'FV3_HRRR_gf'
+    ccpp_suite = 'RRFS_sas'
     chksum_debug = .false.
     dycore_only = .false.
     ignore_rst_cksum = .true.
@@ -156,6 +156,7 @@
     addsmoke_flag = 1
     aero_dir_fdb = .true.
     aero_ind_fdb = .false.
+    betadcu = 1.0
     bl_mynn_edmf = 1
     bl_mynn_edmf_mom = 1
     bl_mynn_tkeadvect = .true.
@@ -204,6 +205,7 @@
     frac_ice = .true.
     gwd_opt = 3
     h2o_phys = .true.
+    hwp_method = 1
     hybedmf = .false.
     iaer = 1011
     ialb = 2
@@ -215,7 +217,7 @@
     icloud_bl = 1
     ico2 = 2
     iems = 2
-    imfdeepcnv = 3
+    imfdeepcnv = 2
     imfshalcnv = -1
     imp_physics = 8
     iopt_alb = 2
@@ -267,20 +269,21 @@
     oz_phys_2015 = .true.
     pdfcld = .false.
     plume_wind_eff = 1
-    plumerisefire_frq = 60
+    plumerisefire_frq = 30
     pre_rad = .false.
     print_diff_pgr = .true.
+    progsigma = .true.
     prslrd0 = 0.0
     random_clds = .false.
     redrag = .true.
     rrfs_sd = .false.
     rrfs_smoke_debug = .false.
     satmedmf = .false.
+    sc_factor = 1.0
     seas_opt = 0
     sfclay_compute_flux = .true.
     shal_cnv = .false.
     smoke_conv_wet_coef = 0.5, 0.5, 0.5
-    smoke_forecast = 1
     swhtr = .true.
     thsfc_loc = .false.
     trans_trac = .true.
@@ -302,7 +305,7 @@
     lndp_tau = 21600, 21600, 21600, 21600, 21600
     lndp_type = 2
     lndp_var_list = 'smc', 'vgf', 'alb', 'sal', 'emi', 'zol', 'stc'
-    lndpint = 360
+    lndpint = 180
 /
 
 &nam_sppperts
@@ -314,7 +317,7 @@
     spp_stddev_cutoff = 1.5, 1.5, 2.5, 1.5, 1.5
     spp_tau = 21600.0, 21600.0, 21600.0, 21600.0, 21600.0
     spp_var_list = 'pbl', 'sfc', 'mp', 'rad', 'gwd'
-    sppint = 360
+    sppint = 36
 /
 
 &nam_stochy
diff --git a/parm/config/ensf/input.nml_restart_stoch_ensphy1 b/parm/config/ensf/input.nml_restart_stoch_ensphy1
index 22b028e0c..ef96c927c 100644
--- a/parm/config/ensf/input.nml_restart_stoch_ensphy1
+++ b/parm/config/ensf/input.nml_restart_stoch_ensphy1
@@ -190,8 +190,10 @@
     fhswr = 900.0
     fhzero = 1.0
     frac_ice = .true.
+    gf_coldstart = .true.
     gwd_opt = 3
     h2o_phys = .true.
+    hwp_method = 1
     hybedmf = .false.
     iaer = 1011
     ialb = 2
@@ -261,6 +263,7 @@
     random_clds = .false.
     redrag = .true.
     satmedmf = .true.
+    sc_factor = 1.0
     sfclay_compute_flux = .true.
     shal_cnv = .true.
     smoke_conv_wet_coef = 0.5, 0.5, 0.5
@@ -284,7 +287,7 @@
     lndp_tau = 21600, 21600, 21600, 21600, 21600
     lndp_type = 2
     lndp_var_list = 'smc', 'vgf', 'alb', 'sal', 'emi', 'zol', 'stc'
-    lndpint = 360
+    lndpint = 180
 /
 
 &nam_sppperts
@@ -296,7 +299,7 @@
     spp_stddev_cutoff = 2.5, 1.5, 1.5, 3.0
     spp_tau = 21600.0, 21600.0, 21600.0, 21600.0
     spp_var_list = 'mp', 'rad', 'gwd', 'cu_deep'
-    sppint = 360
+    sppint = 36
 /
 
 &nam_stochy
diff --git a/parm/config/ensf/input.nml_restart_stoch_ensphy2 b/parm/config/ensf/input.nml_restart_stoch_ensphy2
index 4f8ac9f65..00b0740ce 100644
--- a/parm/config/ensf/input.nml_restart_stoch_ensphy2
+++ b/parm/config/ensf/input.nml_restart_stoch_ensphy2
@@ -195,6 +195,7 @@
     frac_ice = .true.
     gwd_opt = 3
     h2o_phys = .true.
+    hwp_method = 1
     hybedmf = .false.
     iaer = 1011
     ialb = 2
@@ -264,6 +265,7 @@
     random_clds = .false.
     redrag = .true.
     satmedmf = .false.
+    sc_factor = 1.0
     sfclay_compute_flux = .true.
     shal_cnv = .false.
     smoke_conv_wet_coef = 0.5, 0.5, 0.5
@@ -287,7 +289,7 @@
     lndp_tau = 21600, 21600, 21600, 21600, 21600
     lndp_type = 2
     lndp_var_list = 'smc', 'vgf', 'alb', 'sal', 'emi', 'zol', 'stc'
-    lndpint = 360
+    lndpint = 180
 /
 
 &nam_sppperts
@@ -299,7 +301,7 @@
     spp_stddev_cutoff = 1.5, 1.5, 2.5, 1.5, 1.5
     spp_tau = 21600.0, 21600.0, 21600.0, 21600.0, 21600.0
     spp_var_list = 'pbl', 'sfc', 'mp', 'rad', 'gwd'
-    sppint = 360
+    sppint = 36
 /
 
 &nam_stochy
diff --git a/parm/config/ensf/input.nml_restart_stoch_ensphy3 b/parm/config/ensf/input.nml_restart_stoch_ensphy3
index dc54817ba..2076993f9 100644
--- a/parm/config/ensf/input.nml_restart_stoch_ensphy3
+++ b/parm/config/ensf/input.nml_restart_stoch_ensphy3
@@ -194,6 +194,7 @@
     frac_ice = .true.
     gwd_opt = 3
     h2o_phys = .true.
+    hwp_method = 1
     hybedmf = .false.
     iaer = 1011
     ialb = 2
@@ -252,12 +253,12 @@
     n_var_lndp = 7
     n_var_spp = 5
     nsfullradar_diag = 3600
-    nssl_alphah = 2.62
-    nssl_alphar = 0.63
-    nssl_cccn = 390000000.0
+    nssl_alphah = 2.32
+    nssl_alphar = 0.83
+    nssl_cccn = 550000000.0
     nssl_ccn_on = .true.
-    nssl_ehlw0 = 0.89
-    nssl_ehw0 = 0.83
+    nssl_ehlw0 = 0.82
+    nssl_ehw0 = 0.79
     nssl_hail_on = .true.
     nssl_invertccn = .true.
     oz_phys = .false.
@@ -270,6 +271,7 @@
     random_clds = .false.
     redrag = .true.
     satmedmf = .false.
+    sc_factor = 1.0
     sfclay_compute_flux = .true.
     shal_cnv = .false.
     smoke_conv_wet_coef = 0.5, 0.5, 0.5
@@ -293,7 +295,7 @@
     lndp_tau = 21600, 21600, 21600, 21600, 21600
     lndp_type = 2
     lndp_var_list = 'smc', 'vgf', 'alb', 'sal', 'emi', 'zol', 'stc'
-    lndpint = 360
+    lndpint = 180
 /
 
 &nam_sppperts
@@ -305,7 +307,7 @@
     spp_stddev_cutoff = 1.5, 1.5, 1.5, 1.5, 3.0
     spp_tau = 21600.0, 21600.0, 21600.0, 21600.0, 21600.0
     spp_var_list = 'pbl', 'sfc', 'rad', 'gwd', 'cu_deep'
-    sppint = 360
+    sppint = 36
 /
 
 &nam_stochy
diff --git a/parm/config/ensf/input.nml_restart_stoch_ensphy4 b/parm/config/ensf/input.nml_restart_stoch_ensphy4
index 8fb0cf711..3fbac4109 100644
--- a/parm/config/ensf/input.nml_restart_stoch_ensphy4
+++ b/parm/config/ensf/input.nml_restart_stoch_ensphy4
@@ -190,8 +190,10 @@
     fhswr = 900.0
     fhzero = 1.0
     frac_ice = .true.
+    gf_coldstart = .true.
     gwd_opt = 3
     h2o_phys = .true.
+    hwp_method = 1
     hybedmf = .false.
     iaer = 1011
     ialb = 2
@@ -251,12 +253,12 @@
     n_var_lndp = 7
     n_var_spp = 3
     nsfullradar_diag = 3600
-    nssl_alphah = 0.75
-    nssl_alphar = 1.44
-    nssl_cccn = 930000000.0
+    nssl_alphah = 0.95
+    nssl_alphar = 1.38
+    nssl_cccn = 880000000.0
     nssl_ccn_on = .true.
-    nssl_ehlw0 = 0.95
-    nssl_ehw0 = 0.59
+    nssl_ehlw0 = 0.87
+    nssl_ehw0 = 0.62
     nssl_hail_on = .true.
     nssl_invertccn = .true.
     oz_phys = .false.
@@ -269,6 +271,7 @@
     random_clds = .false.
     redrag = .true.
     satmedmf = .true.
+    sc_factor = 1.0
     sfclay_compute_flux = .true.
     shal_cnv = .true.
     smoke_conv_wet_coef = 0.5, 0.5, 0.5
@@ -292,7 +295,7 @@
     lndp_tau = 21600, 21600, 21600, 21600, 21600
     lndp_type = 2
     lndp_var_list = 'smc', 'vgf', 'alb', 'sal', 'emi', 'zol', 'stc'
-    lndpint = 360
+    lndpint = 180
 /
 
 &nam_sppperts
@@ -304,7 +307,7 @@
     spp_stddev_cutoff = 1.5, 1.5, 3.0
     spp_tau = 21600.0, 21600.0, 21600.0
     spp_var_list = 'rad', 'gwd', 'cu_deep'
-    sppint = 360
+    sppint = 36
 /
 
 &nam_stochy
diff --git a/parm/config/ensf/input.nml_restart_stoch_ensphy5 b/parm/config/ensf/input.nml_restart_stoch_ensphy5
index e5cedd54c..69befc742 100644
--- a/parm/config/ensf/input.nml_restart_stoch_ensphy5
+++ b/parm/config/ensf/input.nml_restart_stoch_ensphy5
@@ -195,6 +195,7 @@
     frac_ice = .true.
     gwd_opt = 3
     h2o_phys = .true.
+    hwp_method = 1
     hybedmf = .false.
     iaer = 1011
     ialb = 2
@@ -253,12 +254,12 @@
     n_var_lndp = 7
     n_var_spp = 4
     nsfullradar_diag = 3600
-    nssl_alphah = 1.35
-    nssl_alphar = 2.4
-    nssl_cccn = 1110000000.0
+    nssl_alphah = 1.39
+    nssl_alphar = 2.03
+    nssl_cccn = 990000000.0
     nssl_ccn_on = .true.
-    nssl_ehlw0 = 0.85
-    nssl_ehw0 = 0.67
+    nssl_ehlw0 = 0.8
+    nssl_ehw0 = 0.68
     nssl_hail_on = .true.
     nssl_invertccn = .true.
     oz_phys = .false.
@@ -272,6 +273,7 @@
     random_clds = .false.
     redrag = .true.
     satmedmf = .false.
+    sc_factor = 1.0
     sfclay_compute_flux = .true.
     shal_cnv = .false.
     smoke_conv_wet_coef = 0.5, 0.5, 0.5
@@ -295,7 +297,7 @@
     lndp_tau = 21600, 21600, 21600, 21600, 21600
     lndp_type = 2
     lndp_var_list = 'smc', 'vgf', 'alb', 'sal', 'emi', 'zol', 'stc'
-    lndpint = 360
+    lndpint = 180
 /
 
 &nam_sppperts
@@ -307,7 +309,7 @@
     spp_stddev_cutoff = 1.5, 1.5, 1.5, 1.5
     spp_tau = 21600.0, 21600.0, 21600.0, 21600.0
     spp_var_list = 'pbl', 'sfc', 'rad', 'gwd'
-    sppint = 360
+    sppint = 36
 /
 
 &nam_stochy
diff --git a/parm/config/ensf/input.nml_stoch b/parm/config/ensf/input.nml_stoch
index 9060ec9a9..afe9ff3d7 100644
--- a/parm/config/ensf/input.nml_stoch
+++ b/parm/config/ensf/input.nml_stoch
@@ -10,7 +10,7 @@
 &atmos_model_nml
     avg_max_length = 3600.0
     blocksize = 28
-    ccpp_suite = 'FV3_HRRR_gf'
+    ccpp_suite = 'RRFS_sas'
     chksum_debug = .false.
     dycore_only = .false.
     ignore_rst_cksum = .true.
@@ -156,6 +156,7 @@
     addsmoke_flag = 1
     aero_dir_fdb = .true.
     aero_ind_fdb = .false.
+    betadcu = 1.0
     bl_mynn_edmf = 1
     bl_mynn_edmf_mom = 1
     bl_mynn_tkeadvect = .true.
@@ -204,6 +205,7 @@
     frac_ice = .true.
     gwd_opt = 3
     h2o_phys = .true.
+    hwp_method = 1
     hybedmf = .false.
     iaer = 1011
     ialb = 2
@@ -215,7 +217,7 @@
     icloud_bl = 1
     ico2 = 2
     iems = 2
-    imfdeepcnv = 3
+    imfdeepcnv = 2
     imfshalcnv = -1
     imp_physics = 8
     iopt_alb = 2
@@ -267,20 +269,21 @@
     oz_phys_2015 = .true.
     pdfcld = .false.
     plume_wind_eff = 1
-    plumerisefire_frq = 60
+    plumerisefire_frq = 30
     pre_rad = .false.
     print_diff_pgr = .true.
+    progsigma = .true.
     prslrd0 = 0.0
     random_clds = .false.
     redrag = .true.
     rrfs_sd = .false.
     rrfs_smoke_debug = .false.
     satmedmf = .false.
+    sc_factor = 1.0
     seas_opt = 0
     sfclay_compute_flux = .true.
     shal_cnv = .false.
     smoke_conv_wet_coef = 0.5, 0.5, 0.5
-    smoke_forecast = 1
     swhtr = .true.
     thsfc_loc = .false.
     trans_trac = .true.
@@ -302,7 +305,7 @@
     lndp_tau = 21600, 21600, 21600, 21600, 21600
     lndp_type = 2
     lndp_var_list = 'smc', 'vgf', 'alb', 'sal', 'emi', 'zol', 'stc'
-    lndpint = 360
+    lndpint = 180
 /
 
 &nam_sppperts
@@ -314,7 +317,7 @@
     spp_stddev_cutoff = 1.5, 1.5, 2.5, 1.5, 1.5
     spp_tau = 21600.0, 21600.0, 21600.0, 21600.0, 21600.0
     spp_var_list = 'pbl', 'sfc', 'mp', 'rad', 'gwd'
-    sppint = 360
+    sppint = 36
 /
 
 &nam_stochy
diff --git a/parm/config/ensf/var_defns.sh b/parm/config/ensf/var_defns.sh
index d68be5363..e2f96405a 100644
--- a/parm/config/ensf/var_defns.sh
+++ b/parm/config/ensf/var_defns.sh
@@ -4,7 +4,7 @@
 # This file sets the experiment's configuration variables (which are
 # global shell variables) to their default values.  For many of these
 # variables, the valid values that they may take on are defined in the
-# file $USHdir/valid_param_vals.sh.
+# file $USHrrfs/valid_param_vals.sh.
 #
 #-----------------------------------------------------------------------
 #
@@ -21,7 +21,7 @@
 #
 #-----------------------------------------------------------------------
 #
-version="v0.9.5"
+version="v0.9.1"
 #
 #-----------------------------------------------------------------------
 #
@@ -58,7 +58,7 @@ version="v0.9.5"
 # If using the slurm job scheduler (i.e. if SCHED is set to "slurm"),
 # the default partition to which to submit workflow tasks.  If a task
 # does not have a specific variable that specifies the partition to which
-# it will be submitted (e.g. PARTITION_HPSS, PARTITION_FCST; see below),
+# it will be submitted (e.g. PARTITION_HPSS, PARTITION_FORECAST; see below),
 # it will be submitted to the partition specified by this variable.  If
 # this is not set or is set to an empty string, it will be (re)set to a
 # machine-dependent value.  This is not used if SCHED is not set to
@@ -68,7 +68,7 @@ version="v0.9.5"
 # The default queue or QOS (if using the slurm job scheduler, where QOS
 # is Quality of Service) to which workflow tasks are submitted.  If a
 # task does not have a specific variable that specifies the queue to which
-# it will be submitted (e.g. QUEUE_HPSS, QUEUE_FCST; see below), it will
+# it will be submitted (e.g. QUEUE_HPSS, QUEUE_FORECAST; see below), it will
 # be submitted to the queue specified by this variable.  If this is not
 # set or is set to an empty string, it will be (re)set to a machine-
 # dependent value.
@@ -95,14 +95,14 @@ version="v0.9.5"
 # wil be (re)set to a machine-dependent value.  This is not used if SCHED
 # is not set to "slurm."
 #
-# PARTITION_FCST:
+# PARTITION_FORECAST:
 # If using the slurm job scheduler (i.e. if SCHED is set to "slurm"),
 # the partition to which the task that runs forecasts is submitted.  If
 # this is not set or set to an empty string, it will be (re)set to a
 # machine-dependent value.  This is not used if SCHED is not set to
 # "slurm".
 #
-# QUEUE_FCST:
+# QUEUE_FORECAST:
 # The queue or QOS to which the task that runs a forecast is submitted.
 # If this is not set or set to an empty string, it will be (re)set to a
 # machine-dependent value.
@@ -157,10 +157,8 @@ QUEUE_DEFAULT="pridev"
 PARTITION_HPSS=""
 QUEUE_HPSS="dev_transfer"
 PARTITION_SFC_CLIMO=""
-PARTITION_FCST=""
-QUEUE_FCST="pridev"
-PARTITION_GRAPHICS=""
-QUEUE_GRAPHICS="pridev"
+PARTITION_FORECAST=""
+QUEUE_FORECAST="pridev"
 PARTITION_ANALYSIS=""
 QUEUE_ANALYSIS="pridev"
 PARTITION_PRDGEN=""
@@ -211,14 +209,14 @@ CRON_RELAUNCH_INTVL_MNTS="03"
 #
 #-----------------------------------------------------------------------
 #
-EXPT_BASEDIR="${HOMErrfs}"
-EXPT_SUBDIR="rrfs_na"
+EXPT_BASEDIR="${HOMErrfs}/parm/config"
+EXPT_SUBDIR="ensf"
 #
 #-----------------------------------------------------------------------
 #
 # COMINgfs:
 # The beginning portion of the directory containing files generated by
-# the external model (FV3GFS) that the initial and lateral boundary
+# the external model (GFS) that the initial and lateral boundary
 # condition generation tasks need in order to create initial and boundary
 # condition files for a given cycle on the native FV3-LAM grid.  For a
 # cycle that starts on the date specified by the variable yyyymmdd
@@ -253,7 +251,7 @@ EXPT_SUBDIR="rrfs_na"
 #
 #   $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
@@ -269,6 +267,9 @@ EXPT_SUBDIR="rrfs_na"
 #   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
@@ -278,13 +279,13 @@ EXPT_SUBDIR="rrfs_na"
 #
 #   $PTMP/com/$NET/$envir/$RUN.$yyyymmdd/$hh
 #
-# NWGES:
+# GESROOT:
 # The beginning portion of the directory that will contain the output
 # files from the forecast for a given cycle.  For a cycle
 # that starts on the date specified by yyyymmdd and hour specified by hh
 # (where yyyymmdd and hh are as described above), the directory in which
 # the forecast output files will be placed will be:
-#   $NWGES/$NET/$envir/$RUN.$yyyymmdd/$hh
+#   $GESROOT/$RUN.$yyyymmdd/$hh
 #
 # Setup default observation locations for data assimilation:
 #
@@ -326,23 +327,20 @@ COMINgfs=""
 FIXLAM_NCO_BASEDIR="$HOMErrfs/fix/lam"
 STMP="$DATAROOT"
 ENSCTRL_STMP="/base/path/of/directory/containing/model/input/and/raw/output/files"
-RRFSE_NWGES_BASEDIR="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
-NET="rrfs_a"
+RRFSE_GESROOT="/base/path/of/directory/containing/model/output/files"
+NET="rrfs"
 envir="prod"
 RUN="refs"
 RUN_ensctrl="rrfs"
 TAG="n3enfcst91"
-PTMP="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0"
-ENSCTRL_PTMP="/base/path/of/directory/containing/postprocessed/output/files"
-NWGES="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
-ENSCTRL_NWGES="/base/path/of/directory/containing/model/restart/files"
-RRFSE_NWGES="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
+WGF="ensf"
+PTMP="/lfs/h3/emc/lam/noscrub/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0"
+ENSCTRL_PTMP="notused"
+GESROOT="/lfs/h3/emc/lam/noscrub/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
+ENSCTRL_GESROOT="/lfs/h3/emc/lam/noscrub/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
+RRFSE_GESROOT="/base/path/of/directory/containing/model/output/files"
 
-ARCHIVEDIR="/NCEPDEV/emc-meso/1year/emc.lam/n3v91"
-NCARG_ROOT="/apps/ncl/6.5.0-CentOS6.10_64bit_nodap_gnu447"
-NCL_HOME="/home/rtrr/RRFS/graphics"
-NCL_REGION="na"
-MODEL="RRFS_A"
+MODEL="RRFS"
 
 OBSTYPE_SOURCE="rap"
 OBSPATH="/lfs/h1/ops/prod/com/obsproc/v1.2"
@@ -438,7 +436,7 @@ RELATIVE_LINK_FLAG="--relative"
 # FV3_EXEC_FN:
 # Name to use for the forecast model executable when it is copied from
 # the directory in which it is created in the build step to the executables
-# directory (EXECdir; this is set during experiment generation).
+# directory (EXECrrfs; this is set in the J-jobs).
 #
 # WFLOW_XML_FN:
 # Name of the rocoto workflow XML file that the experiment generation
@@ -591,14 +589,14 @@ WFLOW_LAUNCH_LOG_FN="log.launch_FV3LAM_wflow"
 #
 #-----------------------------------------------------------------------
 #
-DATE_FIRST_CYCL="20240531"
-DATE_LAST_CYCL="20240531"
+DATE_FIRST_CYCL="20241029"
+DATE_LAST_CYCL="20241031"
 STARTYEAR="2024"
-STARTMONTH="05"
-STARTDAY="31"
+STARTMONTH="10"
+STARTDAY="29"
 STARTHOUR="00"
 ENDYEAR="2024"
-ENDMONTH="05"
+ENDMONTH="10"
 ENDDAY="31"
 ENDHOUR="23"
 CYCL_HRS="18"
@@ -696,13 +694,13 @@ CYCL_HRS_HYB_FV3LAM_ENS="99"
 #
 # SPINUP_CYCLEDEF:
 # cycle definition for spin-up cycle group
-# This group runs: anal_gsi_input_spinup and data process, run_fcst_spinup,
-# run_post_spinup
+# This group runs: anal_gsi_input_spinup and data process, forecast_spinup,
+# post_spinup
 #
 # PROD_CYCLEDEF:
 # cycle definition for product cycle group
-# This group runs: anal_gsi_input and data process, run_fcst, python_skewt,
-# run_post, run_clean
+# This group runs: anal_gsi_input and data process, forecast, python_skewt,
+# post, run_clean
 #
 # SAVEDA_CYCLEDEF:
 # cycle definition for saving DA output files
@@ -715,24 +713,19 @@ CYCL_HRS_HYB_FV3LAM_ENS="99"
 # PRODLONG_CYCLEDEF:
 # same as PROD_CYCLEDEF, but for long forecast
 #
-# ARCHIVE_CYCLEDEF:
-# cycle definition for "archive" group
-# This group runs: run_archive
-#
 #-----------------------------------------------------------------------
 #
-CYCLEDAY="31"
-CYCLEMONTH="05"
+CYCLEDAY="29-31"
+CYCLEMONTH="10"
 AT_START_CYCLEDEF="00 01 01 01 2100 *"
 INITIAL_CYCLEDEF="00 01 01 01 2100 *"
-BOUNDARY_CYCLEDEF="202405310000 202405312300 06:00:00"
+BOUNDARY_CYCLEDEF="202410290000 202410312300 06:00:00"
 BOUNDARY_LONG_CYCLEDEF="00 01 01 01 2100 *"
 SPINUP_CYCLEDEF="00 01 01 01 2100 *"
-PROD_CYCLEDEF="202405310000 202405312300 06:00:00"
-RECENTER_CYCLEDEF="202405310000 202405312300 06:00:00"
+PROD_CYCLEDEF="202410290000 202410312300 06:00:00"
+RECENTER_CYCLEDEF="202410290000 202410312300 06:00:00"
 PRODLONG_CYCLEDEF="00 01 01 01 2100 *"
-ARCHIVE_CYCLEDEF="00 01 01 01 2100 *"
-SAVEDA_CYCLEDEF="202405310000 202405312300 06:00:00"
+SAVEDA_CYCLEDEF="202410290000 202410312300 06:00:00"
 #
 #-----------------------------------------------------------------------
 #
@@ -741,7 +734,7 @@ SAVEDA_CYCLEDEF="202405310000 202405312300 06:00:00"
 # shell variable and assign value in config.sh and give it a default
 # value in config_default.sh In realtime testing, don't need to regenerate
 # the whole workflow, you can tweak $EXPTDIR/var_defns.sh and
-# $FIX_GSI/gsiparm.anl.sh to make sure the change is expected and then
+# $FIXrrfs/gsi/gsiparm.anl.sh to make sure the change is expected and then
 # put it back into config.sh and config_default.sh
 # (need to follow FORTRAN namelist convetion)
 #
@@ -818,7 +811,7 @@ ENKF_ANAVINFO_FN="anavinfo.rrfs"
 ENKF_ANAVINFO_DBZ_FN="anavinfo.enkf.rrfs_dbz"
 CONVINFO_FN="convinfo.rrfs"
 CONVINFO_SD_FN="convinfo.rrfs_sd"
-BERROR_FN="rrfs_glb_berror.l127y770.f77" #under $FIX_GSI
+BERROR_FN="rrfs_glb_berror.l127y770.f77" #under $FIXrrfs/gsi
 BERROR_SD_FN="berror.rrfs_sd" # for test only
 OBERROR_FN="errtable.rrfs"
 HYBENSINFO_FN="hybens_info.rrfs"
@@ -888,14 +881,14 @@ beta_recenter="1.0"
 #              1 means search start at 1-h previous cycle  lbcs directory.
 #              2 means search start at 2-h previous cycle  lbcs directory.
 #
-# FV3GFS_FILE_FMT_ICS:
-# If using the FV3GFS model as the source of the ICs (i.e. if EXTRN_MDL_NAME_ICS
-# is set to "FV3GFS"), this variable specifies the format of the model
+# GFS_FILE_FMT_ICS:
+# If using the GFS model as the source of the ICs (i.e. if EXTRN_MDL_NAME_ICS
+# is set to "GFS"), this variable specifies the format of the model
 # files to use when generating the ICs.
 #
-# FV3GFS_FILE_FMT_LBCS:
-# If using the FV3GFS model as the source of the LBCs (i.e. if
-# EXTRN_MDL_NAME_LBCS is set to "FV3GFS"), this variable specifies the
+# GFS_FILE_FMT_LBCS:
+# If using the GFS model as the source of the LBCs (i.e. if
+# EXTRN_MDL_NAME_LBCS is set to "GFS"), this variable specifies the
 # format of the model files to use when generating the LBCs.
 #
 # EXTRN_MDL_DATE_JULIAN:
@@ -912,8 +905,8 @@ LBC_SPEC_INTVL_HRS="3"
 EXTRN_MDL_LBCS_OFFSET_HRS="6"
 EXTRN_MDL_LBCS_SEARCH_OFFSET_HRS="0"
 LBCS_SEARCH_HRS="6"
-FV3GFS_FILE_FMT_ICS="netcdf"
-FV3GFS_FILE_FMT_LBCS="grib2"
+GFS_FILE_FMT_ICS="netcdf"
+GFS_FILE_FMT_LBCS="grib2"
 EXTRN_MDL_DATE_JULIAN="FALSE"
 #
 #-----------------------------------------------------------------------
@@ -992,7 +985,7 @@ EXTRN_MDL_FILES_LBCS=( \
 #
 #-----------------------------------------------------------------------
 #
-CCPP_PHYS_SUITE="FV3_HRRR_gf"
+CCPP_PHYS_SUITE="RRFS_sas"
 #
 #-----------------------------------------------------------------------
 #
@@ -1373,7 +1366,7 @@ ESGgrid_PAZI="0.0"
 # WRITE_DOPOST:
 # Flag that determines whether or not to use the inline post feature
 # [i.e. calling the Unified Post Processor (UPP) from within the
-# weather model].  If this is set to true, the the run_post task will
+# weather model].  If this is set to true, then the post task will
 # be deactivated.
 #-----------------------------------------------------------------------
 #
@@ -1579,19 +1572,15 @@ SAVE_CYCLE_LOG="TRUE"
 # SFC_CLIMO_DIR:
 # Same as GRID_DIR but for the surface climatology generation task.
 #
-# RUN_TASK_RUN_PRDGEN:
+# RUN_TASK_PRDGEN:
 # Flag that determines whether the product generation task is to run.
 #
-# RUN_TASK_ADD_AEROSOL:
-# Flag that determines whether the task for adding dusk in the GEFS
-# aerosol data to LBCs task is to run.
-#
 # IS_RTMA:
 # If true, some ICs,LBCs,GSI rocoto tasks will be turned off
 #
 # FG_ROOTDIR:
 # First Guess Root Directory, APP will find corresponding first guess
-# fields from this directory. RRFS will find FG under NWGES_BASEDIR,
+# fields from this directory. RRFS will find FG under GESROOT,
 # but we needs to explicitly specify where to find FG for RTMA.
 # So this parameter only matters for RTMA
 #
@@ -1599,10 +1588,6 @@ SAVE_CYCLE_LOG="TRUE"
 # "" or "GSL":  RTMA's observations follow the GSL naming convention
 #       "NCO":  RTMA's observations follow the NCO naming convention
 #
-# PYTHON_GRAPHICS_YML_FN:
-# The name of the yml file under ${PYTHON_GRAPHICS_DIR}/image_lists
-# to be used by current application
-#
 #-----------------------------------------------------------------------
 #
 RUN_TASK_MAKE_GRID="FALSE"
@@ -1614,14 +1599,12 @@ OROG_DIR="$HOMErrfs/fix/lam/RRFS_NA_3km"
 RUN_TASK_MAKE_SFC_CLIMO="FALSE"
 SFC_CLIMO_DIR="$HOMErrfs/fix/lam/RRFS_NA_3km"
 
-RUN_TASK_RUN_PRDGEN="TRUE"
-RUN_TASK_ADD_AEROSOL="FALSE"
+RUN_TASK_PRDGEN="TRUE"
 #
 NCORES_PER_NODE="128" #Jet default value
 IS_RTMA="FALSE"
 FG_ROOTDIR=""
 RTMA_OBS_FEED=""
-PYTHON_GRAPHICS_YML_FN="rrfs_subset.yml"
 #
 #-----------------------------------------------------------------------
 #
@@ -1649,9 +1632,6 @@ SFC_CLIMO_FIELDS=( \
 # System directory in which the majority of fixed (i.e. time-independent)
 # files that are needed to run the FV3-LAM model are located
 #
-# FIXprdgen:
-# directory where prdgen fix files are located
-#
 # TOPO_DIR:
 # The location on disk of the static input files used by the make_orog
 # task (orog.x and shave.x). Can be the same as FIXgsm.
@@ -1661,23 +1641,6 @@ SFC_CLIMO_FIELDS=( \
 # used by sfc_climo_gen. These files are only used if
 # RUN_TASK_MAKE_SFC_CLIMO=TRUE
 #
-# FIX_GSI:
-# System directory in which the fixed files that are needed to run
-# the GSI are located
-#
-# FIX_UPP:
-# System directory in which the fixed files that are needed to run
-# the UPP are located
-#
-# FIX_CRTM:
-# System directory in which the CRTM coefficient files are located
-#
-# FIX_SMOKE_DUST
-# directory in which the smoke and dust fix files are located
-#
-# FIX_BUFRSND
-# directory in which the bufrsnd fix files are located
-#
 # FNGLAC, ..., FNMSKH:
 # Names of (some of the) global data files that are assumed to exist in
 # a system directory specified (this directory is machine-dependent;
@@ -1732,15 +1695,8 @@ SFC_CLIMO_FIELDS=( \
 # to a null string which will then be overwritten in setup.sh unless the
 # user has specified a different value in config.sh
 FIXgsm="$HOMErrfs/fix/am"
-FIXprdgen="$HOMErrfs/fix/prdgen"
 TOPO_DIR="/lfs/h2/emc/lam/noscrub/RRFS_input/fix/fix_orog"
 SFC_CLIMO_INPUT_DIR="/lfs/h2/emc/lam/noscrub/RRFS_input/fix/fix_sfc_climo"
-FIX_GSI="$HOMErrfs/fix/gsi"
-FIX_UPP="$HOMErrfs/fix/upp"
-FIX_CRTM="/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/intel-19.1.3.304/cray-mpich-8.1.12/crtm/2.4.0/fix"
-FIX_UPP_CRTM="/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/intel-19.1.3.304/cray-mpich-8.1.12/crtm/2.4.0/fix"
-FIX_SMOKE_DUST="$HOMErrfs/fix/smoke_dust"
-FIX_BUFRSND="$HOMErrfs/fix/bufrsnd"
 
 FNGLAC="global_glacier.2x2.grb"
 FNMXIC="global_maxice.2x2.grb"
@@ -1878,37 +1834,28 @@ GET_GEFS_LBCS_TN="get_gefs_lbcs"
 MAKE_ICS_TN="make_ics"
 BLEND_ICS_TN="blend_ics"
 MAKE_LBCS_TN="make_lbcs"
-RUN_FCST_TN="run_fcst"
-RUN_POST_TN="run_post"
-RUN_PRDGEN_TN="run_prdgen"
-RUN_BUFRSND_TN="run_bufrsnd"
+FORECAST_TN="forecast"
+POST_TN="post"
+PRDGEN_TN="prdgen"
+BUFRSND_TN="bufrsnd"
 
-ANALYSIS_GSI_TN="analysis_gsi_input"
+ANALYSIS_GSI_TN="analysis_gsi"
 ANALYSIS_GSIDIAG_TN="analysis_gsi_diag"
-ANALYSIS_SD_GSI_TN="analysis_sd_gsi_input"
-POSTANAL_TN="postanal_input"
+UPDATE_LBC_SOIL_TN="update_lbc_soil"
 OBSERVER_GSI_ENSMEAN_TN="observer_gsi_ensmean"
 OBSERVER_GSI_TN="observer_gsi"
-PREP_START_TN="prep_start"
 PREP_CYC_SPINUP_TN="prep_cyc_spinup"
 PREP_CYC_PROD_TN="prep_cyc_prod"
-PREP_CYC_ENSMEAN_TN="prep_cyc_ensmean"
 PREP_CYC_TN="prep_cyc"
 CALC_ENSMEAN_TN="calc_ensmean"
-PROCESS_RADAR_REF_TN="process_radarref"
-PROCESS_LIGHTNING_TN="process_lightning"
+PROCESS_RADAR_TN="process_radar"
 RADAR_REF_THINNING="2"
 PROCESS_BUFR_TN="process_bufr"
 PROCESS_SMOKE_TN="process_smoke"
-PROCESS_PM_TN="process_pm"
-RADAR_REFL2TTEN_TN="radar_refl2tten"
-CLDANL_NONVAR_TN="cldanl_nonvar"
+ANALYSIS_NONVARCLD_TN="analysis_nonvarcld"
 SAVE_RESTART_TN="save_restart"
 SAVE_DA_OUTPUT_TN="save_da_output"
-JEDI_ENVAR_IODA_TN="jedi_envar_ioda"
-IODA_PREPBUFR_TN="ioda_prepbufr"
-PROCESS_GLMFED_TN="process_glmfed"
-ADD_AEROSOL_TN="add_aerosol"
+PROCESS_LIGHTNING_TN="process_lightning"
 #
 # Number of nodes.
 #
@@ -1920,39 +1867,31 @@ NNODES_GET_EXTRN_LBCS="1"
 NNODES_MAKE_ICS="2"
 NNODES_BLEND_ICS="1"
 NNODES_MAKE_LBCS="1"
-NNODES_RUN_PREPSTART="1"
-NNODES_RUN_FCST="52"  # This is calculated in the workflow generation scripts, so no need to set here.
-NNODES_RUN_POST="4"
-NNODES_RUN_PRDGEN="1"
-NNODES_RUN_ANALYSIS="1"
-NNODES_RUN_GSIDIAG="1"
-NNODES_RUN_POSTANAL="1"
-NNODES_RUN_ENKF="10"
-NNODES_RUN_RECENTER="10"
-NNODES_PROC_RADAR="1"
-NNODES_PROC_LIGHTNING="1"
-NNODES_PROC_GLMFED="1"
-NNODES_PROC_BUFR="1"
-NNODES_PROC_SMOKE="1"
-NNODES_PROC_PM="1"
-NNODES_RUN_REF2TTEN="1"
-NNODES_RUN_NONVARCLDANL="1"
-NNODES_RUN_GRAPHICS="1"
-NNODES_RUN_ENSPOST="1"
-NNODES_RUN_BUFRSND="2"
+NNODES_PREP_CYC="1"
+NNODES_FORECAST="52"  # This is calculated in the workflow generation scripts, so no need to set here.
+NNODES_POST="4"
+NNODES_PRDGEN="1"
+NNODES_ANALYSIS_GSI="1"
+NNODES_ANALYSIS_GSIDIAG="1"
+NNODES_UPDATE_LBC_SOIL="1"
+NNODES_ANALYSIS_ENKF="10"
+NNODES_RECENTER="10"
+NNODES_PROCESS_RADAR="1"
+NNODES_PROCESS_LIGHTNING="1"
+NNODES_PROCESS_BUFR="1"
+NNODES_PROCESS_SMOKE="1"
+NNODES_ANALYSIS_NONVARCLD="1"
+NNODES_BUFRSND="2"
 NNODES_SAVE_RESTART="1"
-NNODES_RUN_JEDIENVAR_IODA="1"
-NNODES_RUN_IODA_PREPBUFR="1"
-NNODES_ADD_AEROSOL="1"
 #
 # Number of cores.
 #
-NCORES_RUN_ANALYSIS="360"
+NCORES_ANALYSIS_GSI="360"
 NCORES_RUN_OBSERVER="80"
-NCORES_RUN_ENKF="4"
-NATIVE_RUN_FCST="--cpus-per-task 2 --exclusive"
-NATIVE_RUN_ANALYSIS="--cpus-per-task 2 --exclusive"
-NATIVE_RUN_ENKF="--cpus-per-task 4 --exclusive"
+NCORES_ANALYSIS_ENKF="4"
+NATIVE_FORECAST="--cpus-per-task 2 --exclusive"
+NATIVE_ANALYSIS_GSI="--cpus-per-task 2 --exclusive"
+NATIVE_ANALYSIS_ENKF="--cpus-per-task 4 --exclusive"
 #
 # Number of MPI processes per node.
 #
@@ -1964,40 +1903,32 @@ PPN_GET_EXTRN_LBCS="1"
 PPN_MAKE_ICS="32"
 PPN_BLEND_ICS="8"
 PPN_MAKE_LBCS="64"
-PPN_RUN_PREPSTART="1"
-PPN_RUN_FCST="64"  # This may have to be changed depending on the number of threads used.
-PPN_RUN_POST="32"
-PPN_RUN_PRDGEN="128"
-PPN_RUN_ANALYSIS="16"
-PPN_RUN_GSIDIAG="128"
-PPN_RUN_POSTANAL="8"
-PPN_RUN_ENKF="8"
-PPN_RUN_RECENTER="128"
-PPN_PROC_RADAR="64"
-PPN_PROC_LIGHTNING="1"
-PPN_PROC_GLMFED="1"
-PPN_PROC_BUFR="1"
-PPN_PROC_SMOKE="1"
-PPN_PROC_PM="1"
-PPN_RUN_REF2TTEN="1"
-PPN_RUN_NONVARCLDANL="128"
-PPN_RUN_GRAPHICS="12"
-PPN_RUN_ENSPOST="1"
-PPN_RUN_BUFRSND="64"
+PPN_PREP_CYC="1"
+PPN_FORECAST="64"  # This may have to be changed depending on the number of threads used.
+PPN_POST="32"
+PPN_PRDGEN="128"
+PPN_ANALYSIS_GSI="16"
+PPN_ANALYSIS_GSIDIAG="128"
+PPN_UPDATE_LBC_SOIL="8"
+PPN_ANALYSIS_ENKF="8"
+PPN_RECENTER="128"
+PPN_PROCESS_RADAR="64"
+PPN_PROCESS_LIGHTNING="1"
+PPN_PROCESS_BUFR="1"
+PPN_PROCESS_SMOKE="1"
+PPN_ANALYSIS_NONVARCLD="128"
+PPN_BUFRSND="64"
 PPN_SAVE_RESTART="1"
-PPN_RUN_JEDIENVAR_IODA="1"
-PPN_RUN_IODA_PREPBUFR="1"
-PPN_ADD_AEROSOL="9"
 #
 # Number of TPP for WCOSS2.
 #
 TPP_MAKE_ICS="4"
 TPP_MAKE_LBCS="2"
-TPP_RUN_ANALYSIS="8"
-TPP_RUN_ENKF="16"
-TPP_RUN_FCST="2"
-TPP_RUN_POST="4"
-TPP_RUN_BUFRSND="2"
+TPP_ANALYSIS_GSI="8"
+TPP_ANALYSIS_ENKF="16"
+TPP_FORECAST="2"
+TPP_POST="4"
+TPP_BUFRSND="2"
 #
 # Walltimes.
 #
@@ -2009,32 +1940,24 @@ WTIME_GET_EXTRN_LBCS="00:45:00"
 WTIME_MAKE_ICS="00:30:00"
 WTIME_BLEND_ICS="00:30:00"
 WTIME_MAKE_LBCS="01:30:00"
-WTIME_RUN_PREPSTART="00:20:00"
-WTIME_RUN_PREPSTART_ENSMEAN="00:10:00"
-WTIME_RUN_FCST="04:45:00"
-WTIME_RUN_FCST_LONG="04:45:00"
-WTIME_RUN_FCST_SPINUP="00:30:00"
-WTIME_RUN_POST="00:15:00"
-WTIME_RUN_PRDGEN="00:40:00"
-WTIME_RUN_ANALYSIS="00:50:00"
-WTIME_RUN_GSIDIAG="00:15:00"
-WTIME_RUN_POSTANAL="00:30:00"
-WTIME_RUN_ENKF="01:00:00"
-WTIME_RUN_RECENTER="01:00:00"
-WTIME_PROC_RADAR="00:25:00"
-WTIME_PROC_LIGHTNING="00:25:00"
-WTIME_PROC_GLMFED="00:25:00"
-WTIME_PROC_BUFR="00:25:00"
-WTIME_PROC_SMOKE="00:25:00"
-WTIME_PROC_PM="00:25:00"
-WTIME_RUN_REF2TTEN="00:20:00"
-WTIME_RUN_NONVARCLDANL="00:20:00"
-WTIME_RUN_BUFRSND="04:45:00"
+WTIME_PREP_CYC="00:20:00"
+WTIME_FORECAST="04:45:00"
+WTIME_FORECAST_LONG="04:45:00"
+WTIME_FORECAST_SPINUP="00:30:00"
+WTIME_POST="00:15:00"
+WTIME_PRDGEN="00:40:00"
+WTIME_ANALYSIS_GSI="00:50:00"
+WTIME_ANALYSIS_GSIDIAG="00:15:00"
+WTIME_UPDATE_LBC_SOIL="00:30:00"
+WTIME_ANALYSIS_ENKF="01:00:00"
+WTIME_RECENTER="01:00:00"
+WTIME_PROCESS_RADAR="00:25:00"
+WTIME_PROCESS_LIGHTNING="00:25:00"
+WTIME_PROCESS_BUFR="00:25:00"
+WTIME_PROCESS_SMOKE="00:25:00"
+WTIME_ANALYSIS_NONVARCLD="00:20:00"
+WTIME_BUFRSND="04:45:00"
 WTIME_SAVE_RESTART="00:15:00"
-WTIME_RUN_ENSPOST="00:30:00"
-WTIME_RUN_JEDIENVAR_IODA="00:30:00"
-WTIME_RUN_IODA_PREPBUFR="00:20:00"
-WTIME_ADD_AEROSOL="00:30:00"
 #
 # Start times.
 #
@@ -2044,30 +1967,21 @@ START_TIME_CONVENTIONAL_SPINUP="00:40:00"
 START_TIME_BLENDING="04:00:00"
 START_TIME_LATE_ANALYSIS="01:20:00"
 START_TIME_CONVENTIONAL="00:45:00"
-START_TIME_IODA_PREPBUFR="00:50:00"
 START_TIME_NSSLMOSIAC="00:45:00"
-START_TIME_LIGHTNINGNC="00:55:00"
-START_TIME_GLMFED="00:45:00"
-START_TIME_PROCSMOKE="00:50:00"
-START_TIME_PROCPM="00:45:00"
+START_TIME_PROCESS_LIGHTNING="00:45:00"
+START_TIME_PROCESS_SMOKE="00:50:00"
 #
 # Memory.
 #
-MEMO_RUN_PROCESSBUFR="20G"
-MEMO_RUN_REF2TTEN="20G"
-MEMO_RUN_NONVARCLDANL="256G"
-MEMO_RUN_PREPSTART="120G"
-MEMO_RUN_PRDGEN="256G"
-MEMO_RUN_JEDIENVAR_IODA="20G"
-MEMO_RUN_IODA_PREPBUFR="20G"
-MEMO_PREP_CYC="40G"
+MEMO_PROCESS_BUFR="20G"
+MEMO_ANALYSIS_NONVARCLD="256G"
+MEMO_PRDGEN="256G"
+MEMO_PREP_CYC="120G"
 MEMO_SAVE_RESTART="120G"
 MEMO_SAVE_INPUT="120G"
-MEMO_PROC_SMOKE="256G"
-MEMO_PROC_GLMFED="70G"
-MEMO_PROC_PM="40G"
+MEMO_PROCESS_SMOKE="256G"
+MEMO_PROCESS_LIGHTNING="70G"
 MEMO_SAVE_DA_OUTPUT="40G"
-MEMO_ADD_AEROSOL="70G"
 #
 # Maximum number of attempts.
 #
@@ -2079,29 +1993,23 @@ MAXTRIES_GET_EXTRN_LBCS="2"
 MAXTRIES_MAKE_ICS="1"
 MAXTRIES_BLEND_ICS="1"
 MAXTRIES_MAKE_LBCS="1"
-MAXTRIES_RUN_PREPSTART="1"
-MAXTRIES_RUN_FCST="1"
+MAXTRIES_PREP_CYC="1"
+MAXTRIES_FORECAST="1"
 MAXTRIES_ANALYSIS_GSI="1"
-MAXTRIES_POSTANAL="2"
+MAXTRIES_UPDATE_LBC_SOIL="2"
 MAXTRIES_ANALYSIS_ENKF="1"
-MAXTRIES_RUN_POST="2"
-MAXTRIES_RUN_PRDGEN="1"
-MAXTRIES_RUN_ANALYSIS="2"
-MAXTRIES_RUN_POSTANAL="1"
+MAXTRIES_POST="2"
+MAXTRIES_PRDGEN="1"
+MAXTRIES_ANALYSIS_GSI="1"
+MAXTRIES_UPDATE_LBC_SOIL="2"
 MAXTRIES_RECENTER="1"
-MAXTRIES_PROCESS_RADARREF="1"
+MAXTRIES_PROCESS_RADAR="1"
 MAXTRIES_PROCESS_LIGHTNING="1"
-MAXTRIES_PROC_GLMFED="1"
 MAXTRIES_PROCESS_BUFR="1"
 MAXTRIES_PROCESS_SMOKE="1"
-MAXTRIES_PROCESS_PM="1"
-MAXTRIES_RADAR_REF2TTEN="1"
-MAXTRIES_CLDANL_NONVAR="2"
+MAXTRIES_ANALYSIS_NONVARCLD="2"
 MAXTRIES_SAVE_RESTART="2"
 MAXTRIES_SAVE_DA_OUTPUT="2"
-MAXTRIES_JEDI_ENVAR_IODA="1"
-MAXTRIES_IODA_PREPBUFR="1"
-MAXTRIES_ADD_AEROSOL="1"
 #
 #-----------------------------------------------------------------------
 #
@@ -2251,13 +2159,6 @@ TILE_SETS="full SE,SC,SW NE,NC,NW ATL,CA-NV,CentralCA CHI-DET,DCArea,EastCO
 # DO_GSIDIAG_OFFLINE:
 # Decide whether or not to run GSI diag generation outside of the GSI task
 #
-# DO_ENS_GRAPHICS:
-# Flag to turn on/off ensemble graphics. Turns OFF deterministic
-# graphics.
-#
-# DO_ENSPOST:
-# Flag to turn on/off python ensemble postprocessing for WPC testbeds.
-#
 # DO_ENSINIT:
 # Decide whether or not to do ensemble initialization by running 1
 # timestep ensemble forecast and recentering on the deterministic
@@ -2325,8 +2226,6 @@ DO_ENKF_RADAR_REF="TRUE"
 DO_ENVAR_RADAR_REF="FALSE"
 DO_ENVAR_RADAR_REF_ONCE="FALSE"
 DO_RECENTER="TRUE"
-DO_ENS_GRAPHICS="FALSE"
-DO_ENSPOST="FALSE"
 DO_ENSINIT="TRUE"
 DO_SAVE_DA_OUTPUT="TRUE"
 DO_GSIDIAG_OFFLINE="FALSE"
@@ -2394,7 +2293,6 @@ DO_BUFRSND="TRUE"
 USE_RRFSE_ENS="FALSE"
 DO_SMOKE_DUST="FALSE"
 EBB_DCYCLE="2"
-DO_PM_DA="FALSE"
 USE_CLM="TRUE"
 DO_NON_DA_RUN="FALSE"
 #
@@ -2541,8 +2439,8 @@ ISEED_SPP=( \
 "7" \
 "8" \
 )
-LNDPINT="360"
-SPPINT="360"
+LNDPINT="180"
+SPPINT="36"
 #
 #-----------------------------------------------------------------------
 #
@@ -2714,37 +2612,11 @@ GWD_HRRRsuite_BASEDIR="$HOMErrfs/fix/lam"
 #
 #-----------------------------------------------------------------------
 #
-# Parameters for JEDI options
-#
-# DO_JEDI_ENVAR_IODA:
-# Flag turn on the JEDI-IODA converters for EnVAR.  It requires GSI
-# to produce NetCDF diag files
-#-----------------------------------------------------------------------
-#
-DO_JEDI_ENVAR_IODA="FALSE"
-#
-#-----------------------------------------------------------------------
-#
-# Parameters for IODA options
-#
-# DO_IODA_PREPBUFR:
-# Flag turn on the IODA converters for conventional observations in prepbufr files.
-#-----------------------------------------------------------------------
-#
-DO_IODA_PREPBUFR="FALSE"
-#
-#-----------------------------------------------------------------------
-#
 # Parameters for analysis options
 #
-# DO_NONVAR_CLDANAL:
+# DO_ANALYSIS_NONVARCLD:
 # Flag turn on the non-var cloud analysis.
 #
-# DO_REFL2TTEN:
-# Flag turn on the radar reflectivity to temperature tendenecy.
-#
-# DO_NLDN_LGHT
-# Flag turn on processing NLDN NetCDF lightning data
 # DO_GLM_FED_DA
 # Flag turn on processing gridded GLM lightning data
 # GLMFED_DATA_MODE
@@ -2756,15 +2628,12 @@ DO_IODA_PREPBUFR="FALSE"
 #
 #-----------------------------------------------------------------------
 #
-DO_NONVAR_CLDANAL="FALSE"
-DO_REFL2TTEN="FALSE"
-DO_NLDN_LGHT="FALSE"
+DO_ANALYSIS_NONVARCLD="FALSE"
 DO_GLM_FED_DA="TRUE"
 GLMFED_DATA_MODE="PROD"
 PREP_MODEL_FOR_FED="TRUE"
 DO_SMOKE_DUST="FALSE"
 EBB_DCYCLE="2"
-DO_PM_DA="FALSE"
 #
 #-----------------------------------------------------------------------
 #
@@ -2852,45 +2721,35 @@ CRONTAB_LINE=""
 #-----------------------------------------------------------------------
 #
 HOMErrfs="$HOMErrfs"
-USHdir="$HOMErrfs/ush"
-SCRIPTSdir="$HOMErrfs/scripts"
-JOBSdir="$HOMErrfs/jobs"
-SORCdir="$HOMErrfs/sorc"
-PARMdir="$HOMErrfs/parm"
+USHrrfs="$HOMErrfs/ush"
+SORCrrfs="$HOMErrfs/sorc"
+PARMrrfs="$HOMErrfs/parm"
 MODULES_DIR="$HOMErrfs/modulefiles"
-EXECdir="$HOMErrfs/exec"
 LIB64dir="$HOMErrfs/sorc/build/lib64"
 FIXam="$HOMErrfs/parm/config/ensf/fix_am"
 FIXLAM="$HOMErrfs/parm/config/ensf/fix_lam"
 FIXgsm="$HOMErrfs/fix/am"
-FIXprdgen="$HOMErrfs/fix/prdgen"
-COMROOT="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0"
-COMOUT_BASEDIR="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0/prod"
-NWGES_BASEDIR="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
+COMROOT="$COMROOT"
+GESROOT="/lfs/h3/emc/lam/noscrub/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
 UFS_WTHR_MDL_DIR="$HOMErrfs/sorc/ufs-weather-model"
 UFS_UTILS_DIR="$HOMErrfs/sorc/UFS_UTILS"
 SFC_CLIMO_INPUT_DIR="/lfs/h2/emc/lam/noscrub/RRFS_input/fix/fix_sfc_climo"
 TOPO_DIR="/lfs/h2/emc/lam/noscrub/RRFS_input/fix/fix_orog"
 UPP_DIR="$HOMErrfs/sorc/UPP"
-PYTHON_GRAPHICS_DIR="$HOMErrfs/python_graphics"
 
-ARCHIVEDIR="/NCEPDEV/emc-meso/1year/emc.lam/n3v91"
-NCARG_ROOT="/apps/ncl/6.5.0-CentOS6.10_64bit_nodap_gnu447"
-NCL_HOME="/home/rtrr/RRFS/graphics"
-NCL_REGION="na"
 MODEL="RRFS_A"
 
 EXPTDIR="$HOMErrfs/parm/config/ensf"
-LOG_BASEDIR="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0/logs"
-CYCLE_BASEDIR="$DATAROOT"
+LOG_BASEDIR="notused"
+DATAROOT="$DATAROOT"
 GRID_DIR="$HOMErrfs/fix/lam/RRFS_NA_3km"
 OROG_DIR="$HOMErrfs/fix/lam/RRFS_NA_3km"
 SFC_CLIMO_DIR="$HOMErrfs/fix/lam/RRFS_NA_3km"
 GWD_HRRRsuite_DIR="$HOMErrfs/fix/lam/RRFS_NA_3km"
 
-NDIGITS_ENSMEM_NAMES="4"
-ENSMEM_NAMES=( "mem0001" "mem0002" "mem0003" "mem0004" "mem0005" )
-FV3_NML_ENSMEM_FPS=( "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enfcst/input.nml_mem0001" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enfcst/input.nml_mem0002" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enfcst/input.nml_mem0003" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enfcst/input.nml_mem0004" "/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/v0.9.5/rrfs_na_enfcst/input.nml_mem0005" )
+NDIGITS_ENSMEM_NAMES="3"
+ENSMEM_NAMES=( "mem001" "mem002" "mem003" "mem004" "mem005" )
+FV3_NML_ENSMEM_FPS=( "$HOMErrfs/parm/config/ensf/input.nml_mem001" "$HOMErrfs/parm/config/ensf/input.nml_mem002" "$HOMErrfs/parm/config/ensf/input.nml_mem003" "$HOMErrfs/parm/config/ensf/input.nml_mem004" "$HOMErrfs/parm/config/ensf/input.nml_mem005" )
 
 # for data assimilation
 OBSPATH="/lfs/h1/ops/prod/com/obsproc/v1.2"
@@ -2901,14 +2760,8 @@ GLMFED_EAST_ROOT="/lfs/h1/ops/prod/dcom/ldmdata/obs/GOES-16/GLM/tiles"
 GLMFED_WEST_ROOT="/lfs/h1/ops/prod/dcom/ldmdata/obs/GOES-17/GLM/tiles"
 ENKF_FCST="/lfs/h1/ops/prod/com/gfs/v16.3"
 
-FIX_GSI="$HOMErrfs/fix/gsi"
-FIX_CRTM="/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/intel-19.1.3.304/cray-mpich-8.1.12/crtm/2.4.0/fix"
-FIX_UPP_CRTM="/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/intel-19.1.3.304/cray-mpich-8.1.12/crtm/2.4.0/fix"
-FIX_SMOKE_DUST="$HOMErrfs/fix/smoke_dust"
-FIX_BUFRSND="$HOMErrfs/fix/bufrsnd"
 AIRCRAFT_REJECT="/lfs/h2/emc/lam/noscrub/emc.lam/FIX_RRFS/gsi"
 SFCOBS_USELIST="/lfs/h2/emc/lam/noscrub/emc.lam/FIX_RRFS/gsi"
-PARM_IODACONV="$HOMErrfs/parm/iodaconv"
 
 RADARREFL_MINS=( "0" "1" "2" "3" )
 RADARREFL_TIMELEVEL=( "0" )
@@ -2920,29 +2773,29 @@ ADDNL_OUTPUT_GRIDS=( "hrrr" "hrrrak" )
 #
 #-----------------------------------------------------------------------
 #
-GLOBAL_VAR_DEFNS_FP="/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/para/packages/rrfs.v1.0.0/parm/config/ensf/var_defns.sh"
+GLOBAL_VAR_DEFNS_FP="$HOMErrfs/parm/config/ensf/var_defns.sh"
 # Try this at some point instead of hard-coding it as above; it's a more
 # flexible approach (if it works).
 #GLOBAL_VAR_DEFNS_FP=$HOMErrfs/ush/setup.sh
 
 DATA_TABLE_TMPL_FN="data_table"
-DIAG_TABLE_TMPL_FN="diag_table.FV3_HRRR_gf_clm"
-FIELD_TABLE_TMPL_FN="field_table.FV3_HRRR_gf"
+DIAG_TABLE_TMPL_FN="diag_table.RRFS_sas_clm"
+FIELD_TABLE_TMPL_FN="field_table.RRFS_sas"
 MODEL_CONFIG_TMPL_FN="model_configure"
 UFS_CONFIG_TMPL_FN="ufs.configure"
 
 DATA_TABLE_TMPL_FP="$HOMErrfs/parm/data_table"
-DIAG_TABLE_TMPL_FP="$HOMErrfs/parm/diag_table.FV3_HRRR_gf_clm"
-FIELD_TABLE_TMPL_FP="$HOMErrfs/parm/field_table.FV3_HRRR_gf"
+DIAG_TABLE_TMPL_FP="$HOMErrfs/parm/diag_table.RRFS_sas_clm"
+FIELD_TABLE_TMPL_FP="$HOMErrfs/parm/field_table.RRFS_sas"
 FV3_NML_BASE_SUITE_FP="$HOMErrfs/parm/input.nml.FV3"
 FV3_NML_YAML_CONFIG_FP="$HOMErrfs/parm/FV3.input.yml"
 FV3_NML_BASE_ENS_FP="$HOMErrfs/parm/config/ensf/input.nml.base_ens"
 MODEL_CONFIG_TMPL_FP="$HOMErrfs/parm/model_configure"
 UFS_CONFIG_TMPL_FP="$HOMErrfs/parm/ufs.configure"
 
-CCPP_PHYS_SUITE_FN="suite_FV3_HRRR_gf.xml"
-CCPP_PHYS_SUITE_IN_CCPP_FP="$HOMErrfs/sorc/ufs-weather-model/FV3/ccpp/suites/suite_FV3_HRRR_gf.xml"
-CCPP_PHYS_SUITE_FP="$HOMErrfs/parm/config/ensf/suite_FV3_HRRR_gf.xml"
+CCPP_PHYS_SUITE_FN="suite_RRFS_sas.xml"
+CCPP_PHYS_SUITE_IN_CCPP_FP="$HOMErrfs/sorc/ufs-weather-model/FV3/ccpp/suites/suite_RRFS_sas.xml"
+CCPP_PHYS_SUITE_FP="$HOMErrfs/parm/config/ensf/suite_RRFS_sas.xml"
 
 DATA_TABLE_FP="$HOMErrfs/parm/config/ensf/data_table"
 FIELD_TABLE_FP="$HOMErrfs/parm/config/ensf/field_table"
diff --git a/parm/config/firewx/field_table b/parm/config/firewx/field_table
index 3d4e0afcd..691a27f54 100644
--- a/parm/config/firewx/field_table
+++ b/parm/config/firewx/field_table
@@ -63,6 +63,11 @@
            "longname",     "subgrid scale turbulent kinetic energy"
            "units",        "m2/s2"
        "profile_type", "fixed", "surface_value=0.0" /
+# prognostic sigmab tracer
+ "TRACER", "atmos_mod", "sigmab"
+           "longname",     "sigma fraction"
+           "units",        "fraction"
+       "profile_type", "fixed", "surface_value=0.0" /
 # prognostic smoke mixing ratio tracer
   "TRACER", "atmos_mod", "smoke"
             "longname",     "smoke mixing ratio"
diff --git a/parm/config/firewx/input.nml b/parm/config/firewx/input.nml
index b03e6a1f7..c066bbeba 100644
--- a/parm/config/firewx/input.nml
+++ b/parm/config/firewx/input.nml
@@ -10,7 +10,7 @@
 &atmos_model_nml
     avg_max_length = 3600.0
     blocksize = 32
-    ccpp_suite = 'FV3_HRRR_gf_nogwd'
+    ccpp_suite = 'RRFS_sas_nogwd'
     chksum_debug = .false.
     dycore_only = .false.
     ignore_rst_cksum = .true.
@@ -133,8 +133,8 @@
     rf_cutoff = 2000.0
     sg_cutoff = -1
     stretch_fac = 0.999
-    target_lat = 44.3
-    target_lon = -109.5
+    target_lat = 49.3
+    target_lon = -123.0
     tau = 5.0
     use_hydro_pressure = .false.
     vtdm4 = 0.02
@@ -148,6 +148,7 @@
 /
 
 &gfs_physics_nml
+    betadcu = 1.0
     bl_mynn_edmf = 1
     bl_mynn_edmf_mom = 1
     bl_mynn_tkeadvect = .true.
@@ -191,7 +192,7 @@
     icloud_bl = 1
     ico2 = 2
     iems = 2
-    imfdeepcnv = 3
+    imfdeepcnv = 2
     imfshalcnv = -1
     imp_physics = 8
     iopt_alb = 2
@@ -235,6 +236,7 @@
     pdfcld = .false.
     pre_rad = .false.
     print_diff_pgr = .false.
+    progsigma = .true.
     prslrd0 = 0.0
     random_clds = .false.
     redrag = .true.
diff --git a/parm/config/firewx/var_defns.sh b/parm/config/firewx/var_defns.sh
index d5f62d4d9..dd6c65c64 100644
--- a/parm/config/firewx/var_defns.sh
+++ b/parm/config/firewx/var_defns.sh
@@ -4,7 +4,7 @@
 # This file sets the experiment's configuration variables (which are
 # global shell variables) to their default values.  For many of these
 # variables, the valid values that they may take on are defined in the
-# file $USHdir/valid_param_vals.sh.
+# file $USHrrfs/valid_param_vals.sh.
 #
 #-----------------------------------------------------------------------
 #
@@ -21,7 +21,7 @@
 #
 #-----------------------------------------------------------------------
 #
-version="v0.9.5"
+version="v0.9.1"
 #
 #-----------------------------------------------------------------------
 #
@@ -58,7 +58,7 @@ version="v0.9.5"
 # If using the slurm job scheduler (i.e. if SCHED is set to "slurm"),
 # the default partition to which to submit workflow tasks.  If a task
 # does not have a specific variable that specifies the partition to which
-# it will be submitted (e.g. PARTITION_HPSS, PARTITION_FCST; see below),
+# it will be submitted (e.g. PARTITION_HPSS, PARTITION_FORECAST; see below),
 # it will be submitted to the partition specified by this variable.  If
 # this is not set or is set to an empty string, it will be (re)set to a
 # machine-dependent value.  This is not used if SCHED is not set to
@@ -68,7 +68,7 @@ version="v0.9.5"
 # The default queue or QOS (if using the slurm job scheduler, where QOS
 # is Quality of Service) to which workflow tasks are submitted.  If a
 # task does not have a specific variable that specifies the queue to which
-# it will be submitted (e.g. QUEUE_HPSS, QUEUE_FCST; see below), it will
+# it will be submitted (e.g. QUEUE_HPSS, QUEUE_FORECAST; see below), it will
 # be submitted to the queue specified by this variable.  If this is not
 # set or is set to an empty string, it will be (re)set to a machine-
 # dependent value.
@@ -95,14 +95,14 @@ version="v0.9.5"
 # wil be (re)set to a machine-dependent value.  This is not used if SCHED
 # is not set to "slurm."
 #
-# PARTITION_FCST:
+# PARTITION_FORECAST:
 # If using the slurm job scheduler (i.e. if SCHED is set to "slurm"),
 # the partition to which the task that runs forecasts is submitted.  If
 # this is not set or set to an empty string, it will be (re)set to a
 # machine-dependent value.  This is not used if SCHED is not set to
 # "slurm".
 #
-# QUEUE_FCST:
+# QUEUE_FORECAST:
 # The queue or QOS to which the task that runs a forecast is submitted.
 # If this is not set or set to an empty string, it will be (re)set to a
 # machine-dependent value.
@@ -153,20 +153,18 @@ RESERVATION_POST=""
 SCHED="pbspro"
 WORKFLOW_MANAGER="ecflow"
 PARTITION_DEFAULT=""
-QUEUE_DEFAULT="pridev"
+QUEUE_DEFAULT="dev"
 PARTITION_HPSS=""
 QUEUE_HPSS="dev_transfer"
 PARTITION_SFC_CLIMO=""
-PARTITION_FCST=""
-QUEUE_FCST="pridev"
-PARTITION_GRAPHICS=""
-QUEUE_GRAPHICS="pridev"
+PARTITION_FORECAST=""
+QUEUE_FORECAST="dev"
 PARTITION_ANALYSIS=""
-QUEUE_ANALYSIS="pridev"
+QUEUE_ANALYSIS="dev"
 PARTITION_PRDGEN=""
-QUEUE_PRDGEN="pridev"
+QUEUE_PRDGEN="dev"
 PARTITION_POST=""
-QUEUE_POST="pridev"
+QUEUE_POST="dev"
 #
 #-----------------------------------------------------------------------
 #
@@ -211,14 +209,14 @@ CRON_RELAUNCH_INTVL_MNTS="03"
 #
 #-----------------------------------------------------------------------
 #
-EXPT_BASEDIR="${HOMErrfs}"
-EXPT_SUBDIR="rrfs_na"
+EXPT_BASEDIR="${HOMErrfs}/parm/config"
+EXPT_SUBDIR="firewx"
 #
 #-----------------------------------------------------------------------
 #
 # COMINgfs:
 # The beginning portion of the directory containing files generated by
-# the external model (FV3GFS) that the initial and lateral boundary
+# the external model (GFS) that the initial and lateral boundary
 # condition generation tasks need in order to create initial and boundary
 # condition files for a given cycle on the native FV3-LAM grid.  For a
 # cycle that starts on the date specified by the variable yyyymmdd
@@ -253,7 +251,7 @@ EXPT_SUBDIR="rrfs_na"
 #
 #   $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
@@ -269,6 +267,9 @@ EXPT_SUBDIR="rrfs_na"
 #   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
@@ -278,13 +279,13 @@ EXPT_SUBDIR="rrfs_na"
 #
 #   $PTMP/com/$NET/$envir/$RUN.$yyyymmdd/$hh
 #
-# NWGES:
+# GESROOT:
 # The beginning portion of the directory that will contain the output
 # files from the forecast for a given cycle.  For a cycle
 # that starts on the date specified by yyyymmdd and hour specified by hh
 # (where yyyymmdd and hh are as described above), the directory in which
 # the forecast output files will be placed will be:
-#   $NWGES/$NET/$envir/$RUN.$yyyymmdd/$hh
+#   $GESROOT/$RUN.$yyyymmdd/$hh
 #
 # Setup default observation locations for data assimilation:
 #
@@ -322,46 +323,43 @@ EXPT_SUBDIR="rrfs_na"
 #  FIRE_RRFS_update_hour
 #-----------------------------------------------------------------------
 #
-COMINgfs=""
+COMINgfs="/base/path/of/directory/containing/gfs/input/files"
 FIXLAM_NCO_BASEDIR="$HOMErrfs/fix/lam"
 STMP="$DATAROOT"
 ENSCTRL_STMP="/base/path/of/directory/containing/model/input/and/raw/output/files"
-RRFSE_NWGES_BASEDIR="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
+RRFSE_GESROOT="/base/path/of/directory/containing/model/output/files"
 NET="rrfs"
 envir="prod"
 RUN="rrfs"
 RUN_ensctrl="experiment_name"
 TAG="n3v91"
-PTMP="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0"
+WGF="firewx"
+PTMP="/lfs/h2/emc/ptmp/emc.lam/rrfs/v0.9.1"
 ENSCTRL_PTMP="/base/path/of/directory/containing/postprocessed/output/files"
-NWGES="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
-ENSCTRL_NWGES="/base/path/of/directory/containing/model/restart/files"
-RRFSE_NWGES="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
+GESROOT="notused"
+ENSCTRL_GESROOT="/base/path/of/directory/containing/model/restart/files"
+RRFSE_GESROOT="/base/path/of/directory/containing/model/output/files"
 
-ARCHIVEDIR="/NCEPDEV/emc-meso/1year/emc.lam/n3v91"
-NCARG_ROOT="/apps/ncl/6.5.0-CentOS6.10_64bit_nodap_gnu447"
-NCL_HOME="/home/rtrr/RRFS/graphics"
-NCL_REGION="conus"
 MODEL="rrfs"
 
 OBSTYPE_SOURCE="rap"
-OBSPATH="/lfs/h1/ops/prod/com/obsproc/v1.2"
-OBSPATH_NSSLMOSIAC="/lfs/h1/ops/prod/dcom/ldmdata/obs/upperair/mrms/conus/MergedReflectivityQC"
-OBSPATH_PM="/lfs4/BMC/public/data/airnow/hourly_aqobs"
+OBSPATH="/public/data/grids/rap/obs"
+OBSPATH_NSSLMOSIAC="/public/data/radar/mrms"
+OBSPATH_PM="/mnt/lfs1/BMC/wrfruc/hwang/rrfs_sd/pm"
 LIGHTNING_ROOT="/public/data/lightning"
-GLMFED_EAST_ROOT="/lfs/h1/ops/prod/dcom/ldmdata/obs/GOES-16/GLM/tiles"
-GLMFED_WEST_ROOT="/lfs/h1/ops/prod/dcom/ldmdata/obs/GOES-17/GLM/tiles"
-ENKF_FCST="/lfs/h1/ops/prod/com/gfs/v16.3"
+GLMFED_EAST_ROOT="/public/data/sat/nesdis/goes-east/glm/full-disk/"
+GLMFED_WEST_ROOT="/public/data/sat/nesdis/goes-east/glm/full-disk/"
+ENKF_FCST="/lfs4/BMC/public/data/grids/enkf/atm"
 FFG_DIR="/public/data/grids/ncep/ffg/grib2"
-SST_ROOT="/lfs/h1/ops/prod/com/nsst/v1.2"
-SST_update_hour="01"
-GVF_ROOT="/lfs/h1/ops/prod/dcom/viirs"
-GVF_update_hour="04"
-IMSSNOW_ROOT="/lfs/h1/ops/prod/com/obsproc/v1.2"
-SNOWICE_update_hour="01"
-RAPHRRR_SOIL_ROOT="/lfs/h1/ops/prod/com"
-SOIL_SURGERY_time="2023100916"
-FIRE_RAVE_DIR="/lfs/h1/ops/prod/dcom"
+SST_ROOT="/lfs4/BMC/public/data/grids/ncep/sst/0p083deg/grib2"
+SST_update_hour="99"
+GVF_ROOT="/public/data/sat/ncep/viirs/gvf/grib2"
+GVF_update_hour="99"
+IMSSNOW_ROOT="/public/data/grids/ncep/snow/ims96/grib2"
+SNOWICE_update_hour="99"
+RAPHRRR_SOIL_ROOT="/mnt/lfs4/BMC/rtwbl/mhu/wcoss/nco/com"
+SOIL_SURGERY_time="9999999999"
+FIRE_RAVE_DIR="/lfs4/BMC/public/data/grids/nesdis/3km_fire_emissions"
 FIRE_RRFS_ROOT="/mnt/lfs4/BMC/gsd-fv3-dev/FIRE_RRFS_ROOT"
 FIRE_RRFS_update_hour="99"
 CONT_CYCLE_DATA_ROOT="/lfs/h2/emc/lam/noscrub/emc.lam/nwges"
@@ -438,7 +436,7 @@ RELATIVE_LINK_FLAG="--relative"
 # FV3_EXEC_FN:
 # Name to use for the forecast model executable when it is copied from
 # the directory in which it is created in the build step to the executables
-# directory (EXECdir; this is set during experiment generation).
+# directory (EXECrrfs; this is set in the J-jobs).
 #
 # WFLOW_XML_FN:
 # Name of the rocoto workflow XML file that the experiment generation
@@ -591,8 +589,8 @@ WFLOW_LAUNCH_LOG_FN="log.launch_FV3LAM_wflow"
 #
 #-----------------------------------------------------------------------
 #
-DATE_FIRST_CYCL="20240531"
-DATE_LAST_CYCL="20240531"
+DATE_FIRST_CYCL="20241029"
+DATE_LAST_CYCL="20241031"
 STARTYEAR="2022"
 STARTMONTH="10"
 STARTDAY="21"
@@ -674,13 +672,13 @@ CYCL_HRS_HYB_FV3LAM_ENS="99"
 #
 # SPINUP_CYCLEDEF:
 # cycle definition for spin-up cycle group
-# This group runs: anal_gsi_input_spinup and data process, run_fcst_spinup,
-# run_post_spinup
+# This group runs: anal_gsi_input_spinup and data process, forecast_spinup,
+# post_spinup
 #
 # PROD_CYCLEDEF:
 # cycle definition for product cycle group
-# This group runs: anal_gsi_input and data process, run_fcst, python_skewt,
-# run_post, run_clean
+# This group runs: anal_gsi_input and data process, forecast, python_skewt,
+# post, run_clean
 #
 # SAVEDA_CYCLEDEF:
 # cycle definition for saving DA output files
@@ -693,10 +691,6 @@ CYCL_HRS_HYB_FV3LAM_ENS="99"
 # PRODLONG_CYCLEDEF:
 # same as PROD_CYCLEDEF, but for long forecast
 #
-# ARCHIVE_CYCLEDEF:
-# cycle definition for "archive" group
-# This group runs: run_archive
-#
 #-----------------------------------------------------------------------
 #
 CYCLEDAY="*"
@@ -706,10 +700,9 @@ INITIAL_CYCLEDEF="00 01 01 01 2100 *"
 BOUNDARY_CYCLEDEF="00 01 01 01 2100 *"
 BOUNDARY_LONG_CYCLEDEF="00 01 01 01 2100 *"
 SPINUP_CYCLEDEF="00 01 01 01 2100 *"
-PROD_CYCLEDEF="202405310000 202405311800 06:00:00"
+PROD_CYCLEDEF="202410290000 202410311800 06:00:00"
 RECENTER_CYCLEDEF="00 01 01 01 2100 *"
 PRODLONG_CYCLEDEF="00 01 01 01 2100 *"
-ARCHIVE_CYCLEDEF="00 01 01 01 2100 *"
 SAVEDA_CYCLEDEF="00 01 01 01 2100 *"
 #
 #-----------------------------------------------------------------------
@@ -719,7 +712,7 @@ SAVEDA_CYCLEDEF="00 01 01 01 2100 *"
 # shell variable and assign value in config.sh and give it a default
 # value in config_default.sh In realtime testing, don't need to regenerate
 # the whole workflow, you can tweak $EXPTDIR/var_defns.sh and
-# $FIX_GSI/gsiparm.anl.sh to make sure the change is expected and then
+# $FIXrrfs/gsi/gsiparm.anl.sh to make sure the change is expected and then
 # put it back into config.sh and config_default.sh
 # (need to follow FORTRAN namelist convetion)
 #
@@ -796,12 +789,12 @@ ENKF_ANAVINFO_FN="anavinfo.rrfs"
 ENKF_ANAVINFO_DBZ_FN="anavinfo.enkf.rrfs_dbz"
 CONVINFO_FN="convinfo.rrfs"
 CONVINFO_SD_FN="convinfo.rrfs_sd"
-BERROR_FN="rap_berror_stats_global_RAP_tune" #under $FIX_GSI
+BERROR_FN="rap_berror_stats_global_RAP_tune" #under $FIXrrfs/gsi
 BERROR_SD_FN="berror.rrfs_sd" # for test only
 OBERROR_FN="errtable.rrfs"
 HYBENSINFO_FN="hybens_info.rrfs"
-AIRCRAFT_REJECT="$HOMErrfs/fix/gsi"
-SFCOBS_USELIST="$HOMErrfs/fix/gsi"
+AIRCRAFT_REJECT="$HOMErrfs/fix"
+SFCOBS_USELIST="$HOMErrfs/fix"
 #
 #-----------------------------------------------------------------------
 #
@@ -866,14 +859,14 @@ beta_recenter="1.0"
 #              1 means search start at 1-h previous cycle  lbcs directory.
 #              2 means search start at 2-h previous cycle  lbcs directory.
 #
-# FV3GFS_FILE_FMT_ICS:
-# If using the FV3GFS model as the source of the ICs (i.e. if EXTRN_MDL_NAME_ICS
-# is set to "FV3GFS"), this variable specifies the format of the model
+# GFS_FILE_FMT_ICS:
+# If using the GFS model as the source of the ICs (i.e. if EXTRN_MDL_NAME_ICS
+# is set to "GFS"), this variable specifies the format of the model
 # files to use when generating the ICs.
 #
-# FV3GFS_FILE_FMT_LBCS:
-# If using the FV3GFS model as the source of the LBCs (i.e. if
-# EXTRN_MDL_NAME_LBCS is set to "FV3GFS"), this variable specifies the
+# GFS_FILE_FMT_LBCS:
+# If using the GFS model as the source of the LBCs (i.e. if
+# EXTRN_MDL_NAME_LBCS is set to "GFS"), this variable specifies the
 # format of the model files to use when generating the LBCs.
 #
 # EXTRN_MDL_DATE_JULIAN:
@@ -890,8 +883,8 @@ LBC_SPEC_INTVL_HRS="1"
 EXTRN_MDL_LBCS_OFFSET_HRS="0"
 EXTRN_MDL_LBCS_SEARCH_OFFSET_HRS="0"
 LBCS_SEARCH_HRS="6"
-FV3GFS_FILE_FMT_ICS="nemsio"
-FV3GFS_FILE_FMT_LBCS="nemsio"
+GFS_FILE_FMT_ICS="netcdf"
+GFS_FILE_FMT_LBCS="netcdf"
 EXTRN_MDL_DATE_JULIAN="FALSE"
 #
 #-----------------------------------------------------------------------
@@ -944,13 +937,13 @@ NOMADS_file_type="nemsio"
 #-----------------------------------------------------------------------
 #
 USE_USER_STAGED_EXTRN_FILES="FALSE"
-EXTRN_MDL_SOURCE_BASEDIR_ICS="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0/prod"
+EXTRN_MDL_SOURCE_BASEDIR_ICS="${COMrrfs}"
 EXTRN_MDL_FILES_ICS=( \
 "ICS_file1" \
 "ICS_file2" \
 "..." \
 )
-EXTRN_MDL_SOURCE_BASEDIR_LBCS="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0/prod"
+EXTRN_MDL_SOURCE_BASEDIR_LBCS="${COMrrfs}"
 EXTRN_MDL_FILES_LBCS=( \
 "LBCS_file1" \
 "LBCS_file2" \
@@ -970,7 +963,7 @@ EXTRN_MDL_FILES_LBCS=( \
 #
 #-----------------------------------------------------------------------
 #
-CCPP_PHYS_SUITE="FV3_HRRR_gf_nogwd"
+CCPP_PHYS_SUITE="RRFS_sas_nogwd"
 #
 #-----------------------------------------------------------------------
 #
@@ -1269,8 +1262,8 @@ GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES=""
 #
 #-----------------------------------------------------------------------
 #
-ESGgrid_LON_CTR="-109.5"
-ESGgrid_LAT_CTR="44.3"
+ESGgrid_LON_CTR="-123.0"
+ESGgrid_LAT_CTR="49.3"
 ESGgrid_DELX="1501.18"
 ESGgrid_DELY="1501.18"
 ESGgrid_NX="350"
@@ -1351,7 +1344,7 @@ ESGgrid_PAZI="0.0"
 # WRITE_DOPOST:
 # Flag that determines whether or not to use the inline post feature
 # [i.e. calling the Unified Post Processor (UPP) from within the
-# weather model].  If this is set to true, the the run_post task will
+# weather model].  If this is set to true, then the post task will
 # be deactivated.
 #-----------------------------------------------------------------------
 #
@@ -1426,8 +1419,8 @@ WRTCMP_quantize_mode="quantize_bitround"
 WRTCMP_quantize_nsd="18"
 
 WRTCMP_output_grid="rotated_latlon"
-WRTCMP_cen_lon="-109.5"
-WRTCMP_cen_lat="44.3"
+WRTCMP_cen_lon="-123.0"
+WRTCMP_cen_lat="49.3"
 WRTCMP_lon_lwr_left="-2.5"
 WRTCMP_lat_lwr_left="-2.5"
 WRTCMP_lon_upr_rght="2.5"
@@ -1557,19 +1550,15 @@ SAVE_CYCLE_LOG="TRUE"
 # SFC_CLIMO_DIR:
 # Same as GRID_DIR but for the surface climatology generation task.
 #
-# RUN_TASK_RUN_PRDGEN:
+# RUN_TASK_PRDGEN:
 # Flag that determines whether the product generation task is to run.
 #
-# RUN_TASK_ADD_AEROSOL:
-# Flag that determines whether the task for adding dusk in the GEFS
-# aerosol data to LBCs task is to run.
-#
 # IS_RTMA:
 # If true, some ICs,LBCs,GSI rocoto tasks will be turned off
 #
 # FG_ROOTDIR:
 # First Guess Root Directory, APP will find corresponding first guess
-# fields from this directory. RRFS will find FG under NWGES_BASEDIR,
+# fields from this directory. RRFS will find FG under GESROOT,
 # but we needs to explicitly specify where to find FG for RTMA.
 # So this parameter only matters for RTMA
 #
@@ -1577,29 +1566,23 @@ SAVE_CYCLE_LOG="TRUE"
 # "" or "GSL":  RTMA's observations follow the GSL naming convention
 #       "NCO":  RTMA's observations follow the NCO naming convention
 #
-# PYTHON_GRAPHICS_YML_FN:
-# The name of the yml file under ${PYTHON_GRAPHICS_DIR}/image_lists
-# to be used by current application
-#
 #-----------------------------------------------------------------------
 #
 RUN_TASK_MAKE_GRID="TRUE"
-GRID_DIR="$DATAROOT/rrfs_firewx/grid"
+GRID_DIR="$HOMErrfs/parm/config/firewx/grid"
 
 RUN_TASK_MAKE_OROG="TRUE"
-OROG_DIR="$DATAROOT/rrfs_firewx/orog"
+OROG_DIR="$HOMErrfs/parm/config/firewx/orog"
 
 RUN_TASK_MAKE_SFC_CLIMO="TRUE"
-SFC_CLIMO_DIR="$DATAROOT/rrfs_firewx/sfc_climo"
+SFC_CLIMO_DIR="$HOMErrfs/parm/config/firewx/sfc_climo"
 
-RUN_TASK_RUN_PRDGEN="TRUE"
-RUN_TASK_ADD_AEROSOL="FALSE"
+RUN_TASK_PRDGEN="TRUE"
 #
 NCORES_PER_NODE="128" #Jet default value
 IS_RTMA="FALSE"
 FG_ROOTDIR=""
 RTMA_OBS_FEED=""
-PYTHON_GRAPHICS_YML_FN="rrfs_subset.yml"
 #
 #-----------------------------------------------------------------------
 #
@@ -1627,9 +1610,6 @@ SFC_CLIMO_FIELDS=( \
 # System directory in which the majority of fixed (i.e. time-independent)
 # files that are needed to run the FV3-LAM model are located
 #
-# FIXprdgen:
-# directory where prdgen fix files are located
-#
 # TOPO_DIR:
 # The location on disk of the static input files used by the make_orog
 # task (orog.x and shave.x). Can be the same as FIXgsm.
@@ -1639,23 +1619,6 @@ SFC_CLIMO_FIELDS=( \
 # used by sfc_climo_gen. These files are only used if
 # RUN_TASK_MAKE_SFC_CLIMO=TRUE
 #
-# FIX_GSI:
-# System directory in which the fixed files that are needed to run
-# the GSI are located
-#
-# FIX_UPP:
-# System directory in which the fixed files that are needed to run
-# the UPP are located
-#
-# FIX_CRTM:
-# System directory in which the CRTM coefficient files are located
-#
-# FIX_SMOKE_DUST
-# directory in which the smoke and dust fix files are located
-#
-# FIX_BUFRSND
-# directory in which the bufrsnd fix files are located
-#
 # FNGLAC, ..., FNMSKH:
 # Names of (some of the) global data files that are assumed to exist in
 # a system directory specified (this directory is machine-dependent;
@@ -1710,15 +1673,8 @@ SFC_CLIMO_FIELDS=( \
 # to a null string which will then be overwritten in setup.sh unless the
 # user has specified a different value in config.sh
 FIXgsm="$HOMErrfs/fix/am"
-FIXprdgen="$HOMErrfs/fix/prdgen"
 TOPO_DIR="/lfs/h2/emc/lam/noscrub/RRFS_input/fix/fix_orog"
 SFC_CLIMO_INPUT_DIR="/lfs/h2/emc/lam/noscrub/RRFS_input/fix/fix_sfc_climo"
-FIX_GSI="$HOMErrfs/fix/gsi"
-FIX_UPP="$HOMErrfs/fix/upp"
-FIX_CRTM="/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/intel-19.1.3.304/cray-mpich-8.1.12/crtm/2.4.0/fix"
-FIX_UPP_CRTM="/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/intel-19.1.3.304/cray-mpich-8.1.12/crtm/2.4.0/fix"
-FIX_SMOKE_DUST="$HOMErrfs/fix/smoke_dust"
-FIX_BUFRSND="$HOMErrfs/fix/bufrsnd"
 
 FNGLAC="global_glacier.2x2.grb"
 FNMXIC="global_maxice.2x2.grb"
@@ -1856,37 +1812,28 @@ GET_GEFS_LBCS_TN="get_gefs_lbcs"
 MAKE_ICS_TN="make_ics"
 BLEND_ICS_TN="blend_ics"
 MAKE_LBCS_TN="make_lbcs"
-RUN_FCST_TN="run_fcst"
-RUN_POST_TN="run_post"
-RUN_PRDGEN_TN="run_prdgen"
-RUN_BUFRSND_TN="run_bufrsnd"
+FORECAST_TN="forecast"
+POST_TN="post"
+PRDGEN_TN="prdgen"
+BUFRSND_TN="bufrsnd"
 
-ANALYSIS_GSI_TN="analysis_gsi_input"
+ANALYSIS_GSI_TN="analysis_gsi"
 ANALYSIS_GSIDIAG_TN="analysis_gsi_diag"
-ANALYSIS_SD_GSI_TN="analysis_sd_gsi_input"
-POSTANAL_TN="postanal_input"
+UPDATE_LBC_SOIL_TN="update_lbc_soil"
 OBSERVER_GSI_ENSMEAN_TN="observer_gsi_ensmean"
 OBSERVER_GSI_TN="observer_gsi"
-PREP_START_TN="prep_start"
 PREP_CYC_SPINUP_TN="prep_cyc_spinup"
 PREP_CYC_PROD_TN="prep_cyc_prod"
-PREP_CYC_ENSMEAN_TN="prep_cyc_ensmean"
 PREP_CYC_TN="prep_cyc"
 CALC_ENSMEAN_TN="calc_ensmean"
-PROCESS_RADAR_REF_TN="process_radarref"
-PROCESS_LIGHTNING_TN="process_lightning"
+PROCESS_RADAR_TN="process_radar"
 RADAR_REF_THINNING="1"
 PROCESS_BUFR_TN="process_bufr"
 PROCESS_SMOKE_TN="process_smoke"
-PROCESS_PM_TN="process_pm"
-RADAR_REFL2TTEN_TN="radar_refl2tten"
-CLDANL_NONVAR_TN="cldanl_nonvar"
+ANALYSIS_NONVARCLD_TN="analysis_nonvarcld"
 SAVE_RESTART_TN="save_restart"
 SAVE_DA_OUTPUT_TN="save_da_output"
-JEDI_ENVAR_IODA_TN="jedi_envar_ioda"
-IODA_PREPBUFR_TN="ioda_prepbufr"
-PROCESS_GLMFED_TN="process_glmfed"
-ADD_AEROSOL_TN="add_aerosol"
+PROCESS_LIGHTNING_TN="process_lightning"
 #
 # Number of nodes.
 #
@@ -1898,39 +1845,31 @@ NNODES_GET_EXTRN_LBCS="1"
 NNODES_MAKE_ICS="8"
 NNODES_BLEND_ICS="1"
 NNODES_MAKE_LBCS="1"
-NNODES_RUN_PREPSTART="1"
-NNODES_RUN_FCST="4"  # This is calculated in the workflow generation scripts, so no need to set here.
-NNODES_RUN_POST="2"
-NNODES_RUN_PRDGEN="1"
-NNODES_RUN_ANALYSIS="16"
-NNODES_RUN_GSIDIAG="1"
-NNODES_RUN_POSTANAL="1"
-NNODES_RUN_ENKF="90"
-NNODES_RUN_RECENTER="6"
-NNODES_PROC_RADAR="2"
-NNODES_PROC_LIGHTNING="1"
-NNODES_PROC_GLMFED="1"
-NNODES_PROC_BUFR="1"
-NNODES_PROC_SMOKE="1"
-NNODES_PROC_PM="1"
-NNODES_RUN_REF2TTEN="1"
-NNODES_RUN_NONVARCLDANL="1"
-NNODES_RUN_GRAPHICS="1"
-NNODES_RUN_ENSPOST="1"
-NNODES_RUN_BUFRSND="1"
+NNODES_PREP_CYC="1"
+NNODES_FORECAST="4"  # This is calculated in the workflow generation scripts, so no need to set here.
+NNODES_POST="2"
+NNODES_PRDGEN="1"
+NNODES_ANALYSIS_GSI="16"
+NNODES_ANALYSIS_GSIDIAG="1"
+NNODES_UPDATE_LBC_SOIL="1"
+NNODES_ANALYSIS_ENKF="90"
+NNODES_RECENTER="6"
+NNODES_PROCESS_RADAR="2"
+NNODES_PROCESS_LIGHTNING="1"
+NNODES_PROCESS_BUFR="1"
+NNODES_PROCESS_SMOKE="1"
+NNODES_ANALYSIS_NONVARCLD="1"
+NNODES_BUFRSND="1"
 NNODES_SAVE_RESTART="1"
-NNODES_RUN_JEDIENVAR_IODA="1"
-NNODES_RUN_IODA_PREPBUFR="1"
-NNODES_ADD_AEROSOL="1"
 #
 # Number of cores.
 #
-NCORES_RUN_ANALYSIS="4"
+NCORES_ANALYSIS_GSI="4"
 NCORES_RUN_OBSERVER="4"
-NCORES_RUN_ENKF="4"
-NATIVE_RUN_FCST="--cpus-per-task 2 --exclusive"
-NATIVE_RUN_ANALYSIS="--cpus-per-task 2 --exclusive"
-NATIVE_RUN_ENKF="--cpus-per-task 4 --exclusive"
+NCORES_ANALYSIS_ENKF="4"
+NATIVE_FORECAST="--cpus-per-task 2 --exclusive"
+NATIVE_ANALYSIS_GSI="--cpus-per-task 2 --exclusive"
+NATIVE_ANALYSIS_ENKF="--cpus-per-task 4 --exclusive"
 #
 # Number of MPI processes per node.
 #
@@ -1942,40 +1881,32 @@ PPN_GET_EXTRN_LBCS="1"
 PPN_MAKE_ICS="6"
 PPN_BLEND_ICS="8"
 PPN_MAKE_LBCS="36"
-PPN_RUN_PREPSTART="1"
-PPN_RUN_FCST="63"  # This may have to be changed depending on the number of threads used.
-PPN_RUN_POST="24"
-PPN_RUN_PRDGEN="1"
-PPN_RUN_ANALYSIS="24"
-PPN_RUN_GSIDIAG="24"
-PPN_RUN_POSTANAL="1"
-PPN_RUN_ENKF="1"
-PPN_RUN_RECENTER="20"
-PPN_PROC_RADAR="24"
-PPN_PROC_LIGHTNING="1"
-PPN_PROC_GLMFED="1"
-PPN_PROC_BUFR="1"
-PPN_PROC_SMOKE="1"
-PPN_PROC_PM="1"
-PPN_RUN_REF2TTEN="1"
-PPN_RUN_NONVARCLDANL="1"
-PPN_RUN_GRAPHICS="12"
-PPN_RUN_ENSPOST="1"
-PPN_RUN_BUFRSND="28"
+PPN_PREP_CYC="1"
+PPN_FORECAST="63"  # This may have to be changed depending on the number of threads used.
+PPN_POST="24"
+PPN_PRDGEN="1"
+PPN_ANALYSIS_GSI="24"
+PPN_ANALYSIS_GSIDIAG="24"
+PPN_UPDATE_LBC_SOIL="1"
+PPN_ANALYSIS_ENKF="1"
+PPN_RECENTER="20"
+PPN_PROCESS_RADAR="24"
+PPN_PROCESS_LIGHTNING="1"
+PPN_PROCESS_BUFR="1"
+PPN_PROCESS_SMOKE="1"
+PPN_ANALYSIS_NONVARCLD="1"
+PPN_BUFRSND="28"
 PPN_SAVE_RESTART="1"
-PPN_RUN_JEDIENVAR_IODA="1"
-PPN_RUN_IODA_PREPBUFR="1"
-PPN_ADD_AEROSOL="9"
 #
 # Number of TPP for WCOSS2.
 #
 TPP_MAKE_ICS="1"
 TPP_MAKE_LBCS="1"
-TPP_RUN_ANALYSIS="1"
-TPP_RUN_ENKF="1"
-TPP_RUN_FCST="2"
-TPP_RUN_POST="1"
-TPP_RUN_BUFRSND="1"
+TPP_ANALYSIS_GSI="1"
+TPP_ANALYSIS_ENKF="1"
+TPP_FORECAST="2"
+TPP_POST="1"
+TPP_BUFRSND="1"
 #
 # Walltimes.
 #
@@ -1987,32 +1918,24 @@ WTIME_GET_EXTRN_LBCS="00:45:00"
 WTIME_MAKE_ICS="00:30:00"
 WTIME_BLEND_ICS="00:30:00"
 WTIME_MAKE_LBCS="01:30:00"
-WTIME_RUN_PREPSTART="00:10:00"
-WTIME_RUN_PREPSTART_ENSMEAN="00:10:00"
-WTIME_RUN_FCST="01:10:00"
-WTIME_RUN_FCST_LONG="04:30:00"
-WTIME_RUN_FCST_SPINUP="00:30:00"
-WTIME_RUN_POST="00:15:00"
-WTIME_RUN_PRDGEN="00:40:00"
-WTIME_RUN_ANALYSIS="00:30:00"
-WTIME_RUN_GSIDIAG="00:15:00"
-WTIME_RUN_POSTANAL="00:30:00"
-WTIME_RUN_ENKF="01:00:00"
-WTIME_RUN_RECENTER="01:00:00"
-WTIME_PROC_RADAR="00:25:00"
-WTIME_PROC_LIGHTNING="00:25:00"
-WTIME_PROC_GLMFED="00:25:00"
-WTIME_PROC_BUFR="00:25:00"
-WTIME_PROC_SMOKE="00:25:00"
-WTIME_PROC_PM="00:25:00"
-WTIME_RUN_REF2TTEN="00:20:00"
-WTIME_RUN_NONVARCLDANL="00:20:00"
-WTIME_RUN_BUFRSND="00:45:00"
+WTIME_PREP_CYC="00:10:00"
+WTIME_FORECAST="01:10:00"
+WTIME_FORECAST_LONG="04:30:00"
+WTIME_FORECAST_SPINUP="00:30:00"
+WTIME_POST="00:15:00"
+WTIME_PRDGEN="00:40:00"
+WTIME_ANALYSIS_GSI="00:30:00"
+WTIME_ANALYSIS_GSIDIAG="00:15:00"
+WTIME_UPDATE_LBC_SOIL="00:30:00"
+WTIME_ANALYSIS_ENKF="01:00:00"
+WTIME_RECENTER="01:00:00"
+WTIME_PROCESS_RADAR="00:25:00"
+WTIME_PROCESS_LIGHTNING="00:25:00"
+WTIME_PROCESS_BUFR="00:25:00"
+WTIME_PROCESS_SMOKE="00:25:00"
+WTIME_ANALYSIS_NONVARCLD="00:20:00"
+WTIME_BUFRSND="00:45:00"
 WTIME_SAVE_RESTART="00:15:00"
-WTIME_RUN_ENSPOST="00:30:00"
-WTIME_RUN_JEDIENVAR_IODA="00:30:00"
-WTIME_RUN_IODA_PREPBUFR="00:20:00"
-WTIME_ADD_AEROSOL="00:30:00"
 #
 # Start times.
 #
@@ -2022,30 +1945,21 @@ START_TIME_CONVENTIONAL_SPINUP="00:40:00"
 START_TIME_BLENDING="01:00:00"
 START_TIME_LATE_ANALYSIS="01:40:00"
 START_TIME_CONVENTIONAL="00:40:00"
-START_TIME_IODA_PREPBUFR="00:40:00"
 START_TIME_NSSLMOSIAC="00:45:00"
-START_TIME_LIGHTNINGNC="00:45:00"
-START_TIME_GLMFED="00:45:00"
-START_TIME_PROCSMOKE="00:45:00"
-START_TIME_PROCPM="00:45:00"
+START_TIME_PROCESS_LIGHTNING="00:45:00"
+START_TIME_PROCESS_SMOKE="00:45:00"
 #
 # Memory.
 #
-MEMO_RUN_PROCESSBUFR="20G"
-MEMO_RUN_REF2TTEN="20G"
-MEMO_RUN_NONVARCLDANL="20G"
-MEMO_RUN_PREPSTART="24G"
-MEMO_RUN_PRDGEN="24G"
-MEMO_RUN_JEDIENVAR_IODA="20G"
-MEMO_RUN_IODA_PREPBUFR="20G"
+MEMO_PROCESS_BUFR="20G"
+MEMO_ANALYSIS_NONVARCLD="20G"
+MEMO_PRDGEN="24G"
 MEMO_PREP_CYC="40G"
 MEMO_SAVE_RESTART="40G"
 MEMO_SAVE_INPUT="40G"
-MEMO_PROC_SMOKE="40G"
-MEMO_PROC_GLMFED="70G"
-MEMO_PROC_PM="40G"
+MEMO_PROCESS_SMOKE="40G"
+MEMO_PROCESS_LIGHTNING="70G"
 MEMO_SAVE_DA_OUTPUT="40G"
-MEMO_ADD_AEROSOL="70G"
 #
 # Maximum number of attempts.
 #
@@ -2057,29 +1971,23 @@ MAXTRIES_GET_EXTRN_LBCS="2"
 MAXTRIES_MAKE_ICS="2"
 MAXTRIES_BLEND_ICS="2"
 MAXTRIES_MAKE_LBCS="2"
-MAXTRIES_RUN_PREPSTART="1"
-MAXTRIES_RUN_FCST="1"
+MAXTRIES_PREP_CYC="1"
+MAXTRIES_FORECAST="1"
 MAXTRIES_ANALYSIS_GSI="1"
-MAXTRIES_POSTANAL="1"
+MAXTRIES_UPDATE_LBC_SOIL="1"
 MAXTRIES_ANALYSIS_ENKF="1"
-MAXTRIES_RUN_POST="2"
-MAXTRIES_RUN_PRDGEN="1"
-MAXTRIES_RUN_ANALYSIS="1"
-MAXTRIES_RUN_POSTANAL="1"
+MAXTRIES_POST="2"
+MAXTRIES_PRDGEN="1"
+MAXTRIES_ANALYSIS_GSI="1"
+MAXTRIES_UPDATE_LBC_SOIL="1"
 MAXTRIES_RECENTER="1"
-MAXTRIES_PROCESS_RADARREF="1"
+MAXTRIES_PROCESS_RADAR="1"
 MAXTRIES_PROCESS_LIGHTNING="1"
-MAXTRIES_PROC_GLMFED="1"
 MAXTRIES_PROCESS_BUFR="1"
 MAXTRIES_PROCESS_SMOKE="1"
-MAXTRIES_PROCESS_PM="1"
-MAXTRIES_RADAR_REF2TTEN="1"
-MAXTRIES_CLDANL_NONVAR="1"
+MAXTRIES_ANALYSIS_NONVARCLD="1"
 MAXTRIES_SAVE_RESTART="1"
 MAXTRIES_SAVE_DA_OUTPUT="1"
-MAXTRIES_JEDI_ENVAR_IODA="1"
-MAXTRIES_IODA_PREPBUFR="1"
-MAXTRIES_ADD_AEROSOL="1"
 #
 #-----------------------------------------------------------------------
 #
@@ -2226,13 +2134,6 @@ TILE_SETS="full"
 # DO_GSIDIAG_OFFLINE:
 # Decide whether or not to run GSI diag generation outside of the GSI task
 #
-# DO_ENS_GRAPHICS:
-# Flag to turn on/off ensemble graphics. Turns OFF deterministic
-# graphics.
-#
-# DO_ENSPOST:
-# Flag to turn on/off python ensemble postprocessing for WPC testbeds.
-#
 # DO_ENSINIT:
 # Decide whether or not to do ensemble initialization by running 1
 # timestep ensemble forecast and recentering on the deterministic
@@ -2300,8 +2201,6 @@ DO_ENKF_RADAR_REF="FALSE"
 DO_ENVAR_RADAR_REF="FALSE"
 DO_ENVAR_RADAR_REF_ONCE="FALSE"
 DO_RECENTER="FALSE"
-DO_ENS_GRAPHICS="FALSE"
-DO_ENSPOST="FALSE"
 DO_ENSINIT="FALSE"
 DO_SAVE_DA_OUTPUT="FALSE"
 DO_GSIDIAG_OFFLINE="FALSE"
@@ -2369,7 +2268,6 @@ DO_BUFRSND="FALSE"
 USE_RRFSE_ENS="FALSE"
 DO_SMOKE_DUST="FALSE"
 EBB_DCYCLE="2"
-DO_PM_DA="FALSE"
 USE_CLM="FALSE"
 DO_NON_DA_RUN="TRUE"
 #
@@ -2624,7 +2522,7 @@ PRINT_DIFF_PGR="FALSE"
 #
 USE_FVCOM="FALSE"
 PREP_FVCOM="FALSE"
-FVCOM_DIR="/lfs/h2/emc/lam/noscrub/emc.lam/OWAQ_fv3"
+FVCOM_DIR="/user/defined/dir/to/fvcom/data"
 FVCOM_FILE="fvcom.nc"
 #
 #-----------------------------------------------------------------------
@@ -2689,37 +2587,11 @@ GWD_HRRRsuite_BASEDIR=""
 #
 #-----------------------------------------------------------------------
 #
-# Parameters for JEDI options
-#
-# DO_JEDI_ENVAR_IODA:
-# Flag turn on the JEDI-IODA converters for EnVAR.  It requires GSI
-# to produce NetCDF diag files
-#-----------------------------------------------------------------------
-#
-DO_JEDI_ENVAR_IODA="FALSE"
-#
-#-----------------------------------------------------------------------
-#
-# Parameters for IODA options
-#
-# DO_IODA_PREPBUFR:
-# Flag turn on the IODA converters for conventional observations in prepbufr files.
-#-----------------------------------------------------------------------
-#
-DO_IODA_PREPBUFR="FALSE"
-#
-#-----------------------------------------------------------------------
-#
 # Parameters for analysis options
 #
-# DO_NONVAR_CLDANAL:
+# DO_ANALYSIS_NONVARCLD:
 # Flag turn on the non-var cloud analysis.
 #
-# DO_REFL2TTEN:
-# Flag turn on the radar reflectivity to temperature tendenecy.
-#
-# DO_NLDN_LGHT
-# Flag turn on processing NLDN NetCDF lightning data
 # DO_GLM_FED_DA
 # Flag turn on processing gridded GLM lightning data
 # GLMFED_DATA_MODE
@@ -2731,15 +2603,12 @@ DO_IODA_PREPBUFR="FALSE"
 #
 #-----------------------------------------------------------------------
 #
-DO_NONVAR_CLDANAL="FALSE"
-DO_REFL2TTEN="FALSE"
-DO_NLDN_LGHT="FALSE"
+DO_ANALYSIS_NONVARCLD="FALSE"
 DO_GLM_FED_DA="FALSE"
 GLMFED_DATA_MODE="FULL"
 PREP_MODEL_FOR_FED="FALSE"
 DO_SMOKE_DUST="FALSE"
 EBB_DCYCLE="2"
-DO_PM_DA="FALSE"
 #
 #-----------------------------------------------------------------------
 #
@@ -2827,40 +2696,30 @@ CRONTAB_LINE=""
 #-----------------------------------------------------------------------
 #
 HOMErrfs="$HOMErrfs"
-USHdir="$HOMErrfs/ush"
-SCRIPTSdir="$HOMErrfs/scripts"
-JOBSdir="$HOMErrfs/jobs"
-SORCdir="$HOMErrfs/sorc"
-PARMdir="$HOMErrfs/parm"
+USHrrfs="$HOMErrfs/ush"
+SORCrrfs="$HOMErrfs/sorc"
+PARMrrfs="$HOMErrfs/parm"
 MODULES_DIR="$HOMErrfs/modulefiles"
-EXECdir="$HOMErrfs/exec"
 LIB64dir="$HOMErrfs/sorc/build/lib64"
 FIXam="$HOMErrfs/parm/config/firewx/fix_am"
 FIXLAM="$HOMErrfs/parm/config/firewx/fix_lam"
 FIXgsm="$HOMErrfs/fix/am"
-FIXprdgen="$HOMErrfs/fix/prdgen"
-COMROOT="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0"
-COMOUT_BASEDIR="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0/prod"
-NWGES_BASEDIR="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/nwges"
+COMROOT="$COMROOT"
+GESROOT="notused"
 UFS_WTHR_MDL_DIR="$HOMErrfs/sorc/ufs-weather-model"
 UFS_UTILS_DIR="$HOMErrfs/sorc/UFS_UTILS"
 SFC_CLIMO_INPUT_DIR="/lfs/h2/emc/lam/noscrub/RRFS_input/fix/fix_sfc_climo"
 TOPO_DIR="/lfs/h2/emc/lam/noscrub/RRFS_input/fix/fix_orog"
 UPP_DIR="$HOMErrfs/sorc/UPP"
-PYTHON_GRAPHICS_DIR="$HOMErrfs/python_graphics"
 
-ARCHIVEDIR="/NCEPDEV/emc-meso/1year/emc.lam/n3v91"
-NCARG_ROOT="/apps/ncl/6.5.0-CentOS6.10_64bit_nodap_gnu447"
-NCL_HOME="/home/rtrr/RRFS/graphics"
-NCL_REGION="conus"
 MODEL="rrfs"
 
 EXPTDIR="$HOMErrfs/parm/config/firewx"
-LOG_BASEDIR="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0/logs"
-CYCLE_BASEDIR="$DATAROOT"
-GRID_DIR="$DATAROOT/rrfs_firewx/grid"
-OROG_DIR="$DATAROOT/rrfs_firewx/orog"
-SFC_CLIMO_DIR="$DATAROOT/rrfs_firewx/sfc_climo"
+LOG_BASEDIR="notused"
+DATAROOT="$DATAROOT"
+GRID_DIR="$HOMErrfs/parm/config/firewx/grid"
+OROG_DIR="$HOMErrfs/parm/config/firewx/orog"
+SFC_CLIMO_DIR="$HOMErrfs/parm/config/firewx/sfc_climo"
 GWD_HRRRsuite_DIR=""
 
 NDIGITS_ENSMEM_NAMES="0"
@@ -2868,22 +2727,16 @@ ENSMEM_NAMES=( "" )
 FV3_NML_ENSMEM_FPS=( "" )
 
 # for data assimilation
-OBSPATH="/lfs/h1/ops/prod/com/obsproc/v1.2"
-OBSPATH_PM="/lfs4/BMC/public/data/airnow/hourly_aqobs"
-OBSPATH_NSSLMOSIAC="/lfs/h1/ops/prod/dcom/ldmdata/obs/upperair/mrms/conus/MergedReflectivityQC"
+OBSPATH="/public/data/grids/rap/obs"
+OBSPATH_PM="/mnt/lfs1/BMC/wrfruc/hwang/rrfs_sd/pm"
+OBSPATH_NSSLMOSIAC="/public/data/radar/mrms"
 LIGHTNING_ROOT="/public/data/lightning"
-GLMFED_EAST_ROOT="/lfs/h1/ops/prod/dcom/ldmdata/obs/GOES-16/GLM/tiles"
-GLMFED_WEST_ROOT="/lfs/h1/ops/prod/dcom/ldmdata/obs/GOES-17/GLM/tiles"
-ENKF_FCST="/lfs/h1/ops/prod/com/gfs/v16.3"
+GLMFED_EAST_ROOT="/public/data/sat/nesdis/goes-east/glm/full-disk/"
+GLMFED_WEST_ROOT="/public/data/sat/nesdis/goes-east/glm/full-disk/"
+ENKF_FCST="/lfs4/BMC/public/data/grids/enkf/atm"
 
-FIX_GSI="$HOMErrfs/fix/gsi"
-FIX_CRTM="/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/intel-19.1.3.304/cray-mpich-8.1.12/crtm/2.4.0/fix"
-FIX_UPP_CRTM="/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/intel-19.1.3.304/cray-mpich-8.1.12/crtm/2.4.0/fix"
-FIX_SMOKE_DUST="$HOMErrfs/fix/smoke_dust"
-FIX_BUFRSND="$HOMErrfs/fix/bufrsnd"
-AIRCRAFT_REJECT="$HOMErrfs/fix/gsi"
-SFCOBS_USELIST="$HOMErrfs/fix/gsi"
-PARM_IODACONV="$HOMErrfs/parm/iodaconv"
+AIRCRAFT_REJECT="$HOMErrfs/fix"
+SFCOBS_USELIST="$HOMErrfs/fix"
 
 RADARREFL_MINS=( "0" "1" "2" "3" )
 RADARREFL_TIMELEVEL=( "0" )
@@ -2895,29 +2748,29 @@ ADDNL_OUTPUT_GRIDS=( "" )
 #
 #-----------------------------------------------------------------------
 #
-GLOBAL_VAR_DEFNS_FP="/lfs/h2/emc/lam/noscrub/emc.lam/rrfs/para/packages/rrfs.v1.0.0/parm/config/firewx/var_defns.sh"
+GLOBAL_VAR_DEFNS_FP="$HOMErrfs/parm/config/firewx/var_defns.sh"
 # Try this at some point instead of hard-coding it as above; it's a more
 # flexible approach (if it works).
 #GLOBAL_VAR_DEFNS_FP=$HOMErrfs/ush/setup.sh
 
 DATA_TABLE_TMPL_FN="data_table"
-DIAG_TABLE_TMPL_FN="diag_table.FV3_HRRR_gf_nogwd"
-FIELD_TABLE_TMPL_FN="field_table.FV3_HRRR_gf_nogwd"
+DIAG_TABLE_TMPL_FN="diag_table.RRFS_sas_nogwd"
+FIELD_TABLE_TMPL_FN="field_table.RRFS_sas_nogwd"
 MODEL_CONFIG_TMPL_FN="model_configure"
 UFS_CONFIG_TMPL_FN="ufs.configure"
 
 DATA_TABLE_TMPL_FP="$HOMErrfs/parm/data_table"
-DIAG_TABLE_TMPL_FP="$HOMErrfs/parm/diag_table.FV3_HRRR_gf_clm"
-FIELD_TABLE_TMPL_FP="$HOMErrfs/parm/field_table.FV3_HRRR_gf"
-FV3_NML_BASE_SUITE_FP="$HOMErrfs/parm/input.nml.FV3"
-FV3_NML_YAML_CONFIG_FP="$HOMErrfs/parm/FV3.input.yml"
+DIAG_TABLE_TMPL_FP="$HOMErrfs/parm/diag_table.RRFS_sas_nogwd"
+FIELD_TABLE_TMPL_FP="$HOMErrfs/parm/field_table.RRFS_sas_nogwd"
+FV3_NML_BASE_SUITE_FP="$HOMErrfs/parm/input.nml.RRFSFW"
+FV3_NML_YAML_CONFIG_FP="$HOMErrfs/parm/"
 FV3_NML_BASE_ENS_FP="$HOMErrfs/parm/config/firewx/input.nml.base_ens"
 MODEL_CONFIG_TMPL_FP="$HOMErrfs/parm/model_configure"
 UFS_CONFIG_TMPL_FP="$HOMErrfs/parm/ufs.configure"
 
-CCPP_PHYS_SUITE_FN="suite_FV3_HRRR_gf_nogwd.xml"
-CCPP_PHYS_SUITE_IN_CCPP_FP="$HOMErrfs/sorc/ufs-weather-model/FV3/ccpp/suites/suite_FV3_HRRR_gf.xml"
-CCPP_PHYS_SUITE_FP="$HOMErrfs/parm/config/firewx/suite_FV3_HRRR_gf.xml"
+CCPP_PHYS_SUITE_FN="suite_RRFS_sas_nogwd.xml"
+CCPP_PHYS_SUITE_IN_CCPP_FP="$HOMErrfs/sorc/ufs-weather-model/FV3/ccpp/suites/suite_RRFS_sas_nogwd.xml"
+CCPP_PHYS_SUITE_FP="$HOMErrfs/parm/config/firewx/suite_RRFS_sas_nogwd.xml"
 
 DATA_TABLE_FP="$HOMErrfs/parm/config/firewx/data_table"
 FIELD_TABLE_FP="$HOMErrfs/parm/config/firewx/field_table"
@@ -2960,8 +2813,8 @@ NH0="0"
 NH3="3"
 NH4="4"
 
-LON_CTR="-109.5"
-LAT_CTR="44.3"
+LON_CTR="-123.0"
+LAT_CTR="49.3"
 NX="350"
 NY="350"
 PAZI="0.0"
@@ -3009,7 +2862,7 @@ OZONE_PARAM=""
 #
 #-----------------------------------------------------------------------
 #
-EXTRN_MDL_SYSBASEDIR_ICS="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0/prod"
+EXTRN_MDL_SYSBASEDIR_ICS="${COMrrfs}"
 #
 #-----------------------------------------------------------------------
 #
@@ -3030,7 +2883,7 @@ EXTRN_MDL_ICS_OFFSET_HRS="0"
 #
 #-----------------------------------------------------------------------
 #
-EXTRN_MDL_SYSBASEDIR_LBCS="/lfs/h3/emc/rrfstemp/ecflow/ptmp/emc.lam/ecflow_rrfs/para/com/rrfs/v1.0/prod"
+EXTRN_MDL_SYSBASEDIR_LBCS="${COMrrfs}"
 #
 #-----------------------------------------------------------------------
 #
@@ -3062,7 +2915,7 @@ LBC_SPEC_FCST_LONG_HRS=(0)
 #-----------------------------------------------------------------------
 #
 USE_FVCOM="FALSE"
-FVCOM_DIR="/lfs/h2/emc/lam/noscrub/emc.lam/OWAQ_fv3"
+FVCOM_DIR="/user/defined/dir/to/fvcom/data"
 FVCOM_FILE="fvcom.nc"
 #
 #-----------------------------------------------------------------------
diff --git a/scripts/exrrfs_analysis_enkf.sh b/scripts/exrrfs_analysis_enkf.sh
index faa594b69..2b374a2d7 100755
--- a/scripts/exrrfs_analysis_enkf.sh
+++ b/scripts/exrrfs_analysis_enkf.sh
@@ -120,9 +120,9 @@ else
 fi
 mkdir -p ${enkfanal_nwges_dir}
 
-cpreq -p ${fixgriddir}/fv3_coupler.res    coupler.res
-cpreq -p ${fixgriddir}/fv3_akbk           fv3sar_tile1_akbk.nc
-cpreq -p ${fixgriddir}/fv3_grid_spec      fv3sar_tile1_grid_spec.nc
+cpreq ${fixgriddir}/fv3_coupler.res    coupler.res
+cpreq ${fixgriddir}/fv3_akbk           fv3sar_tile1_akbk.nc
+cpreq ${fixgriddir}/fv3_grid_spec      fv3sar_tile1_grid_spec.nc
 #
 #-----------------------------------------------------------------------
 #
diff --git a/scripts/exrrfs_analysis_gsi.sh b/scripts/exrrfs_analysis_gsi.sh
index 7fdd38872..41f729678 100755
--- a/scripts/exrrfs_analysis_gsi.sh
+++ b/scripts/exrrfs_analysis_gsi.sh
@@ -411,7 +411,7 @@ else                          # cycle uses background from restart
 fi
 
 # update times in coupler.res to current cycle time
-cpreq -p ${fixgriddir}/fv3_coupler.res  coupler.res
+cpreq ${fixgriddir}/fv3_coupler.res  coupler.res
 sed -i "s/yyyy/${YYYY}/" coupler.res
 sed -i "s/mm/${MM}/"     coupler.res
 sed -i "s/dd/${DD}/"     coupler.res
@@ -477,9 +477,9 @@ if [[ ${GSI_TYPE} == "OBSERVER" || ${anav_type} == "conv" || ${anav_type} == "co
   if [ "${anav_type}" = "conv_dbz" ]; then
     obs_number=${#obs_files_source[@]}
     if [ "${CYCLE_TYPE}" = "spinup" ]; then
-      obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_radar_spinup_${envir}_${cyc}/Gridded_ref.nc
+      obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_radar_spinup_${envir}_${cyc}/00/Gridded_ref.nc
     else
-      obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_radar_${envir}_${cyc}/Gridded_ref.nc
+      obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_radar_prod_${envir}_${cyc}/00/Gridded_ref.nc
     fi
     obs_files_target[${obs_number}]=dbzobs.nc
     if [ "${DO_GLM_FED_DA}" = "TRUE" ]; then
@@ -487,7 +487,7 @@ if [[ ${GSI_TYPE} == "OBSERVER" || ${anav_type} == "conv" || ${anav_type} == "co
       if [ "${CYCLE_TYPE}" = "spinup" ]; then
         obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_lightning_spinup_${envir}_${cyc}/fedobs.nc
       else
-        obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_lightning_${envir}_${cyc}/fedobs.nc
+        obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_lightning_prod_${envir}_${cyc}/fedobs.nc
       fi
       obs_files_target[${obs_number}]=fedobs.nc
     fi
@@ -496,14 +496,18 @@ if [[ ${GSI_TYPE} == "OBSERVER" || ${anav_type} == "conv" || ${anav_type} == "co
   if [ "${DO_ENKF_RADAR_REF}" = "TRUE" ]; then
     obs_number=${#obs_files_source[@]}
     if [ "${CYCLE_TYPE}" = "spinup" ]; then
-      obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_radar_spinup_enkf_${envir}_${cyc}/Gridded_ref.nc
+      obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_radar_spinup_${envir}_${cyc}/00/Gridded_ref.nc
     else
-      obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_radar_enkf_${envir}_${cyc}/Gridded_ref.nc
+      obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_radar_prod_${envir}_${cyc}/00/Gridded_ref.nc
     fi
     obs_files_target[${obs_number}]=dbzobs.nc
     if [ "${DO_GLM_FED_DA}" = "TRUE" ]; then
       obs_number=${#obs_files_source[@]}
-      obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_lightning_enkf_${envir}_${cyc}/fedobs.nc
+      if [ "${CYCLE_TYPE}" = "spinup" ]; then
+        obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_lightning_spinup_${envir}_${cyc}/fedobs.nc
+      else
+        obs_files_source[${obs_number}]=${DATAROOT}/${RUN}_process_lightning_prod_${envir}_${cyc}/fedobs.nc
+      fi
       obs_files_target[${obs_number}]=fedobs.nc
     fi
   fi
@@ -512,16 +516,16 @@ else
 
   if [ "${anav_type}" = "radardbz" ]; then
     if [ "${CYCLE_TYPE}" = "spinup" ]; then
-      obs_files_source[0]=${DATAROOT}/${RUN}_process_radar_spinup_${envir}_${cyc}/Gridded_ref.nc
+      obs_files_source[0]=${DATAROOT}/${RUN}_process_radar_spinup_${envir}_${cyc}/00/Gridded_ref.nc
     else
-      obs_files_source[0]=${DATAROOT}/${RUN}_process_radar_${envir}_${cyc}/Gridded_ref.nc
+      obs_files_source[0]=${DATAROOT}/${RUN}_process_radar_prod_${envir}_${cyc}/00/Gridded_ref.nc
     fi
     obs_files_target[0]=dbzobs.nc
     if [ "${DO_GLM_FED_DA}" = "TRUE" ]; then
       if [ "${CYCLE_TYPE}" = "spinup" ]; then
         obs_files_source[1]=${DATAROOT}/${RUN}_process_lightning_spinup_${envir}_${cyc}/fedobs.nc
       else
-        obs_files_source[1]=${DATAROOT}/${RUN}_process_lightning_${envir}_${cyc}/fedobs.nc
+        obs_files_source[1]=${DATAROOT}/${RUN}_process_lightning_prod_${envir}_${cyc}/fedobs.nc
       fi
       obs_files_target[1]=fedobs.nc
     fi
diff --git a/scripts/exrrfs_analysis_nonvarcld.sh b/scripts/exrrfs_analysis_nonvarcld.sh
index a79c8e872..4268f4704 100755
--- a/scripts/exrrfs_analysis_nonvarcld.sh
+++ b/scripts/exrrfs_analysis_nonvarcld.sh
@@ -136,8 +136,8 @@ fi
 n_iolayouty=$(($IO_LAYOUT_Y-1))
 list_iolayout=$(seq 0 $n_iolayouty)
 
-cpreq -p ${fixgriddir}/fv3_akbk       fv3_akbk
-cpreq -p ${fixgriddir}/fv3_grid_spec  fv3_grid_spec
+cpreq ${fixgriddir}/fv3_akbk       fv3_akbk
+cpreq ${fixgriddir}/fv3_grid_spec  fv3_grid_spec
 
 BKTYPE=0
 if [ -r "${bkpath}/coupler.res" ]; then # Use background from warm restart
diff --git a/scripts/exrrfs_blend_ics.sh b/scripts/exrrfs_blend_ics.sh
index 9e64c7761..cc035c37f 100755
--- a/scripts/exrrfs_blend_ics.sh
+++ b/scripts/exrrfs_blend_ics.sh
@@ -137,8 +137,8 @@ if [[ $DO_ENS_BLENDING == "TRUE" ]]; then
 
   # Loop through each ensemble member and check if the 1h RRFS EnKF files exist
   for imem in $(seq 1 ${NUM_ENS_MEMBERS}); do
-      ensmem=$( printf "%04d" $imem )
-      checkfile="${GESROOT}/${RUN}.${yyyymmdd_m1}/${hh_m1}/${mem_num}/forecast/RESTART/${yyyymmdd}.${hh}0000.coupler.res"
+      ensmem=$( printf "%03d" $imem )
+      checkfile="${GESROOT}/${RUN}.${yyyymmdd_m1}/${hh_m1}/m${ensmem}/forecast/RESTART/${yyyymmdd}.${hh}0000.coupler.res"
       if [[ -f $checkfile ]]; then
           ((existing_files++))
           echo "checkfile count: $existing_files"
diff --git a/scripts/exrrfs_clean.ksh b/scripts/exrrfs_clean.ksh
index 91891d860..af9c79e9a 100755
--- a/scripts/exrrfs_clean.ksh
+++ b/scripts/exrrfs_clean.ksh
@@ -153,4 +153,8 @@ for onetime in ${XX[*]};do
 done
 
 #-----------------------------------------------------------------------
+
+storage=$(du -sh /lfs/h3/emc/lam/noscrub/ecflow)
+[[ -z $ECF_PORT ]]&& ecflow_client --label=storage "${storage}"
+
 exit 0
diff --git a/scripts/exrrfs_forecast.sh b/scripts/exrrfs_forecast.sh
index 476539c4b..7f8475f12 100755
--- a/scripts/exrrfs_forecast.sh
+++ b/scripts/exrrfs_forecast.sh
@@ -52,8 +52,14 @@ specified cycle.
 #
 #-----------------------------------------------------------------------
 #
-run_blending=${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/run_blending
-run_ensinit=${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/run_ensinit
+if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+  runcyc_path=${RUN}.${PDY}/${cyc}/${mem_num}
+else
+  runcyc_path=${RUN}.${PDY}/${cyc}
+fi
+
+run_blending=${GESROOT}/${runcyc_path}/run_blending
+run_ensinit=${GESROOT}/${runcyc_path}/run_ensinit
 if [[ ${CYCLE_SUBTYPE} == "ensinit" && -e $run_blending && ! -e $run_ensinit ]]; then
    echo "clean exit ensinit, blending used instead of ensinit."
    exit 0
diff --git a/scripts/exrrfs_fsm.sh b/scripts/exrrfs_fsm.sh
index b43bc77d5..ceaa5f123 100755
--- a/scripts/exrrfs_fsm.sh
+++ b/scripts/exrrfs_fsm.sh
@@ -71,11 +71,13 @@ scan_release_enkf_make_ics="NO"
 scan_release_enkf_observer_gsi_spinup_ensmean="NO"
 scan_release_enkf_save_restart_spinup="NO"
 scan_release_enkf_save_restart_ensinit="NO"
+scan_release_firewx_make_lbcs="NO"
 
 if [ ${cyc} == "00" ]; then
   scan_release_det_make_lbcs="YES"
   scan_release_enkf_make_lbcs="YES"
   scan_release_ensf_make_lbcs="YES"
+  scan_release_firewx_make_lbcs="YES"
   scan_release_det_post_long="YES"
   scan_release_save_restart_long="YES"
 fi
@@ -118,6 +120,7 @@ if [ ${cyc} == "06" ]; then
   scan_release_det_make_lbcs="YES"
   scan_release_enkf_make_lbcs="YES"
   scan_release_ensf_make_lbcs="YES"
+  scan_release_firewx_make_lbcs="YES"
   scan_release_det_post_long="YES"
   scan_release_save_restart_long="YES"
   scan_release_save_restart_spinup_f001="YES"
@@ -163,6 +166,7 @@ if [ ${cyc} == "12" ]; then
   scan_release_det_make_lbcs="YES"
   scan_release_enkf_make_lbcs="YES"
   scan_release_ensf_make_lbcs="YES"
+  scan_release_firewx_make_lbcs="YES"
   scan_release_det_post_long="YES"
   scan_release_save_restart_long="YES"
   #scan_release_save_restart_spinup_f001="YES"
@@ -206,6 +210,7 @@ if [ ${cyc} == "18" ]; then
   scan_release_det_make_lbcs="YES"
   scan_release_enkf_make_lbcs="YES"
   scan_release_ensf_make_lbcs="YES"
+  scan_release_firewx_make_lbcs="YES"
   scan_release_det_post_long="YES"
   scan_release_save_restart_long="YES"
   scan_release_save_restart_spinup_f001="YES"
@@ -302,6 +307,30 @@ while [ $proceed_trigger_scan == "YES" ]; do
     fi
   fi
   #### scan_release_det_make_lbcs
+  #### scan_release_firewx_make_lbcs
+  if [ ${scan_release_firewx_make_lbcs} == "YES" ]; then
+    echo "Proceeding with scan_release_firewx_make_lbcs"
+    source_file_found="NO"
+    # rrfs_natlev_staging_shared=${umbrella_fsm_data}/firewx_make_lbcs
+    # mkdir -p ${rrfs_natlev_staging_shared}
+    # natlev_shared_directory=$(compath.py -o rrfs/${rrfs_ver})/rrfs.${RRFS_Current_PDY}/${RRFS_Current_cyc}
+    # natlev_shared_directory=${COMrrfs}/prod/rrfs.${RRFS_Current_PDY}/${RRFS_Current_cyc}
+    natlev_shared_directory=${DATAROOT}/rrfs_make_ics_prod_${RRFS_Current_cyc}/tmp_ICS
+    # inp_file_to_check=${natlev_shared_directory}/rrfs.t${RRFS_Current_cyc}z.natlev.f036.grib2
+    inp_file_to_check=${natlev_shared_directory}/rrfs.t${RRFS_Current_cyc}z.natlev.3km.f000.na.grib2
+    if [ -s ${inp_file_to_check} ]; then
+      for idx_fhr in $(seq 1 36); do
+        idx_fhr3d=$( printf "%03d" "${idx_fhr}" )
+        #### cpreq -p ${natlev_shared_directory}/rrfs.t${RRFS_Current_cyc}z.natlev.f${idx_fhr3d}.grib2 ${rrfs_natlev_staging_shared}
+      done
+      source_file_found="YES"
+      scan_release_firewx_make_lbcs="NO"
+      ecflow_client --event release_firewx_make_lbcs
+    else
+      proceed_trigger_scan="YES"
+    fi
+  fi
+  #### scan_release_firewx_make_lbcs
   #### release_det_analysis_gsi
   if [ ${scan_release_det_analysis_gsi} == "YES" ]; then
     echo "Proceeding with scan_release_det_analysis_gsi"
@@ -312,7 +341,7 @@ while [ $proceed_trigger_scan == "YES" ]; do
     if [ -s ${obsproc_rap_inp_file} ]; then
       source_file_found="YES"
       # fg_restart_dirname=forecast
-      if [ -d ${GESROOT}/${RUN}.${RRFS_previous_PDY}/${RRFS_previous_cyc}/m001/forecast ]; then
+      if [ -d ${GESROOT}/enkfrrfs.${RRFS_previous_PDY}/${RRFS_previous_cyc}/m001/forecast ]; then
         fg_restart_dirname=forecast
       else
         fg_restart_dirname=forecast_spinup
@@ -323,7 +352,7 @@ while [ $proceed_trigger_scan == "YES" ]; do
       # NWGES_BASEDIR/${YYYYMMDDHHmInterv}
       for member_num in $(seq 1 30); do
         member_num_2d=$( printf "%02d" ${member_num} )
-        target_file_scan=${GESROOT}/${RUN}.${RRFS_previous_PDY}/${RRFS_previous_cyc}/m0${member_num_2d}/${fg_restart_dirname}/RESTART/${RRFS_Current_PDY}.${RRFS_Current_cyc}0000.coupler.res
+        target_file_scan=${GESROOT}/enkfrrfs.${RRFS_previous_PDY}/${RRFS_previous_cyc}/m0${member_num_2d}/${fg_restart_dirname}/RESTART/${RRFS_Current_PDY}.${RRFS_Current_cyc}0000.coupler.res
         [[ ! -s ${target_file_scan} ]]&& source_file_found="NO"
       done
     fi
@@ -356,7 +385,8 @@ while [ $proceed_trigger_scan == "YES" ]; do
     # s_v=$(echo $rrfs_ver|cut -c1-4)
     s_v=det
     fg_restart_dirname=forecast
-    umbrella_forecast_data=${DATAROOT}/${RUN}/${s_v}/${cdate}/${fg_restart_dirname}
+    #### umbrella_forecast_data=${DATAROOT}/${RUN}/${s_v}/${cdate}/${fg_restart_dirname}
+    umbrella_forecast_data=${DATAROOT}/rrfs_forecast_prod_${RRFS_Current_cyc}
     source_file_found="YES"
     if [ $(ls ${umbrella_forecast_data}/log.atm.f001-*|wc -l) -eq 4 ]; then
       ecflow_client --event release_save_restart_long_1
@@ -402,7 +432,8 @@ while [ $proceed_trigger_scan == "YES" ]; do
     # s_v=$(echo $rrfs_ver|cut -c1-4)
     s_v=det
     fg_restart_dirname=forecast
-    umbrella_forecast_data=${DATAROOT}/${RUN}/det/${cdate}/${fg_restart_dirname}
+    #### umbrella_forecast_data=${DATAROOT}/${RUN}/det/${cdate}/${fg_restart_dirname}
+    umbrella_forecast_data=${DATAROOT}/rrfs_forecast_prod_${RRFS_Current_cyc}
     source_file_found="YES"
     # if [ $(ls ${umbrella_forecast_data}/log.atm.f001-*|wc -l) -eq 4 ]; then
     # RRFS_next_PDY
@@ -425,7 +456,8 @@ while [ $proceed_trigger_scan == "YES" ]; do
     # s_v=$(echo $rrfs_ver|cut -c1-4)
     s_v=det
     fg_restart_dirname=forecast
-    umbrella_forecast_data=${DATAROOT}/${RUN}/det/${cdate}/${fg_restart_dirname}
+    #### umbrella_forecast_data=${DATAROOT}/${RUN}/det/${cdate}/${fg_restart_dirname}
+    umbrella_forecast_data=${DATAROOT}/rrfs_forecast_prod_${RRFS_Current_cyc}
     source_file_found="YES"
     # if [ $(ls ${umbrella_forecast_data}/log.atm.f001-*|wc -l) -eq 4 ]; then
     if [ $(ls ${umbrella_forecast_data}/RESTART/${RRFS_next_2_PDY}.${RRFS_next_2_cyc}0000.coupler.res|wc -l) -eq 1 ]; then
@@ -443,8 +475,10 @@ while [ $proceed_trigger_scan == "YES" ]; do
   #### release_save_restart_spinup_f001
   if [ ${scan_release_save_restart_spinup_f001} == "YES" ]; then
     echo "Proceeding with scan_release_save_restart_spinup_f001"
-    fg_restart_dirname=forecast_spinup
-    umbrella_forecast_data=${DATAROOT}/${RUN}/det/${cdate}/${fg_restart_dirname}
+    #### fg_restart_dirname=forecast_spinup
+    #### umbrella_forecast_data=${DATAROOT}/${RUN}/det/${cdate}/${fg_restart_dirname}
+    fg_restart_dirname=${RUN}_forecast_spinup_prod_${RRFS_Current_cyc}
+    umbrella_forecast_data=${DATAROOT}/${fg_restart_dirname}
     source_file_found="YES"
     target_file_scan=${umbrella_forecast_data}/RESTART/${RRFS_next_1_PDY}.${RRFS_next_1_cyc}0000.coupler.res
     if [ $(ls ${target_file_scan}|wc -l) -eq 1 ]; then
@@ -468,7 +502,8 @@ while [ $proceed_trigger_scan == "YES" ]; do
     # s_v=$(echo $rrfs_ver|cut -c1-4)
     s_v=det
     fg_restart_dirname=forecast
-    umbrella_forecast_data=${DATAROOT}/${RUN}/${s_v}/${cdate}/${fg_restart_dirname}
+    #### umbrella_forecast_data=${DATAROOT}/${RUN}/${s_v}/${cdate}/${fg_restart_dirname}
+    umbrella_forecast_data=${DATAROOT}/rrfs_forecast_prod_${RRFS_Current_cyc}
     # fhr cover 000~060
     for fhr in $(seq 0 60); do
       fhr_2d=$( printf "%02d" ${fhr} )
@@ -510,7 +545,8 @@ while [ $proceed_trigger_scan == "YES" ]; do
     # s_v=$(echo $rrfs_ver|cut -c1-4)
     s_v=det
     fg_restart_dirname=forecast
-    umbrella_forecast_data=${DATAROOT}/${RUN}/det/${cdate}/${fg_restart_dirname}
+    #### umbrella_forecast_data=${DATAROOT}/${RUN}/det/${cdate}/${fg_restart_dirname}
+    umbrella_forecast_data=${DATAROOT}/rrfs_forecast_prod_${RRFS_Current_cyc}
     # fhr cover 000~018
     for fhr in $(seq 0 18); do
       fhr_2d=$( printf "%02d" ${fhr} )
@@ -574,14 +610,14 @@ while [ $proceed_trigger_scan == "YES" ]; do
   if [ ${scan_release_enkf_prep_cyc} == "YES" ]; then
     echo "Proceeding with scan_release_enkf_prep_cyc"
     source_file_found="YES"
-    if [ -d ${GESROOT}/${RUN}.${RRFS_previous_PDY}/${RRFS_previous_cyc}/m001/forecast ]; then
+    if [ -d ${GESROOT}/enkfrrfs.${RRFS_previous_PDY}/${RRFS_previous_cyc}/m001/forecast ]; then
       fg_restart_dirname=forecast
     else
       fg_restart_dirname=forecast_spinup
     fi
     for mem_num in $(seq 1 30); do
       mem_num_2d=$( printf "%02d" ${mem_num} )
-      target_file_scan=${GESROOT}/${RUN}.${RRFS_previous_PDY}/${RRFS_previous_cyc}/m0${mem_num_2d}/${fg_restart_dirname}/RESTART/${RRFS_Current_PDY}.${RRFS_Current_cyc}0000.coupler.res
+      target_file_scan=${GESROOT}/enkfrrfs.${RRFS_previous_PDY}/${RRFS_previous_cyc}/m0${mem_num_2d}/${fg_restart_dirname}/RESTART/${RRFS_Current_PDY}.${RRFS_Current_cyc}0000.coupler.res
       if [ -s ${target_file_scan} ]; then
         ecflow_client --event release_enkf_prep_cyc_mem0${mem_num_2d}
       else
diff --git a/scripts/exrrfs_make_ics.sh b/scripts/exrrfs_make_ics.sh
index 9c63a0f16..a13049943 100755
--- a/scripts/exrrfs_make_ics.sh
+++ b/scripts/exrrfs_make_ics.sh
@@ -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
@@ -598,10 +598,11 @@ if [ ${PREDEF_GRID_NAME} = "RRFS_FIREWX_1.5km" ]; then
   sp_lon=$(echo "$LON_CTR + 360" | bc -l)
   sp_lat=$(echo "(90 - $LAT_CTR) * -1" | bc -l)
   gridspecs="rot-ll:${sp_lon}:${sp_lat}:0 -10:801:0.025 -10:801:0.025"
-  fn_grib2_subset=rrfs.t${hh}z.natlev.f000.subset.grib2
+  fn_grib2_subset=rrfs.t${hh}z.natlev.3km.f000.na.subset.grib2
 
   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
 #
@@ -708,7 +709,7 @@ if [[ $DO_ENS_BLENDING == "TRUE" && $EXTRN_MDL_NAME_ICS = "GDASENKF" ]]; then
   # Required FIX files
   cpreq -p $FIXLAM/${CRES}_grid.tile7.nc .
   cpreq -p $FIXLAM/${CRES}_oro_data.tile7.halo0.nc .
-  cpreq -p $FIX_GSI/$PREDEF_GRID_NAME/fv3_akbk fv_core.res.nc
+  cpreq $FIX_GSI/$PREDEF_GRID_NAME/fv3_akbk fv_core.res.nc
 
   # Shortcut the file names
   warm=./fv_core.res.tile1.nc
diff --git a/scripts/exrrfs_make_lbcs.sh b/scripts/exrrfs_make_lbcs.sh
index da532623f..50064afb2 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
@@ -622,10 +622,14 @@ $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`
-    fn_grib2_subset=rrfs.t${hh}z.natlev.f${fcst_hhh_FV3LAM}.subset.grib2
+    fn_grib2_subset=rrfs.t${hh}z.natlev.3km.f${fcst_hhh_FV3LAM}.na.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
 #
diff --git a/scripts/exrrfs_prdgen.sh b/scripts/exrrfs_prdgen.sh
index 32a273fe6..939d82095 100755
--- a/scripts/exrrfs_prdgen.sh
+++ b/scripts/exrrfs_prdgen.sh
@@ -310,17 +310,19 @@ if [ "${DO_PARALLEL_PRDGEN}" = "TRUE" ]; then
     for domain in ${domains[@]}
     do
       if [ ${DO_ENSFCST} = "TRUE" ]; then
+        [[ -f ${COMOUT}/rrfs.t${cyc}z.${mem_num}.prslev.${gridspacing}.f${fhr}.${domain}.grib2 ]]&& rm -f ${COMOUT}/rrfs.t${cyc}z.${mem_num}.prslev.${gridspacing}.f${fhr}.${domain}.grib2
         for task in $(seq ${tasks[count]})
         do
           cat $DATAprdgen/prdgen_${domain}_${task}/${domain}_${task}.grib2 >> ${COMOUT}/rrfs.t${cyc}z.${mem_num}.prslev.${gridspacing}.f${fhr}.${domain}.grib2
         done
-        wgrib2 ${COMOUT}/rrfs.t${cyc}z.${mem_num}.prslev.f${fhr}.${domain}.grib2 -s > ${COMOUT}/rrfs.t${cyc}z.${mem_num}.prslev.${gridspacing}.f${fhr}.${domain}.grib2.idx
+        wgrib2 ${COMOUT}/rrfs.t${cyc}z.${mem_num}.prslev.${gridspacing}.f${fhr}.${domain}.grib2 -s > ${COMOUT}/rrfs.t${cyc}z.${mem_num}.prslev.${gridspacing}.f${fhr}.${domain}.grib2.idx
       else
+        [[ -f ${COMOUT}/rrfs.t${cyc}z.prslev.${gridspacing}.f${fhr}.${domain}.grib2 ]]&& rm -f ${COMOUT}/rrfs.t${cyc}z.prslev.${gridspacing}.f${fhr}.${domain}.grib2
         for task in $(seq ${tasks[count]})
         do
           cat $DATAprdgen/prdgen_${domain}_${task}/${domain}_${task}.grib2 >> ${COMOUT}/rrfs.t${cyc}z.prslev.${gridspacing}.f${fhr}.${domain}.grib2
         done
-        wgrib2 ${COMOUT}/rrfs.t${cyc}z.prslev.f${fhr}.${domain}.grib2 -s > ${COMOUT}/rrfs.t${cyc}z.prslev.${gridspacing}.f${fhr}.${domain}.grib2.idx
+        wgrib2 ${COMOUT}/rrfs.t${cyc}z.prslev.${gridspacing}.f${fhr}.${domain}.grib2 -s > ${COMOUT}/rrfs.t${cyc}z.prslev.${gridspacing}.f${fhr}.${domain}.grib2.idx
       fi
       count=$count+1
     done
@@ -429,7 +431,7 @@ else
             wgrib2 ${infile} -set_bitmap 1 -set_grib_type c3 -new_grid_winds grid \
              -new_grid_vectors "UGRD:VGRD:USTM:VSTM:VUCSH:VVCSH" \
              -new_grid_interpolation neighbor \
-	     -if ":(AEMFLX):" -new_grid_interpolation bilinear -fi \
+             -if ":(AEMFLX):" -new_grid_interpolation bilinear -fi \
              -new_grid ${grid_specs} ${subdir}/${fhr}/tmp_${grid}.grib2
           fi
 
diff --git a/scripts/exrrfs_prep_cyc.sh b/scripts/exrrfs_prep_cyc.sh
index 621362b64..d30aba23d 100755
--- a/scripts/exrrfs_prep_cyc.sh
+++ b/scripts/exrrfs_prep_cyc.sh
@@ -123,14 +123,21 @@ YYJJJ00000000=`date +"%y%j00000000" -d "${START_DATE} 1 day ago"`
 YYJJJ1200=`date +"%y%j1200" -d "${START_DATE} 1 day ago"`
 YYJJJ2200000000=`date +"%y%j2200000000" -d "${START_DATE} 1 day ago"`
 #
+
+if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+  runcyc_path=${RUN}.${PDY}/${cyc}/${mem_num}
+else
+  runcyc_path=${RUN}.${PDY}/${cyc}
+fi
+
 #-----------------------------------------------------------------------
 #
 # Determine early exit for running blending vs 1 time step ensinit.
 #
 #-----------------------------------------------------------------------
 #
-run_blending=${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/run_blending
-run_ensinit=${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/run_ensinit
+run_blending=${GESROOT}/${runcyc_path}/run_blending
+run_ensinit=${GESROOT}/${runcyc_path}/run_ensinit
 if [[ $CYCLE_SUBTYPE == "ensinit" && -e $run_blending && ! -e $run_ensinit ]]; then
    echo "clean exit ensinit, blending used instead of ensinit."
    exit 0
@@ -145,7 +152,8 @@ fi
 #
 if [ "${DO_ENSFCST}" = "TRUE" ] &&  [ "${DO_ENKFUPDATE}" = "TRUE" ]; then
   cd ${INPUT_DATA}
-  bkpath=${FG_ROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/forecast/DA_OUTPUT  # use DA analysis from DA_OUTPUT
+  bkpath=${FG_ROOT}/enkfrrfs.${PDY}/${cyc}/${mem_num}/forecast/DA_OUTPUT  # use DA analysis from DA_OUTPUT
+
   filelistn="fv_core.res.tile1.nc fv_srf_wnd.res.tile1.nc fv_tracer.res.tile1.nc phy_data.nc sfc_data.nc"
   checkfile=${bkpath}/coupler.res
   n_iolayouty=$(($IO_LAYOUT_Y-1))
@@ -342,8 +350,8 @@ else
   if [ "${CYCLE_SUBTYPE}" = "spinup" ] ; then
     # point to the 0-h cycle for the warm start from the 1 timestep restart files
     fg_restart_dirname=forecast_ensinit
-    bkpath=${FG_ROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/${fg_restart_dirname}/RESTART  # cycling, use background from RESTART
-    ctrl_bkpath=${FG_ROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/forecast_spinup/INPUT
+    bkpath=${FG_ROOT}/${runcyc_path}/${fg_restart_dirname}/RESTART  # cycling, use background from RESTART
+    ctrl_bkpath=${FG_ROOT}/${runcyc_path}/forecast_spinup/INPUT
   else
     YYYYMMDDHHmInterv=$( date +%Y%m%d%H -d "${START_DATE} ${DA_CYCLE_INTERV} hours ago" )
     YYYYMMDDInterv=`echo ${YYYYMMDDHHmInterv} | cut -c1-8`
@@ -444,7 +452,7 @@ else
       done
     fi
     if [ "${CYCLE_SUBTYPE}" = "spinup" ] ; then
-      cpreq -p ${FG_ROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/${fg_restart_dirname}/INPUT/gfs_ctrl.nc  gfs_ctrl.nc
+      cpreq -p ${FG_ROOT}/${runcyc_path}/${fg_restart_dirname}/INPUT/gfs_ctrl.nc  gfs_ctrl.nc
     else
       if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
         cpreq -p ${FG_ROOT}/${RUN}.${YYYYMMDDInterv}/${HHInterv}/${mem_num}/${fg_restart_dirname}/INPUT/gfs_ctrl.nc  gfs_ctrl.nc
@@ -568,7 +576,7 @@ if [ ${HH} -eq ${SST_update_hour} ] && [ "${CYCLE_TYPE}" = "prod" ] ; then
    if [ -r "latest.SST" ]; then
      cpreq -p ${FIXam}/RTG_SST_landmask.dat               RTG_SST_landmask.dat
      ln -sf ./latest.SST                                  SSTRTG
-     cpreq -p ${FIX_GSI}/${PREDEF_GRID_NAME}/fv3_akbk     fv3_akbk
+     cpreq ${FIX_GSI}/${PREDEF_GRID_NAME}/fv3_akbk        fv3_akbk
 
 cat << EOF > sst.namelist
 &setup
diff --git a/scripts/exrrfs_process_smoke.sh b/scripts/exrrfs_process_smoke.sh
index b870a5cd8..2656cdf24 100755
--- a/scripts/exrrfs_process_smoke.sh
+++ b/scripts/exrrfs_process_smoke.sh
@@ -53,6 +53,7 @@ This is the script for the task that runs smoke emissions preprocessing.
 #
 #-----------------------------------------------------------------------
 #
+export GESROOT=${GESROOT}
 export rave_nwges_dir=${GESROOT}/RAVE_INTP
 mkdir -p "${rave_nwges_dir}"
 export hourly_hwpdir=${GESROOT}/HOURLY_HWP
diff --git a/scripts/exrrfs_recenter.sh b/scripts/exrrfs_recenter.sh
index 6f328da16..14987ada0 100755
--- a/scripts/exrrfs_recenter.sh
+++ b/scripts/exrrfs_recenter.sh
@@ -119,7 +119,11 @@ for imem in  $(seq 1 $nens)
   if [ "${CYCLE_TYPE}" = "spinup" ]; then
     bkpath=${DATAROOT}/${RUN}_forecast_spinup_m${ensmem}_${envir}_${cyc}/INPUT  # cycling, use background from RESTART
   else
-    bkpath=${DATAROOT}/${RUN}_forecast_m${ensmem}_${envir}_${cyc}/INPUT  # cycling, use background from RESTART
+    if [ ${DO_ENSFCST} = "TRUE" ] ; then
+      bkpath=${DATAROOT}/enkfrrfs_forecast_m${ensmem}_${envir}_${cyc}/INPUT
+    else
+      bkpath=${DATAROOT}/${RUN}_forecast_m${ensmem}_${envir}_${cyc}/INPUT  # cycling, use background from RESTART
+    fi
   fi
 
   dynvarfile=${bkpath}/fv_core.res.tile1.nc
@@ -160,18 +164,18 @@ cp -f ./fv3sar_tile1_mem001_sfcvar fv3sar_tile1_sfcvar
 #
 #-----------------------------------------------------------------------
 #
-dynvarfile_control=${ctrlpath}/rrfs_forecast_${envir}_${cyc}/INPUT/fv_core.res.tile1.nc
-tracerfile_control=${ctrlpath}/rrfs_forecast_${envir}_${cyc}/INPUT/fv_tracer.res.tile1.nc
-dynvarfile_control_spinup=${ctrlpath}/rrfs_forecast_spinup_${envir}_${cyc}/INPUT/fv_core.res.tile1.nc
-tracerfile_control_spinup=${ctrlpath}/rrfs_forecast_spinup_${envir}_${cyc}/INPUT/fv_tracer.res.tile1.nc
+dynvarfile_control=${ctrlpath}/rrfs.${PDY}/${cyc}/forecast/INPUT/fv_core.res.tile1.nc
+tracerfile_control=${ctrlpath}/rrfs.${PDY}/${cyc}/forecast/INPUT/fv_tracer.res.tile1.nc
+dynvarfile_control_spinup=${ctrlpath}/rrfs.${PDY}/${cyc}/forecast_spinup/INPUT/fv_core.res.tile1.nc
+tracerfile_control_spinup=${ctrlpath}/rrfs.${PDY}/${cyc}/forecast_spinup/INPUT/fv_tracer.res.tile1.nc
 if [ -r "${dynvarfile_control_spinup}" ] && [ -r "${tracerfile_control_spinup}" ] && [[ ${DO_ENSFCST} != "TRUE" ]] ; then
-  ln -sf ${ctrlpath}/rrfs_forecast_spinup_${envir}_${cyc}/INPUT/fv_core.res.tile1.nc  ./control_dynvar
-  ln -sf ${ctrlpath}/rrfs_forecast_spinup_${envir}_${cyc}/INPUT/fv_tracer.res.tile1.nc   ./control_tracer
-  ln -sf ${ctrlpath}/rrfs_forecast_spinup_${envir}_${cyc}/INPUT/sfc_data.nc  ./control_sfcvar
+  ln -sf ${ctrlpath}/rrfs.${PDY}/${cyc}/forecast_spinup/INPUT/fv_core.res.tile1.nc  ./control_dynvar
+  ln -sf ${ctrlpath}/rrfs.${PDY}/${cyc}/forecast_spinup/INPUT/fv_tracer.res.tile1.nc   ./control_tracer
+  ln -sf ${ctrlpath}/rrfs.${PDY}/${cyc}/forecast_spinup/INPUT/sfc_data.nc  ./control_sfcvar
 elif [ -r "${dynvarfile_control}" ] && [ -r "${tracerfile_control}" ] ; then
-  ln -sf ${ctrlpath}/rrfs_forecast_${envir}_${cyc}/INPUT/fv_core.res.tile1.nc  ./control_dynvar
-  ln -sf ${ctrlpath}/rrfs_forecast_${envir}_${cyc}/INPUT/fv_tracer.res.tile1.nc   ./control_tracer
-  ln -sf ${ctrlpath}/rrfs_forecast_${envir}_${cyc}/INPUT/sfc_data.nc  ./control_sfcvar
+  ln -sf ${ctrlpath}/rrfs.${PDY}/${cyc}/forecast/INPUT/fv_core.res.tile1.nc  ./control_dynvar
+  ln -sf ${ctrlpath}/rrfs.${PDY}/${cyc}/forecast/INPUT/fv_tracer.res.tile1.nc   ./control_tracer
+  ln -sf ${ctrlpath}/rrfs.${PDY}/${cyc}/forecast/INPUT/sfc_data.nc  ./control_sfcvar
 else
   err_exit "Cannot find background: ${dynvarfile_control} or ${dynvarfile_control_spinup}"
 fi
diff --git a/scripts/exrrfs_save_restart.sh b/scripts/exrrfs_save_restart.sh
index a3d181ccf..6ff987269 100755
--- a/scripts/exrrfs_save_restart.sh
+++ b/scripts/exrrfs_save_restart.sh
@@ -69,8 +69,15 @@ save_hh=${save_time:8:2}
 #
 #-----------------------------------------------------------------------
 #
-run_blending=${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/run_blending
-run_ensinit=${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/run_ensinit
+
+if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+  runcyc_path=${RUN}.${PDY}/${cyc}/${mem_num}
+else
+  runcyc_path=${RUN}.${PDY}/${cyc}
+fi
+
+run_blending=${GESROOT}/${runcyc_path}/run_blending
+run_ensinit=${GESROOT}/${runcyc_path}/run_ensinit
 if [[ ${CYCLE_SUBTYPE} == "ensinit" && -e $run_blending ]]; then
    echo "clean exit ensinit, blending used instead of ensinit."
    exit 0
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..3ebb41d8d 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
@@ -144,8 +144,8 @@ GFS_FILE_FMT_ICS="netcdf"
 GFS_FILE_FMT_LBCS="grib2"
 
 envir="para"
-NET="rrfs_a"
-MODEL="RRFS_A"
+NET="rrfs"
+MODEL="RRFS"
 
 if [[ ${DO_ENSEMBLE}  == "TRUE" ]]; then
    NUM_ENS_MEMBERS=30
@@ -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..b18712cca 100644
--- a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_n3
+++ b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_n3
@@ -118,11 +118,12 @@ EXTRN_MDL_NAME_LBCS="GFS"
 
 envir="para"
 
-NET="rrfs_a"
+NET="rrfs"
 TAG="n3v91"
 
-MODEL="rrfs_a"
+MODEL="rrfs"
 RUN="rrfs"
+WGF="det"
 
 . set_rrfs_config.sh
 
diff --git a/ush/set_FV3nml_ens_stoch_seeds.sh b/ush/set_FV3nml_ens_stoch_seeds.sh
index a3617c14f..ec2866f55 100644
--- a/ush/set_FV3nml_ens_stoch_seeds.sh
+++ b/ush/set_FV3nml_ens_stoch_seeds.sh
@@ -94,8 +94,8 @@ function set_FV3nml_ens_stoch_seeds() {
 #
   ensmem_name="mem${ENSMEM_INDX}"
 
-  fv3_nml_ensmem_fp_base="${run_dir}/input.nml_base"
-  fv3_nml_ensmem_fp="${run_dir}/input.nml"
+  fv3_nml_ensmem_fp_base="${DATA}/input.nml_base"
+  fv3_nml_ensmem_fp="${DATA}/input.nml"
 
   ensmem_num=$((10#${ENSMEM_INDX}))
 
diff --git a/ush/setup.sh b/ush/setup.sh
index 731d5da96..3e5d4097d 100755
--- a/ush/setup.sh
+++ b/ush/setup.sh
@@ -1289,7 +1289,7 @@ ENSCTRL_DATAROOT="${ENSCTRL_STMP}"
 COMROOT="${PTMP}/com"
 ENSCTRL_COMROOT="${ENSCTRL_PTMP}/com"
 ENSCTRL_COMOUT="${ENSCTRL_COMROOT}/${NET}/${rrfs_ver}/${RUN_ensctrl}.@Y@m@d"
-GESROOT="${PTMP}/nwges"
+GESROOT="${GESROOT:-${PTMP}/nwges}"
 LOG_BASEDIR="${PTMP}/logs"
 #
 #-----------------------------------------------------------------------