Change RUN for ensemble jobs

Updates `$RUN` and `$CDUMP` for ensemble jobs to include `enkf`. Previously, the `$RUN` for EnKF jobs had been set to `gdas` or `gfs`. However, this violates NCO policy and was also complicating Issue NOAA-EMC#761. Now the `$RUN` for EnKF jobs is either `enkfgdas` or `enkfgfs`. Theoeretically, `$CDUMP` shouldn't need to change. However, `$CDUMP` and `$RUN` are used interchangably throughout much of the workflow (Issue NOAA-EMC#1299), so for now the `$CDUMP` is kept identical to `$RUN`. Refs: NOAA-EMC#1298
WalterKolczynski-NOAA · Feb 7, 2023 · 4589bde · 4589bde
1 parent 219c23b
commit 4589bde
Show file tree

Hide file tree

Showing 25 changed files with 176 additions and 205 deletions.
diff --git a/jobs/JGDAS_ATMOS_ANALYSIS_DIAG b/jobs/JGDAS_ATMOS_ANALYSIS_DIAG
@@ -24,10 +24,10 @@ GDUMP=${GDUMP:-"gdas"}
 export OPREFIX="${CDUMP}.t${cyc}z."
 export GPREFIX="${GDUMP}.t${gcyc}z."
 export APREFIX="${CDUMP}.t${cyc}z."
+export GPREFIX_ENS="enkf${GDUMP}.t${gcyc}z."
 
 
 if [ ${RUN_ENVIR} = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
-    export COMIN=${COMIN:-${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos}
     export COMOUT=${COMOUT:-${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos}
     export COMIN_OBS=${COMIN_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/${RUN}.${PDY}/${cyc}/atmos}
     export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/${GDUMP}.${gPDY}/${gcyc}/atmos}
@@ -50,7 +50,7 @@ fi
 
 
 if [ ${DOHYBVAR} = "YES" ]; then
-    export ATMGES_ENSMEAN="${COMIN_GES_ENS}/${GPREFIX}atmf006.ensmean.nc"
+    export ATMGES_ENSMEAN="${COMIN_GES_ENS}/${GPREFIX_ENS}atmf006.ensmean.nc"
     if [ ! -f ${ATMGES_ENSMEAN} ]; then
         echo "FATAL ERROR: FILE MISSING: ATMGES_ENSMEAN = ${ATMGES_ENSMEAN}"
         exit 2

diff --git a/jobs/JGDAS_ATMOS_CHGRES_FORENKF b/jobs/JGDAS_ATMOS_CHGRES_FORENKF
@@ -17,31 +17,19 @@ export DO_CALC_ANALYSIS=${DO_CALC_ANALYSIS:-"YES"}
 # Begin JOB SPECIFIC work
 ##############################################
 
-GDATE=$(${NDATE} -${assim_freq} ${CDATE})
-gPDY=$(echo ${GDATE} | cut -c1-8)
-gcyc=$(echo ${GDATE} | cut -c9-10)
-GDUMP=${GDUMP:-"gdas"}
-
-export OPREFIX="${CDUMP}.t${cyc}z."
-export GPREFIX="${GDUMP}.t${gcyc}z."
-export APREFIX="${CDUMP}.t${cyc}z."
+export APREFIX="${CDUMP/enkf}.t${cyc}z."
+export APREFIX_ENS="${CDUMP}.t${cyc}z."
 
 if [ ${RUN_ENVIR} = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
-    export COMIN=${COMIN:-${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos}
-    export COMOUT=${COMOUT:-${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos}
-    export COMOUT_ENS=${COMOUT_ENS:-${ROTDIR}/enkfgdas.${PDY}/${cyc}}
-    export COMIN_OBS=${COMIN_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/${RUN}.${PDY}/${cyc}/atmos}
-    export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/${GDUMP}.${gPDY}/${gcyc}/atmos}
+    export COMOUT=${COMOUT:-${ROTDIR}/${RUN/enkf}.${PDY}/${cyc}/atmos}
+    export COMOUT_ENS=${COMOUT_ENS:-${ROTDIR}/${RUN}.${PDY}/${cyc}}
 else
-    export COMOUT="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos"
-    export COMOUT_ENS="${ROTDIR}/enkfgdas.${PDY}/${cyc}"
-    export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs}"
-    export COMIN_GES_OBS="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/obs"
+    export COMOUT="${ROTDIR}/${RUN/enkf}.${PDY}/${cyc}/atmos"
+    export COMOUT_ENS="${ROTDIR}/${RUN}.${PDY}/${cyc}"
 fi
 mkdir -m 775 -p ${COMOUT}
-# COMIN_GES and COMIN_GES_ENS are used in script
-export COMIN_GES="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/atmos"
-export COMIN_GES_ENS="${ROTDIR}/enkfgdas.${gPDY}/${gcyc}"
+
+export ATMFCST_ENSRES="${COMOUT_ENS}/mem001/atmos/${APREFIX_ENS}atmf006.nc"
 
 ###############################################################
 # Run relevant script

diff --git a/jobs/JGDAS_ENKF_DIAG b/jobs/JGDAS_ENKF_DIAG
@@ -22,31 +22,33 @@ GDATE=$(${NDATE} -${assim_freq} ${CDATE})
 gPDY=$(echo ${GDATE} | cut -c1-8)
 gcyc=$(echo ${GDATE} | cut -c9-10)
 GDUMP=${GDUMP:-"gdas"}
+GDUMP_ENS=${GDUMP_ENS:-"enkf${GDUMP}"}
 
 export CASE=${CASE_ENKF}
-export CDUMP_OBS=${CDUMP_OBS:-${CDUMP}}
+export CDUMP_OBS=${CDUMP_OBS:-${CDUMP/enkf}}
+export CDUMP_CTL=${CDUMP_CTL:-${CDUMP/enkf}}
+
 
 export OPREFIX="${CDUMP_OBS}.t${cyc}z."
-export APREFIX="${CDUMP}.t${cyc}z."
+export APREFIX="${CDUMP_CTL}.t${cyc}z."
+export APREFIX_ENS="${CDUMP}.t${cyc}z."
 export GPREFIX="${GDUMP}.t${gcyc}z."
+export GPREFIX_ENS="${GDUMP_ENS}.t${gcyc}z."
 
 if [ ${RUN_ENVIR} = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
-    export COMIN_OBS=${COMIN_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/${RUN}.${PDY}/${cyc}/${COMPONENT}}
-    export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/${GDUMP}.${gPDY}/${gcyc}/${COMPONENT}}
+    export COMIN_OBS=${COMIN_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/${CDUMP_OBS}.${PDY}/${cyc}/${COMPONENT}}
 else
-    export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs}"
-    export COMIN_GES_OBS="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/obs"
+    export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP_OBS}.${PDY}/${cyc}/obs}"
 fi
 
 # COMIN_GES, COMIN_ANL COMIN_GES_ENS, and COMOUT  are used in script
 COMIN_GES_CTL="${ROTDIR}/gdas.${gPDY}/${gcyc}/${COMPONENT}"
