From 095f594e2f9ba9be7d2f068d6befa2e884289eca Mon Sep 17 00:00:00 2001
From: benjamin blake <benjamin.blake@clogin08.cactus.wcoss2.ncep.noaa.gov>
Date: Wed, 30 Oct 2024 15:48:47 +0000
Subject: [PATCH] Updates needed for ecflow workflow

---
 jobs/JRRFS_ANALYSIS_GSI                            | 5 +++++
 jobs/JRRFS_ANALYSIS_NONVARCLD                      | 5 +++++
 jobs/JRRFS_BLEND_ICS                               | 5 +++++
 jobs/JRRFS_BUFRSND                                 | 5 +++++
 jobs/JRRFS_FORECAST                                | 5 +++++
 jobs/JRRFS_MAKE_ICS                                | 7 ++++++-
 jobs/JRRFS_MAKE_LBCS                               | 7 ++++++-
 jobs/JRRFS_POST                                    | 5 +++++
 jobs/JRRFS_PRDGEN                                  | 5 +++++
 jobs/JRRFS_PREP_CYC                                | 5 +++++
 jobs/JRRFS_SAVE_DA_OUTPUT                          | 5 +++++
 jobs/JRRFS_SAVE_RESTART                            | 5 +++++
 jobs/JRRFS_UPDATE_LBC_SOIL                         | 5 +++++
 parm/FV3LAM_wflow.xml                              | 4 ++--
 parm/FV3LAM_wflow_firewx.xml                       | 4 ++--
 parm/FV3LAM_wflow_nonDA.xml                        | 4 ++--
 ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_n3 | 4 ++--
 ush/sample_configs/RRFS_A/config.sh_rrfs_a_n3      | 4 ++--
 18 files changed, 77 insertions(+), 12 deletions(-)

diff --git a/jobs/JRRFS_ANALYSIS_GSI b/jobs/JRRFS_ANALYSIS_GSI
index d90559cd7..c9c816eab 100755
--- a/jobs/JRRFS_ANALYSIS_GSI
+++ b/jobs/JRRFS_ANALYSIS_GSI
@@ -65,6 +65,11 @@ export RUN=${RUN:-rrfs}
 #export jobid=${jobid:-${taskid}}
 export jobid=${taskid}
 
+if [ $WGF = "enkf" ] || [ $WGF = "ensf" ]; then
+  export ENSMEM_INDX=`echo ${GDAS_MEM_NAME} | cut -c4-6`
+else
+  export ENSMEM_INDX=""
+fi
 export mem_num=m$(echo "${ENSMEM_INDX}")
 
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
diff --git a/jobs/JRRFS_ANALYSIS_NONVARCLD b/jobs/JRRFS_ANALYSIS_NONVARCLD
index 49c00f3fd..0055b0fb4 100755
--- a/jobs/JRRFS_ANALYSIS_NONVARCLD
+++ b/jobs/JRRFS_ANALYSIS_NONVARCLD
@@ -64,6 +64,11 @@ export RUN=${RUN:-rrfs}
 #export jobid=${jobid:-${taskid}}
 export jobid=${taskid}
 
+if [ $WGF = "enkf" ] || [ $WGF = "ensf" ]; then
+  export ENSMEM_INDX=`echo ${GDAS_MEM_NAME} | cut -c4-6`
+else
+  export ENSMEM_INDX=""
+fi
 export mem_num=m$(echo "${ENSMEM_INDX}")
 
 export DATA=${DATAROOT}/${jobid}
diff --git a/jobs/JRRFS_BLEND_ICS b/jobs/JRRFS_BLEND_ICS
index e0f962c5c..6729bb5de 100755
--- a/jobs/JRRFS_BLEND_ICS
+++ b/jobs/JRRFS_BLEND_ICS
@@ -62,6 +62,11 @@ export RUN=${RUN:-rrfs}
 export outid=${outid:-"LL$job"}
 export jobid=${jobid:-taskid}
 
+if [ $WGF = "enkf" ] || [ $WGF = "ensf" ]; then
+  export ENSMEM_INDX=`echo ${GDAS_MEM_NAME} | cut -c4-6`
+else
+  export ENSMEM_INDX=""
+fi
 export mem_num=m$(echo "${ENSMEM_INDX}")
 export umbrella_data="${DATAROOT}/${RUN}_${PDY}${cyc}/${WGF}/${mem_num}/ics"
 
diff --git a/jobs/JRRFS_BUFRSND b/jobs/JRRFS_BUFRSND
index 3db1d3982..9c700a582 100755
--- a/jobs/JRRFS_BUFRSND
+++ b/jobs/JRRFS_BUFRSND
@@ -68,6 +68,11 @@ export jobid=${taskid}
 export fhr=01
 export tmmark=tm00
 
