diff --git a/scripts/exregional_run_enkf.sh b/scripts/exregional_run_enkf.sh
index cb3b83caf..8dd97f98e 100755
--- a/scripts/exregional_run_enkf.sh
+++ b/scripts/exregional_run_enkf.sh
@@ -107,7 +107,7 @@ case $MACHINE in
 "JET")
   ulimit -s unlimited
   ulimit -a
-  APRUN="srun"
+  APRUN="srun --mem=0"
   ;;
 #
 "ODIN")
diff --git a/ush/config.sh.RRFS_CONUS_13km b/ush/config.sh.RRFS_CONUS_13km
index 731b7c315..9862fffa9 100644
--- a/ush/config.sh.RRFS_CONUS_13km
+++ b/ush/config.sh.RRFS_CONUS_13km
@@ -6,62 +6,8 @@ ACCOUNT="nrtrr"
 EXPT_BASEDIR="YourOwnSpace/rrfs.${version}"
 EXPT_SUBDIR="RRFS_CONUS_13km"
 
-if [[ -n $RESERVATION ]] ; then
-  ACCOUNT=rtrr
-  SERVICE_ACCOUNT=nrtrr
-  PARTITION_DEFAULT=kjet
-  PARTITION_FCST=kjet
-  PARTITION_GRAPHICS=kjet
-  PARTITION_ANALYSIS=kjet
-  PARTITION_WGRIB2=kjet
-  PARTITION_POST=kjet
-  QUEUE_DEFAULT="rth"
-  QUEUE_FCST="rth"
-  QUEUE_ANALYSIS="rth"
-  QUEUE_WGRIB2="rt"
-  QUEUE_GRAPHICS="rt"
-  QUEUE_HPSS="rt"
-  QUEUE_POST="rt"
-  RESERVATION_POST="rrfsdet"
-fi
-
-if [[ $MACHINE == "hera" ]] ; then
-  ACCOUNT="wrfruc"
-  PARTITION_DEFAULT=""
-  PARTITION_FCST=""
-  QUEUE_ANALYSIS="batch"
-  QUEUE_WGRIB2="batch"
-  QUEUE_GRAPHICS="batch"
-fi
-
-if [[ $MACHINE == "orion" ]] ; then
-  ACCOUNT=wrfruc
-  QUEUE_ANALYSIS="batch"
-  QUEUE_WGRIB2="batch"
-  QUEUE_GRAPHICS="batch"
-  QUEUE_POST="batch"
-  NCORES_PER_NODE=24
-fi
-
-if [[ $MACHINE == "wcoss2" ]] ; then
-  ACCOUNT=RRFS-DEV
-  QUEUE_DEFAULT="dev"
-  QUEUE_ANALYSIS="dev"
-  QUEUE_FCST="dev"
-  QUEUE_HPSS="dev_transfer"
-  QUEUE_WGRIB2="dev"
-  QUEUE_GRAPHICS="dev"
-fi
-
-VERBOSE="TRUE"
-
-RUN_ENVIR="nco"
-
 PREDEF_GRID_NAME=RRFS_CONUS_13km
-ADDNL_OUTPUT_GRIDS=()
-
-TILE_LABELS="CONUS REGIONS"
-TILE_SETS="full NE,NC,NW,SE,SC,SW"
+. set_rrfs_config_temp.sh
 
 DO_DACYCLE="TRUE"
 DO_SURFACE_CYCLE="TRUE"
@@ -81,8 +27,12 @@ DO_SOIL_ADJUST="TRUE"
 DO_RADDA="FALSE"
 DO_BUFRSND="FALSE"
 
-QUILTING="TRUE"
-CCPP_PHYS_SUITE="FV3_HRRR"
+NET="rrfs_b"
+TAG="RRFS_CONUS_13km"
+ARCHIVEDIR="/1year/BMC/wrfruc/rrfs_dev1"
+NCL_REGION="conus"
+MODEL="RRFS_conus_13km"
+RUN="rrfs_conus_13km"
 
 EXTRN_MDL_ICS_OFFSET_HRS="3"
 LBC_SPEC_INTVL_HRS="1"
@@ -132,146 +82,13 @@ RESTART_INTERVAL="1"
 SST_update_hour=01
 GVF_update_hour=04
 SNOWICE_update_hour=00
-netcdf_diag=.true.
-binary_diag=.false.
 SOIL_SURGERY_time=2022020704
 
-DT_ATMOS=60
-NCORES_RUN_ANAL=360
-NCORES_RUN_OBSERVER=80
-HYBENSMEM_NMIN=66
-HALO_BLEND=20
-IO_LAYOUT_Y=1
-PPN_RUN_REF2TTEN=1
-PPN_RUN_NONVARCLDANL=${IO_LAYOUT_Y}
 regional_ensemble_option=5
 
-MAXTRIES_MAKE_ICS="3"
-MAXTRIES_MAKE_LBCS="3"
-MAXTRIES_RUN_PREPSTART="3"
-MAXTRIES_RUN_FCST="3"
-MAXTRIES_ANAL_GSI="3"
-MAXTRIES_CLDANL_NONVAR="3"
-MAXTRIES_RUN_POST="3"
-MAXTRIES_RUN_PRDGEN="3"
-
-WTIME_RUN_FCST="00:45:00"
-WTIME_RUN_FCST_LONG="03:45:00"
-WTIME_MAKE_LBCS="02:00:00"
-WTIME_RUN_ANAL="00:50:00"
-WTIME_RUN_PREPSTART="00:20:00"
-
-START_TIME_SPINUP="02:10:00"
-START_TIME_PROD="08:20:00"
-START_TIME_LATE_ANALYSIS="08:40:00"
-
-PRINT_DIFF_PGR="TRUE"
-
-if [[ -n $RESERVATION ]] ; then
-  NNODES_MAKE_ICS="3"
-  PPN_MAKE_ICS="20"
-  NNODES_MAKE_LBCS="3"
-  PPN_MAKE_LBCS="20"
-  NNODES_RUN_POST="1"
-  PPN_RUN_POST="40"
-fi
-
 EXTRN_MDL_NAME_ICS="FV3GFS"
 EXTRN_MDL_NAME_LBCS="FV3GFS"
 
-FV3GFS_FILE_FMT_ICS="grib2"
-FV3GFS_FILE_FMT_LBCS="grib2"
-
-envir="para"
-
-NET="rrfs_b"
-TAG="RRFS_CONUS_13km"
-
-USE_CUSTOM_POST_CONFIG_FILE="TRUE"
-TESTBED_FIELDS_FN="testbed_fields_bgdawp.txt"
-TESTBED_FIELDS_FN2="testbed_fields_bgrd3d.txt"
-CUSTOM_POST_CONFIG_FP="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." &>/dev/null&&pwd)/fix/upp/postxconfig-NT-fv3lam_rrfs.txt"
-CUSTOM_POST_PARAMS_FP="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." &>/dev/null&&pwd)/fix/upp/params_grib2_tbl_new"
-ARCHIVEDIR="/1year/BMC/wrfruc/rrfs_dev1"
-NCARG_ROOT="/apps/ncl/6.5.0-CentOS6.10_64bit_nodap_gnu447"
-NCL_HOME="/home/rtrr/RRFS/graphics"
-NCL_REGION="conus"
-MODEL="RRFS_conus_13km"
-
-#
-# In NCO mode, the following don't need to be explicitly set to "FALSE" 
-# in this configuration file because the experiment generation script
-# will do this (along with printing out an informational message).
-#
-#RUN_TASK_MAKE_GRID="FALSE"
-#RUN_TASK_MAKE_OROG="FALSE"
-#RUN_TASK_MAKE_SFC_CLIMO="FALSE"
-
-if [[ $MACHINE == "wcoss2" ]] ; then
-  LAYOUT_X="48"
-  LAYOUT_Y="40"
-  PPN_MAKE_ICS="32"
-  PPN_MAKE_LBCS="64"
-  NNODES_MAKE_ICS="2"
-  NNODES_MAKE_LBCS="1"
-  PPN_RUN_ANAL="32"
-  NNODES_RUN_ANAL="10"
-  PPN_RUN_FCST="64"
-  NNODES_RUN_FCST="31"
-  PPN_RUN_POST="64"
-  NNODES_RUN_POST="1"
-  PPN_PROC_RADAR="64"
-  NNODES_PROC_RADAR="1"
-
-  MAXTRIES_MAKE_ICS="2"
-  MAXTRIES_MAKE_LBCS="2"
-  MAXTRIES_RUN_PREPSTART="2"
-  MAXTRIES_RUN_FCST="2"
-  MAXTRIES_ANAL_GSI="2"
-  MAXTRIES_ANAL_ENKF="2"
-  MAXTRIES_RUN_POST="2"
-  MAXTRIES_RUN_PRDGEN="2"
-  MAXTRIES_ANAL_GSI="2"
-
-  FV3GFS_FILE_FMT_ICS="netcdf"
-  FV3GFS_FILE_FMT_LBCS="netcdf"
-fi
-
-if [[ $MACHINE == "orion" ]] ; then
-  LAYOUT_X="30"
-  LAYOUT_Y="40"
-  PPN_RUN_FCST="40"
-  WTIME_RUN_PRDGEN="00:20:00"
-fi
-
-if [[ ${PREDEF_GRID_NAME}=="RRFS_CONUS_13km" ]] ; then
-  NNODES_MAKE_ICS="1"
-  NNODES_MAKE_LBCS="1"
-  NNODES_RUN_POST="1"
-  NCORES_RUN_ANAL=60
-  NATIVE_RUN_ANAL="--cpus-per-task 4 --exclusive"
-
-  DT_ATMOS=120
-  LAYOUT_X=12
-  LAYOUT_Y=6
-
-  PPN_MAKE_ICS="20"
-  PPN_MAKE_LBCS="20"
-  NNODES_MAKE_ICS="1"
-  NNODES_MAKE_LBCS="1"
-  PPN_RUN_ANAL="20"
-  NNODES_RUN_ANAL="3"
-  PPN_RUN_FCST="20"
-  NNODES_RUN_FCST="3"
-  PPN_RUN_POST="20"
-  NNODES_RUN_POST="1"
-  PPN_PROC_RADAR="40"
-  NNODES_PROC_RADAR="1"
-fi
-
-RUN="RRFS_conus_13km"
-COMINgfs=""
-
 . set_rrfs_config.sh
 
 STMP="YourOwnSpace/${version}/stmp"  # Path to directory STMP that mostly contains input files.
@@ -280,18 +97,7 @@ NWGES="YourOwnSpace/${version}/nwges/${envir}/${NET}"  # Path to directory NWGES
 if [[ ${regional_ensemble_option} == "5" ]]; then
   RRFSE_NWGES="YourOwnSpace/${version}/nwges/${envir}/${NET}"  # Path to RRFSE directory NWGES that mostly contains ensemble restart files for GSI hybrid.
   NUM_ENS_MEMBERS=30     # FV3LAM ensemble size for GSI hybrid analysis
-  CYCL_HRS_PRODSTART_ENS=("19")
+  CYCL_HRS_PRODSTART_ENS=("07" "19")
   DO_ENVAR_RADAR_REF="TRUE"
 fi
 
-
-if [[ ${DO_ENSEMBLE}  == "TRUE" ]]; then
-   NUM_ENS_MEMBERS=30
-#   DO_SPPT=TRUE
-#   SPPT_MAG=0.5
-#   DO_ENSCONTROL="TRUE"
-   DO_GSIOBSERVER="TRUE"
-   DO_ENKFUPDATE="TRUE"
-   ARCHIVEDIR="/5year/BMC/wrfruc/rrfs_ens"
-fi
-
diff --git a/ush/config.sh.RRFS_CONUS_13km_ens b/ush/config.sh.RRFS_CONUS_13km_ens
index e74bab22d..77fe18654 100644
--- a/ush/config.sh.RRFS_CONUS_13km_ens
+++ b/ush/config.sh.RRFS_CONUS_13km_ens
@@ -1,106 +1,60 @@
-MACHINE="hera"
+MACHINE="jet"
 version="v0.3.1"