-export COMIN_ANL="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENT}"
+export COMIN_ANL="${ROTDIR}/${CDUMP/enkf}.${PDY}/${cyc}/${COMPONENT}"
 export COMIN_GES_ENS="${ROTDIR}/enkfgdas.${gPDY}/${gcyc}"
-export COMIN_GES=${COMIN_GES_ENS}
-export COMOUT="${ROTDIR}/enkf${CDUMP}.${PDY}/${cyc}"
+export COMOUT="${ROTDIR}/${CDUMP}.${PDY}/${cyc}"
 
 
-export ATMGES_ENSMEAN="${COMIN_GES_ENS}/${GPREFIX}atmf006.ensmean.nc"
+export ATMGES_ENSMEAN="${COMIN_GES_ENS}/${GPREFIX_ENS}atmf006.ensmean.nc"
 if [ ! -f ${ATMGES_ENSMEAN} ]; then
     echo "FATAL ERROR: FILE MISSING: ATMGES_ENSMEAN = ${ATMGES_ENSMEAN}"
     exit 1
@@ -71,21 +73,21 @@ export GBIASAIR=${COMIN_GES_CTL}/${GPREFIX}abias_air
 export GRADSTAT=${COMIN_GES_CTL}/${GPREFIX}radstat
 
 # Bias correction coefficients related to ensemble mean