+if [ $WGF = "enkf" ] || [ $WGF = "ensf" ]; then
+  export ENSMEM_INDX=`echo ${GDAS_MEM_NAME} | cut -c4-6`
+else
+  export ENSMEM_INDX=""
+fi
 export mem_num=m$(echo "${ENSMEM_INDX}")
 
 CYCLE_TYPE=${CYCLE_TYPE:-prod}
diff --git a/jobs/JRRFS_FORECAST b/jobs/JRRFS_FORECAST
index 7ac6e7740..a6c5fa97a 100755
--- a/jobs/JRRFS_FORECAST
+++ b/jobs/JRRFS_FORECAST
@@ -67,6 +67,11 @@ export RUN=${RUN:-rrfs}
 #export jobid=${jobid:-${taskid}}
 export jobid=${taskid}
 
+if [ $WGF = "enkf" ] || [ $WGF = "ensf" ]; then
+  export ENSMEM_INDX=`echo ${GDAS_MEM_NAME} | cut -c4-6`
+else
+  export ENSMEM_INDX=""
+fi
 export mem_num=m$(echo "${ENSMEM_INDX}")
 
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
diff --git a/jobs/JRRFS_MAKE_ICS b/jobs/JRRFS_MAKE_ICS
index f0c2564d6..10592e18c 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}"
@@ -137,6 +137,11 @@ export RUN=${RUN:-rrfs}
 export outid=${outid:-"LL$job"}
 export jobid=${jobid:-taskid}
 
+if [ $WGF = "enkf" ] || [ $WGF = "ensf" ]; then
+  export ENSMEM_INDX=`echo ${GDAS_MEM_NAME} | cut -c4-6`
+else
+  export ENSMEM_INDX=""
+fi
 export mem_num=m$(echo "${ENSMEM_INDX}")
 if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
   export umbrella_data="${DATAROOT}/${RUN}_${PDY}${cyc}/${WGF}/${mem_num}/ics"
diff --git a/jobs/JRRFS_MAKE_LBCS b/jobs/JRRFS_MAKE_LBCS
index 4b1823390..2a06216f1 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}"
@@ -176,6 +176,11 @@ export RUN=${RUN:-rrfs}
 export outid=${outid:-"LL$job"}
 export jobid=${jobid:-taskid}
 
+if [ $WGF = "enkf" ] || [ $WGF = "ensf" ]; then
+  export ENSMEM_INDX=`echo ${GDAS_MEM_NAME} | cut -c4-6`
+else
+  export ENSMEM_INDX=""
+fi
 export mem_num=m$(echo "${ENSMEM_INDX}")
 
 export DATA=${DATAROOT}/${jobid}
diff --git a/jobs/JRRFS_POST b/jobs/JRRFS_POST
index 462658c79..3830b5026 100755
--- a/jobs/JRRFS_POST
+++ b/jobs/JRRFS_POST
@@ -65,6 +65,11 @@ export RUN=${RUN:-rrfs}
 #export jobid=${jobid:-${taskid}}
 export jobid=${taskid}
 
+if [ $WGF = "enkf" ] || [ $WGF = "ensf" ]; then
+  export ENSMEM_INDX=`echo ${GDAS_MEM_NAME} | cut -c4-6`
+else
+  export ENSMEM_INDX=""
+fi
 export mem_num=m$(echo "${ENSMEM_INDX}")
 
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
diff --git a/jobs/JRRFS_PRDGEN b/jobs/JRRFS_PRDGEN
index 1ae7fe361..8c5d19244 100755
--- a/jobs/JRRFS_PRDGEN
+++ b/jobs/JRRFS_PRDGEN
@@ -65,6 +65,11 @@ export RUN=${RUN:-rrfs}
 #export jobid=${jobid:-${taskid}}
 export jobid=${taskid}
 
+if [ $WGF = "enkf" ] || [ $WGF = "ensf" ]; then
+  export ENSMEM_INDX=`echo ${GDAS_MEM_NAME} | cut -c4-6`
+else
+  export ENSMEM_INDX=""
+fi
 export mem_num=m$(echo "${ENSMEM_INDX}")
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
 
diff --git a/jobs/JRRFS_PREP_CYC b/jobs/JRRFS_PREP_CYC
index 599f7fcf7..1cb9d2bb2 100755
--- a/jobs/JRRFS_PREP_CYC
+++ b/jobs/JRRFS_PREP_CYC
@@ -65,6 +65,11 @@ export RUN=${RUN:-rrfs}
 #export jobid=${jobid:-${taskid}}
 export jobid=${taskid}
 
+if [ $WGF = "enkf" ] || [ $WGF = "ensf" ]; then
+  export ENSMEM_INDX=`echo ${GDAS_MEM_NAME} | cut -c4-6`
+else
+  export ENSMEM_INDX=""
+fi
 export mem_num=m$(echo "${ENSMEM_INDX}")
 
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
diff --git a/jobs/JRRFS_SAVE_DA_OUTPUT b/jobs/JRRFS_SAVE_DA_OUTPUT
index 43c2a6a6d..7098f4102 100755
--- a/jobs/JRRFS_SAVE_DA_OUTPUT
+++ b/jobs/JRRFS_SAVE_DA_OUTPUT
@@ -61,6 +61,11 @@ export RUN=${RUN:-rrfs}
 #export jobid=${jobid:-${taskid}}
 export jobid=${taskid}
 