-ACCOUNT="nrtrr"
-#RESERVATION="rrfsdet"
-#RESERVATION_POST="rrfsdet"
-EXPT_BASEDIR="YourOwnSpace/rrfs.${version}"
+ACCOUNT="wrfruc"
+RESERVATION="rrfsens"
+RESERVATION_POST="rrfsdet"
+EXPT_BASEDIR="/misc/whome/wrfruc/RRFSE/rrfs.${version}"
 EXPT_SUBDIR="RRFS_CONUS_13km_ens"
 
-if [[ -n $RESERVATION ]] ; then
-  ACCOUNT=rtrr
-  SERVICE_ACCOUNT=nrtrr
-  PARTITION_DEFAULT=kjet
-  PARTITION_FCST=kjet
-  PARTITION_GRAPHICS=kjet
-  PARTITION_ANALYSIS=kjet
-  PARTITION_WGRIB2=kjet
-  PARTITION_POST=kjet
-  QUEUE_DEFAULT="rth"
-  QUEUE_FCST="rth"
-  QUEUE_ANALYSIS="rth"
-  QUEUE_WGRIB2="rt"
-  QUEUE_GRAPHICS="rt"
-  QUEUE_HPSS="rt"
-  QUEUE_POST="rt"
-  RESERVATION_POST="rrfsdet"
-fi
-
-if [[ $MACHINE == "hera" ]] ; then
-  ACCOUNT="wrfruc"
-  PARTITION_DEFAULT=""
-  PARTITION_FCST=""
-  QUEUE_ANALYSIS="batch"
-  QUEUE_WGRIB2="batch"
-  QUEUE_GRAPHICS="batch"
-fi
-
-if [[ $MACHINE == "orion" ]] ; then
-  ACCOUNT=wrfruc
-  QUEUE_ANALYSIS="batch"
-  QUEUE_WGRIB2="batch"
-  QUEUE_GRAPHICS="batch"
-  QUEUE_POST="batch"
-  NCORES_PER_NODE=24
-fi
-
-if [[ $MACHINE == "wcoss2" ]] ; then
-  ACCOUNT=RRFS-DEV
-  QUEUE_DEFAULT="dev"
-  QUEUE_ANALYSIS="dev"
-  QUEUE_FCST="dev"
-  QUEUE_HPSS="dev_transfer"
-  QUEUE_WGRIB2="dev"
-  QUEUE_GRAPHICS="dev"
-fi
-
-VERBOSE="TRUE"
-
-RUN_ENVIR="nco"
-
 PREDEF_GRID_NAME=RRFS_CONUS_13km
-ADDNL_OUTPUT_GRIDS=()
-
-TILE_LABELS="CONUS REGIONS"
-TILE_SETS="full NE,NC,NW,SE,SC,SW"
+. set_rrfs_config_temp.sh
 
 DO_ENSEMBLE="TRUE"
+#DO_ENSFCST="TRUE"
 #DO_DACYCLE="TRUE"
 #DO_SURFACE_CYCLE="TRUE"
 DO_SPINUP="TRUE"
-#DO_POST_SPINUP="TRUE"
+DO_POST_SPINUP="TRUE"
 DO_POST_PROD="TRUE"
-DO_RETRO="TRUE"
+#DO_RETRO="TRUE"
 DO_NONVAR_CLDANAL="TRUE"
-#DO_ENVAR_RADAR_REF="TRUE"
-#DO_SMOKE_DUST="FALSE"
+DO_SMOKE_DUST="FALSE"
 #DO_REFL2TTEN="FALSE"
 #RADARREFL_TIMELEVEL=(0)
 #FH_DFI_RADAR="0.0,0.25,0.5"
 #DO_SOIL_ADJUST="TRUE"
 #DO_RADDA="FALSE"
-#DO_BUFRSND="FALSE"
 
-QUILTING="TRUE"
-CCPP_PHYS_SUITE="FV3_HRRR"
+NCL_REGION="conus"
+MODEL="RRFS_B"
+NET="RRFS_CONUS"
+TAG="RRFSE_CONUS_13km"
+RUN="rrfs_conus_13km_ensda"
+if [[ ${DO_ENSFCST} == "TRUE" ]]; then
+  RUN="rrfs_conus_13km_ensfcst"
+fi
 
 EXTRN_MDL_ICS_OFFSET_HRS="30"
 LBC_SPEC_INTVL_HRS="1"
 EXTRN_MDL_LBCS_OFFSET_HRS="6"
 BOUNDARY_LEN_HRS="6"
-BOUNDARY_LONG_LEN_HRS="24"
-BOUNDARY_PROC_GROUP_NUM="3"
+BOUNDARY_PROC_GROUP_NUM="10"
+
+WTIME_RUN_FCST="01:00:00"
+WTIME_MAKE_LBCS="02:00:00"
 
 # avaialble retro period:
 # 20210511-20210531; 20210718-20210801
-DATE_FIRST_CYCL="20220207"
-DATE_LAST_CYCL="20220208"
+DATE_FIRST_CYCL="20221110"
+DATE_LAST_CYCL="20221130"
 CYCL_HRS=( "00" "12" )
 CYCL_HRS=( "18" )
-CYCL_HRS_SPINSTART=("18")
-CYCL_HRS_PRODSTART=("19")
-#CYCL_HRS_STOCH=("00")
-CYCLEMONTH="2"
-CYCLEDAY="7-8"
+CYCL_HRS_SPINSTART=("06" "18")
+CYCL_HRS_PRODSTART=("07" "19")
+CYCL_HRS_STOCH=("00" "12")
+#CYCL_HRS_RECENTER=("19")
+CYCLEMONTH="11"
+CYCLEDAY="10-30"
 
 STARTYEAR=${DATE_FIRST_CYCL:0:4}
 STARTMONTH=${DATE_FIRST_CYCL:4:2}
@@ -112,144 +66,41 @@ ENDDAY=${DATE_LAST_CYCL:6:2}
 ENDHOUR="23"
 
 PREEXISTING_DIR_METHOD="upgrade" # "rename"
-INITIAL_CYCLEDEF="${DATE_FIRST_CYCL}1800 ${DATE_LAST_CYCL}2300 24:00:00"
-BOUNDARY_CYCLEDEF="${DATE_FIRST_CYCL}1800 ${DATE_LAST_CYCL}0000 06:00:00"
+INITIAL_CYCLEDEF="${DATE_FIRST_CYCL}0600 ${DATE_LAST_CYCL}2300 12:00:00"
+BOUNDARY_CYCLEDEF="${DATE_FIRST_CYCL}0600 ${DATE_LAST_CYCL}2300 06:00:00"
+PROD_CYCLEDEF="${DATE_FIRST_CYCL}0700 ${DATE_LAST_CYCL}2300 01:00:00"
 #RECENTER_CYCLEDEF="00 19 * 10 2022 *"
-PROD_CYCLEDEF="${DATE_FIRST_CYCL}1800 ${DATE_LAST_CYCL}2300 01:00:00"
 ARCHIVE_CYCLEDEF="${DATE_FIRST_CYCL}1500 ${DATE_LAST_CYCL}2300 24:00:00"
+if [[ ${DO_ENSFCST} == "TRUE" ]]; then
+  BOUNDARY_LEN_HRS="36"
+  DO_SPINUP="FALSE"
+  INITIAL_CYCLEDEF="00 01 01 01 2100 *"
+  PROD_CYCLEDEF="${DATE_FIRST_CYCL}1200 ${DATE_LAST_CYCL}2300 12:00:00"
+fi
 if [[ $DO_SPINUP == "TRUE" ]] ; then
-  SPINUP_CYCLEDEF="${DATE_FIRST_CYCL}1800 ${DATE_LAST_CYCL}2300 24:00:00"
+  SPINUP_CYCLEDEF="${DATE_FIRST_CYCL}0600 ${DATE_LAST_CYCL}2300 12:00:00"
 fi
 
 FCST_LEN_HRS="1"
 FCST_LEN_HRS_SPINUP="1"
 POSTPROC_LEN_HRS="1"
-POSTPROC_LONG_LEN_HRS="1"
 #FCST_LEN_HRS_CYCLES=(48 18 18 18 18 18 48 18 18 18 18 18 48 18 18 18 18 18 48 18 18 18 18 18)
 for i in {0..23}; do FCST_LEN_HRS_CYCLES[$i]=1; done
-for i in {0..23..3}; do FCST_LEN_HRS_CYCLES[$i]=1; done
-DA_CYCLE_INTERV="1"
-RESTART_INTERVAL="1"
-netcdf_diag=.true.
-binary_diag=.false.
-NFHOUT="3"
-NFHMAX_HF="12"
-
-DT_ATMOS=60
-NCORES_RUN_ANAL=60
-NCORES_RUN_OBSERVER=40
-HYBENSMEM_NMIN=66
-HALO_BLEND=20
-IO_LAYOUT_Y=1
-PPN_RUN_REF2TTEN=1
-PPN_RUN_NONVARCLDANL=${IO_LAYOUT_Y}
-
-MAXTRIES_GET_EXTRN_ICS="2"
-MAXTRIES_GET_EXTRN_LBCS="2"
-MAXTRIES_MAKE_ICS="2"
-MAXTRIES_MAKE_LBCS="2"
-MAXTRIES_RUN_PREPSTART="2"
-MAXTRIES_RUN_FCST="2"
-MAXTRIES_ANAL_GSI="2"
-MAXTRIES_CLDANL_NONVAR="2"
-MAXTRIES_ANAL_ENKF="2"
-MAXTRIES_RECENTER="2"
-MAXTRIES_SAVE_RESTART="2"
-MAXTRIES_PROCESS_BUFR="2"
-MAXTRIES_PROCESS_RADARREF="2"
-MAXTRIES_RUN_POST="2"
-MAXTRIES_RUN_PRDGEN="2"
-
-WTIME_RUN_FCST="00:30:00"
-WTIME_MAKE_LBCS="00:00:00"
-
-
-PRINT_DIFF_PGR="TRUE"
-
-if [[ -n $RESERVATION ]] ; then
-  NNODES_MAKE_ICS="3"
-  PPN_MAKE_ICS="20"
-  NNODES_MAKE_LBCS="3"
-  PPN_MAKE_LBCS="20"
-  NNODES_RUN_POST="1"
-  PPN_RUN_POST="40"
+if [[ ${DO_ENSFCST} == "TRUE" ]]; then
+  for i in {0..23..12}; do FCST_LEN_HRS_CYCLES[$i]=24; done 
+  POSTPROC_LEN_HRS="24"
+  WTIME_RUN_FCST="05:30:00"
 fi
 
 EXTRN_MDL_NAME_ICS="GEFS"
 EXTRN_MDL_NAME_LBCS="GEFS"
-EXTRN_MDL_SOURCE_BASEDIR_ICS="/scratch2/BMC/zrtrr/rli/data/GEFS/dsg"
-EXTRN_MDL_SOURCE_BASEDIR_LBCS="/scratch2/BMC/zrtrr/rli/data/GEFS/dsg"
-
-FV3GFS_FILE_FMT_ICS="grib2"
-FV3GFS_FILE_FMT_LBCS="grib2"
-
-envir="para"
-
-NET="rrfs_b"
-TAG="RRFSE_CONUS_13km"
+DA_CYCLE_INTERV="1"
+RESTART_INTERVAL="1"
 
-USE_CUSTOM_POST_CONFIG_FILE="TRUE"
-TESTBED_FIELDS_FN="testbed_fields_bgdawp.txt"
-TESTBED_FIELDS_FN2="testbed_fields_bgrd3d.txt"
-CUSTOM_POST_CONFIG_FP="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." &>/dev/null&&pwd)/fix/upp/postxconfig-NT-fv3lam_rrfs.txt"
-CUSTOM_POST_PARAMS_FP="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." &>/dev/null&&pwd)/fix/upp/params_grib2_tbl_new"
 ARCHIVEDIR="/1year/BMC/wrfruc/rrfs_dev1"