-export ABIAS="${COMOUT}/${APREFIX}abias.ensmean"
-export ABIASPC="${COMOUT}/${APREFIX}abias_pc.ensmean"
-export ABIASAIR="${COMOUT}/${APREFIX}abias_air.ensmean"
-export ABIASe="${COMOUT}/${APREFIX}abias_int.ensmean"
+export ABIAS="${COMOUT}/${APREFIX_ENS}abias.ensmean"
+export ABIASPC="${COMOUT}/${APREFIX_ENS}abias_pc.ensmean"
+export ABIASAIR="${COMOUT}/${APREFIX_ENS}abias_air.ensmean"
+export ABIASe="${COMOUT}/${APREFIX_ENS}abias_int.ensmean"
 
 # Diagnostics related to ensemble mean
-export GSISTAT="${COMOUT}/${APREFIX}gsistat.ensmean"
-export CNVSTAT="${COMOUT}/${APREFIX}cnvstat.ensmean"
-export OZNSTAT="${COMOUT}/${APREFIX}oznstat.ensmean"
-export RADSTAT="${COMOUT}/${APREFIX}radstat.ensmean"
+export GSISTAT="${COMOUT}/${APREFIX_ENS}gsistat.ensmean"
+export CNVSTAT="${COMOUT}/${APREFIX_ENS}cnvstat.ensmean"
+export OZNSTAT="${COMOUT}/${APREFIX_ENS}oznstat.ensmean"
+export RADSTAT="${COMOUT}/${APREFIX_ENS}radstat.ensmean"
 
 # Select observations based on ensemble mean
 export RUN_SELECT="YES"
 export USE_SELECT="NO"
-export SELECT_OBS="${COMOUT}/${APREFIX}obsinput.ensmean"
+export SELECT_OBS="${COMOUT}/${APREFIX_ENS}obsinput.ensmean"
 
 export DIAG_SUFFIX="_ensmean"
 export DIAG_COMPRESS="NO"

diff --git a/jobs/JGDAS_ENKF_ECEN b/jobs/JGDAS_ENKF_ECEN
@@ -8,7 +8,7 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "ecen" -c "base ecen"
 # Set variables used in the script
 ##############################################
 export CDATE=${CDATE:-${PDY}${cyc}}
-export CDUMP=${CDUMP:-${RUN:-"gdas"}}
+export CDUMP=${CDUMP:-${RUN:-"enkfgdas"}}
 export COMPONENT="atmos"
 
 
@@ -20,35 +20,23 @@ GDATE=$(${NDATE} -${assim_freq} ${CDATE})
 gPDY=$(echo ${GDATE} | cut -c1-8)
 gcyc=$(echo ${GDATE} | cut -c9-10)
 GDUMP=${GDUMP:-"gdas"}
+GDUMP_ENS=${GDUMP_ENS:-"enkf${GDUMP}"}
 
 export CASE=${CASE_ENKF}
 
+export CDUMP_OBS=${CDUMP_OBS:-${CDUMP/enkf}}
 
-EUPD_CYC=$(echo ${EUPD_CYC:-"gdas"} | tr a-z A-Z)
-if [[ ${EUPD_CYC} = "GFS" ]]; then
-    CDUMP_ENKF="gfs"
-else
-    CDUMP_ENKF=${CDUMP}
-fi
-
-export OPREFIX="${CDUMP}.t${cyc}z."
-export APREFIX="${CDUMP}.t${cyc}z."
-export APREFIX_ENKF="${CDUMP_ENKF}.t${cyc}z."
+export OPREFIX="${CDUMP_OBS}.t${cyc}z."
+export APREFIX="${CDUMP/enkf}.t${cyc}z."
+export APREFIX_ENS="${CDUMP}.t${cyc}z."
 export GPREFIX="${GDUMP}.t${gcyc}z."
-
-if [ ${RUN_ENVIR} = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
-    export COMIN_OBS=${COMIN_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/${RUN}.${PDY}/${cyc}/atmos}
-    export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/${GDUMP}.${gPDY}/${gcyc}/atmos}
-else
-    export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs}"
-    export COMIN_GES_OBS="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/obs"
-fi
+export GPREFIX_ENS="${GDUMP_ENS}.t${gcyc}z."
 
 # COMIN, COMIN_ENS and COMIN_GES_ENS are used in script
