Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
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
6 changes: 3 additions & 3 deletions jobs/JGDAS_ATMOS_ANALYSIS_DIAG
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ if [ ${RUN_ENVIR} = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/${GDUMP}.${gPDY}/${gcyc}/atmos}
else
export COMOUT="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos"
export COMIN_OBS="${DMPDIR}/${CDUMP}.${PDY}/${cyc}/atmos"
export COMIN_GES_OBS="${DMPDIR}/${GDUMP}.${gPDY}/${gcyc}/atmos"
export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs}"
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
export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs}"
export COMIN_OBS="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs"

Copy link
Contributor

Choose a reason for hiding this comment

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

ROTDIR_DUMP=NO does not work, so this change is untested.

export COMIN_GES_OBS="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/obs"
fi
mkdir -m 775 -p ${COMOUT}
# COMIN_GES and COMIN_GES_ENS are used in script
Expand Down Expand Up @@ -72,7 +72,7 @@ status=$?
##############################################
# Final processing
##############################################
if [ -e "${pgmout}" ] ; then
if [[ -e "${pgmout}" ]] ; then
cat ${pgmout}
fi

Expand Down
6 changes: 3 additions & 3 deletions jobs/JGDAS_ATMOS_CHGRES_FORENKF
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ if [ ${RUN_ENVIR} = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
else
export COMOUT="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos"
export COMOUT_ENS="${ROTDIR}/enkfgdas.${PDY}/${cyc}"
export COMIN_OBS="${DMPDIR}/${CDUMP}.${PDY}/${cyc}/atmos"
export COMIN_GES_OBS="${DMPDIR}/${GDUMP}.${gPDY}/${gcyc}/atmos"
export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs}"
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
export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs}"
export COMIN_OBS="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs"

export COMIN_GES_OBS="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/obs"
fi
mkdir -m 775 -p ${COMOUT}
# COMIN_GES and COMIN_GES_ENS are used in script
Expand All @@ -57,7 +57,7 @@ status=$?
##############################################
# Final processing
##############################################
if [ -e "${pgmout}" ] ; then
if [[ -e "${pgmout}" ]] ; then
cat ${pgmout}
fi

Expand Down
21 changes: 6 additions & 15 deletions jobs/JGDAS_ENKF_DIAG
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ 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}}
else
export COMIN_OBS="${DMPDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENT}"
export COMIN_GES_OBS="${DMPDIR}/${GDUMP}.${gPDY}/${gcyc}/${COMPONENT}"
export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP}.${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
Expand All @@ -55,23 +55,14 @@ fi

# Link observational data
export PREPQC="${COMIN_OBS}/${OPREFIX}prepbufr"
if [ ! -f ${PREPQC} ]; then
if [[ ! -f ${PREPQC} ]]; then
echo "WARNING: Global PREPBUFR FILE ${PREPQC} MISSING"
fi
export TCVITL="${COMIN_ANL}/${OPREFIX}syndata.tcvitals.tm00"
if [[ ${DONST} = "YES" ]]; then
if [[ ${MAKE_NSSTBUFR} == "YES" ]]; then
export NSSTBF="${COMOUT}/${OPREFIX}nsstbufr"
else
export NSSTBF="${COMIN_OBS}/${OPREFIX}nsstbufr"
fi
fi

if [[ ${MAKE_ACFTBUFR} == "YES" ]]; then
export PREPQCPF="${COMOUT}/${OPREFIX}prepbufr.acft_profiles"
else
export PREPQCPF="${COMIN_OBS}/${OPREFIX}prepbufr.acft_profiles"
export NSSTBF="${COMIN_OBS}/${OPREFIX}nsstbufr"
fi
export PREPQCPF="${COMIN_OBS}/${OPREFIX}prepbufr.acft_profiles"

# Guess Bias correction coefficients related to control
export GBIAS=${COMIN_GES_CTL}/${GPREFIX}abias
Expand Down Expand Up @@ -123,7 +114,7 @@ status=$?
##############################################
# Final processing
##############################################
if [ -e "${pgmout}" ] ; then
if [[ -e "${pgmout}" ]] ; then
cat ${pgmout}
fi

Expand Down
8 changes: 4 additions & 4 deletions jobs/JGDAS_ENKF_ECEN
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export CASE=${CASE_ENKF}


EUPD_CYC=$(echo ${EUPD_CYC:-"gdas"} | tr a-z A-Z)
if [ ${EUPD_CYC} = "GFS" ]; then
if [[ ${EUPD_CYC} = "GFS" ]]; then
CDUMP_ENKF="gfs"
else
CDUMP_ENKF=${CDUMP}
Expand All @@ -40,8 +40,8 @@ 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="${DMPDIR}/${CDUMP}.${PDY}/${cyc}/atmos"
export COMIN_GES_OBS="${DMPDIR}/${GDUMP}.${gPDY}/${gcyc}/atmos"
export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs}"
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
export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs}"
export COMIN_OBS="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs"

export COMIN_GES_OBS="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/obs"
fi