-NCARG_ROOT="/apps/ncl/6.5.0-CentOS6.10_64bit_nodap_gnu447"
-NCL_HOME="/home/rtrr/RRFS/graphics"
-NCL_REGION="conus"
-MODEL="RRFS_conus_13km"
-
-#
-# In NCO mode, the following don't need to be explicitly set to "FALSE" 
-# in this configuration file because the experiment generation script
-# will do this (along with printing out an informational message).
-#
-#RUN_TASK_MAKE_GRID="FALSE"
-#RUN_TASK_MAKE_OROG="FALSE"
-#RUN_TASK_MAKE_SFC_CLIMO="FALSE"
-
-if [[ $MACHINE == "wcoss2" ]] ; then
-  LAYOUT_X="48"
-  LAYOUT_Y="40"
-  PPN_MAKE_ICS="32"
-  PPN_MAKE_LBCS="64"
-  NNODES_MAKE_ICS="2"
-  NNODES_MAKE_LBCS="1"
-  PPN_RUN_ANAL="32"
-  NNODES_RUN_ANAL="10"
-  PPN_RUN_FCST="64"
-  NNODES_RUN_FCST="31"
-  PPN_RUN_POST="64"
-  NNODES_RUN_POST="1"
-  PPN_PROC_RADAR="64"
-  NNODES_PROC_RADAR="1"
-
-  MAXTRIES_MAKE_ICS="2"
-  MAXTRIES_MAKE_LBCS="2"
-  MAXTRIES_RUN_PREPSTART="2"
-  MAXTRIES_RUN_FCST="2"
-  MAXTRIES_ANAL_GSI="2"
-  MAXTRIES_ANAL_ENKF="2"
-  MAXTRIES_RUN_POST="2"
-  MAXTRIES_RUN_PRDGEN="2"
-  MAXTRIES_ANAL_GSI="2"
-
-  FV3GFS_FILE_FMT_ICS="netcdf"
-  FV3GFS_FILE_FMT_LBCS="netcdf"
-fi
-
-if [[ $MACHINE == "orion" ]] ; then
-  LAYOUT_X="30"
-  LAYOUT_Y="40"
-  PPN_RUN_FCST="40"
-  WTIME_RUN_PRDGEN="00:20:00"
-fi
 
 if [[ ${DO_ENSEMBLE}  == "TRUE" ]]; then
    NUM_ENS_MEMBERS=30
-#   DO_SPPT=TRUE
-   DO_SPP=TRUE
-#   SPPT_MAG=0.5
 #   DO_ENSCONTROL="TRUE"
    DO_GSIOBSERVER="TRUE"
    DO_ENKFUPDATE="TRUE"
@@ -258,8 +109,13 @@ if [[ ${DO_ENSEMBLE}  == "TRUE" ]]; then
    DO_ENKF_RADAR_REF="TRUE"
    DO_ENSPOST="TRUE"
    DO_ENSINIT="TRUE"
-   DO_ENSFCST="FALSE"
    NUM_ENS_MEMBERS_FCST=9
+   if [[ ${DO_ENSFCST} == "TRUE" ]]; then
+     NUM_ENS_MEMBERS=${NUM_ENS_MEMBERS_FCST}
+#     DO_SPPT=TRUE
+     DO_SPP=TRUE
+#     SPPT_MAG=0.5
+   fi
    RADAR_REF_THINNING="2"
    ARCHIVEDIR="/5year/BMC/wrfruc/rrfs_ens"
    NNODES_RUN_RECENTER="3"
@@ -271,41 +127,15 @@ if [[ ${DO_ENSEMBLE}  == "TRUE" ]]; then
    write_diag_2=.true.
 fi
 
-if [[ ${PREDEF_GRID_NAME}=="RRFS_CONUS_13km" ]] ; then
-  NNODES_MAKE_ICS="1"
-  NNODES_MAKE_LBCS="1"
-  NNODES_RUN_POST="1"
-  NCORES_RUN_ANAL=60
-  NATIVE_RUN_ANAL="--cpus-per-task 4 --exclusive"
-
-  DT_ATMOS=120
-  LAYOUT_X=12
-  LAYOUT_Y=6
-
-  PPN_MAKE_ICS="20"
-  PPN_MAKE_LBCS="20"
-  NNODES_MAKE_ICS="1"
-  NNODES_MAKE_LBCS="1"
-  PPN_RUN_ANAL="20"
-  NNODES_RUN_ANAL="3"
-  PPN_RUN_FCST="20"
-  NNODES_RUN_FCST="3"
-  PPN_RUN_POST="20"
-  NNODES_RUN_POST="1"
-  PPN_PROC_RADAR="40"
-  NNODES_PROC_RADAR="1"
-fi
-
-RUN="RRFS_conus_13km"
-COMINgfs=""
-
 . set_rrfs_config.sh
 
-STMP="YourOwnSpace/${version}/stmp"  # Path to directory STMP that mostly contains input files.
-PTMP="YourOwnSpace/${version}"  # Path to directory STMP that mostly contains input files.
-NWGES="YourOwnSpace/${version}/nwges"  # Path to directory NWGES that save boundary, cold initial, restart files
-ENSCTRL_STMP="YourOwnSpace/${version}/stmp"  # Path to directory STMP that mostly contains control input files for ensemble recentering.
-ENSCTRL_PTMP="YourOwnSpace/${version}"  # Path to directory STMP that mostly contains control input files for ensemble recentering.
-ENSCTRL_NWGES="YourOwnSpace/${version}/nwges"  # Path to directory STMP that mostly contains control input files for ensemble recentering.
-
+STMP="/mnt/lfs4/BMC/wrfruc/RRFSE/${version}/stmp"  # Path to directory STMP that mostly contains input files.
+if [[ ${DO_ENSFCST} == "TRUE" ]]; then
+  STMP="/mnt/lfs4/BMC/wrfruc/RRFSE/${version}/stmp_ensfcst"  # Path to directory STMP that mostly contains input files.
+fi
+PTMP="/mnt/lfs4/BMC/wrfruc/RRFSE/${version}"  # Path to directory STMP that mostly contains input files.
+NWGES="/mnt/lfs4/BMC/wrfruc/RRFSE/${version}/nwges"  # Path to directory NWGES that save boundary, cold initial, restart files
+ENSCTRL_STMP="/mnt/lfs4/BMC/nrtrr/${version}/stmp"  # Path to directory STMP that mostly contains control input files for ensemble recentering.
+ENSCTRL_PTMP="/mnt/lfs4/BMC/nrtrr/${version}"  # Path to directory STMP that mostly contains control input files for ensemble recentering.
+ENSCTRL_NWGES="/mnt/lfs4/BMC/nrtrr/${version}/nwges"  # Path to directory STMP that mostly contains control input files for ensemble recentering.
 
diff --git a/ush/config.sh.RRFS_CONUS_3km b/ush/config.sh.RRFS_CONUS_3km
index 32f2aaf33..e387bc7d1 100644
--- a/ush/config.sh.RRFS_CONUS_3km
+++ b/ush/config.sh.RRFS_CONUS_3km
@@ -6,62 +6,8 @@ ACCOUNT="nrtrr"
 EXPT_BASEDIR="YourOwnSpace/rrfs.${version}"
 EXPT_SUBDIR="RRFS_CONUS_3km"
 
-if [[ -n $RESERVATION ]] ; then
-  ACCOUNT=rtrr
-  SERVICE_ACCOUNT=rtrr
-  PARTITION_DEFAULT=kjet
-  PARTITION_FCST=kjet
-  PARTITION_GRAPHICS=kjet
-  PARTITION_ANALYSIS=kjet
-  PARTITION_WGRIB2=kjet
-  PARTITION_POST=kjet
-  QUEUE_DEFAULT="rth"
-  QUEUE_FCST="rth"
-  QUEUE_ANALYSIS="rth"
-  QUEUE_WGRIB2="rt"
-  QUEUE_GRAPHICS="rt"
-  QUEUE_HPSS="rt"
-  QUEUE_POST="rt"
-  RESERVATION_POST="rrfsdet"
-fi
-
-if [[ $MACHINE == "hera" ]] ; then
-  ACCOUNT="wrfruc"
-  PARTITION_DEFAULT=""
-  PARTITION_FCST=""
-  QUEUE_ANALYSIS="batch"
-  QUEUE_WGRIB2="batch"
-  QUEUE_GRAPHICS="batch"
-fi
-
-if [[ $MACHINE == "orion" ]] ; then
-  ACCOUNT=wrfruc
-  QUEUE_ANALYSIS="batch"
-  QUEUE_WGRIB2="batch"
-  QUEUE_GRAPHICS="batch"
-  QUEUE_POST="batch"
-  NCORES_PER_NODE=24
-fi
-
-if [[ $MACHINE == "wcoss2" ]] ; then
-  ACCOUNT=RRFS-DEV
-  QUEUE_DEFAULT="dev"
-  QUEUE_ANALYSIS="dev"
-  QUEUE_FCST="dev"
-  QUEUE_HPSS="dev_transfer"
-  QUEUE_WGRIB2="dev"
-  QUEUE_GRAPHICS="dev"
-fi
-
-VERBOSE="TRUE"
-
-RUN_ENVIR="nco"
-
 PREDEF_GRID_NAME=RRFS_CONUS_3km
-ADDNL_OUTPUT_GRIDS=()
-
-TILE_LABELS="CONUS REGIONS"
-TILE_SETS="full NE,NC,NW,SE,SC,SW"
+. set_rrfs_config_temp.sh
 
 DO_DACYCLE="TRUE"
 DO_SURFACE_CYCLE="TRUE"
@@ -81,8 +27,12 @@ DO_SOIL_ADJUST="TRUE"
 DO_RADDA="FALSE"
 DO_BUFRSND="FALSE"
 
-QUILTING="TRUE"
-CCPP_PHYS_SUITE="FV3_HRRR"
+NET="rrfs_b"
+TAG="RRFS_CONUS_3km"
+ARCHIVEDIR="/1year/BMC/wrfruc/rrfs_b"
+NCL_REGION="conus"
+MODEL="RRFS_conus_3km"
+RUN="rrfs_conus_3km"
 
 EXTRN_MDL_ICS_OFFSET_HRS="3"
 LBC_SPEC_INTVL_HRS="1"
@@ -90,6 +40,10 @@ EXTRN_MDL_LBCS_OFFSET_HRS="6"
 BOUNDARY_LEN_HRS="18"
 BOUNDARY_PROC_GROUP_NUM="10"
 
+WTIME_RUN_FCST="00:45:00"
+WTIME_RUN_FCST_LONG="03:45:00"
+WTIME_MAKE_LBCS="02:00:00"
+
 # avaialble retro period:
 # 20210511-20210531; 20210718-20210801
 DATE_FIRST_CYCL="20220720"
@@ -132,121 +86,13 @@ RESTART_INTERVAL="1"
 SST_update_hour=01
 GVF_update_hour=04
 SNOWICE_update_hour=00
-netcdf_diag=.true.
-binary_diag=.false.
 SOIL_SURGERY_time=2022072404
 
-DT_ATMOS=60
-NCORES_RUN_ANAL=360
-NCORES_RUN_OBSERVER=80
-HYBENSMEM_NMIN=66
-HALO_BLEND=20
-IO_LAYOUT_Y=1
-PPN_RUN_REF2TTEN=1
-PPN_RUN_NONVARCLDANL=${IO_LAYOUT_Y}
 regional_ensemble_option=1   # 5 for RRFS ensemble
 
-MAXTRIES_MAKE_ICS="3"
-MAXTRIES_MAKE_LBCS="3"
-MAXTRIES_RUN_PREPSTART="3"
-MAXTRIES_RUN_FCST="3"
-MAXTRIES_ANAL_GSI="3"
-MAXTRIES_CLDANL_NONVAR="3"
-MAXTRIES_RUN_POST="3"
-MAXTRIES_RUN_PRDGEN="3"
-
-WTIME_RUN_FCST="00:45:00"
-WTIME_RUN_FCST_LONG="03:45:00"
-WTIME_MAKE_LBCS="02:00:00"
-WTIME_RUN_ANAL="00:50:00"
-WTIME_RUN_PREPSTART="00:20:00"
-
-START_TIME_SPINUP="02:10:00"
-START_TIME_PROD="08:20:00"
-START_TIME_LATE_ANALYSIS="08:40:00"
-
-PRINT_DIFF_PGR="TRUE"
-
-if [[ -n $RESERVATION ]] ; then
-  NNODES_MAKE_ICS="3"
-  PPN_MAKE_ICS="20"
-  NNODES_MAKE_LBCS="3"
-  PPN_MAKE_LBCS="20"
-  NNODES_RUN_POST="1"
-  PPN_RUN_POST="40"
-fi
-
 EXTRN_MDL_NAME_ICS="FV3GFS"
 EXTRN_MDL_NAME_LBCS="FV3GFS"
 
