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.

Sign up for GitHub

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

Modify workflow to access files from obs component #1202

Merged
merged 19 commits into from
Jan 30, 2023
Merged

Modify workflow to access files from obs component #1202

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
af35fd9
Modify workflow to access files from obs component.
lgannoaa Jan 3, 2023
40c930c
Apply shellcheck 2250 and 2292
lgannoaa Jan 4, 2023
cffd37a
Apply shellcheck 2292 to prep.sh
lgannoaa Jan 4, 2023
1888a7d
Remove unused statement in config.anal
lgannoaa Jan 4, 2023
b62030b
Modify jobs to use obsproc files from prep step instead of redo the f…
lgannoaa Jan 11, 2023
21cdf29
Apply shellcheck 2292
lgannoaa Jan 11, 2023
ce62f2f
Remove redundant logic for variable assignment
lgannoaa Jan 11, 2023
ca5e63a
Merge branch 'develop' into feature/issue-1198
lgannoaa Jan 11, 2023
b2a36c0
Revert change in forecast_det and modify if logic in prep.sh
lgannoaa Jan 12, 2023
5ce3364
Merge branch 'feature/issue-1198' of https://github.com/lgannoaa/glob…
lgannoaa Jan 12, 2023
6d95e54
Wire in atmos into COMOUT assignment and remove the use of COMPONENT …
lgannoaa Jan 12, 2023
a3a5619
Remove MAKE_ACFTBUFR in if statement for JGDAS_ENKF_DIAG and JGDAS_EN…
lgannoaa Jan 17, 2023
aa1c253
Remove MAKE_ACFTBUFR if statement in JGLOBAL_ATMOS_ANALYSIS
lgannoaa Jan 17, 2023
7715189
Add exec permission to scripts
lgannoaa Jan 17, 2023
031355b
Merge remote-tracking branch 'upstream/develop' into feature/issue-1198
lgannoaa Jan 19, 2023
e97b991
Merge branch 'develop' into feature/issue-1198
lgannoaa Jan 23, 2023
d2d0e8a
chmod 755 on scripts
lgannoaa Jan 23, 2023
58a7eab
Reproducibility tested
lgannoaa Jan 27, 2023
2bacc00
Merge develop
lgannoaa Jan 30, 2023
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
12 changes: 6 additions & 6 deletions jobs/JGDAS_ATMOS_ANALYSIS_DIAG
View file
Open in desktop
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_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 All @@ -45,15 +45,15 @@ export COMIN_GES_ENS="${ROTDIR}/enkfgdas.${gPDY}/${gcyc}"


export ATMGES="${COMIN_GES}/${GPREFIX}atmf006${GSUFFIX}"
if [ ! -f ${ATMGES} ]; then
if [[ ! -f ${ATMGES} ]]; then
echo "FATAL ERROR: FILE MISSING: ATMGES = ${ATMGES}"
exit 1
fi


if [ ${DOHYBVAR} = "YES" ]; then
if [[ ${DOHYBVAR} = "YES" ]]; then
export ATMGES_ENSMEAN="${COMIN_GES_ENS}/${GPREFIX}atmf006.ensmean${GSUFFIX}"
if [ ! -f ${ATMGES_ENSMEAN} ]; then
if [[ ! -f ${ATMGES_ENSMEAN} ]]; then
echo "FATAL ERROR: FILE MISSING: ATMGES_ENSMEAN = ${ATMGES_ENSMEAN}"
exit 2
fi
Expand All @@ -74,7 +74,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,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 @@ -60,7 +60,7 @@ status=$?
##############################################
# Final processing
##############################################
if [ -e "${pgmout}" ] ; then
if [[ -e "${pgmout}" ]] ; then
cat ${pgmout}
fi

Expand Down
23 changes: 7 additions & 16 deletions jobs/JGDAS_ENKF_DIAG
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,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 @@ -49,31 +49,22 @@ 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


# 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 @@ -125,7 +116,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
View file
Open in desktop
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 @@ -42,8 +42,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 @@ -68,7 +68,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,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 @@ -49,7 +49,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 @@ -60,23 +60,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 @@ -123,7 +114,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 @@ -135,7 +126,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
View file
Open in desktop
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 @@ -42,8 +42,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 @@ -69,7 +69,7 @@ status=$?
##############################################
# Final processing
##############################################
if [ -e "${pgmout}" ] ; then
if [[ -e "${pgmout}" ]] ; then
cat ${pgmout}
fi