# COMIN, COMIN_ENS and COMIN_GES_ENS are used in script
Expand All @@ -66,7 +66,7 @@ status=$?
##############################################
# Final processing
##############################################
if [ -e "${pgmout}" ] ; then
if [[ -e "${pgmout}" ]] ; then
cat ${pgmout}
fi

Expand Down
25 changes: 8 additions & 17 deletions jobs/JGDAS_ENKF_SELECT_OBS
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ 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}}
else
export COMIN_OBS="${DMPDIR}/${CDUMP}.${PDY}/${cyc}/${COMPONENT}"
export COMIN_GES_OBS="${DMPDIR}/${GDUMP}.${gPDY}/${gcyc}/${COMPONENT}"
export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs}"
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
export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs}"
export COMIN_OBS="${ROTDIR}/${CDUMP}.${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
Expand All @@ -48,7 +48,7 @@ export COMOUT="${ROTDIR}/enkf${CDUMP}.${PDY}/${cyc}"


export ATMGES_ENSMEAN="${COMIN_GES_ENS}/${GPREFIX}atmf006${GSUFFIX}"
if [ ! -f ${ATMGES_ENSMEAN} ]; then
if [[ ! -f ${ATMGES_ENSMEAN} ]]; then
echo "FATAL ERROR: FILE MISSING: ATMGES_ENSMEAN = ${ATMGES_ENSMEAN}"
exit 1
fi
Expand All @@ -59,23 +59,14 @@ status=$?

# Link observational data
export PREPQC="${COMIN_OBS}/${OPREFIX}prepbufr"
if [ ! -f ${PREPQC} ]; then
if [[ ! -f ${PREPQC} ]]; then
echo "WARNING: Global PREPBUFR FILE ${PREPQC} MISSING"
fi
export TCVITL="${COMIN_ANL}/${OPREFIX}syndata.tcvitals.tm00"
if [[ ${DONST} = "YES" ]]; then
if [[ ${MAKE_NSSTBUFR} == "YES" ]]; then
export NSSTBF="${COMOUT}/${OPREFIX}nsstbufr"
else
export NSSTBF="${COMIN_OBS}/${OPREFIX}nsstbufr"
fi
fi

if [[ ${MAKE_ACFTBUFR} == "YES" ]]; then
export PREPQCPF="${COMOUT}/${OPREFIX}prepbufr.acft_profiles"
else
export PREPQCPF="${COMIN_OBS}/${OPREFIX}prepbufr.acft_profiles"
export NSSTBF="${COMIN_OBS}/${OPREFIX}nsstbufr"
fi
export PREPQCPF="${COMIN_OBS}/${OPREFIX}prepbufr.acft_profiles"

# Guess Bias correction coefficients related to control
export GBIAS=${COMIN_GES_CTL}/${GPREFIX}abias
Expand Down Expand Up @@ -122,7 +113,7 @@ status=$?
##############################################
# Send Alerts
##############################################
if [ ${SENDDBN} = YES ] ; then
if [[ ${SENDDBN} = YES ]] ; then
${DBNROOT}/bin/dbn_alert MODEL ENKF1_MSC_gsistat ${job} ${GSISTAT}
fi

Expand All @@ -134,7 +125,7 @@ fi
##############################################
# Final processing
##############################################
if [ -e "${pgmout}" ] ; then
if [[ -e "${pgmout}" ]] ; then
cat ${pgmout}
fi

Expand Down
8 changes: 4 additions & 4 deletions jobs/JGDAS_ENKF_SFC
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export CASE=${CASE_ENKF}


EUPD_CYC=$(echo ${EUPD_CYC:-"gdas"} | tr a-z A-Z)
if [ ${EUPD_CYC} = "GFS" ]; then
if [[ ${EUPD_CYC} = "GFS" ]]; then
CDUMP_ENKF="gfs"
else
CDUMP_ENKF=${CDUMP}
Expand All @@ -40,8 +40,8 @@ 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="${DMPDIR}/${CDUMP}.${PDY}/${cyc}/atmos"
export COMIN_GES_OBS="${DMPDIR}/${GDUMP}.${gPDY}/${gcyc}/atmos"
export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs}"
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
export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs}"
export COMIN_OBS="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs"

export COMIN_GES_OBS="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/obs"
fi

# COMIN, COMIN_ENS and COMIN_GES_ENS are used in script
Expand All @@ -67,7 +67,7 @@ status=$?
##############################################
# Final processing
##############################################
if [ -e "${pgmout}" ] ; then
if [[ -e "${pgmout}" ]] ; then
cat ${pgmout}
fi

Expand Down
31 changes: 11 additions & 20 deletions jobs/JGLOBAL_ATMOS_ANALYSIS
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,15 @@ export OPREFIX="${CDUMP}.t${cyc}z."
export GPREFIX="${GDUMP}.t${gcyc}z."
export APREFIX="${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 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 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}
if [ ${RUN_ENVIR} = "nco" ]; then
export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/${GDUMP}.${gPDY}/${gcyc}/atmos}
else
export COMOUT="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos"
export COMIN_OBS="${DMPDIR}/${CDUMP}.${PDY}/${cyc}/atmos"
export COMIN_GES_OBS="${DMPDIR}/${GDUMP}.${gPDY}/${gcyc}/atmos"
export COMIN_GES_OBS="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/obs"
fi