-FV3GFS_FILE_FMT_ICS="grib2"
-FV3GFS_FILE_FMT_LBCS="grib2"
-
-envir="para"
-
-NET="RRFS_CONUS"
-TAG="RRFS_CONUS_3km"
-
-USE_CUSTOM_POST_CONFIG_FILE="TRUE"
-TESTBED_FIELDS_FN="testbed_fields_bgdawp.txt"
-TESTBED_FIELDS_FN2="testbed_fields_bgrd3d.txt"
-CUSTOM_POST_CONFIG_FP="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." &>/dev/null&&pwd)/fix/upp/postxconfig-NT-fv3lam_rrfs.txt"
-CUSTOM_POST_PARAMS_FP="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." &>/dev/null&&pwd)/fix/upp/params_grib2_tbl_new"
-ARCHIVEDIR="/1year/BMC/wrfruc/rrfs_b"
-NCARG_ROOT="/apps/ncl/6.5.0-CentOS6.10_64bit_nodap_gnu447"
-NCL_HOME="/home/rtrr/RRFS/graphics"
-NCL_REGION="conus"
-MODEL="RRFS_conus_3km"
-
-#
-# In NCO mode, the following don't need to be explicitly set to "FALSE" 
-# in this configuration file because the experiment generation script
-# will do this (along with printing out an informational message).
-#
-#RUN_TASK_MAKE_GRID="FALSE"
-#RUN_TASK_MAKE_OROG="FALSE"
-#RUN_TASK_MAKE_SFC_CLIMO="FALSE"
-
-if [[ $MACHINE == "wcoss2" ]] ; then
-  LAYOUT_X="48"
-  LAYOUT_Y="40"
-  PPN_MAKE_ICS="32"
-  PPN_MAKE_LBCS="64"
-  NNODES_MAKE_ICS="2"
-  NNODES_MAKE_LBCS="1"
-  PPN_RUN_ANAL="32"
-  NNODES_RUN_ANAL="10"
-  PPN_RUN_FCST="64"
-  NNODES_RUN_FCST="31"
-  PPN_RUN_POST="64"
-  NNODES_RUN_POST="1"
-  PPN_PROC_RADAR="64"
-  NNODES_PROC_RADAR="1"
-
-  MAXTRIES_MAKE_ICS="2"
-  MAXTRIES_MAKE_LBCS="2"
-  MAXTRIES_RUN_PREPSTART="2"
-  MAXTRIES_RUN_FCST="2"
-  MAXTRIES_ANAL_GSI="2"
-  MAXTRIES_ANAL_ENKF="2"
-  MAXTRIES_RUN_POST="2"
-  MAXTRIES_RUN_PRDGEN="2"
-  MAXTRIES_ANAL_GSI="2"
-
-  FV3GFS_FILE_FMT_ICS="netcdf"
-  FV3GFS_FILE_FMT_LBCS="netcdf"
-fi
-
-if [[ $MACHINE == "orion" ]] ; then
-  LAYOUT_X="30"
-  LAYOUT_Y="40"
-  PPN_RUN_FCST="40"
-  WTIME_RUN_PRDGEN="00:20:00"
-fi
-
-RUN="RRFS_conus_3km"
-COMINgfs=""
-
 . set_rrfs_config.sh
 
 STMP="YourOwnSpace/${version}/stmp"  # Path to directory STMP that mostly contains input files.
@@ -260,13 +106,3 @@ if [[ ${regional_ensemble_option} == "5" ]]; then
 fi
 
 
-if [[ ${DO_ENSEMBLE}  == "TRUE" ]]; then
-   NUM_ENS_MEMBERS=30
-#   DO_SPPT=TRUE
-#   SPPT_MAG=0.5
-#   DO_ENSCONTROL="TRUE"
-   DO_GSIOBSERVER="TRUE"
-   DO_ENKFUPDATE="TRUE"
-   ARCHIVEDIR="/5year/BMC/wrfruc/rrfs_ens"
-fi
-
diff --git a/ush/config.sh.RRFS_CONUS_3km.2022HWT b/ush/config.sh.RRFS_CONUS_3km.2022HWT
index ce26cbc90..4c62bf1d7 100644
--- a/ush/config.sh.RRFS_CONUS_3km.2022HWT
+++ b/ush/config.sh.RRFS_CONUS_3km.2022HWT
@@ -5,62 +5,8 @@ RESERVATION="rrfsdet"
 EXPT_BASEDIR="/home/rtrr/RRFS/rrfs.${version}"
 EXPT_SUBDIR="RRFS_CONUS_3km"
 
-if [[ -n $RESERVATION ]] ; then
-  ACCOUNT=rtrr
-  SERVICE_ACCOUNT=rtrr
-  PARTITION_DEFAULT=kjet
-  PARTITION_FCST=kjet
-  PARTITION_GRAPHICS=kjet
-  PARTITION_ANALYSIS=kjet
-  PARTITION_WGRIB2=kjet
-  PARTITION_POST=kjet
-  QUEUE_DEFAULT="rth"
-  QUEUE_FCST="rth"
-  QUEUE_ANALYSIS="rth"
-  QUEUE_WGRIB2="rt"
-  QUEUE_GRAPHICS="rt"
-  QUEUE_HPSS="rt"
-  QUEUE_POST="rt"
-  RESERVATION_POST="rrfsdet"
-fi
-
-if [[ $MACHINE == "hera" ]] ; then
-  ACCOUNT="wrfruc"
-  PARTITION_DEFAULT=""
-  PARTITION_FCST=""
-  QUEUE_ANALYSIS="batch"
-  QUEUE_WGRIB2="batch"
-  QUEUE_GRAPHICS="batch"
-fi
-
-if [[ $MACHINE == "orion" ]] ; then
-  ACCOUNT=wrfruc
-  QUEUE_ANALYSIS="batch"
-  QUEUE_WGRIB2="batch"
-  QUEUE_GRAPHICS="batch"
-  QUEUE_POST="batch"
-  NCORES_PER_NODE=24
-fi
-
-if [[ $MACHINE == "wcoss2" ]] ; then
-  ACCOUNT=RRFS-DEV
-  QUEUE_DEFAULT="devhigh"
-  QUEUE_ANALYSIS="devmax"
-  QUEUE_FCST="devmax"
-  QUEUE_HPSS="dev_transfer"
-  QUEUE_WGRIB2="devhigh"
-  QUEUE_GRAPHICS="devhigh"
-fi
-
-VERBOSE="TRUE"
-
-RUN_ENVIR="nco"
-
 PREDEF_GRID_NAME=RRFS_CONUS_3km
-ADDNL_OUTPUT_GRIDS=()
-
-TILE_LABELS="CONUS REGIONS"
-TILE_SETS="full NE,NC,NW,SE,SC,SW"
+. set_rrfs_config_temp.sh
 
 DO_DACYCLE="TRUE"
 DO_SURFACE_CYCLE="TRUE"
@@ -78,9 +24,6 @@ DO_SOIL_ADJUST="TRUE"
 DO_RADDA="FALSE"
 DO_BUFRSND="FALSE"
 
-QUILTING="TRUE"
-CCPP_PHYS_SUITE="FV3_HRRR"
-
 EXTRN_MDL_ICS_OFFSET_HRS="3"
 LBC_SPEC_INTVL_HRS="1"
 EXTRN_MDL_LBCS_OFFSET_HRS="6"
@@ -135,25 +78,8 @@ SNOWICE_update_hour=00
 netcdf_diag=.true.
 binary_diag=.false.
 
-DT_ATMOS=60
-NCORES_RUN_ANAL=360
-NCORES_RUN_OBSERVER=80
-HYBENSMEM_NMIN=66
-HALO_BLEND=20
-IO_LAYOUT_Y=1
-PPN_RUN_REF2TTEN=1
-PPN_RUN_NONVARCLDANL=${IO_LAYOUT_Y}
 regional_ensemble_option=5
 
-MAXTRIES_MAKE_ICS="3"
-MAXTRIES_MAKE_LBCS="3"
-MAXTRIES_RUN_PREPSTART="3"
-MAXTRIES_RUN_FCST="3"
-MAXTRIES_ANAL_GSI="3"
-MAXTRIES_CLDANL_NONVAR="3"
-MAXTRIES_RUN_POST="3"
-MAXTRIES_RUN_PRDGEN="3"
-
 WTIME_RUN_FCST="00:45:00"
 WTIME_RUN_FCST_LONG="03:45:00"
 WTIME_MAKE_LBCS="02:00:00"
@@ -164,87 +90,17 @@ START_TIME_SPINUP="02:10:00"
 START_TIME_PROD="08:20:00"
 START_TIME_LATE_ANALYSIS="08:40:00"
 
-PRINT_DIFF_PGR="TRUE"
-
-if [[ -n $RESERVATION ]] ; then
-  NNODES_MAKE_ICS="3"
-  PPN_MAKE_ICS="20"
-  NNODES_MAKE_LBCS="3"
-  PPN_MAKE_LBCS="20"
-  NNODES_RUN_POST="1"
-  PPN_RUN_POST="40"
-fi
-
 EXTRN_MDL_NAME_ICS="FV3GFS"
 EXTRN_MDL_NAME_LBCS="FV3GFS"
 
-FV3GFS_FILE_FMT_ICS="grib2"
-FV3GFS_FILE_FMT_LBCS="grib2"
-
-envir="para"
-
 NET="RRFS_CONUS"
 TAG="RRFS_CONUS_3km"
 
-USE_CUSTOM_POST_CONFIG_FILE="TRUE"
-TESTBED_FIELDS_FN="testbed_fields_bgdawp.txt"
-TESTBED_FIELDS_FN2="testbed_fields_bgrd3d.txt"
-CUSTOM_POST_CONFIG_FP="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." &>/dev/null&&pwd)/fix/upp/postxconfig-NT-fv3lam_rrfs.txt"
-CUSTOM_POST_PARAMS_FP="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." &>/dev/null&&pwd)/fix/upp/params_grib2_tbl_new"
 ARCHIVEDIR="/1year/BMC/wrfruc/rrfs_b"
-NCARG_ROOT="/apps/ncl/6.5.0-CentOS6.10_64bit_nodap_gnu447"
-NCL_HOME="/home/rtrr/RRFS/graphics"
 NCL_REGION="conus"
 MODEL="RRFS_B"
 
-#
-# In NCO mode, the following don't need to be explicitly set to "FALSE" 
-# in this configuration file because the experiment generation script
-# will do this (along with printing out an informational message).
-#
-#RUN_TASK_MAKE_GRID="FALSE"
-#RUN_TASK_MAKE_OROG="FALSE"
-#RUN_TASK_MAKE_SFC_CLIMO="FALSE"
-
-if [[ $MACHINE == "wcoss2" ]] ; then
-  LAYOUT_X="48"
-  LAYOUT_Y="40"
-  PPN_MAKE_ICS="32"
-  PPN_MAKE_LBCS="64"
-  NNODES_MAKE_ICS="2"
-  NNODES_MAKE_LBCS="1"
-  PPN_RUN_ANAL="64"
-  NNODES_RUN_ANAL="10"
-  PPN_RUN_FCST="64"
-  NNODES_RUN_FCST="31"
-  PPN_RUN_POST="64"
-  NNODES_RUN_POST="1"
-  PPN_PROC_RADAR="64"
-  NNODES_PROC_RADAR="1"
-
-  MAXTRIES_MAKE_ICS="2"
-  MAXTRIES_MAKE_LBCS="2"
-  MAXTRIES_RUN_PREPSTART="2"
-  MAXTRIES_RUN_FCST="2"
-  MAXTRIES_ANAL_GSI="2"
-  MAXTRIES_ANAL_ENKF="2"
-  MAXTRIES_RUN_POST="2"
-  MAXTRIES_RUN_PRDGEN="2"
-  MAXTRIES_ANAL_GSI="2"
-
-  FV3GFS_FILE_FMT_ICS="netcdf"
-  FV3GFS_FILE_FMT_LBCS="netcdf"
-fi
-
-if [[ $MACHINE == "orion" ]] ; then
-  LAYOUT_X="30"
-  LAYOUT_Y="40"
-  PPN_RUN_FCST="40"
-  WTIME_RUN_PRDGEN="00:20:00"
-fi
-
 RUN="RRFS_conus_3km"
