Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change RUN and CDUMP for ensemble jobs #1309

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions jobs/JGDAS_ATMOS_ANALYSIS_DIAG
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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
Expand Down
28 changes: 8 additions & 20 deletions jobs/JGDAS_ATMOS_CHGRES_FORENKF
Original file line number Diff line number Diff line change
Expand Up @@ -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"
KateFriedman-NOAA marked this conversation as resolved.
Show resolved Hide resolved

###############################################################
# Run relevant script
Expand Down
40 changes: 21 additions & 19 deletions jobs/JGDAS_ENKF_DIAG
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,33 @@ GDATE=$(${NDATE} -${assim_freq} ${CDATE})
gPDY=$(echo ${GDATE} | cut -c1-8)
gcyc=$(echo ${GDATE} | cut -c9-10)
GDUMP=${GDUMP:-"gdas"}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
GDUMP=${GDUMP:-"gdas"}
GDUMP="gdas"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This wasn't something I changed, but I've changed it now to what you suggested (I had wondered the same thing).

GDUMP_ENS=${GDUMP_ENS:-"enkf${GDUMP}"}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a j-job. There is no one above this job setting GDUMP_ENS.

Suggested change
GDUMP_ENS=${GDUMP_ENS:-"enkf${GDUMP}"}
GDUMP_ENS="enkf${GDUMP}"

Same on the line above for 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}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is intent of introducing CDUMP_CTL?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same for CDUMP_OBS

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CDUMP_OBS was a pre-existing variable. I created CDUMP_CTL so as not to misuse CDUMP_OBS for the deterministic member (even though they will be the same for now). I think this all goes away in the COM refactor when I revert CDUMP and use it per our discussion for both of these.



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
Expand All @@ -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"
Expand Down
34 changes: 11 additions & 23 deletions jobs/JGDAS_ENKF_ECEN
Original file line number Diff line number Diff line change
Expand Up @@ -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"


Expand All @@ -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}"}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar comment as the one made above.


export CASE=${CASE_ENKF}

export CDUMP_OBS=${CDUMP_OBS:-${CDUMP/enkf}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CDUMP_OBS is needed for?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was done because this is how other j-jobs did it (though I clearly wasn't consistent, since I didn't use a CDUMP_CTL and instead just did the substitution in-line). I didn't worry too much about consistency since I know this is all about to be substantially refactored anyway.


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}"


###############################################################
Expand Down
6 changes: 3 additions & 3 deletions jobs/JGDAS_ENKF_FCST
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions jobs/JGDAS_ENKF_POST
Original file line number Diff line number Diff line change
Expand Up @@ -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"


Expand All @@ -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))
Expand Down
30 changes: 19 additions & 11 deletions jobs/JGDAS_ENKF_SELECT_OBS
Original file line number Diff line number Diff line change
Expand Up @@ -22,30 +22,32 @@ 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 APREFIX_ANL="${CDUMP/enkf}.t${cyc}z."
export GPREFIX_CTL="${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

# 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${GSUFFIX}"
if [[ ! -f ${ATMGES_ENSMEAN} ]]; then
Expand All @@ -68,11 +70,17 @@ if [[ ${DONST} = "YES" ]]; then
fi
export PREPQCPF="${COMIN_OBS}/${OPREFIX}prepbufr.acft_profiles"

# Deterministic analysis and increment files
export SFCANL="${COMIN_ANL}/${APREFIX_ANL}sfcanl.nc"
export DTFANL="${COMIN_ANL}/${APREFIX_ANL}dtfanl.nc"
export ATMANL="${COMIN_ANL}/${APREFIX_ANL}atmanl.nc"
export ATMINC="${COMIN_ANL}/${APREFIX_ANL}atminc.nc"

# 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_CTL}abias
export GBIASPC=${COMIN_GES_CTL}/${GPREFIX_CTL}abias_pc
export GBIASAIR=${COMIN_GES_CTL}/${GPREFIX_CTL}abias_air
export GRADSTAT=${COMIN_GES_CTL}/${GPREFIX_CTL}radstat

# Bias correction coefficients related to ensemble mean
export ABIAS="${COMOUT}/${APREFIX}abias.ensmean"
Expand Down
32 changes: 10 additions & 22 deletions jobs/JGDAS_ENKF_SFC
Original file line number Diff line number Diff line change
Expand Up @@ -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}"


###############################################################
Expand Down
6 changes: 3 additions & 3 deletions jobs/JGDAS_ENKF_UPDATE
Original file line number Diff line number Diff line change
Expand Up @@ -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"


Expand All @@ -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}"


###############################################################
Expand Down
3 changes: 2 additions & 1 deletion jobs/JGLOBAL_ATMOS_ANALYSIS
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion jobs/JGLOBAL_ATMOS_ANALYSIS_CALC
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down
Loading