mkdir -m 775 -p ${COMOUT}
# COMIN_GES and COMIN_GES_ENS are used in script
export COMIN_GES="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/atmos"
Expand Down Expand Up @@ -69,26 +67,19 @@ fi

# Link observational data
export PREPQC="${COMIN_OBS}/${OPREFIX}prepbufr"
if [ ! -f ${PREPQC} ]; then
if [[ ! -f ${PREPQC} ]]; then
echo "WARNING: Global PREPBUFR FILE ${PREPQC} MISSING"
fi
export TCVITL="${COMOUT}/${OPREFIX}syndata.tcvitals.tm00"
if [[ ${DONST} = "YES" ]]; then
if [[ ${MAKE_NSSTBUFR} == "YES" ]]; then
export NSSTBF="${COMOUT}/${OPREFIX}nsstbufr"
else
export NSSTBF="${COMIN_OBS}/${OPREFIX}nsstbufr"
fi
fi

if [[ ${MAKE_ACFTBUFR} == "YES" ]]; then
export PREPQCPF="${COMOUT}/${OPREFIX}prepbufr.acft_profiles"
else
export PREPQCPF="${COMIN_OBS}/${OPREFIX}prepbufr.acft_profiles"
fi
export PREPQCPF="${COMIN_OBS}/${OPREFIX}prepbufr.acft_profiles"

# Copy fix file for obsproc # TODO: Why is this necessary?
if [ ${RUN} = "gfs" ]; then
if [[ ${RUN} = "gfs" ]]; then
mkdir -p ${ROTDIR}/fix
cp ${FIXgsi}/prepobs_errtable.global ${ROTDIR}/fix/
fi
Expand Down Expand Up @@ -119,7 +110,7 @@ fi
##############################################
# Final processing
##############################################
if [ -e "${pgmout}" ] ; then
if [[ -e "${pgmout}" ]] ; then
cat ${pgmout}
fi

Expand Down
6 changes: 3 additions & 3 deletions jobs/JGLOBAL_ATMOS_ANALYSIS_CALC
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ if [ ${RUN_ENVIR} = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
export COMIN_GES_OBS=${COMIN_GES_OBS:-$(compath.py ${envir}/obsproc/${obsproc_ver})/${GDUMP}.${gPDY}/${gcyc}/atmos}
else
export COMOUT="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos"
export COMIN_OBS="${DMPDIR}/${CDUMP}.${PDY}/${cyc}/atmos"
export COMIN_GES_OBS="${DMPDIR}/${GDUMP}.${gPDY}/${gcyc}/atmos"
export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs}"
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
export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs}"
export COMIN_OBS="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs"

export COMIN_GES_OBS="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/obs"
fi
mkdir -m 775 -p ${COMOUT}
# COMIN_GES and COMIN_GES_ENS are used in script
Expand Down Expand Up @@ -83,7 +83,7 @@ status=$?
##############################################
# Final processing
##############################################
if [ -e "${pgmout}" ] ; then
if [[ -e "${pgmout}" ]] ; then
cat ${pgmout}
fi

Expand Down
8 changes: 4 additions & 4 deletions jobs/JGLOBAL_ATMOS_SFCANL
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "sfcanl" -c "base sfcanl"
export CDATE=${CDATE:-${PDY}${cyc}}
export CDUMP=${CDUMP:-${RUN:-"gfs"}}
export COMPONENT="atmos"
if [ ${RUN_ENVIR} = "nco" ]; then
if [[ ${RUN_ENVIR} = "nco" ]]; then
export ROTDIR=${COMROOT:?}/${NET}/${envir}
fi

Expand All @@ -35,8 +35,8 @@ if [ ${RUN_ENVIR} = "nco" -o ${ROTDIR_DUMP:-NO} = "YES" ]; then
export COMIN_GES_OBS=${COMIN_GES_OBS:-${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/atmos}
else
export COMOUT="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/atmos"
export COMIN_OBS="${DMPDIR}/${CDATE}/${CDUMP}"
export COMIN_GES_OBS="${DMPDIR}/${GDATE}/${GDUMP}"
export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs}"
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
export COMIN_OBS="${COMIN_OBS:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs}"
export COMIN_OBS="${ROTDIR}/${CDUMP}.${PDY}/${cyc}/obs"

export COMIN_GES_OBS="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/obs"
fi
mkdir -m 775 -p ${COMOUT}
# COMIN_GES and COMIN_GES_ENS are used in script
Expand Down Expand Up @@ -66,7 +66,7 @@ status=$?
##############################################
# Final processing
##############################################
if [ -e "${pgmout}" ] ; then
if [[ -e "${pgmout}" ]] ; then
cat ${pgmout}
fi

Expand Down
Loading