-export COMIN="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos"
-export COMIN_ENS="${ROTDIR}/enkf${CDUMP_ENKF}.${PDY}/${cyc}"
-export COMOUT_ENS="${ROTDIR}/enkf${CDUMP}.${PDY}/${cyc}"
-export COMIN_GES_ENS="${ROTDIR}/enkf${GDUMP}.${gPDY}/${gcyc}"
+export COMIN="${ROTDIR}/${CDUMP/enkf}.${PDY}/${cyc}/atmos"
+export COMIN_ENS="${ROTDIR}/${CDUMP}.${PDY}/${cyc}"
+export COMOUT_ENS="${ROTDIR}/${CDUMP}.${PDY}/${cyc}"
+export COMIN_GES_ENS="${ROTDIR}/${GDUMP_ENS}.${gPDY}/${gcyc}"
 
 
 ###############################################################

diff --git a/jobs/JGDAS_ENKF_FCST b/jobs/JGDAS_ENKF_FCST
@@ -8,9 +8,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "efcs" -c "base fcst efcs"
 # Set variables used in the script
 ##############################################
 export CDATE=${CDATE:-${PDY}${cyc}}
-export CDUMP=${CDUMP:-${RUN:-"gdas"}}
+export CDUMP=${CDUMP:-${RUN:-"enkfgdas"}}
 export COMPONENT="atmos"
-export rCDUMP="gdas"
+export rCDUMP="enkfgdas"
 
 ##############################################
 # Begin JOB SPECIFIC work
@@ -19,7 +19,7 @@ export rCDUMP="gdas"
 export CASE=${CASE_ENKF}
 
 # COMOUT is used in script
-export COMOUT="${ROTDIR}/enkf${CDUMP}.${PDY}/${cyc}"
+export COMOUT="${ROTDIR}/${CDUMP}.${PDY}/${cyc}"
 
 
 # Forecast length for EnKF forecast

diff --git a/jobs/JGDAS_ENKF_POST b/jobs/JGDAS_ENKF_POST
@@ -8,7 +8,7 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "epos" -c "base epos"
 # Set variables used in the script
 ##############################################
 export CDATE=${CDATE:-${PDY}${cyc}}
-export CDUMP=${CDUMP:-${RUN:-"gdas"}}
+export CDUMP=${CDUMP:-${RUN:-"enkfgdas"}}
 export COMPONENT="atmos"
 
 
@@ -20,8 +20,8 @@ export GFS_NCIO=${GFS_NCIO:-"YES"}
 export PREFIX="${CDUMP}.t${cyc}z."
 
 # COMIN, COMOUT are used in script
-export COMIN="${ROTDIR}/enkf${CDUMP}.${PDY}/${cyc}"
-export COMOUT="${ROTDIR}/enkf${CDUMP}.${PDY}/${cyc}"
+export COMIN="${ROTDIR}/${CDUMP}.${PDY}/${cyc}"
+export COMOUT="${ROTDIR}/${CDUMP}.${PDY}/${cyc}"
 
 
 export LEVS=$((LEVS-1))

diff --git a/jobs/JGDAS_ENKF_SELECT_OBS b/jobs/JGDAS_ENKF_SELECT_OBS
@@ -22,20 +22,22 @@ GDATE=$(${NDATE} -${assim_freq} ${CDATE})
 gPDY=$(echo ${GDATE} | cut -c1-8)
 gcyc=$(echo ${GDATE} | cut -c9-10)
 GDUMP=${GDUMP:-"gdas"}
+GDUMP_ENS=${GDUMP_ENS:-"enkf${GDUMP}"}
 
 export CASE=${CASE_ENKF}
-export CDUMP_OBS=${CDUMP_OBS:-${CDUMP}}
+export CDUMP_OBS=${CDUMP_OBS:-${CDUMP/enkf}}
 
 export OPREFIX="${CDUMP_OBS}.t${cyc}z."
 export APREFIX="${CDUMP}.t${cyc}z."
-export GPREFIX="${GDUMP}.t${gcyc}z."
+export GPREFIX_DET="${GDUMP}.t${gcyc}z."
+export GPREFIX="${GDUMP_ENS}.t${gcyc}z."
 export GSUFFIX=".ensmean.nc"
 
 if [ ${RUN_ENVIR} = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
-    export COMIN_OBS=${COMIN_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/${RUN}.${PDY}/${cyc}/${COMPONENT}}
+    export COMIN_OBS=${COMIN_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/${CDUMP_OBS}.${PDY}/${cyc}/${COMPONENT}}
     export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/${GDUMP}.${gPDY}/${gcyc}/${COMPONENT}}
 else