Expand Down
25 changes: 9 additions & 16 deletions jobs/JGLOBAL_ATMOS_ANALYSIS
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,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 All @@ -48,7 +48,7 @@ export COMIN_GES_ENS="${ROTDIR}/enkfgdas.${gPDY}/${gcyc}"


export ATMGES="${COMIN_GES}/${GPREFIX}atmf006${GSUFFIX}"
if [ ! -f ${ATMGES} ]; then
if [[ ! -f ${ATMGES} ]]; then
echo "FATAL ERROR: FILE MISSING: ATMGES = ${ATMGES}"
exit 1
fi
Expand All @@ -60,9 +60,9 @@ status=$?
[[ ${status} -ne 0 ]] && exit ${status}


if [ ${DOHYBVAR} = "YES" ]; then
if [[ ${DOHYBVAR} = "YES" ]]; then
export ATMGES_ENSMEAN="${COMIN_GES_ENS}/${GPREFIX}atmf006.ensmean${GSUFFIX}"
if [ ! -f ${ATMGES_ENSMEAN} ]; then
if [[ ! -f ${ATMGES_ENSMEAN} ]]; then
echo "FATAL ERROR: FILE MISSING: ATMGES_ENSMEAN = ${ATMGES_ENSMEAN}"
exit 2
fi
Expand All @@ -71,26 +71,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 @@ -121,7 +114,7 @@ fi
##############################################
# Final processing
##############################################
if [ -e "${pgmout}" ] ; then
if [[ -e "${pgmout}" ]] ; then
cat ${pgmout}
fi

Expand Down
12 changes: 6 additions & 6 deletions jobs/JGLOBAL_ATMOS_ANALYSIS_CALC
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,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 All @@ -46,7 +46,7 @@ export COMIN_GES_ENS="${ROTDIR}/enkfgdas.${gPDY}/${gcyc}"


export ATMGES="${COMIN_GES}/${GPREFIX}atmf006${GSUFFIX}"
if [ ! -f ${ATMGES} ]; then
if [[ ! -f ${ATMGES} ]]; then
echo "FATAL ERROR: FILE MISSING: ATMGES = ${ATMGES}"
exit 1
fi
Expand All @@ -58,9 +58,9 @@ status=$?
[[ ${status} -ne 0 ]] && exit ${status}


if [ ${DOHYBVAR} = "YES" ]; then
if [[ ${DOHYBVAR} = "YES" ]]; then
export ATMGES_ENSMEAN="${COMIN_GES_ENS}/${GPREFIX}atmf006.ensmean${GSUFFIX}"
if [ ! -f ${ATMGES_ENSMEAN} ]; then
if [[ ! -f ${ATMGES_ENSMEAN} ]]; then
echo "FATAL ERROR: FILE MISSING: ATMGES_ENSMEAN = ${ATMGES_ENSMEAN}"
exit 2
fi
Expand All @@ -86,7 +86,7 @@ status=$?
##############################################
# Final processing
##############################################
if [ -e "${pgmout}" ] ; then
if [[ -e "${pgmout}" ]] ; then
cat ${pgmout}
fi

Expand Down
10 changes: 5 additions & 5 deletions jobs/JGLOBAL_ATMOS_SFCANL
View file
Open in desktop
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 Down Expand Up @@ -38,8 +38,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 All @@ -48,7 +48,7 @@ export COMIN_GES_ENS="${ROTDIR}/enkfgdas.${gPDY}/${gcyc}"


export ATMGES="${COMIN_GES}/${GPREFIX}atmf006${GSUFFIX}"
if [ ! -f ${ATMGES} ]; then
if [[ ! -f ${ATMGES} ]]; then
echo "FATAL ERROR: FILE MISSING: ATMGES = ${ATMGES}"
exit 1
fi
Expand All @@ -69,7 +69,7 @@ status=$?
##############################################
# Final processing
##############################################
if [ -e "${pgmout}" ] ; then
if [[ -e "${pgmout}" ]] ; then
cat ${pgmout}
fi

Expand Down
Loading