+if [ $WGF = "enkf" ] || [ $WGF = "ensf" ]; then
+  export ENSMEM_INDX=`echo ${GDAS_MEM_NAME} | cut -c4-6`
+else
+  export ENSMEM_INDX=""
+fi
 export mem_num=m$(echo "${ENSMEM_INDX}")
 
 # NWGES_DIR is the directory in which the model IC file (DA analysis) will be saved
diff --git a/jobs/JRRFS_SAVE_RESTART b/jobs/JRRFS_SAVE_RESTART
index 9905d70a1..3cbeb7d20 100755
--- a/jobs/JRRFS_SAVE_RESTART
+++ b/jobs/JRRFS_SAVE_RESTART
@@ -61,6 +61,11 @@ export RUN=${RUN:-rrfs}
 #export jobid=${jobid:-${taskid}}
 export jobid=${taskid}
 
+if [ $WGF = "enkf" ] || [ $WGF = "ensf" ]; then
+  export ENSMEM_INDX=`echo ${GDAS_MEM_NAME} | cut -c4-6`
+else
+  export ENSMEM_INDX=""
+fi
 export mem_num=m$(echo "${ENSMEM_INDX}")
 
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
diff --git a/jobs/JRRFS_UPDATE_LBC_SOIL b/jobs/JRRFS_UPDATE_LBC_SOIL
index ed56c366c..25ae3329a 100755
--- a/jobs/JRRFS_UPDATE_LBC_SOIL
+++ b/jobs/JRRFS_UPDATE_LBC_SOIL
@@ -64,6 +64,11 @@ export RUN=${RUN:-rrfs}
 #export jobid=${jobid:-${taskid}}
 export jobid=${taskid}
 
+if [ $WGF = "enkf" ] || [ $WGF = "ensf" ]; then
+  export ENSMEM_INDX=`echo ${GDAS_MEM_NAME} | cut -c4-6`
+else
+  export ENSMEM_INDX=""
+fi
 export mem_num=m$(echo "${ENSMEM_INDX}")
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
 
diff --git a/parm/FV3LAM_wflow.xml b/parm/FV3LAM_wflow.xml
index 7ac1515e1..e8d60bd94 100644
--- a/parm/FV3LAM_wflow.xml
+++ b/parm/FV3LAM_wflow.xml
@@ -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>
@@ -857,7 +857,7 @@ MODULES_RUN_TASK_FP script.
     <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
     <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
     <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
-    <envar><name>EXTRN_MDL_NAME</name><value>{{ extrn_mdl_name_lbcs }}</value></envar>
+    <envar><name>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_firewx.xml b/parm/FV3LAM_wflow_firewx.xml
index 3ef860b12..0cf2e4de4 100644
--- a/parm/FV3LAM_wflow_firewx.xml
+++ b/parm/FV3LAM_wflow_firewx.xml
@@ -296,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>
@@ -339,7 +339,7 @@ MODULES_RUN_TASK_FP script.
       <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
       <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
       <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
-      <envar><name>EXTRN_MDL_NAME</name><value>{{ extrn_mdl_name_lbcs }}</value></envar>
+      <envar><name>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 8aadb11b2..40f1efae9 100644
--- a/parm/FV3LAM_wflow_nonDA.xml
+++ b/parm/FV3LAM_wflow_nonDA.xml
@@ -298,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>
@@ -349,7 +349,7 @@ MODULES_RUN_TASK_FP script.
       <envar><name>DATAROOT</name><value>&DATAROOT;</value></envar>
       <envar><name>COMROOT</name><value>&COMROOT;</value></envar>
       <envar><name>GESROOT</name><value>&GESROOT;</value></envar>
-      <envar><name>EXTRN_MDL_NAME</name><value>{{ extrn_mdl_name_lbcs }}</value></envar>
+      <envar><name>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/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_n3 b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_enkf_n3
index 09961d5a9..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
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 a0b1affd2..3ec36f338 100644
--- a/ush/sample_configs/RRFS_A/config.sh_rrfs_a_n3
+++ b/ush/sample_configs/RRFS_A/config.sh_rrfs_a_n3
@@ -117,9 +117,9 @@ EXTRN_MDL_NAME_ICS="GFS"
 EXTRN_MDL_NAME_LBCS="GFS"
 
 envir="para"
-NET="rrfs_a"
+NET="rrfs"
 TAG="n3v91"
-MODEL="rrfs_a"
+MODEL="rrfs"
 RUN="rrfs"
 WGF="det"