-COMINgfs=""
 
 . set_rrfs_config.sh
 
@@ -258,14 +114,3 @@ if [[ ${regional_ensemble_option} == "5" ]]; then
   DO_ENVAR_RADAR_REF="TRUE"
 fi
 
-
-if [[ ${DO_ENSEMBLE}  == "TRUE" ]]; then
-   NUM_ENS_MEMBERS=30
-#   DO_SPPT=TRUE
-#   SPPT_MAG=0.5
-#   DO_ENSCONTROL="TRUE"
-   DO_GSIOBSERVER="TRUE"
-   DO_ENKFUPDATE="TRUE"
-   ARCHIVEDIR="/5year/BMC/wrfruc/rrfs_ens"
-fi
-
diff --git a/ush/config.sh.RRFS_CONUS_3km_ens b/ush/config.sh.RRFS_CONUS_3km_ens
index a2b29b277..b6f4c7669 100644
--- a/ush/config.sh.RRFS_CONUS_3km_ens
+++ b/ush/config.sh.RRFS_CONUS_3km_ens
@@ -1,67 +1,13 @@
 MACHINE="jet"
 version="v0.3.1"
-ACCOUNT="nrtrr"
+ACCOUNT="wrfruc"
 RESERVATION="rrfsens"
 RESERVATION_POST="rrfsdet"
 EXPT_BASEDIR="/misc/whome/wrfruc/RRFSE/rrfs.${version}"
 EXPT_SUBDIR="RRFS_CONUS_3km_ens"
 
-if [[ -n $RESERVATION ]] ; then
-  ACCOUNT=rtwrfruc
-  SERVICE_ACCOUNT=rtrr
-  PARTITION_DEFAULT=kjet
-  PARTITION_FCST=kjet
-  PARTITION_GRAPHICS=kjet
-  PARTITION_ANALYSIS=kjet
-  PARTITION_WGRIB2=kjet
-  QUEUE_DEFAULT="rth"
-  QUEUE_FCST="rth"
-  QUEUE_ANALYSIS="rth"
-  QUEUE_WGRIB2="rt"
-  QUEUE_GRAPHICS="rt"
-  QUEUE_HPSS="rt"
-  if [[ -n ${RESERVATION_POST} ]] ; then
-    QUEUE_POST="rt"
-  fi
-fi
-
-if [[ $MACHINE == "hera" ]] ; then
-  ACCOUNT="wrfruc"
-  PARTITION_DEFAULT=""
-  PARTITION_FCST=""
-  QUEUE_ANALYSIS="batch"
-  QUEUE_WGRIB2="batch"
-  QUEUE_GRAPHICS="batch"
-fi
-
-if [[ $MACHINE == "orion" ]] ; then
-  ACCOUNT=wrfruc
-  QUEUE_ANALYSIS="batch"
-  QUEUE_WGRIB2="batch"
-  QUEUE_GRAPHICS="batch"
-  QUEUE_POST="batch"
-  NCORES_PER_NODE=24
-fi
-
-if [[ $MACHINE == "wcoss2" ]] ; then
-  ACCOUNT=RRFS-DEV
-  QUEUE_DEFAULT="devhigh"
-  QUEUE_ANALYSIS="devmax"
-  QUEUE_FCST="devmax"
-  QUEUE_HPSS="dev_transfer"
-  QUEUE_WGRIB2="devhigh"
-  QUEUE_GRAPHICS="devhigh"
-fi
-
-VERBOSE="TRUE"
-
-RUN_ENVIR="nco"
-
 PREDEF_GRID_NAME=RRFS_CONUS_3km
-ADDNL_OUTPUT_GRIDS=()
-
-TILE_LABELS="CONUS REGIONS"
-TILE_SETS="full NE,NC,NW,SE,SC,SW"
+. set_rrfs_config_temp.sh
 
 DO_ENSEMBLE="TRUE"
 #DO_ENSFCST="TRUE"
@@ -69,8 +15,8 @@ DO_ENSEMBLE="TRUE"
 #DO_SURFACE_CYCLE="TRUE"
 DO_SPINUP="TRUE"
 DO_SAVE_INPUT="TRUE"
-DO_POST_SPINUP="FALSE"
-DO_POST_PROD="FALSE"
+DO_POST_SPINUP="TRUE"
+DO_POST_PROD="TRUE"
 #DO_RETRO="TRUE"
 DO_NONVAR_CLDANAL="TRUE"
 DO_SMOKE_DUST="FALSE"
@@ -86,8 +32,14 @@ if [[ ${DO_ENSFCST} == "TRUE" ]] ; then
   DO_POST_PROD="TRUE"
 fi
 
-QUILTING="TRUE"
-CCPP_PHYS_SUITE="FV3_HRRR"
+NCL_REGION="conus"
+MODEL="RRFS_B"
+NET="RRFS_CONUS"
+TAG="RRFSE_CONUS_3km"
+RUN="rrfs_conus_3km_ensda"
+if [[ ${DO_ENSFCST} == "TRUE" ]]; then
+  RUN="rrfs_conus_3km_ensfcst"
+fi
 
 EXTRN_MDL_ICS_OFFSET_HRS="30"
 LBC_SPEC_INTVL_HRS="1"
@@ -95,6 +47,9 @@ EXTRN_MDL_LBCS_OFFSET_HRS="6"
 BOUNDARY_LEN_HRS="8"
 BOUNDARY_PROC_GROUP_NUM="2"
 
+WTIME_RUN_FCST="01:00:00"
+WTIME_MAKE_LBCS="02:00:00"
+
 # avaialble retro period:
 # 20210511-20210531; 20210718-20210801
 DATE_FIRST_CYCL="20221214"
@@ -103,7 +58,7 @@ CYCL_HRS=( "00" "12" )
 CYCL_HRS=( "18" )
 CYCL_HRS_SPINSTART=("18")
 CYCL_HRS_PRODSTART=("19")
-#CYCL_HRS_STOCH=("00" "12")
+CYCL_HRS_STOCH=("00" "12")
 #CYCL_HRS_RECENTER=("19")
 CYCLEMONTH="12"
 CYCLEDAY="14-15"
@@ -147,6 +102,9 @@ if [[ ${DO_ENSFCST} == "TRUE" ]] ; then
   POSTPROC_LEN_HRS="24"
   BOUNDARY_PROC_GROUP_NUM="8"
 fi
+
+EXTRN_MDL_NAME_ICS="GEFS"
+EXTRN_MDL_NAME_LBCS="GEFS"
 DA_CYCLE_INTERV="1"
 RESTART_INTERVAL="1"
 netcdf_diag=.true.
@@ -154,102 +112,10 @@ binary_diag=.false.
 NFHOUT="3"
 NFHMAX_HF="12"
 
-DT_ATMOS=60
-NCORES_RUN_ANAL=360
-NCORES_RUN_OBSERVER=80
-HYBENSMEM_NMIN=66
-HALO_BLEND=20
-IO_LAYOUT_Y=1
-PPN_RUN_REF2TTEN=1
-PPN_RUN_NONVARCLDANL=${IO_LAYOUT_Y}
-
-MAXTRIES_GET_EXTRN_ICS="2"
-MAXTRIES_GET_EXTRN_LBCS="2"
-MAXTRIES_MAKE_ICS="2"
-MAXTRIES_MAKE_LBCS="2"
-MAXTRIES_RUN_PREPSTART="2"
-MAXTRIES_RUN_FCST="2"
-MAXTRIES_ANAL_GSI="2"
-MAXTRIES_CLDANL_NONVAR="2"
-MAXTRIES_ANAL_ENKF="2"
-MAXTRIES_RECENTER="2"
-MAXTRIES_SAVE_RESTART="2"
-MAXTRIES_PROCESS_BUFR="2"
-MAXTRIES_PROCESS_RADARREF="2"
-MAXTRIES_RUN_POST="2"
-MAXTRIES_RUN_PRDGEN="2"
-
-PRINT_DIFF_PGR="TRUE"
-
-if [[ -n $RESERVATION ]] ; then
-  NNODES_MAKE_ICS="3"
-  PPN_MAKE_ICS="20"
-  NNODES_MAKE_LBCS="3"
-  PPN_MAKE_LBCS="20"
-  NNODES_RUN_POST="1"
-  PPN_RUN_POST="40"
-fi
-
-WTIME_RUN_FCST="00:45:00"
-WTIME_MAKE_LBCS="00:30:00"
-
-EXTRN_MDL_NAME_ICS="GEFS"
-EXTRN_MDL_NAME_LBCS="GEFS"
-if [[ $MACHINE == "wcoss2" ]] ; then
-EXTRN_MDL_NAME_LBCS="FV3GFS"
-fi
-EXTRN_MDL_SOURCE_BASEDIR_ICS="/mnt/lfs4/BMC/wrfruc/RRFSE/data/gens"
-EXTRN_MDL_SOURCE_BASEDIR_LBCS="/mnt/lfs4/BMC/wrfruc/RRFSE/data/gens"
-
-FV3GFS_FILE_FMT_ICS="grib2"
-FV3GFS_FILE_FMT_LBCS="grib2"
-
-envir="para"
-
 NET="RRFS_CONUS"
 TAG="RRFSE_CONUS_3km"
 
-USE_CUSTOM_POST_CONFIG_FILE="TRUE"
-TESTBED_FIELDS_FN="testbed_fields_bgdawp.txt"
-TESTBED_FIELDS_FN2="testbed_fields_bgrd3d.txt"
-CUSTOM_POST_CONFIG_FP="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." &>/dev/null&&pwd)/fix/upp/postxconfig-NT-fv3lam_rrfs.txt"
-CUSTOM_POST_PARAMS_FP="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." &>/dev/null&&pwd)/fix/upp/params_grib2_tbl_new"
 ARCHIVEDIR="/1year/BMC/wrfruc/rrfs_dev1"
-NCARG_ROOT="/apps/ncl/6.5.0-CentOS6.10_64bit_nodap_gnu447"
-NCL_HOME="/home/rtrr/RRFS/graphics"
-NCL_REGION="conus"
-MODEL="RRFS_B"
-
-#
-# In NCO mode, the following don't need to be explicitly set to "FALSE" 
-# in this configuration file because the experiment generation script
-# will do this (along with printing out an informational message).
-#
-#RUN_TASK_MAKE_GRID="FALSE"
-#RUN_TASK_MAKE_OROG="FALSE"
-#RUN_TASK_MAKE_SFC_CLIMO="FALSE"
-
-if [[ $MACHINE == "wcoss2" ]] ; then
-  LAYOUT_X="48"
-  LAYOUT_Y="40"
-  PPN_MAKE_ICS="32"
-  PPN_MAKE_LBCS="64"
-  NNODES_MAKE_ICS="2"
-  NNODES_MAKE_LBCS="1"
-  PPN_RUN_ANAL="64"
-  NNODES_RUN_ANAL="1"
-  PPN_RUN_FCST="64"
-  NNODES_RUN_FCST="31"
-  PPN_RUN_POST="64"
-  NNODES_RUN_POST="1"
-  PPN_PROC_RADAR="64"
-  NNODES_PROC_RADAR="1"
-  PPN_RUN_ENKF="32"
-  NNODES_RUN_ENKF="6"
-
-  FV3GFS_FILE_FMT_ICS="grib2"
-  FV3GFS_FILE_FMT_LBCS="grib2"
-fi
 
 if [[ ${DO_ENSEMBLE}  == "TRUE" ]]; then
    NUM_ENS_MEMBERS=30
@@ -268,7 +134,6 @@ if [[ ${DO_ENSEMBLE}  == "TRUE" ]]; then
      DO_SPP=TRUE
 #     SPPT_MAG=0.5
      WTIME_RUN_FCST="04:45:00"
-     WTIME_MAKE_LBCS="01:30:00"
    fi
    RADAR_REF_THINNING="2"
    ARCHIVEDIR="/5year/BMC/wrfruc/rrfs_ens"
@@ -281,12 +146,6 @@ if [[ ${DO_ENSEMBLE}  == "TRUE" ]]; then
    write_diag_2=.true.
 fi
 