-    export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs}"
+    export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP_OBS}.${PDY}/${cyc}/obs}"
     export COMIN_GES_OBS="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/obs"
 fi
 
@@ -44,7 +46,7 @@ COMIN_GES_CTL="${ROTDIR}/gdas.${gPDY}/${gcyc}/${COMPONENT}"
 export COMIN_ANL="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENT}"
 export COMIN_GES_ENS="${ROTDIR}/enkfgdas.${gPDY}/${gcyc}"
 export COMIN_GES=${COMIN_GES_ENS}
-export COMOUT="${ROTDIR}/enkf${CDUMP}.${PDY}/${cyc}"
+export COMOUT="${ROTDIR}/${CDUMP}.${PDY}/${cyc}"
 
 
 export ATMGES_ENSMEAN="${COMIN_GES_ENS}/${GPREFIX}atmf006${GSUFFIX}"
@@ -69,10 +71,10 @@ fi
 export PREPQCPF="${COMIN_OBS}/${OPREFIX}prepbufr.acft_profiles"
 
 # Guess Bias correction coefficients related to control
-export GBIAS=${COMIN_GES_CTL}/${GPREFIX}abias
-export GBIASPC=${COMIN_GES_CTL}/${GPREFIX}abias_pc
-export GBIASAIR=${COMIN_GES_CTL}/${GPREFIX}abias_air
-export GRADSTAT=${COMIN_GES_CTL}/${GPREFIX}radstat
+export GBIAS=${COMIN_GES_CTL}/${GPREFIX_DET}abias
+export GBIASPC=${COMIN_GES_CTL}/${GPREFIX_DET}abias_pc
+export GBIASAIR=${COMIN_GES_CTL}/${GPREFIX_DET}abias_air
+export GRADSTAT=${COMIN_GES_CTL}/${GPREFIX_DET}radstat
 
 # Bias correction coefficients related to ensemble mean
 export ABIAS="${COMOUT}/${APREFIX}abias.ensmean"

diff --git a/jobs/JGDAS_ENKF_SFC b/jobs/JGDAS_ENKF_SFC
@@ -20,36 +20,24 @@ GDATE=$(${NDATE} -${assim_freq} ${CDATE})
 gPDY=$(echo ${GDATE} | cut -c1-8)
 gcyc=$(echo ${GDATE} | cut -c9-10)
 GDUMP=${GDUMP:-"gdas"}
+GDUMP_ENS=${GDUMP_ENS:-"enkf${GDUMP}"}
 
 export CASE=${CASE_ENKF}
 
+export CDUMP_OBS=${CDUMP_OBS:-${CDUMP/enkf}}
 
-EUPD_CYC=$(echo ${EUPD_CYC:-"gdas"} | tr a-z A-Z)
-if [[ ${EUPD_CYC} = "GFS" ]]; then
-    CDUMP_ENKF="gfs"
-else
-    CDUMP_ENKF=${CDUMP}
-fi
-
-export OPREFIX="${CDUMP}.t${cyc}z."
-export APREFIX="${CDUMP}.t${cyc}z."
-export APREFIX_ENKF="${CDUMP_ENKF}.t${cyc}z."
+export OPREFIX="${CDUMP_OBS}.t${cyc}z."
+export APREFIX="${CDUMP/enkf}.t${cyc}z."
+export APREFIX_ENS="${CDUMP}.t${cyc}z."
 export GPREFIX="${GDUMP}.t${gcyc}z."
-
-if [ ${RUN_ENVIR} = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
-    export COMIN_OBS=${COMIN_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/${RUN}.${PDY}/${cyc}/atmos}
-    export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/${GDUMP}.${gPDY}/${gcyc}/atmos}
-else
-    export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs}"
-    export COMIN_GES_OBS="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/obs"
-fi
+export GPREFIX_ENS="${GDUMP_ENS}.t${gcyc}z."
 
 # COMIN, COMIN_ENS and COMIN_GES_ENS are used in script
-export COMIN="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos"
+export COMIN="${ROTDIR}/${RUN/enkf}.${PDY}/${cyc}/atmos"
 export COMIN_GES="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/atmos"