-RUN="rrfs_conus_3km_ensda"
-if [[ ${DO_ENSFCST} == "TRUE" ]] ; then
-  RUN="rrfs_conus_3km_ensfcst"
-fi
-COMINgfs=""
-
 . set_rrfs_config.sh
 
 STMP="/mnt/lfs4/BMC/wrfruc/RRFSE/${version}/stmp"  # Path to directory STMP that mostly contains input files.
diff --git a/ush/config.sh.RRFS_NA_13km b/ush/config.sh.RRFS_NA_13km
index 09e77083b..ea8265390 100644
--- a/ush/config.sh.RRFS_NA_13km
+++ b/ush/config.sh.RRFS_NA_13km
@@ -1,42 +1,12 @@
 MACHINE="jet"
 ACCOUNT="nrtrr"
 #RESERVATION="rrfsdet"
-EXPT_BASEDIR="YourOwnSpace"
+EXPT_BASEDIR="YourOwnSpacei/rrfs.${version}"
 EXPT_SUBDIR="RRFS_NA_13km_dev1"
 
-if [[ -n $RESERVATION ]] ; then
-  ACCOUNT=rtrr
-  SERVICE_ACCOUNT=nrtrr
-  PARTITION_DEFAULT=kjet
-  PARTITION_FCST=kjet
-  PARTITION_GRAPHICS=kjet
-  PARTITION_ANALYSIS=kjet
-fi
-
-if [[ $MACHINE == "hera" ]] ; then
-  ACCOUNT="wrfruc"
-  PARTITION_DEFAULT=""
-  PARTITION_FCST=""
-  QUEUE_ANALYSIS="batch"
-  QUEUE_WGRIB2="batch"
-  QUEUE_GRAPHICS="batch"
-  PPN_RUN_POST="24"
-fi
-if [[ $MACHINE == "orion" ]] ; then
-  ACCOUNT=ztrr
-  QUEUE_ANALYSIS="batch"
-fi
-if [[ $MACHINE == "WCOSS_DELL_P3" ]] ; then
-  ACCOUNT=HRRR-T2O
-  QUEUE_ANALYSIS="dev"
-  QUEUE_HPSS="dev"
-fi
-
-VERBOSE="TRUE"
-
-RUN_ENVIR="nco"
-
 PREDEF_GRID_NAME=GSD_RAP13km
+. set_rrfs_config_temp.sh
+
 ADDNL_OUTPUT_GRIDS=( "130" "242" )
 
 TILE_LABELS="NA"
@@ -54,9 +24,15 @@ DO_SOIL_ADJUST="TRUE"
 DO_RADDA="FALSE"
 LBCS_ICS_ONLY="FALSE"
 
+NET="RRFS_NA_13km"
+TAG="RRFS_dev1_NA_13km"
+ARCHIVEDIR="/5year/BMC/wrfruc/rrfs_na_13km_dev1"
+NCL_REGION="conus"
+MODEL="RRFS_NA_13km"
+RUN="RRFS_NA_13km_dev1"
+
 grid_ratio_fv3=1.0
 
-QUILTING="TRUE"
 CCPP_PHYS_SUITE="FV3_RAP"
 
 EXTRN_MDL_ICS_OFFSET_HRS="3"
@@ -98,56 +74,15 @@ for i in {0..23..3}; do FCST_LEN_HRS_CYCLES[$i]=12; done
 DA_CYCLE_INTERV="1"
 RESTART_INTERVAL="1"
 
-DT_ATMOS=90
-
-NCORES_RUN_ANAL=240
-HALO_BLEND=20
-
-PRINT_DIFF_PGR="TRUE"
-
 WTIME_RUN_FCST="02:30:00"
 WTIME_MAKE_LBCS="02:30:00"
 
-NNODES_RUN_POST="1"
-
 EXTRN_MDL_NAME_ICS="FV3GFS"
 EXTRN_MDL_NAME_LBCS="FV3GFS"
 
-FV3GFS_FILE_FMT_ICS="grib2"
-FV3GFS_FILE_FMT_LBCS="grib2"
-
-envir="para"
-
-NET="RRFS_NA_13km"
-TAG="RRFS_dev1_NA_13km"
-
-USE_CUSTOM_POST_CONFIG_FILE="TRUE"
-TESTBED_FIELDS_FN="testbed_fields_bgdawp.txt"
-TESTBED_FIELDS_FN2="testbed_fields_bgrd3d.txt"
-CUSTOM_POST_CONFIG_FP="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." &>/dev/null&&pwd)/fix/upp/postxconfig-NT-fv3lam_rrfs.txt"
-CUSTOM_POST_PARAMS_FP="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." &>/dev/null&&pwd)/fix/upp/params_grib2_tbl_new"
-ARCHIVEDIR="/5year/BMC/wrfruc/rrfs_na_13km_dev1"
-NCARG_ROOT="/apps/ncl/6.5.0-CentOS6.10_64bit_nodap_gnu447"
-NCL_HOME="/home/rtrr/RRFS/graphics"
-NCL_REGION="conus"
-MODEL="RRFS_NA_13km"
-
-#
-# In NCO mode, the following don't need to be explicitly set to "FALSE" 
-# in this configuration file because the experiment generation script
-# will do this (along with printing out an informational message).
-#
-#RUN_TASK_MAKE_GRID="FALSE"
-#RUN_TASK_MAKE_OROG="FALSE"
-#RUN_TASK_MAKE_SFC_CLIMO="FALSE"
-
-RUN="RRFS_NA_13km_dev1"
-COMINgfs=""
-
 . set_rrfs_config.sh
 
-STMP="YourOwnSpace/stmp"  # Path to directory STMP that mostly contains input files.
-PTMP="YourOwnSpace/ptmp"  # Path to directory STMP that mostly contains input files.
-NWGES="YourOwnSpace/nwges"  # Path to directory NWGES that save boundary, cold initial, restart files
+STMP="YourOwnSpace/${version}/stmp"  # Path to directory STMP that mostly contains input files.
+PTMP="YourOwnSpace/${version}"  # Path to directory STMP that mostly contains input files.
+NWGES="YourOwnSpace/${version}/nwges/${envir}/${NET}"  # Path to directory NWGES that save boundary, cold initial, restart files
 
-#
diff --git a/ush/config.sh.RRFS_NA_3km b/ush/config.sh.RRFS_NA_3km
index 8eae147a2..e1edc172f 100644
--- a/ush/config.sh.RRFS_NA_3km
+++ b/ush/config.sh.RRFS_NA_3km
@@ -1,104 +1,67 @@
 MACHINE="jet"
-
 ACCOUNT="nrtrr"
-RESERVATION="rrfsdet"
-#RESERVATION_POST="rrfsdet"
-EXPT_BASEDIR="/home/rtrr/RRFS"
-EXPT_SUBDIR="RRFS_NA_3km_dev1"
-
-
-PARTITION_GRAPHICS=kjet,xjet
-
-if [[ -n $RESERVATION ]] ; then
-  ACCOUNT=rtrr
-  SERVICE_ACCOUNT=nrtrr
-  PARTITION_DEFAULT=kjet
-  PARTITION_FCST=kjet
-  PARTITION_GRAPHICS=kjet,xjet
-  PARTITION_ANALYSIS=kjet
-  PARTITION_WGRIB2=sjet,vjet,kjet,xjet
-
-  QUEUE_DEFAULT="rt"
-  QUEUE_FCST="rt"
-  QUEUE_ANALYSIS="rt"
-  QUEUE_WGRIB2="batch"
-  QUEUE_GRAPHICS="batch"
-  QUEUE_HPSS="batch"
-else
-  PARTITION_DEFAULT=kjet
-fi
-
-
-if [[ $MACHINE == "hera" ]] ; then
-  ACCOUNT="wrfruc"
-  PARTITION_DEFAULT=""
-  PARTITION_FCST=""
-  QUEUE_ANALYSIS="batch"
-fi
-
-if [[ $MACHINE == "wcoss_dell_p3" ]] ; then
-  ACCOUNT=HRRR-T2O
-  RESERVATION="rrfsdet"
-  QUEUE_ANALYSIS="dev"
-  QUEUE_HPSS="dev"
-  EXPT_BASEDIR="/gpfs/dell6/emc/modeling/noscrub/Shun.Liu/rrfs_dev1/test"
-fi
+#RESERVATION="rrfsdet"
+EXPT_BASEDIR="YourOwnSpacei/rrfs.${version}"
+EXPT_SUBDIR="RRFS_NA_3km"
 
-VERBOSE="TRUE"
-SAVE_CYCLE_LOG="TRUE"
-
-RUN_ENVIR="nco"
 PREDEF_GRID_NAME="RRFS_NA_3km"
+. set_rrfs_config_temp.sh
 
 DO_DACYCLE="TRUE"
-DO_SPINUP="TRUE"
 DO_SURFACE_CYCLE="TRUE"
-SURFACE_CYCLE_DELAY_HRS="1"
-#DO_RETRO="TRUE"
-#LBCS_ICS_ONLY="TRUE"
-DO_RADDA="FALSE"
-DO_NONVAR_CLDANAL="FALSE"
-DO_SMOKE_DUST="FALSE"
+DO_SPINUP="TRUE"
+DO_RETRO="TRUE"
+DO_NONVAR_CLDANAL="TRUE"
 DO_REFL2TTEN="FALSE"
 RADARREFL_TIMELEVEL=(0)
 FH_DFI_RADAR="0.0,0.25,0.5"
 DO_SOIL_ADJUST="TRUE"
+DO_RADDA="FALSE"
+LBCS_ICS_ONLY="FALSE"
 
-QUILTING="TRUE"
-CCPP_PHYS_SUITE="FV3_HRRR"
+NET="RRFS_NA_3km"
+TAG="RRFS_dev1_NA_3km"
+ARCHIVEDIR="/5year/BMC/wrfruc/rrfs_na_3km_dev1"
+NCL_REGION="conus"
+MODEL="RRFS_NA_3km"
+RUN="RRFS_NA_3km"
 
 EXTRN_MDL_ICS_OFFSET_HRS="3"
-BOUNDARY_LEN_HRS="9"
+BOUNDARY_LEN_HRS="21"
+BOUNDARY_LONG_LEN_HRS="1"
 LBC_SPEC_INTVL_HRS="1"
-EXTRN_MDL_LBCS_OFFSET_HRS="6"
+EXTRN_MDL_LBCS_OFFSET_HRS="0"
 EXTRN_MDL_LBCS_SEARCH_OFFSET_HRS="0"
 
-DATE_FIRST_CYCL="20220421"
-DATE_LAST_CYCL="20220430"
-CYCL_HRS=( "00" )
+# avaialble retro period:
+# 20210511-20210531; 20210718-20210801
+DATE_FIRST_CYCL="20210512"
+DATE_LAST_CYCL="20210513"
+CYCL_HRS=( "00" "12" )
 CYCL_HRS_SPINSTART=("03" "15")
 CYCL_HRS_PRODSTART=("09" "21")
-CYCLEMONTH="4"
-CYCLEDAY="21-30"
+CYCLEMONTH="5"
+CYCLEDAY="12-14"
+
 #
 PREEXISTING_DIR_METHOD="upgrade"
 INITIAL_CYCLEDEF="${DATE_FIRST_CYCL}0300 ${DATE_LAST_CYCL}2300 12:00:00"
 BOUNDARY_CYCLEDEF="${DATE_FIRST_CYCL}0000 ${DATE_LAST_CYCL}2300 06:00:00"
-PROD_CYCLEDEF="${DATE_FIRST_CYCL}0900 ${DATE_LAST_CYCL}2300 01:00:00"
-POSTPROC_CYCLEDEF="${DATE_FIRST_CYCL}0900 ${DATE_LAST_CYCL}2300 01:00:00"
-POSTPROC_LONG_CYCLEDEF="${DATE_FIRST_CYCL}0900 ${DATE_LAST_CYCL}2300 06:00:00"
-ARCHIVE_CYCLEDEF="${DATE_FIRST_CYCL}0700 ${DATE_LAST_CYCL}2300 24:00:00"
+PROD_CYCLEDEF="${DATE_FIRST_CYCL}0300 ${DATE_LAST_CYCL}2300 01:00:00"
+POSTPROC_CYCLEDEF="${DATE_FIRST_CYCL}0300 ${DATE_LAST_CYCL}2300 01:00:00"
+POSTPROC_LONG_CYCLEDEF="${DATE_FIRST_CYCL}0300 ${DATE_LAST_CYCL}2300 03:00:00"
 if [[ $DO_SPINUP == "TRUE" ]] ; then