-export COMIN_ENS="${ROTDIR}/enkf${CDUMP_ENKF}.${PDY}/${cyc}"
-export COMOUT_ENS="${ROTDIR}/enkf${CDUMP}.${PDY}/${cyc}"
-export COMIN_GES_ENS="${ROTDIR}/enkf${GDUMP}.${gPDY}/${gcyc}"
+export COMIN_ENS="${ROTDIR}/${CDUMP}.${PDY}/${cyc}"
+export COMOUT_ENS="${ROTDIR}/${CDUMP}.${PDY}/${cyc}"
+export COMIN_GES_ENS="${ROTDIR}/${GDUMP_ENS}.${gPDY}/${gcyc}"
 
 
 ###############################################################

diff --git a/jobs/JGDAS_ENKF_UPDATE b/jobs/JGDAS_ENKF_UPDATE
@@ -8,7 +8,7 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "eupd" -c "base anal eupd"
 # Set variables used in the script
 ##############################################
 export CDATE=${CDATE:-${PDY}${cyc}}
-export CDUMP=${CDUMP:-${RUN:-"gdas"}}
+export CDUMP=${CDUMP:-${RUN:-"enkfgdas"}}
 export COMPONENT="atmos"
 
 
@@ -21,11 +21,11 @@ gPDY=$(echo ${GDATE} | cut -c1-8)
 gcyc=$(echo ${GDATE} | cut -c9-10)
 
 export APREFIX="${CDUMP}.t${cyc}z."
-export GPREFIX="gdas.t${gcyc}z."
+export GPREFIX="enkfgdas.t${gcyc}z."
 
 # COMIN_GES_ENS and COMOUT_ANL_ENS are used in script
 export COMIN_GES_ENS="${ROTDIR}/enkfgdas.${gPDY}/${gcyc}"
-export COMOUT_ANL_ENS="${ROTDIR}/enkf${CDUMP}.${PDY}/${cyc}"
+export COMOUT_ANL_ENS="${ROTDIR}/${CDUMP}.${PDY}/${cyc}"
 
 
 ###############################################################

diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS b/jobs/JGLOBAL_ATMOS_ANALYSIS
@@ -27,6 +27,7 @@ GDUMP=${GDUMP:-"gdas"}
 export OPREFIX="${CDUMP}.t${cyc}z."
 export GPREFIX="${GDUMP}.t${gcyc}z."
 export APREFIX="${CDUMP}.t${cyc}z."
+export GPREFIX_ENS="enkf${GDUMP}.t${gcyc}z."
 
 export COMIN=${COMIN:-${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos}
 export COMOUT=${COMOUT:-${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos}
@@ -57,7 +58,7 @@ status=$?
 
 
 if [ ${DOHYBVAR} = "YES" ]; then
-    export ATMGES_ENSMEAN="${COMIN_GES_ENS}/${GPREFIX}atmf006.ensmean.nc"
+    export ATMGES_ENSMEAN="${COMIN_GES_ENS}/enkf${GPREFIX}atmf006.ensmean.nc"
     if [ ! -f ${ATMGES_ENSMEAN} ]; then
         echo "FATAL ERROR: FILE MISSING: ATMGES_ENSMEAN = ${ATMGES_ENSMEAN}"
         exit 2

diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC b/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC
@@ -25,6 +25,7 @@ GDUMP=${GDUMP:-"gdas"}
 export OPREFIX="${CDUMP}.t${cyc}z."
 export GPREFIX="${GDUMP}.t${gcyc}z."
 export APREFIX="${CDUMP}.t${cyc}z."
+export GPREFIX_ENS="enkf${GDUMP}.t${gcyc}z."
 
 if [ ${RUN_ENVIR} = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
     export COMIN=${COMIN:-${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos}
@@ -56,7 +57,7 @@ status=$?
 
 
 if [ ${DOHYBVAR} = "YES" ]; then
-    export ATMGES_ENSMEAN="${COMIN_GES_ENS}/${GPREFIX}atmf006.ensmean.nc"
+    export ATMGES_ENSMEAN="${COMIN_GES_ENS}/${GPREFIX_ENS}atmf006.ensmean.nc"
     if [ ! -f ${ATMGES_ENSMEAN} ]; then
         echo "FATAL ERROR: FILE MISSING: ATMGES_ENSMEAN = ${ATMGES_ENSMEAN}"
         exit 2