-  SPINUP_CYCLEDEF="00 03-08,15-20 ${CYCLEDAY} ${CYCLEMONTH} 2022 *"
+  SPINUP_CYCLEDEF="00 03-08,15-20 ${CYCLEDAY} ${CYCLEMONTH} 2021 *"
 fi
+ARCHIVE_CYCLEDEF="${DATE_FIRST_CYCL}0700 ${DATE_LAST_CYCL}2300 24:00:00"
 
 FCST_LEN_HRS="3"
-FCST_LEN_HRS_SPINUP="1"
+FCST_LEN_HRS_SPINUP="2"
 POSTPROC_LEN_HRS="3"
-POSTPROC_LONG_LEN_HRS="3"
-#FCST_LEN_HRS_CYCLES=(30 03 03 03 03 03 03 03 03 03 03 03 30 03 03 03 03 03 03 03 03 03 03 03)
+POSTPROC_LONG_LEN_HRS="12"
+#FCST_LEN_HRS_CYCLES=(21 21 21 63 21 21 21 21 21 63 21 21 21 21 21 63 21 21 21 21 21 63 21 21)
 for i in {0..23}; do FCST_LEN_HRS_CYCLES[$i]=3; done
-for i in {3..23..6}; do FCST_LEN_HRS_CYCLES[$i]=3; done
+for i in {0..23..3}; do FCST_LEN_HRS_CYCLES[$i]=12; done
 DA_CYCLE_INTERV="1"
 RESTART_INTERVAL="1 2 3"
 
@@ -106,86 +69,15 @@ SST_update_hour=01
 GVF_update_hour=04
 SNOWICE_update_hour=00
 
-USE_FVCOM="FALSE"
-FVCOM_DIR="/mnt/lfs4/BMC/public/data/grids/glerl/owaq"
-FVCOM_FILE="tsfc_fv3grid"
-NCORES_RUN_ANAL=240
-WTIME_RUN_ANAL="01:00:00"
-HYBENSMEM_NMIN=66
-HALO_BLEND=20
-PRINT_DIFF_PGR=TRUE
-
-NNODES_MAKE_ICS="10"
-NNODES_MAKE_LBCS="5"
-PPN_MAKE_ICS="8"
-PPN_MAKE_LBCS="10"
-WTIME_MAKE_LBCS="02:45:00"
-WTIME_RUN_PREPSTART="00:20:00"
-PPN_RUN_PREPSTART="5"
-WRTCMP_write_tasks_per_group="50"
-NCORES_PER_NODE="40"
-
-MEMO_RUN_REF2TTEN="60G"
-
-WTIME_RUN_FCST="04:00:00"
-LAYOUT_X=50
-LAYOUT_Y=20
-IO_LAYOUT_Y=10
-PPN_RUN_NONVARCLDANL=${IO_LAYOUT_Y}
-NATIVE_RUN_FCST="--cpus-per-task 4 --exclusive"
-NATIVE_RUN_ANAL="--cpus-per-task 4 --exclusive"
-
-PARTITION_POST="kjet"
-PPN_RUN_POST="20"
-NNODES_RUN_POST="10"
-WTIME_RUN_POST="00:35:00"
+WTIME_RUN_FCST="02:30:00"
+WTIME_MAKE_LBCS="02:30:00"
 
 EXTRN_MDL_NAME_ICS="FV3GFS"
 EXTRN_MDL_NAME_LBCS="FV3GFS"
 
-FV3GFS_FILE_FMT_ICS="grib2"
-FV3GFS_FILE_FMT_LBCS="grib2"
-
-envir="para"
-
-NET="RRFS_NA_3km"
-TAG="RRFS_dev1_NA_3km"
-
-USE_CUSTOM_POST_CONFIG_FILE="TRUE"
-TESTBED_FIELDS_FN="testbed_fields_bgdawp.txt"
-TESTBED_FIELDS_FN2="testbed_fields_bgrd3d.txt"
-# Below:  use EMC_post control file from 13-km NA configuration (provisional only)
-CUSTOM_POST_CONFIG_FP="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." &>/dev/null&&pwd)/fix/upp/postxconfig-NT-fv3lam_rrfs.txt"
-CUSTOM_POST_PARAMS_FP="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." &>/dev/null&&pwd)/fix/upp/params_grib2_tbl_new"
-ARCHIVEDIR="/5year/BMC/wrfruc/rrfs_na_3km_dev1"
-NCARG_ROOT="/apps/ncl/6.5.0-CentOS6.10_64bit_nodap_gnu447"
-NCL_HOME="/home/rtrr/RRFS/graphics"
-NCL_REGION="conus"
-MODEL="RRFS_NA_3km"
-ADDNL_OUTPUT_GRIDS=( "hrrr" "hrrrak" )
-
-TILE_LABELS="NA hrrr_regions1 hrrr_regions2 hrrr_tiles1 hrrr_tiles2 hrrr_tiles3
-hrrr_tiles4 hrrrak_tiles"
-TILE_SETS="full SE,SC,SW NE,NC,NW ATL,CA-NV,CentralCA CHI-DET,DCArea,EastCO \
-GreatLakes,NYC-BOS,SEA-POR SouthCA,SouthFL,VortexSE AKRange,Anchorage,Juneau"
-
-CLEAN_OLDPROD_HRS="48"
-CLEAN_OLDRUN_HRS="24"
-
-#
-# In NCO mode, the following don't need to be explicitly set to "FALSE" 
-# in this configuration file because the experiment generation script
-# will do this (along with printing out an informational message).
-#
-#RUN_TASK_MAKE_GRID="FALSE"
-#RUN_TASK_MAKE_OROG="FALSE"
-#RUN_TASK_MAKE_SFC_CLIMO="FALSE"
-
-RUN="RRFS_NA_3km_dev1"
-COMINgfs=""
-
 . set_rrfs_config.sh
 
-STMP="/lfs4/BMC/nrtrr/NCO_dirs/stmp"  # Path to directory STMP that mostly contains input files.
-PTMP="/lfs4/BMC/nrtrr/NCO_dirs/ptmp"  # Path to directory STMP that mostly contains input files.
-NWGES="/lfs4/BMC/nrtrr/NCO_dirs/nwges"  # Path to directory NWGES that save boundary, cold initial, restart files
+STMP="YourOwnSpace/${version}/stmp"  # Path to directory STMP that mostly contains input files.
+PTMP="YourOwnSpace/${version}"  # Path to directory STMP that mostly contains input files.
+NWGES="YourOwnSpace/${version}/nwges/${envir}/${NET}"  # Path to directory NWGES that save boundary, cold initial, restart files
+
diff --git a/ush/set_rrfs_config.sh b/ush/set_rrfs_config.sh
index a374d4cc1..07e966e6a 100644
--- a/ush/set_rrfs_config.sh
+++ b/ush/set_rrfs_config.sh
@@ -119,14 +119,15 @@ fi
 
 # clean system
 if [[ $DO_RETRO == "TRUE" ]] ; then
-  CLEAN_OLDPROD_HRS="240"
-  CLEAN_OLDLOG_HRS="240"
-  CLEAN_OLDRUN_HRS="240"
-  CLEAN_OLDFCST_HRS="240"
-  CLEAN_OLDSTMPPOST_HRS="240"
-  CLEAN_NWGES_HRS="240"
+  CLEAN_OLDPROD_HRS="720"
+  CLEAN_OLDLOG_HRS="720"
+  CLEAN_OLDRUN_HRS="720"
+  CLEAN_OLDFCST_HRS="720"
+  CLEAN_OLDSTMPPOST_HRS="720"
+  CLEAN_NWGES_HRS="720"
   if [[ $LBCS_ICS_ONLY == "TRUE" ]]; then
     CLEAN_OLDRUN_HRS="7777"
     CLEAN_OLDFCST_HRS="7777"
-  fi
+  fi  
 fi
+
diff --git a/ush/set_rrfs_config_temp.sh b/ush/set_rrfs_config_temp.sh
new file mode 100644
index 000000000..59b18a45f
--- /dev/null
+++ b/ush/set_rrfs_config_temp.sh
@@ -0,0 +1,297 @@
+
+if [[ -n $RESERVATION ]] ; then
+  ACCOUNT=rtrr
+  SERVICE_ACCOUNT=nrtrr
+  PARTITION_DEFAULT=kjet
+  PARTITION_FCST=kjet
+  PARTITION_GRAPHICS=kjet
+  PARTITION_ANALYSIS=kjet
+  PARTITION_WGRIB2=kjet
+  PARTITION_POST=kjet
+  QUEUE_DEFAULT="rth"
+  QUEUE_FCST="rth"
+  QUEUE_ANALYSIS="rth"
+  QUEUE_WGRIB2="rt"
+  QUEUE_GRAPHICS="rt"
+  QUEUE_HPSS="rt"
+  QUEUE_POST="rt"
+  RESERVATION_POST="rrfsdet"
+  NNODES_MAKE_ICS="3"
+  PPN_MAKE_ICS="20"
+  NNODES_MAKE_LBCS="3"
+  PPN_MAKE_LBCS="20"
+  NNODES_RUN_POST="1"
+  PPN_RUN_POST="40"
+fi
+
+if [[ $MACHINE == "hera" ]] ; then
+  ACCOUNT="wrfruc"
+  PARTITION_DEFAULT=""
+  PARTITION_FCST=""
+  QUEUE_ANALYSIS="batch"
+  QUEUE_WGRIB2="batch"
+  QUEUE_GRAPHICS="batch"
+fi
+
+if [[ $MACHINE == "orion" ]] ; then
+  ACCOUNT=wrfruc
+  QUEUE_ANALYSIS="batch"
+  QUEUE_WGRIB2="batch"
+  QUEUE_GRAPHICS="batch"
+  QUEUE_POST="batch"
+  NCORES_PER_NODE=24
+fi
+
+if [[ $MACHINE == "wcoss2" ]] ; then
+  ACCOUNT=RRFS-DEV
+  QUEUE_DEFAULT="devhigh"
+  QUEUE_ANALYSIS="devmax"
+  QUEUE_FCST="devmax"
+  QUEUE_HPSS="dev_transfer"
+  QUEUE_WGRIB2="devhigh"
+  QUEUE_GRAPHICS="devhigh"
+fi
+
+VERBOSE="TRUE"
+RUN_ENVIR="nco"
+QUILTING="TRUE"
+netcdf_diag=.true.
+binary_diag=.false.
+HYBENSMEM_NMIN=66
+HALO_BLEND=20
+PRINT_DIFF_PGR="TRUE"
+envir="para"
+USE_CUSTOM_POST_CONFIG_FILE="TRUE"
+TESTBED_FIELDS_FN="testbed_fields_bgdawp.txt"
+TESTBED_FIELDS_FN2="testbed_fields_bgrd3d.txt"
+CUSTOM_POST_CONFIG_FP="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." &>/dev/null&&pwd)/fix/upp/postxconfig-NT-fv3lam_rrfs.txt"
+CUSTOM_POST_PARAMS_FP="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." &>/dev/null&&pwd)/fix/upp/params_grib2_tbl_new"
+NCARG_ROOT="/apps/ncl/6.5.0-CentOS6.10_64bit_nodap_gnu447"
+NCL_HOME="/home/rtrr/RRFS/graphics"
+COMINgfs=""
+
+FV3GFS_FILE_FMT_ICS="grib2"
+FV3GFS_FILE_FMT_LBCS="grib2"
+
+NCORES_RUN_ANAL=360
+NCORES_RUN_OBSERVER=80
+IO_LAYOUT_Y=1
+PPN_RUN_REF2TTEN=1
+PPN_RUN_NONVARCLDANL=${IO_LAYOUT_Y}
+MAXTRIES_GET_EXTRN_ICS="3"
+MAXTRIES_GET_EXTRN_LBCS="3"
+MAXTRIES_MAKE_ICS="3"
+MAXTRIES_MAKE_LBCS="3"
+MAXTRIES_RUN_PREPSTART="3"
+MAXTRIES_RUN_FCST="3"
+MAXTRIES_ANAL_GSI="3"
+MAXTRIES_POSTANAL="3"
+MAXTRIES_ANAL_ENKF="3"
+MAXTRIES_RUN_ANAL="3"
+MAXTRIES_CLDANL_NONVAR="3"
+MAXTRIES_SAVE_INPUT="3"
+MAXTRIES_SAVE_RESTART="3"
+MAXTRIES_RUN_POST="3"
+MAXTRIES_RUN_PRDGEN="3"
+
+WTIME_RUN_FCST="00:45:00"
+WTIME_RUN_FCST_LONG="03:45:00"
+WTIME_MAKE_LBCS="02:00:00"
+WTIME_RUN_ANAL="00:50:00"
+WTIME_RUN_PREPSTART="00:20:00"
+
+START_TIME_SPINUP="02:10:00"
+START_TIME_PROD="08:20:00"
+START_TIME_LATE_ANALYSIS="08:40:00"
+
+if [[ ${PREDEF_GRID_NAME}=="RRFS_CONUS_3km" ]] ; then 
+  DT_ATMOS=60
+  ADDNL_OUTPUT_GRIDS=()
+  TILE_LABELS="CONUS REGIONS"
+  TILE_SETS="full NE,NC,NW,SE,SC,SW"
+  CCPP_PHYS_SUITE="FV3_HRRR"
+
+  if [[ -n $RESERVATION ]] ; then
+    NNODES_MAKE_ICS="3"
+    PPN_MAKE_ICS="20"
+    NNODES_MAKE_LBCS="3"
+    PPN_MAKE_LBCS="20"
+    NNODES_RUN_POST="1"
+    PPN_RUN_POST="40"
+  fi
+
+  if [[ $MACHINE == "wcoss2" ]] ; then
+    LAYOUT_X="48"
+    LAYOUT_Y="40"
+    PPN_MAKE_ICS="32"
+    PPN_MAKE_LBCS="64"
+    NNODES_MAKE_ICS="2"
+    NNODES_MAKE_LBCS="1"
+    PPN_RUN_ANAL="32"
+    NNODES_RUN_ANAL="10"
+    PPN_RUN_FCST="64"
+    NNODES_RUN_FCST="31"
+    PPN_RUN_POST="64"
+    NNODES_RUN_POST="1"
+    PPN_PROC_RADAR="64"
+    NNODES_PROC_RADAR="1"
+
+    MAXTRIES_MAKE_ICS="2"
+    MAXTRIES_MAKE_LBCS="2"
+    MAXTRIES_RUN_PREPSTART="2"
+    MAXTRIES_RUN_FCST="2"
+    MAXTRIES_ANAL_GSI="2"
+    MAXTRIES_ANAL_ENKF="2"
+    MAXTRIES_RUN_POST="2"
+    MAXTRIES_RUN_PRDGEN="2"
+    MAXTRIES_ANAL_GSI="2"
+
+    FV3GFS_FILE_FMT_ICS="netcdf"
+    FV3GFS_FILE_FMT_LBCS="netcdf"
+  fi
+
+  if [[ $MACHINE == "orion" ]] ; then
+    LAYOUT_X="30"
+    LAYOUT_Y="40"
+    PPN_RUN_FCST="40"
+    WTIME_RUN_PRDGEN="00:20:00"
+  fi
+fi
+
+if [[ ${PREDEF_GRID_NAME}=="RRFS_CONUS_13km" ]] ; then 
+  DT_ATMOS=120
+  ADDNL_OUTPUT_GRIDS=()
+  TILE_LABELS="CONUS REGIONS"
+  TILE_SETS="full NE,NC,NW,SE,SC,SW"
+  CCPP_PHYS_SUITE="FV3_HRRR"
+
+  if [[ -n $RESERVATION ]] ; then
+    NNODES_MAKE_ICS="3"
+    PPN_MAKE_ICS="20"
+    NNODES_MAKE_LBCS="3"
+    PPN_MAKE_LBCS="20"
+    NNODES_RUN_POST="1"
+    PPN_RUN_POST="40"
+  fi
+
+  if [[ $MACHINE == "wcoss2" ]] ; then
+    LAYOUT_X="48"
+    LAYOUT_Y="40"
+    PPN_MAKE_ICS="32"
+    PPN_MAKE_LBCS="64"
+    NNODES_MAKE_ICS="2"
+    NNODES_MAKE_LBCS="1"
+    PPN_RUN_ANAL="32"
+    NNODES_RUN_ANAL="10"
+    PPN_RUN_FCST="64"
+    NNODES_RUN_FCST="31"
+    PPN_RUN_POST="64"
+    NNODES_RUN_POST="1"
+    PPN_PROC_RADAR="64"
+    NNODES_PROC_RADAR="1"
+
+    MAXTRIES_MAKE_ICS="2"
+    MAXTRIES_MAKE_LBCS="2"
+    MAXTRIES_RUN_PREPSTART="2"
+    MAXTRIES_RUN_FCST="2"
+    MAXTRIES_ANAL_GSI="2"
+    MAXTRIES_ANAL_ENKF="2"
+    MAXTRIES_RUN_POST="2"
+    MAXTRIES_RUN_PRDGEN="2"
+    MAXTRIES_ANAL_GSI="2"
+
+    FV3GFS_FILE_FMT_ICS="netcdf"
+    FV3GFS_FILE_FMT_LBCS="netcdf"
+  fi
+
+  if [[ $MACHINE == "orion" ]] ; then
+    LAYOUT_X="30"
+    LAYOUT_Y="40"
+    PPN_RUN_FCST="40"
+    WTIME_RUN_PRDGEN="00:20:00"
+  fi
+ 
+  if [[ $MACHINE == "hera" ]] ; then
+    NNODES_MAKE_ICS="1"
+    NNODES_MAKE_LBCS="1"
+    NNODES_RUN_POST="1"
+    NCORES_RUN_ANAL=60
+    NATIVE_RUN_ANAL="--cpus-per-task 4 --exclusive"
+
+    LAYOUT_X=12
+    LAYOUT_Y=6
+
+    PPN_MAKE_ICS="20"
+    PPN_MAKE_LBCS="20"
+    NNODES_MAKE_ICS="1"
+    NNODES_MAKE_LBCS="1"
+    PPN_RUN_ANAL="20"
+    NNODES_RUN_ANAL="3"
+    PPN_RUN_FCST="20"
+    NNODES_RUN_FCST="3"
+    PPN_RUN_POST="20"
+    NNODES_RUN_POST="1"
+    PPN_PROC_RADAR="40"
+    NNODES_PROC_RADAR="1"
+  fi
+
+fi
+
+if [[ ${PREDEF_GRID_NAME}=="RRFS_NA_3km" ]] ; then 
+  DT_ATMOS=60
+  CCPP_PHYS_SUITE="FV3_HRRR"
+  ADDNL_OUTPUT_GRIDS=( "hrrr" "hrrrak" )
+  TILE_LABELS="NA hrrr_regions1 hrrr_regions2 hrrr_tiles1 hrrr_tiles2 hrrr_tiles3 \
+    hrrr_tiles4 hrrrak_tiles"
+  TILE_SETS="full SE,SC,SW NE,NC,NW ATL,CA-NV,CentralCA CHI-DET,DCArea,EastCO \
+    GreatLakes,NYC-BOS,SEA-POR SouthCA,SouthFL,VortexSE AKRange,Anchorage,Juneau"
+
+  if [[ -n $RESERVATION ]] ; then
+    NNODES_MAKE_ICS="10"
+    NNODES_MAKE_LBCS="5"
+    PPN_MAKE_ICS="8"
+    PPN_MAKE_LBCS="10"
+    WTIME_MAKE_LBCS="02:45:00"
+    WTIME_RUN_PREPSTART="00:20:00"
+    PPN_RUN_PREPSTART="5"
+    WRTCMP_write_tasks_per_group="50"
+    NCORES_PER_NODE="40"
+
+    MEMO_RUN_REF2TTEN="60G"
+
+    WTIME_RUN_FCST="04:00:00"
+    LAYOUT_X=50
+    LAYOUT_Y=20
+    IO_LAYOUT_Y=10
+    PPN_RUN_NONVARCLDANL=${IO_LAYOUT_Y}
+    NATIVE_RUN_FCST="--cpus-per-task 4 --exclusive"
+    NATIVE_RUN_ANAL="--cpus-per-task 4 --exclusive"
+
+    PARTITION_POST="kjet"
+    PPN_RUN_POST="20"
+    NNODES_RUN_POST="10"
+    WTIME_RUN_POST="00:35:00"
+  fi
+fi
+
+if [[ ${PREDEF_GRID_NAME}=="RRFS_NA_13km" ]] ; then 
+  DT_ATMOS=120
+  CCPP_PHYS_SUITE="FV3_RAP"
+  ADDNL_OUTPUT_GRIDS=( "130" "242" )
+  TILE_LABELS="NA"
+  TILE_SETS="full"
+  NNODES_RUN_POST="1"
+  grid_ratio_fv3=1.0
+fi
+
+#
+# In NCO mode, the following don't need to be explicitly set to "FALSE" 
+# in this configuration file because the experiment generation script
+# will do this (along with printing out an informational message).
+#
+#RUN_TASK_MAKE_GRID="FALSE"
+#RUN_TASK_MAKE_OROG="FALSE"
+#RUN_TASK_MAKE_SFC_CLIMO="FALSE"
+#
+
+
diff --git a/ush/templates/FV3LAM_wflow.xml b/ush/templates/FV3LAM_wflow.xml
index e647b116d..6cb5314a0 100644
--- a/ush/templates/FV3LAM_wflow.xml
+++ b/ush/templates/FV3LAM_wflow.xml
@@ -1135,10 +1135,7 @@ MODULES_RUN_TASK_FP script.
         {%- for m in range(1, num_ens_members+1) %}
           <taskdep task="&PREP_CYC_SPINUP_TN;_ensinit_mem{{ "%04d" % m }}"/>
         {%- endfor %}
-        <or>    
-        <datadep age="00:00:00:05"><cyclestr>&ENSCTRL_CYCLE_BASEDIR;/@Y@m@d@H/nonvar_cldanl/nonvarcldanl_complete.txt</cyclestr></datadep>
         <datadep age="00:00:00:05"><cyclestr>&ENSCTRL_CYCLE_BASEDIR;/@Y@m@d@H/nonvar_cldanl_spinup/nonvarcldanl_complete.txt</cyclestr></datadep>
-        </or>   
       </and>
     </dependency>
   </task>
@@ -1430,7 +1427,7 @@ MODULES_RUN_TASK_FP script.
         {%- elif do_envar_radar_ref %}
         <or>
           <and>
-            <taskdep task="&POSTANAL_TN;_spinup"{{ uscore_ensmem_name }}/>
+            <taskdep task="&POSTANAL_TN;_spinup{{ uscore_ensmem_name }}"/>
              {%- for h in cycl_hrs_hyb_fv3lam_ens %}
                 <strneq><left>{{ h }}</left><right><cyclestr>@H</cyclestr></right></strneq>
              {%- endfor %}
@@ -1445,7 +1442,7 @@ MODULES_RUN_TASK_FP script.
           </and>
         </or>
         {%- else %}
-	<taskdep task="&POSTANAL_TN;_spinup"{{ uscore_ensmem_name }}/>
+	<taskdep task="&POSTANAL_TN;_spinup{{ uscore_ensmem_name }}"/>
         {%- endif %}
       </and>
     </dependency>
@@ -2317,7 +2314,7 @@ MODULES_RUN_TASK_FP script.
         {%- elif do_envar_radar_ref %}
         <or>
           <and>
-            <taskdep task="&POSTANAL_TN;_prod"{{ uscore_ensmem_name }}/>
+            <taskdep task="&POSTANAL_TN;_prod{{ uscore_ensmem_name }}"/>
              {%- for h in cycl_hrs_hyb_fv3lam_ens %}
                 <strneq><left>{{ h }}</left><right><cyclestr>@H</cyclestr></right></strneq>
              {%- endfor %}
@@ -2332,7 +2329,7 @@ MODULES_RUN_TASK_FP script.
           </and>
         </or>
         {%- else %}
-	<taskdep task="&POSTANAL_TN;_prod"{{ uscore_ensmem_name }}/>
+	<taskdep task="&POSTANAL_TN;_prod{{ uscore_ensmem_name }}"/>
         {%- endif %}
       </and>
     </dependency>