From 5310374ea01c6408b418e940402888a6d01f1712 Mon Sep 17 00:00:00 2001 From: "Walter.Kolczynski" Date: Thu, 2 Oct 2025 05:45:46 +0000 Subject: [PATCH 1/4] Bring non-dev j-jobs into shellcheck compliance Updated all non-dev j-job scripts to be shellcheck compliant. --- jobs/JGDAS_ATMOS_CHGRES_FORENKF | 2 +- jobs/JGDAS_ATMOS_VERFOZN | 2 +- jobs/JGDAS_ATMOS_VERFRAD | 2 +- jobs/JGDAS_ENKF_DIAG | 6 +++--- jobs/JGDAS_ENKF_ECEN | 2 +- jobs/JGDAS_ENKF_POST | 4 ++-- jobs/JGDAS_ENKF_SELECT_OBS | 4 ++-- jobs/JGDAS_ENKF_SFC | 2 +- jobs/JGDAS_ENKF_UPDATE | 4 ++-- jobs/JGFS_ATMOS_CYCLONE_GENESIS | 6 +++--- jobs/JGFS_ATMOS_CYCLONE_TRACKER | 11 +++++------ jobs/JGFS_ATMOS_FSU_GENESIS | 6 +++--- jobs/JGFS_ATMOS_POSTSND | 6 +++--- jobs/JGLOBAL_ATMOS_ANALYSIS | 23 ++++++++++++----------- jobs/JGLOBAL_ATMOS_ANALYSIS_CALC | 7 ++++--- jobs/JGLOBAL_ATMOS_POST_MANAGER | 2 +- jobs/JGLOBAL_ATMOS_SFCANL | 2 +- jobs/JGLOBAL_ATMOS_TROPCY_QC_RELOC | 6 +++--- jobs/JGLOBAL_WAVE_POST_BNDPNT | 2 +- jobs/JGLOBAL_WAVE_POST_BNDPNTBLL | 2 +- jobs/JGLOBAL_WAVE_POST_PNT | 2 +- jobs/JGLOBAL_WAVE_PRDGEN_BULLS | 6 +++--- jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED | 6 +++--- jobs/JGLOBAL_WAVE_PREP | 3 ++- 24 files changed, 60 insertions(+), 58 deletions(-) diff --git a/jobs/JGDAS_ATMOS_CHGRES_FORENKF b/jobs/JGDAS_ATMOS_CHGRES_FORENKF index 6f8a40f04ab..0b0c99b288f 100755 --- a/jobs/JGDAS_ATMOS_CHGRES_FORENKF +++ b/jobs/JGDAS_ATMOS_CHGRES_FORENKF @@ -39,7 +39,7 @@ fi # Final processing ############################################## if [[ -e "${pgmout}" ]] ; then - cat ${pgmout} + cat "${pgmout}" fi ########################################## diff --git a/jobs/JGDAS_ATMOS_VERFOZN b/jobs/JGDAS_ATMOS_VERFOZN index 9c443a9dc69..9b19af35a96 100755 --- a/jobs/JGDAS_ATMOS_VERFOZN +++ b/jobs/JGDAS_ATMOS_VERFOZN @@ -24,7 +24,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ export oznstat="${COMIN_ATMOS_ANALYSIS}/gdas.t${cyc}z.oznstat" export TANKverf_ozn=${TANKverf_ozn:-${COMOUT_ATMOS_OZNMON}} -if [[ ! -d ${TANKverf_ozn} ]]; then mkdir -p ${TANKverf_ozn} ; fi +if [[ ! -d ${TANKverf_ozn} ]]; then mkdir -p "${TANKverf_ozn}" ; fi #------------------------------------------------------- # Execute the script. diff --git a/jobs/JGDAS_ATMOS_VERFRAD b/jobs/JGDAS_ATMOS_VERFRAD index 2c55b272332..d9ff9c85a02 100755 --- a/jobs/JGDAS_ATMOS_VERFRAD +++ b/jobs/JGDAS_ATMOS_VERFRAD @@ -29,7 +29,7 @@ export radstat="${COMIN_ATMOS_ANALYSIS}/gdas.t${cyc}z.radstat" export TANKverf_rad=${TANKverf_rad:-${COMOUT_ATMOS_RADMON}} export TANKverf_radM1=${TANKverf_radM1:-${COMIN_ATMOS_RADMON_PREV}} -if [[ ! -d ${TANKverf_rad} ]]; then mkdir -p ${TANKverf_rad} ; fi +if [[ ! -d ${TANKverf_rad} ]]; then mkdir -p "${TANKverf_rad}" ; fi ######################################################## # Execute the script. diff --git a/jobs/JGDAS_ENKF_DIAG b/jobs/JGDAS_ENKF_DIAG index 81eaa59147f..1fef238927f 100755 --- a/jobs/JGDAS_ENKF_DIAG +++ b/jobs/JGDAS_ENKF_DIAG @@ -38,7 +38,7 @@ MEMDIR="ensstat" RUN=${GDUMP_ENS} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ export ATMGES_ENSMEAN="${COMIN_ATMOS_HISTORY_PREV}/${GPREFIX}atmf006.ensmean.nc" -if [ ! -f ${ATMGES_ENSMEAN} ]; then +if [[ ! -f "${ATMGES_ENSMEAN}" ]]; then export err=1 err_exit "FILE MISSING: ATMGES_ENSMEAN = ${ATMGES_ENSMEAN}" fi @@ -86,7 +86,7 @@ export SETUP_INVOBS="passive_bc=.false.,${SETUP_INVOBS}" # Ensure clean stat tarballs for ensemble mean for fstat in ${CNVSTAT} ${OZNSTAT} ${RADSTAT}; do if [[ -f "${fstat}" ]]; then - rm -f ${fstat} + rm -f "${fstat}" fi done @@ -108,7 +108,7 @@ fi # Final processing ############################################## if [[ -e "${pgmout}" ]] ; then - cat ${pgmout} + cat "${pgmout}" fi ########################################## diff --git a/jobs/JGDAS_ENKF_ECEN b/jobs/JGDAS_ENKF_ECEN index 06446b964e4..073e954d8c4 100755 --- a/jobs/JGDAS_ENKF_ECEN +++ b/jobs/JGDAS_ENKF_ECEN @@ -52,7 +52,7 @@ fi # Final processing ############################################## if [[ -e "${pgmout}" ]] ; then - cat ${pgmout} + cat "${pgmout}" fi ########################################## diff --git a/jobs/JGDAS_ENKF_POST b/jobs/JGDAS_ENKF_POST index 535f4251a03..e078313d1aa 100755 --- a/jobs/JGDAS_ENKF_POST +++ b/jobs/JGDAS_ENKF_POST @@ -34,8 +34,8 @@ fi ############################################## # Final processing ############################################## -if [ -e "${pgmout}" ] ; then - cat ${pgmout} +if [[ -e "${pgmout}" ]] ; then + cat "${pgmout}" fi ########################################## diff --git a/jobs/JGDAS_ENKF_SELECT_OBS b/jobs/JGDAS_ENKF_SELECT_OBS index 3138be1aef0..9687efd3ccd 100755 --- a/jobs/JGDAS_ENKF_SELECT_OBS +++ b/jobs/JGDAS_ENKF_SELECT_OBS @@ -50,7 +50,7 @@ if [[ ! -f ${ATMGES_ENSMEAN} ]]; then err_exit "FILE MISSING: ATMGES_ENSMEAN = ${ATMGES_ENSMEAN}" fi -LEVS=$(${NCLEN} ${ATMGES} pfull) && true +LEVS=$(${NCLEN} "${ATMGES}" pfull) && true export err=$? set_strict @@ -122,7 +122,7 @@ fi # Send Alerts ############################################## if [[ "${SENDDBN}" == "YES" ]] ; then - ${DBNROOT}/bin/dbn_alert MODEL ENKF1_MSC_gsistat ${job} ${GSISTAT} + "${DBNROOT}/bin/dbn_alert" MODEL ENKF1_MSC_gsistat "${job}" "${GSISTAT}" fi diff --git a/jobs/JGDAS_ENKF_SFC b/jobs/JGDAS_ENKF_SFC index 4d22b62f0da..807635ed57b 100755 --- a/jobs/JGDAS_ENKF_SFC +++ b/jobs/JGDAS_ENKF_SFC @@ -54,7 +54,7 @@ fi # Final processing ############################################## if [[ -e "${pgmout}" ]] ; then - cat ${pgmout} + cat "${pgmout}" fi ########################################## diff --git a/jobs/JGDAS_ENKF_UPDATE b/jobs/JGDAS_ENKF_UPDATE index 6f4dd9b13f0..27e6552a440 100755 --- a/jobs/JGDAS_ENKF_UPDATE +++ b/jobs/JGDAS_ENKF_UPDATE @@ -55,8 +55,8 @@ fi ############################################## # Final processing ############################################## -if [ -e "${pgmout}" ] ; then - cat ${pgmout} +if [[ -e "${pgmout}" ]] ; then + cat "${pgmout}" fi ########################################## diff --git a/jobs/JGFS_ATMOS_CYCLONE_GENESIS b/jobs/JGFS_ATMOS_CYCLONE_GENESIS index 422a038ca6d..805ec885f70 100755 --- a/jobs/JGFS_ATMOS_CYCLONE_GENESIS +++ b/jobs/JGFS_ATMOS_CYCLONE_GENESIS @@ -35,7 +35,7 @@ export JYYYY=${PDY:0:4} # Do not fail on errors or unassigned variables in external code set +eu -${SCRIPTens_tracker}/exgfs_tc_genesis.sh && true +"${SCRIPTens_tracker}/exgfs_tc_genesis.sh" && true export err=$? if [[ ${err} -ne 0 ]]; then err_exit @@ -46,8 +46,8 @@ set_strict ############################################## # Final processing ############################################## -if [ -e "${pgmout}" ] ; then - cat ${pgmout} +if [[ -e "${pgmout}" ]] ; then + cat "${pgmout}" fi ########################################## diff --git a/jobs/JGFS_ATMOS_CYCLONE_TRACKER b/jobs/JGFS_ATMOS_CYCLONE_TRACKER index 75be837e9fa..851405fb155 100755 --- a/jobs/JGFS_ATMOS_CYCLONE_TRACKER +++ b/jobs/JGFS_ATMOS_CYCLONE_TRACKER @@ -25,10 +25,10 @@ export COMOUT=${COMOUT_ATMOS_TRACK} export COMINsyn=${COMINsyn:-$(compath.py "${envir}/com/gfs/${gfs_ver}")/syndat} export COMINgenvit=${COMIN_ATMOS_GENESIS} -if [ ${RUN_ENVIR} = "nco" ]; then +if [[ "${RUN_ENVIR}" == "nco" ]]; then export COMOUThur=${COMROOTp1}/hur/${envir}/global export COMOUTatcf=${COMROOTp1}/nhc/${envir}/atcf - mkdir -m 775 -p ${COMOUThur} ${COMOUTatcf} + mkdir -m 775 -p "${COMOUThur}" "${COMOUTatcf}" else # export COMOUThur=$COMOUT # export COMOUTatcf=$COMOUT @@ -47,15 +47,14 @@ export cmodel=${RUN/enkf} export loopnum=1 #-----------input data checking ----------------- -${USHens_tracker}/data_check_gfs.sh +"${USHens_tracker}/data_check_gfs.sh" export err=$? if [[ ${err} -ne 0 ]]; then err_exit fi #------------------------------------------------ -machine=${machine:-$(echo ${SITE})} -${USHens_tracker}/extrkr_gfs.sh "${loopnum}" "${cmodel}" "${PDY}${cyc}" "${pert}" "${DATA}" +"${USHens_tracker}/extrkr_gfs.sh" "${loopnum}" "${cmodel}" "${PDY}${cyc}" "${pert}" "${DATA}" export err=$? if [[ ${err} -ne 0 ]]; then err_exit @@ -73,7 +72,7 @@ fi ############################################## # Final processing ############################################## -if [ -e "${pgmout}" ] ; then +if [[ -e "${pgmout}" ]] ; then cat "${pgmout}" fi diff --git a/jobs/JGFS_ATMOS_FSU_GENESIS b/jobs/JGFS_ATMOS_FSU_GENESIS index 2135816d338..b386183881e 100755 --- a/jobs/JGFS_ATMOS_FSU_GENESIS +++ b/jobs/JGFS_ATMOS_FSU_GENESIS @@ -22,7 +22,7 @@ export COMINsyn=${COMINsyn:-$(compath.py "${envir}/com/gfs/${gfs_ver}")/syndat} ############################################################# # Execute the script -${SCRIPTens_tracker}/exgfs_fsu_genesis.sh +"${SCRIPTens_tracker}/exgfs_fsu_genesis.sh" export err=$? if [[ ${err} -ne 0 ]]; then err_exit @@ -31,8 +31,8 @@ fi ############################################## # Final processing ############################################## -if [ -e "${pgmout}" ] ; then - cat ${pgmout} +if [[ -e "${pgmout}" ]] ; then + cat "${pgmout}" fi ########################################## diff --git a/jobs/JGFS_ATMOS_POSTSND b/jobs/JGFS_ATMOS_POSTSND index 9e9a705b8f7..a3d7814a4d1 100755 --- a/jobs/JGFS_ATMOS_POSTSND +++ b/jobs/JGFS_ATMOS_POSTSND @@ -29,7 +29,7 @@ fi ######################################################## # Execute the script. -${SCRgfs}/exgfs_atmos_postsnd.sh && true +"${SCRgfs}/exgfs_atmos_postsnd.sh" && true export err=$? if [[ ${err} -ne 0 ]]; then err_exit @@ -42,8 +42,8 @@ fi ############################################## # Final processing ############################################## -if [ -e "${pgmout}" ] ; then - cat ${pgmout} +if [[ -e "${pgmout}" ]] ; then + cat "${pgmout}" fi ########################################## diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS b/jobs/JGLOBAL_ATMOS_ANALYSIS index a5483a79e6b..2a68b512b1e 100755 --- a/jobs/JGLOBAL_ATMOS_ANALYSIS +++ b/jobs/JGLOBAL_ATMOS_ANALYSIS @@ -40,21 +40,22 @@ MEMDIR='ensstat' RUN=${GDUMP_ENS} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ mkdir -p "${COMOUT_ATMOS_ANALYSIS}" export ATMGES="${COMIN_ATMOS_HISTORY_PREV}/${GPREFIX}atmf006.nc" -if [ ! -f ${ATMGES} ]; then +if [[ ! -f "${ATMGES}" ]]; then export err=1 err_exit "FILE MISSING: ATMGES = ${ATMGES}" fi # Get LEVS -export LEVS=$(${NCLEN} ${ATMGES} pfull) && true +export LEVS +LEVS=$(${NCLEN} "${ATMGES}" pfull) && true export err=$? if [[ ${err} -ne 0 ]]; then err_exit fi -if [ ${DOHYBVAR} = "YES" ]; then +if [[ "${DOHYBVAR}" == "YES" ]]; then export ATMGES_ENSMEAN="${COMIN_ATMOS_HISTORY_ENS_PREV}/${GPREFIX_ENS}atmf006.ensmean.nc" - if [ ! -f ${ATMGES_ENSMEAN} ]; then + if [[ ! -f "${ATMGES_ENSMEAN}" ]]; then export err=2 err_exit "FILE MISSING: ATMGES_ENSMEAN = ${ATMGES_ENSMEAN}" fi @@ -73,9 +74,9 @@ fi export PREPQCPF="${COMIN_OBS}/${OPREFIX}prepbufr.acft_profiles" # Copy fix file for obsproc # TODO: Why is this necessary? -if [[ ${RUN} = "gfs" ]]; then - mkdir -p ${ROTDIR}/fix - cpreq ${FIXgfs}/gsi/prepobs_errtable.global ${ROTDIR}/fix/ +if [[ ${RUN} == "gfs" ]]; then + mkdir -p "${ROTDIR}/fix" + cpreq "${FIXgfs}/gsi/prepobs_errtable.global" "${ROTDIR}/fix/" fi @@ -92,9 +93,9 @@ fi # Send Alerts ############################################## if [[ "${SENDDBN}" == "YES" ]] && [[ "${RUN}" == "gdas" ]] ; then - ${DBNROOT}/bin/dbn_alert MODEL GDAS_MSC_abias ${job} ${COMOUT_ATMOS_ANALYSIS}/${APREFIX}abias - ${DBNROOT}/bin/dbn_alert MODEL GDAS_MSC_abias_pc ${job} ${COMOUT_ATMOS_ANALYSIS}/${APREFIX}abias_pc - ${DBNROOT}/bin/dbn_alert MODEL GDAS_MSC_abias_air ${job} ${COMOUT_ATMOS_ANALYSIS}/${APREFIX}abias_air + "${DBNROOT}/bin/dbn_alert" MODEL GDAS_MSC_abias "${job}" "${COMOUT_ATMOS_ANALYSIS}/${APREFIX}abias" + "${DBNROOT}/bin/dbn_alert" MODEL GDAS_MSC_abias_pc "${job}" "${COMOUT_ATMOS_ANALYSIS}/${APREFIX}abias_pc" + "${DBNROOT}/bin/dbn_alert" MODEL GDAS_MSC_abias_air "${job}" "${COMOUT_ATMOS_ANALYSIS}/${APREFIX}abias_air" fi @@ -106,7 +107,7 @@ fi # Final processing ############################################## if [[ -e "${pgmout}" ]] ; then - cat ${pgmout} + cat "${pgmout}" fi ########################################## diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC b/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC index ebf84467437..34a12e22ad7 100755 --- a/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC +++ b/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC @@ -38,13 +38,14 @@ RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ export ATMGES="${COMIN_ATMOS_HISTORY_PREV}/${GPREFIX}atmf006.nc" -if [ ! -f ${ATMGES} ]; then +if [[ ! -f "${ATMGES}" ]]; then export err=1 err_exit "FILE MISSING: ATMGES = ${ATMGES}" fi # Get LEVS -export LEVS=$(${NCLEN} ${ATMGES} pfull) && true +export LEVS +LEVS=$(${NCLEN} "${ATMGES}" pfull) && true export err=$? if [[ ${err} -ne 0 ]]; then err_exit @@ -71,7 +72,7 @@ fi # Final processing ############################################## if [[ -e "${pgmout}" ]] ; then - cat ${pgmout} + cat "${pgmout}" fi ########################################## diff --git a/jobs/JGLOBAL_ATMOS_POST_MANAGER b/jobs/JGLOBAL_ATMOS_POST_MANAGER index 9d62d9672bd..d22b5e01f75 100755 --- a/jobs/JGLOBAL_ATMOS_POST_MANAGER +++ b/jobs/JGLOBAL_ATMOS_POST_MANAGER @@ -20,7 +20,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COMIN_ATMOS_HISTORY:COM_ATMOS_HISTORY ######################################################## # Execute the script. -${SCRgfs}/exglobal_atmos_pmgr.sh && true +"${SCRgfs}/exglobal_atmos_pmgr.sh" && true export err=$? if [[ ${err} -ne 0 ]]; then err_exit diff --git a/jobs/JGLOBAL_ATMOS_SFCANL b/jobs/JGLOBAL_ATMOS_SFCANL index 632db5a67f5..d5912a265a5 100755 --- a/jobs/JGLOBAL_ATMOS_SFCANL +++ b/jobs/JGLOBAL_ATMOS_SFCANL @@ -57,7 +57,7 @@ fi ########################################## # Remove the Temporary working directory ########################################## -cd "${DATAROOT}" +cd "${DATAROOT}" || true if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi diff --git a/jobs/JGLOBAL_ATMOS_TROPCY_QC_RELOC b/jobs/JGLOBAL_ATMOS_TROPCY_QC_RELOC index 750cd5330b2..6b8637e32c7 100755 --- a/jobs/JGLOBAL_ATMOS_TROPCY_QC_RELOC +++ b/jobs/JGLOBAL_ATMOS_TROPCY_QC_RELOC @@ -11,7 +11,7 @@ export DO_RELOCATE=${DO_RELOCATE:-NO} # Turn on tropical cyclone reloc export tmmark=tm00 export ARCHSYND=${ROTDIR}/syndat # this location is unique, do not change -if [ ! -d ${ARCHSYND} ]; then mkdir -p ${ARCHSYND}; fi +if [[ ! -d "${ARCHSYND}" ]]; then mkdir -p "${ARCHSYND}"; fi export HOMENHC=${HOMENHC:-/lfs/h1/ops/prod/dcom/nhc/atcf/ncep} @@ -44,8 +44,8 @@ fi ############################################## # Final processing ############################################## -if [ -e "${pgmout}" ] ; then - cat ${pgmout} +if [[ -e "${pgmout}" ]] ; then + cat "${pgmout}" fi ########################################## diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNT b/jobs/JGLOBAL_WAVE_POST_BNDPNT index dd38ccfc91d..725fc93faa9 100755 --- a/jobs/JGLOBAL_WAVE_POST_BNDPNT +++ b/jobs/JGLOBAL_WAVE_POST_BNDPNT @@ -20,7 +20,7 @@ export DOBLL_WAV='NO' # Bulletin post export DOBNDPNT_WAV='YES' # Boundary points # Execute the Script -${SCRgfs}/exgfs_wave_post_pnt.sh && true +"${SCRgfs}/exgfs_wave_post_pnt.sh" && true export err=$? if [[ ${err} -ne 0 ]]; then err_exit "ex-script of JGLOBAL_WAVE_POST_BNDPNT failed!" diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL index 1e01145c628..aae12a63259 100755 --- a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL +++ b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL @@ -22,7 +22,7 @@ export DOBLL_WAV='YES' # Bulletin post export DOBNDPNT_WAV='YES' # Boundary points # Execute the Script -${SCRgfs}/exgfs_wave_post_pnt.sh && true +"${SCRgfs}/exgfs_wave_post_pnt.sh" && true export err=$? if [[ ${err} -ne 0 ]]; then err_exit diff --git a/jobs/JGLOBAL_WAVE_POST_PNT b/jobs/JGLOBAL_WAVE_POST_PNT index 0fda668e5a7..40b51c243dd 100755 --- a/jobs/JGLOBAL_WAVE_POST_PNT +++ b/jobs/JGLOBAL_WAVE_POST_PNT @@ -21,7 +21,7 @@ export DOBNDPNT_WAV='NO' #not boundary points # Execute the Script -${SCRgfs}/exgfs_wave_post_pnt.sh && true +"${SCRgfs}/exgfs_wave_post_pnt.sh" && true export err=$? if [[ ${err} -ne 0 ]]; then err_exit "ex-script of JGLOBAL_WAVE_POST_PNT failed!" diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS index fcd4a6b9662..f41e490df66 100755 --- a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS +++ b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS @@ -10,12 +10,12 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ COMIN_WAVE_STATION:COM_WAVE_STATION_TMPL \ COMOUT_WAVE_WMO:COM_WAVE_WMO_TMPL -if [[ ! -d ${COMOUT_WAVE_WMO} ]]; then mkdir -p "${COMOUT_WAVE_WMO}"; fi +if [[ ! -d "${COMOUT_WAVE_WMO}" ]]; then mkdir -p "${COMOUT_WAVE_WMO}"; fi ################################### # Execute the Script -${SCRgfs}/exgfs_wave_prdgen_bulls.sh && true +"${SCRgfs}/exgfs_wave_prdgen_bulls.sh" && true export err=$? if [[ ${err} -ne 0 ]]; then err_exit @@ -24,7 +24,7 @@ fi ################################### # Remove temp directories cd "${DATAROOT}" || true -if [ "${KEEPDATA}" != "YES" ]; then +if [[ "${KEEPDATA}" != "YES" ]]; then rm -rf "${DATA}" fi diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED index dce07e86911..5c89ce42941 100755 --- a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED +++ b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED @@ -11,7 +11,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ COMIN_WAVE_GRID:COM_WAVE_GRID_TMPL \ COMOUT_WAVE_WMO:COM_WAVE_WMO_TMPL -if [[ ! -d ${COMOUT_WAVE_WMO} ]]; then mkdir -p "${COMOUT_WAVE_WMO}"; fi +if [[ ! -d "${COMOUT_WAVE_WMO}" ]]; then mkdir -p "${COMOUT_WAVE_WMO}"; fi if [[ -n "${GEMPAK_GRIDS}" ]]; then for grdID in ${GEMPAK_GRIDS}; do @@ -26,7 +26,7 @@ fi ################################### # Execute the Script ################################### -${SCRgfs}/exgfs_wave_prdgen_gridded.sh && true +"${SCRgfs}/exgfs_wave_prdgen_gridded.sh" && true export err=$? if [[ ${err} -ne 0 ]]; then err_exit @@ -36,7 +36,7 @@ fi # Remove temp directories ################################### cd "${DATAROOT}" || true -if [ "${KEEPDATA}" != "YES" ]; then +if [[ "${KEEPDATA}" != "YES" ]]; then rm -rf "${DATA}" fi diff --git a/jobs/JGLOBAL_WAVE_PREP b/jobs/JGLOBAL_WAVE_PREP index ca83bfadcf6..683b9237f5e 100755 --- a/jobs/JGLOBAL_WAVE_PREP +++ b/jobs/JGLOBAL_WAVE_PREP @@ -3,6 +3,7 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "waveprep" -c "base wave waveprep" # Set rtofs PDY +# shellcheck disable=SC2153 export RPDY=${PDY} export MP_PULSE=0 @@ -19,7 +20,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ if [[ ! -d ${COMOUT_WAVE_PREP} ]]; then mkdir -p "${COMOUT_WAVE_PREP}"; fi # Execute the Script -${SCRgfs}/exgfs_wave_prep.sh && true +"${SCRgfs}/exgfs_wave_prep.sh" && true export err=$? if [[ ${err} -ne 0 ]]; then From 8f45c25221131a8fb3758ef6b2b75d3adfe7dc7b Mon Sep 17 00:00:00 2001 From: "Walter.Kolczynski" Date: Thu, 2 Oct 2025 06:20:21 +0000 Subject: [PATCH 2/4] Update j-jobs with shfmt --- .editorconfig | 14 ++ dev/jobs/aerosol_init.sh | 1 - dev/jobs/anal.sh | 1 - dev/jobs/analcalc.sh | 3 +- dev/jobs/analdiag.sh | 3 +- dev/jobs/atmos_ensstat.sh | 18 +-- dev/jobs/atmos_products.sh | 18 +-- dev/jobs/awips.sh | 22 +-- dev/jobs/awips_20km_1p0deg.sh | 26 +-- dev/jobs/ecen.sh | 3 +- dev/jobs/echgres.sh | 3 +- dev/jobs/ediag.sh | 3 +- dev/jobs/eobs.sh | 1 - dev/jobs/epos.sh | 3 +- dev/jobs/esfc.sh | 3 +- dev/jobs/eupd.sh | 1 - dev/jobs/fbwind.sh | 2 +- dev/jobs/fcst.sh | 6 +- dev/jobs/fetch.sh | 1 - dev/jobs/gempak.sh | 18 +-- dev/jobs/gempakgrb2spec.sh | 3 +- dev/jobs/gempakmeta.sh | 2 +- dev/jobs/gempakmetancdc.sh | 2 +- dev/jobs/gempakncdcupapgif.sh | 2 +- dev/jobs/genesis.sh | 2 +- dev/jobs/genesis_fsu.sh | 2 +- dev/jobs/metp.sh | 2 +- dev/jobs/npoess.sh | 2 +- dev/jobs/oceanice_products.sh | 18 +-- dev/jobs/postsnd.sh | 2 +- dev/jobs/prep.sh | 70 ++++----- dev/jobs/prep_emissions.sh | 2 +- dev/jobs/sfcanl.sh | 1 - dev/jobs/tracker.sh | 2 +- dev/jobs/upp.sh | 62 ++++---- dev/jobs/verfozn.sh | 2 +- dev/jobs/verfrad.sh | 2 +- dev/jobs/vminmon.sh | 2 +- dev/jobs/wave_stat.sh | 20 ++- dev/jobs/wave_stat_pnt.sh | 5 +- dev/jobs/waveawipsbulls.sh | 1 - dev/jobs/waveawipsgridded.sh | 1 - dev/jobs/wavegempak.sh | 18 +-- dev/jobs/wavepostsbs.sh | 18 +-- jobs/JGDAS_AERO_ANALYSIS_GENERATE_BMATRIX | 4 +- jobs/JGDAS_ATMOS_ANALYSIS_DIAG | 11 +- jobs/JGDAS_ATMOS_CHGRES_FORENKF | 11 +- jobs/JGDAS_ATMOS_GEMPAK | 20 +-- jobs/JGDAS_ATMOS_GEMPAK_META_NCDC | 52 +++--- jobs/JGDAS_ATMOS_VERFOZN | 2 +- jobs/JGDAS_ATMOS_VERFRAD | 2 +- jobs/JGDAS_ENKF_DIAG | 18 +-- jobs/JGDAS_ENKF_ECEN | 19 +-- jobs/JGDAS_ENKF_ECEN_FV3JEDI | 16 +- jobs/JGDAS_ENKF_POST | 10 +- jobs/JGDAS_ENKF_SELECT_OBS | 30 ++-- jobs/JGDAS_ENKF_SFC | 24 ++- jobs/JGDAS_ENKF_UPDATE | 19 +-- jobs/JGDAS_FIT2OBS | 72 +++++---- jobs/JGEFS_WAVE_STAT | 24 +-- jobs/JGEFS_WAVE_STAT_PNT | 6 +- jobs/JGFS_ATMOS_AWIPS_20KM_1P0DEG | 14 +- jobs/JGFS_ATMOS_CYCLONE_GENESIS | 5 +- jobs/JGFS_ATMOS_CYCLONE_TRACKER | 18 +-- jobs/JGFS_ATMOS_FBWIND | 13 +- jobs/JGFS_ATMOS_FSU_GENESIS | 5 +- jobs/JGFS_ATMOS_GEMPAK | 174 ++++++++++----------- jobs/JGFS_ATMOS_GEMPAK_META | 18 +-- jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF | 20 +-- jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC | 10 +- jobs/JGFS_ATMOS_PGRB2_SPEC_NPOESS | 11 +- jobs/JGFS_ATMOS_POSTSND | 15 +- jobs/JGFS_ATMOS_VERIFICATION | 11 +- jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE | 4 +- jobs/JGLOBAL_AERO_ANALYSIS_INITIALIZE | 4 +- jobs/JGLOBAL_AERO_ANALYSIS_VARIATIONAL | 4 +- jobs/JGLOBAL_ANALYSIS_STATS | 23 ++- jobs/JGLOBAL_ARCHIVE_TARS | 15 +- jobs/JGLOBAL_ARCHIVE_VRFY | 12 +- jobs/JGLOBAL_ATMENS_ANALYSIS_FINALIZE | 4 +- jobs/JGLOBAL_ATMENS_ANALYSIS_FV3_INCREMENT | 4 +- jobs/JGLOBAL_ATMENS_ANALYSIS_INITIALIZE | 8 +- jobs/JGLOBAL_ATMENS_ANALYSIS_LETKF | 4 +- jobs/JGLOBAL_ATMENS_ANALYSIS_OBS | 4 +- jobs/JGLOBAL_ATMENS_ANALYSIS_SOL | 4 +- jobs/JGLOBAL_ATMOS_ANALYSIS | 17 +- jobs/JGLOBAL_ATMOS_ANALYSIS_CALC | 11 +- jobs/JGLOBAL_ATMOS_ANALYSIS_CALC_FV3JEDI | 12 +- jobs/JGLOBAL_ATMOS_CHGRES_GEN_CONTROL | 1 - jobs/JGLOBAL_ATMOS_ENSSTAT | 10 +- jobs/JGLOBAL_ATMOS_POST_MANAGER | 2 - jobs/JGLOBAL_ATMOS_PREP_SFC | 5 +- jobs/JGLOBAL_ATMOS_PRODUCTS | 16 +- jobs/JGLOBAL_ATMOS_SFCANL | 23 ++- jobs/JGLOBAL_ATMOS_TROPCY_QC_RELOC | 22 ++- jobs/JGLOBAL_ATMOS_UPP | 10 +- jobs/JGLOBAL_ATMOS_VMINMON | 8 +- jobs/JGLOBAL_ATM_ANALYSIS_FINALIZE | 9 +- jobs/JGLOBAL_ATM_ANALYSIS_FV3_INCREMENT | 6 +- jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE | 10 +- jobs/JGLOBAL_ATM_ANALYSIS_VARIATIONAL | 6 +- jobs/JGLOBAL_ATM_PREP_IODA_OBS | 6 +- jobs/JGLOBAL_CLEANUP | 1 - jobs/JGLOBAL_ENS_ARCHIVE_TARS | 27 ++-- jobs/JGLOBAL_ENS_ARCHIVE_VRFY | 16 +- jobs/JGLOBAL_ENS_GLOBUS_ARCH | 9 +- jobs/JGLOBAL_EXTRACTVARS | 16 +- jobs/JGLOBAL_FETCH | 4 +- jobs/JGLOBAL_FORECAST | 127 ++++++++------- jobs/JGLOBAL_GLOBUS_ARCH | 5 +- jobs/JGLOBAL_MARINE_ANALYSIS_CHECKPOINT | 5 +- jobs/JGLOBAL_MARINE_ANALYSIS_ECEN | 20 +-- jobs/JGLOBAL_MARINE_ANALYSIS_FINALIZE | 18 +-- jobs/JGLOBAL_MARINE_ANALYSIS_INITIALIZE | 17 +- jobs/JGLOBAL_MARINE_ANALYSIS_LETKF | 28 ++-- jobs/JGLOBAL_MARINE_ANALYSIS_VARIATIONAL | 6 +- jobs/JGLOBAL_MARINE_BMAT | 24 +-- jobs/JGLOBAL_MARINE_BMAT_INITIALIZE | 23 ++- jobs/JGLOBAL_OCEANICE_PRODUCTS | 4 +- jobs/JGLOBAL_OFFLINE_ATMOS_ANALYSIS | 17 +- jobs/JGLOBAL_PREP_EMISSIONS | 4 +- jobs/JGLOBAL_PREP_OBS_AERO | 5 +- jobs/JGLOBAL_PREP_OCEAN_OBS | 8 +- jobs/JGLOBAL_SNOWENS_ANALYSIS | 15 +- jobs/JGLOBAL_SNOW_ANALYSIS | 4 +- jobs/JGLOBAL_STAGE_IC | 9 +- jobs/JGLOBAL_WAVE_GEMPAK | 14 +- jobs/JGLOBAL_WAVE_INIT | 2 +- jobs/JGLOBAL_WAVE_POST_BNDPNT | 15 +- jobs/JGLOBAL_WAVE_POST_BNDPNTBLL | 13 +- jobs/JGLOBAL_WAVE_POST_PNT | 18 +-- jobs/JGLOBAL_WAVE_POST_SBS | 22 +-- jobs/JGLOBAL_WAVE_PRDGEN_BULLS | 3 +- jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED | 4 +- jobs/JGLOBAL_WAVE_PREP | 9 +- 135 files changed, 869 insertions(+), 954 deletions(-) diff --git a/.editorconfig b/.editorconfig index 02b0658f3d3..5ad9da1a41d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -22,6 +22,20 @@ indent_style = tab indent_size = 4 max_line_length = 79 +[jobs/*] +indent_style = space +indent_size = 4 +shell_variant = bash +switch_case_indent = true +space_redirects = true + +[*.{sh,bash}] +indent_style = space +indent_size = 4 +shell_variant = bash +switch_case_indent = true +space_redirects = true + [*.{diff}] trim_trailing_whitespace = false diff --git a/dev/jobs/aerosol_init.sh b/dev/jobs/aerosol_init.sh index 901677c253c..c051c24938b 100755 --- a/dev/jobs/aerosol_init.sh +++ b/dev/jobs/aerosol_init.sh @@ -40,5 +40,4 @@ fi ############################################################## # Exit cleanly - exit 0 diff --git a/dev/jobs/anal.sh b/dev/jobs/anal.sh index 720f31364a7..61fb18e00bb 100755 --- a/dev/jobs/anal.sh +++ b/dev/jobs/anal.sh @@ -18,5 +18,4 @@ export jobid="${job}.$$" "${HOMEgfs}/jobs/JGLOBAL_ATMOS_ANALYSIS" status=$? - exit "${status}" diff --git a/dev/jobs/analcalc.sh b/dev/jobs/analcalc.sh index 82438c8572f..cbf31b4bfa2 100755 --- a/dev/jobs/analcalc.sh +++ b/dev/jobs/analcalc.sh @@ -7,7 +7,7 @@ set -x source "${HOMEgfs}/dev/ush/load_gw_gsi_modules.sh" status=$? if [[ ${status} -ne 0 ]]; then - exit "${status}" + exit "${status}" fi export job="analcalc" @@ -18,5 +18,4 @@ export jobid="${job}.$$" "${HOMEgfs}/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC" status=$? - exit "${status}" diff --git a/dev/jobs/analdiag.sh b/dev/jobs/analdiag.sh index 4bfa9f8986e..311983b323c 100755 --- a/dev/jobs/analdiag.sh +++ b/dev/jobs/analdiag.sh @@ -7,7 +7,7 @@ set -x source "${HOMEgfs}/dev/ush/load_gw_gsi_modules.sh" status=$? if [[ ${status} -ne 0 ]]; then - exit "${status}" + exit "${status}" fi export job="analdiag" @@ -18,5 +18,4 @@ export jobid="${job}.$$" "${HOMEgfs}/jobs/JGDAS_ATMOS_ANALYSIS_DIAG" status=$? - exit "${status}" diff --git a/dev/jobs/atmos_ensstat.sh b/dev/jobs/atmos_ensstat.sh index dd4a70cd07c..6083dfe71db 100755 --- a/dev/jobs/atmos_ensstat.sh +++ b/dev/jobs/atmos_ensstat.sh @@ -10,7 +10,7 @@ set -x # Source FV3GFS workflow modules source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" status=$? -if (( status != 0 )); then exit "${status}"; fi +if ((status != 0)); then exit "${status}"; fi export job="atmos_ensstat" @@ -19,14 +19,14 @@ IFS=', ' read -r -a fhr_list <<< "${FHR_LIST}" export FORECAST_HOUR jobid for FORECAST_HOUR in "${fhr_list[@]}"; do - fhr3=$(printf '%03d' "${FORECAST_HOUR}") - jobid="${job}_f${fhr3}.$$" - ############################################################### - # Execute the JJOB - ############################################################### - "${HOMEgfs}/jobs/JGLOBAL_ATMOS_ENSSTAT" - status=$? - [[ ${status} -ne 0 ]] && exit "${status}" + fhr3=$(printf '%03d' "${FORECAST_HOUR}") + jobid="${job}_f${fhr3}.$$" + ############################################################### + # Execute the JJOB + ############################################################### + "${HOMEgfs}/jobs/JGLOBAL_ATMOS_ENSSTAT" + status=$? + [[ ${status} -ne 0 ]] && exit "${status}" done exit 0 diff --git a/dev/jobs/atmos_products.sh b/dev/jobs/atmos_products.sh index e9d15789700..eca03191dae 100755 --- a/dev/jobs/atmos_products.sh +++ b/dev/jobs/atmos_products.sh @@ -10,7 +10,7 @@ set -x # Source FV3GFS workflow modules source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" status=$? -if (( status != 0 )); then exit "${status}"; fi +if ((status != 0)); then exit "${status}"; fi export job="atmos_products" @@ -19,14 +19,14 @@ IFS=', ' read -r -a fhr_list <<< "${FHR_LIST}" export FORECAST_HOUR jobid for FORECAST_HOUR in "${fhr_list[@]}"; do - fhr3=$(printf '%03d' "${FORECAST_HOUR}") - jobid="${job}_f${fhr3}.$$" - ############################################################### - # Execute the JJOB - ############################################################### - "${HOMEgfs}/jobs/JGLOBAL_ATMOS_PRODUCTS" - status=$? - [[ ${status} -ne 0 ]] && exit "${status}" + fhr3=$(printf '%03d' "${FORECAST_HOUR}") + jobid="${job}_f${fhr3}.$$" + ############################################################### + # Execute the JJOB + ############################################################### + "${HOMEgfs}/jobs/JGLOBAL_ATMOS_PRODUCTS" + status=$? + [[ ${status} -ne 0 ]] && exit "${status}" done exit 0 diff --git a/dev/jobs/awips.sh b/dev/jobs/awips.sh index 1c534d4277a..1a97b062067 100755 --- a/dev/jobs/awips.sh +++ b/dev/jobs/awips.sh @@ -4,7 +4,7 @@ set -x source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" status=$? if [[ ${status} -ne 0 ]]; then - exit "${status}" + exit "${status}" fi export job="awips" @@ -14,16 +14,16 @@ IFS=', ' read -r -a fhr_list <<< "${FHR_LIST}" export FHR3 jobid for fhr in "${fhr_list[@]}"; do - FHR3=$(printf '%03d' "${fhr}") - jobid="${job}_f${FHR3}.$$" - ############################################################### - # Execute the JJOB # TODO - ############################################################### - # "${HOMEgfs}/jobs/J${RUN^^}_ATMOS_AWIPS" - err=$? - if [[ ${err} -ne 0 ]]; then - exit "${err}" - fi + FHR3=$(printf '%03d' "${fhr}") + jobid="${job}_f${FHR3}.$$" + ############################################################### + # Execute the JJOB # TODO + ############################################################### + # "${HOMEgfs}/jobs/J${RUN^^}_ATMOS_AWIPS" + err=$? + if [[ ${err} -ne 0 ]]; then + exit "${err}" + fi done exit 0 diff --git a/dev/jobs/awips_20km_1p0deg.sh b/dev/jobs/awips_20km_1p0deg.sh index 5b35606438c..69c1b8de62f 100755 --- a/dev/jobs/awips_20km_1p0deg.sh +++ b/dev/jobs/awips_20km_1p0deg.sh @@ -32,21 +32,21 @@ echo "=============== BEGIN AWIPS ===============" fhrlst=$(echo "${FHRLST}" | sed -e 's/_/ /g; s/f/ /g; s/,/ /g') for fhr3 in ${fhrlst}; do - fhr=$(( 10#${fhr3} )) + fhr=$((10#${fhr3})) # Process every 3 hrs from hour 0 up to hour 84 - if [[ ${fhr} -ge 0 ]] && [[ ${fhr} -le 84 ]] ; then - if (( fhr % 3 == 0 )) ; then - export fcsthr="${fhr3}" - export DATA="${DATAROOT}/${jobid}.${fcsthr}" - "${HOMEgfs}/jobs/JGFS_ATMOS_AWIPS_20KM_1P0DEG" - fi + if [[ ${fhr} -ge 0 ]] && [[ ${fhr} -le 84 ]]; then + if ((fhr % 3 == 0)); then + export fcsthr="${fhr3}" + export DATA="${DATAROOT}/${jobid}.${fcsthr}" + "${HOMEgfs}/jobs/JGFS_ATMOS_AWIPS_20KM_1P0DEG" + fi # Process every 6 hrs from hour 90 up to hour 240 - elif [[ ${fhr} -ge 90 ]] && [[ ${fhr} -le 240 ]] ; then - if (( fhr % 6 == 0 )) ; then - export fcsthr="${fhr3}" - export DATA="${DATAROOT}/${jobid}.${fcsthr}" - "${HOMEgfs}/jobs/JGFS_ATMOS_AWIPS_20KM_1P0DEG" - fi + elif [[ ${fhr} -ge 90 ]] && [[ ${fhr} -le 240 ]]; then + if ((fhr % 6 == 0)); then + export fcsthr="${fhr3}" + export DATA="${DATAROOT}/${jobid}.${fcsthr}" + "${HOMEgfs}/jobs/JGFS_ATMOS_AWIPS_20KM_1P0DEG" + fi fi done diff --git a/dev/jobs/ecen.sh b/dev/jobs/ecen.sh index cc4d2b19b27..0883c0cf7e2 100755 --- a/dev/jobs/ecen.sh +++ b/dev/jobs/ecen.sh @@ -7,7 +7,7 @@ set -x source "${HOMEgfs}/dev/ush/load_gw_gsi_modules.sh" status=$? if [[ ${status} -ne 0 ]]; then - exit "${status}" + exit "${status}" fi ############################################################### @@ -33,5 +33,4 @@ done ############################################################### # Exit out cleanly - exit 0 diff --git a/dev/jobs/echgres.sh b/dev/jobs/echgres.sh index 00c297249ce..ba46ae41505 100755 --- a/dev/jobs/echgres.sh +++ b/dev/jobs/echgres.sh @@ -7,7 +7,7 @@ set -x source "${HOMEgfs}/dev/ush/load_gw_gsi_modules.sh" status=$? if [[ ${status} -ne 0 ]]; then - exit "${status}" + exit "${status}" fi export job="echgres" @@ -18,5 +18,4 @@ export jobid="${job}.$$" "${HOMEgfs}/jobs/JGDAS_ATMOS_CHGRES_FORENKF" status=$? - exit "${status}" diff --git a/dev/jobs/ediag.sh b/dev/jobs/ediag.sh index 4adc50ccc3a..e859bcd9c0d 100755 --- a/dev/jobs/ediag.sh +++ b/dev/jobs/ediag.sh @@ -7,7 +7,7 @@ set -x source "${HOMEgfs}/dev/ush/load_gw_gsi_modules.sh" status=$? if [[ ${status} -ne 0 ]]; then - exit "${status}" + exit "${status}" fi export job="ediag" @@ -18,5 +18,4 @@ export jobid="${job}.$$" "${HOMEgfs}/jobs/JGDAS_ENKF_DIAG" status=$? - exit "${status}" diff --git a/dev/jobs/eobs.sh b/dev/jobs/eobs.sh index b906aa41ac1..5aaa2a68a53 100755 --- a/dev/jobs/eobs.sh +++ b/dev/jobs/eobs.sh @@ -18,5 +18,4 @@ export jobid="${job}.$$" "${HOMEgfs}/jobs/JGDAS_ENKF_SELECT_OBS" status=$? - exit "${status}" diff --git a/dev/jobs/epos.sh b/dev/jobs/epos.sh index e716e4fc557..6fed8d250bc 100755 --- a/dev/jobs/epos.sh +++ b/dev/jobs/epos.sh @@ -7,7 +7,7 @@ set -x source "${HOMEgfs}/dev/ush/load_gw_gsi_modules.sh" status=$? if [[ ${status} -ne 0 ]]; then - exit "${status}" + exit "${status}" fi export job="epos" @@ -34,5 +34,4 @@ done ############################################################### # Exit out cleanly - exit 0 diff --git a/dev/jobs/esfc.sh b/dev/jobs/esfc.sh index 58571678b45..f1b5ae8e333 100755 --- a/dev/jobs/esfc.sh +++ b/dev/jobs/esfc.sh @@ -7,7 +7,7 @@ set -x source "${HOMEgfs}/dev/ush/load_gw_gsi_modules.sh" status=$? if [[ ${status} -ne 0 ]]; then - exit "${status}" + exit "${status}" fi export job="esfc" @@ -18,5 +18,4 @@ export jobid="${job}.$$" "${HOMEgfs}/jobs/JGDAS_ENKF_SFC" status=$? - exit "${status}" diff --git a/dev/jobs/eupd.sh b/dev/jobs/eupd.sh index dc26ff8b45a..bc7191bcb64 100755 --- a/dev/jobs/eupd.sh +++ b/dev/jobs/eupd.sh @@ -18,5 +18,4 @@ export jobid="${job}.$$" "${HOMEgfs}/jobs/JGDAS_ENKF_UPDATE" status=$? - exit "${status}" diff --git a/dev/jobs/fbwind.sh b/dev/jobs/fbwind.sh index 1e658e611a8..6cf0bd77e17 100755 --- a/dev/jobs/fbwind.sh +++ b/dev/jobs/fbwind.sh @@ -5,7 +5,7 @@ set -x ############################################################### source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" status=$? -if (( status != 0 )); then exit "${status}"; fi +if ((status != 0)); then exit "${status}"; fi export job="fbwind" export jobid="${job}.$$" diff --git a/dev/jobs/fcst.sh b/dev/jobs/fcst.sh index 1e88f175723..5aad76a9c75 100755 --- a/dev/jobs/fcst.sh +++ b/dev/jobs/fcst.sh @@ -7,13 +7,13 @@ set -x # TODO clean this up once ncdiag/1.1.2 is installed on WCOSS2 source "${HOMEgfs}/ush/detect_machine.sh" if [[ "${MACHINE_ID}" == "wcoss2" ]]; then - source "${HOMEgfs}/dev/ush/load_ufswm_modules.sh" + source "${HOMEgfs}/dev/ush/load_ufswm_modules.sh" else - source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" + source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" fi status=$? if [[ ${status} -ne 0 ]]; then - exit "${status}" + exit "${status}" fi export job="fcst" diff --git a/dev/jobs/fetch.sh b/dev/jobs/fetch.sh index 9e3850cce82..ef43fca05bd 100755 --- a/dev/jobs/fetch.sh +++ b/dev/jobs/fetch.sh @@ -16,5 +16,4 @@ export jobid="${job}.$$" "${HOMEgfs}/jobs/JGLOBAL_FETCH" status=$? - exit "${status}" diff --git a/dev/jobs/gempak.sh b/dev/jobs/gempak.sh index c6dae756b23..24e491d2ea8 100755 --- a/dev/jobs/gempak.sh +++ b/dev/jobs/gempak.sh @@ -3,7 +3,7 @@ set -x source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" status=$? -if (( status != 0 )); then exit "${status}"; fi +if ((status != 0)); then exit "${status}"; fi export job="gempak" @@ -12,14 +12,14 @@ IFS=', ' read -r -a fhr_list <<< "${FHR_LIST}" export FHR3 jobid for fhr in "${fhr_list[@]}"; do - FHR3=$(printf '%03d' "${fhr}") - jobid="${job}_f${FHR3}.$$" - ############################################################### - # Execute the JJOB - ############################################################### - "${HOMEgfs}/jobs/J${RUN^^}_ATMOS_GEMPAK" - err=$? - [[ ${err} -ne 0 ]] && exit "${err}" + FHR3=$(printf '%03d' "${fhr}") + jobid="${job}_f${FHR3}.$$" + ############################################################### + # Execute the JJOB + ############################################################### + "${HOMEgfs}/jobs/J${RUN^^}_ATMOS_GEMPAK" + err=$? + [[ ${err} -ne 0 ]] && exit "${err}" done exit 0 diff --git a/dev/jobs/gempakgrb2spec.sh b/dev/jobs/gempakgrb2spec.sh index f72030c8e4c..b39cd9e4886 100755 --- a/dev/jobs/gempakgrb2spec.sh +++ b/dev/jobs/gempakgrb2spec.sh @@ -3,12 +3,11 @@ set -x source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" status=$? -if (( status != 0 )); then exit "${status}"; fi +if ((status != 0)); then exit "${status}"; fi export job="gempakpgrb2spec" export jobid="${job}.$$" - # Execute the JJOB "${HOMEgfs}/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC" diff --git a/dev/jobs/gempakmeta.sh b/dev/jobs/gempakmeta.sh index c46777db470..a80208365d7 100755 --- a/dev/jobs/gempakmeta.sh +++ b/dev/jobs/gempakmeta.sh @@ -5,7 +5,7 @@ set -x ############################################################### source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" status=$? -if (( status != 0 )); then exit "${status}"; fi +if ((status != 0)); then exit "${status}"; fi export job="gempakmeta" export jobid="${job}.$$" diff --git a/dev/jobs/gempakmetancdc.sh b/dev/jobs/gempakmetancdc.sh index a51c33f627b..a959b3695c8 100755 --- a/dev/jobs/gempakmetancdc.sh +++ b/dev/jobs/gempakmetancdc.sh @@ -5,7 +5,7 @@ set -x ############################################################### source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" status=$? -if (( status != 0 )); then exit "${status}"; fi +if ((status != 0)); then exit "${status}"; fi export job="gempakmetancdc" export jobid="${job}.$$" diff --git a/dev/jobs/gempakncdcupapgif.sh b/dev/jobs/gempakncdcupapgif.sh index f6fe0cf1a33..e31336cdb5f 100755 --- a/dev/jobs/gempakncdcupapgif.sh +++ b/dev/jobs/gempakncdcupapgif.sh @@ -5,7 +5,7 @@ set -x ############################################################### source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" status=$? -if (( status != 0 )); then exit "${status}"; fi +if ((status != 0)); then exit "${status}"; fi export job="gempakncdcupapgif" export jobid="${job}.$$" diff --git a/dev/jobs/genesis.sh b/dev/jobs/genesis.sh index 04a27f5df21..0ac27fae041 100755 --- a/dev/jobs/genesis.sh +++ b/dev/jobs/genesis.sh @@ -6,7 +6,7 @@ set -x # Source FV3GFS workflow modules source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" status=$? -(( status != 0 )) && exit "${status}" +((status != 0)) && exit "${status}" export job="genesis" export jobid="${job}.$$" diff --git a/dev/jobs/genesis_fsu.sh b/dev/jobs/genesis_fsu.sh index 7d50bf6e25a..e7f54a7cc23 100755 --- a/dev/jobs/genesis_fsu.sh +++ b/dev/jobs/genesis_fsu.sh @@ -6,7 +6,7 @@ set -x # Source FV3GFS workflow modules source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" status=$? -(( status != 0 )) && exit "${status}" +((status != 0)) && exit "${status}" export job="genesis_fsu" export jobid="${job}.$$" diff --git a/dev/jobs/metp.sh b/dev/jobs/metp.sh index 9fc77ea6d52..07080d71e1e 100755 --- a/dev/jobs/metp.sh +++ b/dev/jobs/metp.sh @@ -5,7 +5,7 @@ set -x ############################################################### source "${HOMEgfs}/dev/ush/load_gw_verif_modules.sh" status=$? -if (( status != 0 )); then exit "${status}"; fi +if ((status != 0)); then exit "${status}"; fi export job="metp${METPCASE}" export jobid="${job}.$$" diff --git a/dev/jobs/npoess.sh b/dev/jobs/npoess.sh index b69dc7aceb5..b275c560334 100755 --- a/dev/jobs/npoess.sh +++ b/dev/jobs/npoess.sh @@ -5,7 +5,7 @@ set -x ############################################################### source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" status=$? -if (( status != 0 )); then exit "${status}"; fi +if ((status != 0)); then exit "${status}"; fi export job="npoess_pgrb2_0p5deg" export jobid="${job}.$$" diff --git a/dev/jobs/oceanice_products.sh b/dev/jobs/oceanice_products.sh index ee99c3219dd..586c34f5340 100755 --- a/dev/jobs/oceanice_products.sh +++ b/dev/jobs/oceanice_products.sh @@ -10,7 +10,7 @@ set -x # Source FV3GFS workflow modules source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" status=$? -if (( status != 0 )); then exit "${status}"; fi +if ((status != 0)); then exit "${status}"; fi export job="oceanice_products" @@ -19,14 +19,14 @@ IFS=', ' read -r -a fhr_list <<< "${FHR_LIST}" export FORECAST_HOUR jobid for FORECAST_HOUR in "${fhr_list[@]}"; do - fhr3=$(printf '%03d' "${FORECAST_HOUR}") - jobid="${job}_${COMPONENT}_f${fhr3}.$$" - ############################################################### - # Execute the JJOB - ############################################################### - "${HOMEgfs}/jobs/JGLOBAL_OCEANICE_PRODUCTS" - status=$? - [[ ${status} -ne 0 ]] && exit "${status}" + fhr3=$(printf '%03d' "${FORECAST_HOUR}") + jobid="${job}_${COMPONENT}_f${fhr3}.$$" + ############################################################### + # Execute the JJOB + ############################################################### + "${HOMEgfs}/jobs/JGLOBAL_OCEANICE_PRODUCTS" + status=$? + [[ ${status} -ne 0 ]] && exit "${status}" done exit 0 diff --git a/dev/jobs/postsnd.sh b/dev/jobs/postsnd.sh index b5135012b19..6496758f901 100755 --- a/dev/jobs/postsnd.sh +++ b/dev/jobs/postsnd.sh @@ -5,7 +5,7 @@ set -x source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" status=$? if [[ ${status} -ne 0 ]]; then - exit "${status}" + exit "${status}" fi export job="postsnd" diff --git a/dev/jobs/prep.sh b/dev/jobs/prep.sh index d1d8f8f58c7..088ba372793 100755 --- a/dev/jobs/prep.sh +++ b/dev/jobs/prep.sh @@ -14,7 +14,7 @@ export jobid="${job}.$$" source "${HOMEgfs}/ush/jjob_header.sh" -e "prep" -c "base prep" # Strip 'enkf' from RUN for pulling data -RUN_local="${RUN/enkf}" +RUN_local="${RUN/enkf/}" ############################################################### # Set script and dependency variables @@ -50,11 +50,11 @@ fi # Ensure previous cycle gdas dumps are available (used by cycle & downstream) if [[ ! -s "${COMINobsproc_PREV}/${GDUMP}.t${gcyc}z.updated.status.tm00.bufr_d" ]]; then - "${HOMEgfs}/ush/getdump.sh" "${gPDY}" "${gcyc}" "${GDUMP}" "${COMINobsproc_PREV}" "${COMOUT_OBS_PREV}" - status=$? - if [[ ${status} -ne 0 ]]; then - exit "${status}" - fi + "${HOMEgfs}/ush/getdump.sh" "${gPDY}" "${gcyc}" "${GDUMP}" "${COMINobsproc_PREV}" "${COMOUT_OBS_PREV}" + status=$? + if [[ ${status} -ne 0 ]]; then + exit "${status}" + fi fi # exception handling to ensure no dead link # shellcheck disable=SC2312 @@ -66,7 +66,6 @@ if [[ $(find "${COMINobsproc_PREV}" -xtype l | wc -l) -ge 1 ]]; then exit 9 fi - ############################################################### ############################################################### @@ -79,7 +78,7 @@ if [[ ${PROCESS_TROPCY} == "YES" ]]; then export ARCHSYND=${ROTDIR}/syndat mkdir -p "${ARCHSYND}" if [[ ! -s ${ARCHSYND}/syndat_akavit ]]; then - for file in syndat_akavit syndat_dateck syndat_stmcat.scr syndat_stmcat syndat_sthisto syndat_sthista ; do + for file in syndat_akavit syndat_dateck syndat_stmcat.scr syndat_stmcat syndat_sthisto syndat_sthista; do cpreq "${COMINsyn}/${file}" "${ARCHSYND}"/. done fi @@ -96,7 +95,6 @@ else cpfs "${COMINobsproc}/${RUN_local}.t${cyc}z.syndata.tcvitals.tm00" "${COMOUT_OBS}/" fi - ############################################################### # Generate prepbufr files from dumps and prior gdas guess rm -f "${COMOUT_OBS}/${OPREFIX}prepbufr" @@ -120,46 +118,46 @@ export COMSP=${COMSP:-"${COMIN_OBS}/${RUN_local}.t${cyc}z."} # Create or Copy prepbufr, prepbufr.acft_profiles, nsstbufr files # Do not fail on external errors if [[ ${MAKE_PREPBUFR:-"YES"} == "YES" ]]; then - set +eu - "${HOMEobsproc}/jobs/JOBSPROC_GLOBAL_PREP" && true - export err=$? - if [[ ${err} -ne 0 ]]; then - err_exit "JOBSPROC_GLOBAL_PREP job failed, ABORT!" - fi -else - if [[ ${USE_PREPBUFR_FROM_OPS:-"YES"} == "YES" ]]; then - # If USE_PREPBUFR_FROM_OPS is set, copy prepbufr from COMINobsproc - PREPBUFR_DIR="${COMINobsproc}" - else - # If PREPBUFR_DIR is not set, exit out with an error - if [[ -z "${PREPBUFR_DIR}" ]]; then - export err=1 - err_exit "PREPBUFR_DIR is not set!" + set +eu + "${HOMEobsproc}/jobs/JOBSPROC_GLOBAL_PREP" && true + export err=$? + if [[ ${err} -ne 0 ]]; then + err_exit "JOBSPROC_GLOBAL_PREP job failed, ABORT!" fi +else + if [[ ${USE_PREPBUFR_FROM_OPS:-"YES"} == "YES" ]]; then + # If USE_PREPBUFR_FROM_OPS is set, copy prepbufr from COMINobsproc + PREPBUFR_DIR="${COMINobsproc}" + else + # If PREPBUFR_DIR is not set, exit out with an error + if [[ -z "${PREPBUFR_DIR}" ]]; then + export err=1 + err_exit "PREPBUFR_DIR is not set!" + fi - fi - cpreq "${PREPBUFR_DIR}/${OPREFIX}prepbufr" "${COMOUT_OBS}/${OPREFIX}prepbufr" - cpreq "${PREPBUFR_DIR}/${OPREFIX}prepbufr.acft_profiles" "${COMOUT_OBS}/${OPREFIX}prepbufr.acft_profiles" - if [[ ${DONST} == "YES" ]]; then - cpreq "${PREPBUFR_DIR}/${OPREFIX}nsstbufr" "${COMOUT_OBS}/${OPREFIX}nsstbufr" - fi + fi + cpreq "${PREPBUFR_DIR}/${OPREFIX}prepbufr" "${COMOUT_OBS}/${OPREFIX}prepbufr" + cpreq "${PREPBUFR_DIR}/${OPREFIX}prepbufr.acft_profiles" "${COMOUT_OBS}/${OPREFIX}prepbufr.acft_profiles" + if [[ ${DONST} == "YES" ]]; then + cpreq "${PREPBUFR_DIR}/${OPREFIX}nsstbufr" "${COMOUT_OBS}/${OPREFIX}nsstbufr" + fi fi # Check if prepbufr, etc files were copied to COMOUT_OBS files="prepbufr prepbufr.acft_profiles" if [[ ${DONST} == "YES" ]]; then - files="${files} nsstbufr" + files="${files} nsstbufr" fi err=0 for file in ${files}; do - if [[ ! -f "${COMOUT_OBS}/${OPREFIX}${file}" ]]; then - err=1 - echo "Failed to obtain/create ${file}, ABORT!" - fi + if [[ ! -f "${COMOUT_OBS}/${OPREFIX}${file}" ]]; then + err=1 + echo "Failed to obtain/create ${file}, ABORT!" + fi done export err if [[ ${err} -ne 0 ]]; then - err_exit "Failed to obtain/create ${files}, ABORT!" + err_exit "Failed to obtain/create ${files}, ABORT!" fi ################################################################################ diff --git a/dev/jobs/prep_emissions.sh b/dev/jobs/prep_emissions.sh index 6487ea33fbb..9292fbcf3dd 100755 --- a/dev/jobs/prep_emissions.sh +++ b/dev/jobs/prep_emissions.sh @@ -6,7 +6,7 @@ set -x # Source UFSDA workflow modules source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" status=$? -(( status != 0 )) && exit "${status}" +((status != 0)) && exit "${status}" export job="prep_emissions" export jobid="${job}.$$" diff --git a/dev/jobs/sfcanl.sh b/dev/jobs/sfcanl.sh index c2ce6f0a10c..e899c3405ff 100755 --- a/dev/jobs/sfcanl.sh +++ b/dev/jobs/sfcanl.sh @@ -18,5 +18,4 @@ export jobid="${job}.$$" "${HOMEgfs}/jobs/JGLOBAL_ATMOS_SFCANL" status=$? - exit "${status}" diff --git a/dev/jobs/tracker.sh b/dev/jobs/tracker.sh index 91a28fc3915..457cd187c8a 100755 --- a/dev/jobs/tracker.sh +++ b/dev/jobs/tracker.sh @@ -6,7 +6,7 @@ set -x # Source FV3GFS workflow modules source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" status=$? -(( status != 0 )) && exit "${status}" +((status != 0)) && exit "${status}" export job="tracker" export jobid="${job}.$$" diff --git a/dev/jobs/upp.sh b/dev/jobs/upp.sh index 642f804dc0b..fd5d69e3f64 100755 --- a/dev/jobs/upp.sh +++ b/dev/jobs/upp.sh @@ -15,44 +15,44 @@ set -x # Temporarily load modules from UPP on WCOSS2 source "${HOMEgfs}/ush/detect_machine.sh" if [[ "${MACHINE_ID}" == "wcoss2" ]]; then - set +x - source "${HOMEgfs}/ush/module-setup.sh" - module use "${HOMEgfs}/sorc/ufs_model.fd/UFSATM/upp/modulefiles" - module load "${MACHINE_ID}_intel" - module load prod_util - module load cray-pals - module load cfp - module load libjpeg - module load grib_util/1.2.3 - module load wgrib2/2.0.8 - export WGRIB2=wgrib2 - module load python/3.8.6 - if [[ "${UPP_RUN:-}" == "goes" ]]; then - module load crtm/2.4.0 - fi - set -x - - # Set up the PYTHONPATH to include wxflow from HOMEgfs - if [[ -d "${HOMEgfs}/sorc/wxflow/src" ]]; then - PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${HOMEgfs}/sorc/wxflow/src" - fi - - # Add HOMEgfs/ush/python to PYTHONPATH - PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${HOMEgfs}/ush/python" - export PYTHONPATH + set +x + source "${HOMEgfs}/ush/module-setup.sh" + module use "${HOMEgfs}/sorc/ufs_model.fd/UFSATM/upp/modulefiles" + module load "${MACHINE_ID}_intel" + module load prod_util + module load cray-pals + module load cfp + module load libjpeg + module load grib_util/1.2.3 + module load wgrib2/2.0.8 + export WGRIB2=wgrib2 + module load python/3.8.6 + if [[ "${UPP_RUN:-}" == "goes" ]]; then + module load crtm/2.4.0 + fi + set -x + + # Set up the PYTHONPATH to include wxflow from HOMEgfs + if [[ -d "${HOMEgfs}/sorc/wxflow/src" ]]; then + PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${HOMEgfs}/sorc/wxflow/src" + fi + + # Add HOMEgfs/ush/python to PYTHONPATH + PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${HOMEgfs}/ush/python" + export PYTHONPATH else - source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" - status=$? - if [[ ${status} -ne 0 ]]; then - exit "${status}"; - fi + source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" + status=$? + if [[ ${status} -ne 0 ]]; then + exit "${status}" + fi fi export job="upp" export jobid="${job}.$$" -export FORECAST_HOUR=$(( 10#${FHR3} )) +export FORECAST_HOUR=$((10#${FHR3})) ############################################################### # Execute the JJOB diff --git a/dev/jobs/verfozn.sh b/dev/jobs/verfozn.sh index 930243ef913..493f86537d4 100755 --- a/dev/jobs/verfozn.sh +++ b/dev/jobs/verfozn.sh @@ -7,7 +7,7 @@ set -x source "${HOMEgfs}/dev/ush/load_gw_gsi_modules.sh" status=$? if [[ status -ne 0 ]]; then - exit "${status}" + exit "${status}" fi export job="verfozn" diff --git a/dev/jobs/verfrad.sh b/dev/jobs/verfrad.sh index 5daa372ed0b..65e4097d409 100755 --- a/dev/jobs/verfrad.sh +++ b/dev/jobs/verfrad.sh @@ -7,7 +7,7 @@ set -x source "${HOMEgfs}/dev/ush/load_gw_gsi_modules.sh" status=$? if [[ status -ne 0 ]]; then - exit "${status}" + exit "${status}" fi export job="verfrad" diff --git a/dev/jobs/vminmon.sh b/dev/jobs/vminmon.sh index b3fad40447a..1c700dfa4fd 100755 --- a/dev/jobs/vminmon.sh +++ b/dev/jobs/vminmon.sh @@ -7,7 +7,7 @@ set -x source "${HOMEgfs}/dev/ush/load_gw_gsi_modules.sh" status=$? if [[ status -ne 0 ]]; then - exit "${status}" + exit "${status}" fi export job="vminmon" diff --git a/dev/jobs/wave_stat.sh b/dev/jobs/wave_stat.sh index 1b66a3ea22b..42c7f928fc0 100755 --- a/dev/jobs/wave_stat.sh +++ b/dev/jobs/wave_stat.sh @@ -1,11 +1,10 @@ #! /usr/bin/env bash - ############################################################### source "${HOMEgfs}/dev/ush/load_ufswm_modules.sh" err=$? if [[ "${err}" -ne 0 ]]; then - exit "${err}" + exit "${err}" fi export job="wave_stat" @@ -20,15 +19,14 @@ IFS=', ' read -r -a fhr_list <<< "${FHR_LIST}" export FHR3 jobid for FORECAST_HOUR in "${fhr_list[@]}"; do - FHR3=$(printf '%03d' "${FORECAST_HOUR}") - jobid="${job}_f${FHR3}.$$" - # Execute the JJOB - "${HOMEgfs}/jobs/JGEFS_WAVE_STAT" - err=$? - if [[ "${err}" -ne 0 ]]; then - exit "${err}" - fi + FHR3=$(printf '%03d' "${FORECAST_HOUR}") + jobid="${job}_f${FHR3}.$$" + # Execute the JJOB + "${HOMEgfs}/jobs/JGEFS_WAVE_STAT" + err=$? + if [[ "${err}" -ne 0 ]]; then + exit "${err}" + fi done exit 0 - diff --git a/dev/jobs/wave_stat_pnt.sh b/dev/jobs/wave_stat_pnt.sh index 485530be6c0..d18414cfe0c 100755 --- a/dev/jobs/wave_stat_pnt.sh +++ b/dev/jobs/wave_stat_pnt.sh @@ -4,7 +4,7 @@ source "${HOMEgfs}/dev/ush/load_ufswm_modules.sh" err=$? if [[ "${err}" -ne 0 ]]; then - exit "${err}" + exit "${err}" fi export job="wave_stat_pnt" @@ -17,8 +17,7 @@ echo "=============== START TO RUN WAVESTAT PNT ===============" "${HOMEgfs}/jobs/JGEFS_WAVE_STAT_PNT" err=$? if [[ "${err}" -ne 0 ]]; then - exit "${err}" + exit "${err}" fi exit 0 - diff --git a/dev/jobs/waveawipsbulls.sh b/dev/jobs/waveawipsbulls.sh index 6761bdbe341..8ab2eeb934f 100755 --- a/dev/jobs/waveawipsbulls.sh +++ b/dev/jobs/waveawipsbulls.sh @@ -18,5 +18,4 @@ export jobid="${job}.$$" "${HOMEgfs}/jobs/JGLOBAL_WAVE_PRDGEN_BULLS" status=$? - exit "${status}" diff --git a/dev/jobs/waveawipsgridded.sh b/dev/jobs/waveawipsgridded.sh index 3695b5dc42d..6bedd72cd00 100755 --- a/dev/jobs/waveawipsgridded.sh +++ b/dev/jobs/waveawipsgridded.sh @@ -18,5 +18,4 @@ export jobid="${job}.$$" "${HOMEgfs}/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED" status=$? - exit "${status}" diff --git a/dev/jobs/wavegempak.sh b/dev/jobs/wavegempak.sh index 37d22f3a3d3..812a54a4dfe 100755 --- a/dev/jobs/wavegempak.sh +++ b/dev/jobs/wavegempak.sh @@ -6,7 +6,7 @@ set -x source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh" err=$? if [[ "${err}" -ne 0 ]]; then - exit "${err}" + exit "${err}" fi export job="wavegempak" @@ -18,14 +18,14 @@ IFS=', ' read -r -a fhr_list <<< "${FHR_LIST}" export FORECAST_HOUR jobid for FORECAST_HOUR in "${fhr_list[@]}"; do - fhr3=$(printf '%03d' "${FORECAST_HOUR}") - jobid="${job}_f${fhr3}.$$" - # Execute the JJOB - "${HOMEgfs}/jobs/JGLOBAL_WAVE_GEMPAK" - err=$? - if [[ "${err}" -ne 0 ]]; then - exit "${err}" - fi + fhr3=$(printf '%03d' "${FORECAST_HOUR}") + jobid="${job}_f${fhr3}.$$" + # Execute the JJOB + "${HOMEgfs}/jobs/JGLOBAL_WAVE_GEMPAK" + err=$? + if [[ "${err}" -ne 0 ]]; then + exit "${err}" + fi done exit 0 diff --git a/dev/jobs/wavepostsbs.sh b/dev/jobs/wavepostsbs.sh index e0b2cacd328..dcb79d435fe 100755 --- a/dev/jobs/wavepostsbs.sh +++ b/dev/jobs/wavepostsbs.sh @@ -8,7 +8,7 @@ set -x source "${HOMEgfs}/dev/ush/load_ufswm_modules.sh" err=$? if [[ "${err}" -ne 0 ]]; then - exit "${err}" + exit "${err}" fi export job="wavepostsbs" @@ -19,14 +19,14 @@ IFS=', ' read -r -a fhr_list <<< "${FHR_LIST}" export FORECAST_HOUR jobid for FORECAST_HOUR in "${fhr_list[@]}"; do - fhr3=$(printf '%03d' "${FORECAST_HOUR}") - jobid="${job}_f${fhr3}.$$" - # Execute the JJOB - "${HOMEgfs}/jobs/JGLOBAL_WAVE_POST_SBS" - err=$? - if [[ "${err}" -ne 0 ]]; then - exit "${err}" - fi + fhr3=$(printf '%03d' "${FORECAST_HOUR}") + jobid="${job}_f${fhr3}.$$" + # Execute the JJOB + "${HOMEgfs}/jobs/JGLOBAL_WAVE_POST_SBS" + err=$? + if [[ "${err}" -ne 0 ]]; then + exit "${err}" + fi done exit 0 diff --git a/jobs/JGDAS_AERO_ANALYSIS_GENERATE_BMATRIX b/jobs/JGDAS_AERO_ANALYSIS_GENERATE_BMATRIX index 2f73504b9af..e14705ef949 100755 --- a/jobs/JGDAS_AERO_ANALYSIS_GENERATE_BMATRIX +++ b/jobs/JGDAS_AERO_ANALYSIS_GENERATE_BMATRIX @@ -34,8 +34,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## diff --git a/jobs/JGDAS_ATMOS_ANALYSIS_DIAG b/jobs/JGDAS_ATMOS_ANALYSIS_DIAG index cc58a12bee4..ad83614bff8 100755 --- a/jobs/JGDAS_ATMOS_ANALYSIS_DIAG +++ b/jobs/JGDAS_ATMOS_ANALYSIS_DIAG @@ -2,13 +2,11 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "anal" -c "base anal analdiag" - ############################################## # Set variables used in the script ############################################## export DO_CALC_ANALYSIS=${DO_CALC_ANALYSIS:-"YES"} - ############################################## # Begin JOB SPECIFIC work ############################################## @@ -19,12 +17,12 @@ export gcyc=${GDATE:8:2} export GDUMP="gdas" export GDUMP_ENS="enkf${GDUMP}" -export OPREFIX="${RUN/enkf}.t${cyc}z." +export OPREFIX="${RUN/enkf/}.t${cyc}z." export GPREFIX="${GDUMP}.t${gcyc}z." export APREFIX="${RUN}.t${cyc}z." YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL + COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL mkdir -m 775 -p "${COMOUT_ATMOS_ANALYSIS}" ############################################################### @@ -42,8 +40,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## @@ -54,5 +52,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGDAS_ATMOS_CHGRES_FORENKF b/jobs/JGDAS_ATMOS_CHGRES_FORENKF index 0b0c99b288f..ad6fa3c3f4b 100755 --- a/jobs/JGDAS_ATMOS_CHGRES_FORENKF +++ b/jobs/JGDAS_ATMOS_CHGRES_FORENKF @@ -2,21 +2,19 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "anal" -c "base anal echgres" - ############################################## # Set variables used in the script ############################################## export DO_CALC_ANALYSIS=${DO_CALC_ANALYSIS:-"YES"} - ############################################## # Begin JOB SPECIFIC work ############################################## -export APREFIX="${RUN/enkf}.t${cyc}z." +export APREFIX="${RUN/enkf/}.t${cyc}z." export APREFIX_ENS="${RUN}.t${cyc}z." -RUN=${RUN/enkf} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ +RUN=${RUN/enkf/} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ COMIN_ATMOS_HISTORY:COM_ATMOS_HISTORY_TMPL \ COMOUT_ATMOS_HISTORY:COM_ATMOS_HISTORY_TMPL @@ -38,8 +36,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## @@ -50,5 +48,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGDAS_ATMOS_GEMPAK b/jobs/JGDAS_ATMOS_GEMPAK index 1b7135db6cb..f0b7cec2c8f 100755 --- a/jobs/JGDAS_ATMOS_GEMPAK +++ b/jobs/JGDAS_ATMOS_GEMPAK @@ -10,16 +10,16 @@ export DBN_ALERT_TYPE=${DBN_ALERT_TYPE:-GDAS_GEMPAK} # Define COM directories ############################################## for grid in 0p25 1p00; do - GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMOUT_ATMOS_GRIB_${grid}:COM_ATMOS_GRIB_GRID_TMPL" + GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMOUT_ATMOS_GRIB_${grid}:COM_ATMOS_GRIB_GRID_TMPL" done for grid in 0p25 1p00; do - prod_dir="COMOUT_ATMOS_GEMPAK_${grid}" - GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMOUT_ATMOS_GEMPAK_${grid}:COM_ATMOS_GEMPAK_TMPL" + prod_dir="COMOUT_ATMOS_GEMPAK_${grid}" + GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMOUT_ATMOS_GEMPAK_${grid}:COM_ATMOS_GEMPAK_TMPL" - if [[ ! -d "${!prod_dir}" ]] ; then - mkdir -m 775 -p "${!prod_dir}" - fi + if [[ ! -d "${!prod_dir}" ]]; then + mkdir -m 775 -p "${!prod_dir}" + fi done ######################################################## @@ -47,13 +47,13 @@ fi ############################################ # print exec I/O output ############################################ -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ################################### # Remove temp directories ################################### -if [[ "${KEEPDATA}" != "YES" ]] ; then - rm -rf "${DATA}" +if [[ "${KEEPDATA}" != "YES" ]]; then + rm -rf "${DATA}" fi diff --git a/jobs/JGDAS_ATMOS_GEMPAK_META_NCDC b/jobs/JGDAS_ATMOS_GEMPAK_META_NCDC index c429c4800f0..6286f837696 100755 --- a/jobs/JGDAS_ATMOS_GEMPAK_META_NCDC +++ b/jobs/JGDAS_ATMOS_GEMPAK_META_NCDC @@ -34,14 +34,14 @@ GRID=1p00 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMIN_ATMOS_GEMPAK_1p00:CO GRID="meta" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMOUT_ATMOS_GEMPAK_META:COM_ATMOS_GEMPAK_TMPL" if [[ ! -d "${COMOUT_ATMOS_GEMPAK_META}" ]]; then - mkdir -m 775 -p "${COMOUT_ATMOS_GEMPAK_META}" + mkdir -m 775 -p "${COMOUT_ATMOS_GEMPAK_META}" fi -if (( cyc%12 == 0 )); then - GRID="gif" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMOUT_ATMOS_GEMPAK_GIF:COM_ATMOS_GEMPAK_TMPL" - if [[ ! -d "${COMOUT_ATMOS_GEMPAK_GIF}" ]]; then - mkdir -m 775 -p "${COMOUT_ATMOS_GEMPAK_GIF}" - fi +if ((cyc % 12 == 0)); then + GRID="gif" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMOUT_ATMOS_GEMPAK_GIF:COM_ATMOS_GEMPAK_TMPL" + if [[ ! -d "${COMOUT_ATMOS_GEMPAK_GIF}" ]]; then + mkdir -m 775 -p "${COMOUT_ATMOS_GEMPAK_GIF}" + fi fi export COMINecmwf="${COMINecmwf:-$(compath.py "${envir}/ecmwf/${ecmwf_ver}")/ecmwf}" @@ -54,27 +54,27 @@ export pgmout=OUTPUT.$$ "${HOMEgfs}/gempak/ush/gdas_meta_na.sh" && true export err=$? if [[ ${err} -ne 0 ]]; then - err_exit + err_exit fi "${HOMEgfs}/gempak/ush/gdas_meta_loop.sh" && true export err=$? if [[ ${err} -ne 0 ]]; then - err_exit + err_exit fi if [[ "${cyc}" == '06' ]]; then - "${HOMEgfs}/gempak/ush/gdas_ecmwf_meta_ver.sh" && true - export err=$? - if [[ ${err} -ne 0 ]]; then - err_exit - fi - - "${HOMEgfs}/gempak/ush/gdas_ukmet_meta_ver.sh" && true - export err=$? - if [[ ${err} -ne 0 ]]; then - err_exit - fi + "${HOMEgfs}/gempak/ush/gdas_ecmwf_meta_ver.sh" && true + export err=$? + if [[ ${err} -ne 0 ]]; then + err_exit + fi + + "${HOMEgfs}/gempak/ush/gdas_ukmet_meta_ver.sh" && true + export err=$? + if [[ ${err} -ne 0 ]]; then + err_exit + fi fi ######################################################## @@ -84,25 +84,25 @@ fi ######################################################## # Execute the script. -if (( cyc%12 == 0 )); then - "${SCRgfs}/exgdas_atmos_gempak_gif_ncdc.sh" && true +if ((cyc % 12 == 0)); then + "${SCRgfs}/exgdas_atmos_gempak_gif_ncdc.sh" && true fi export err=$? if [[ ${err} -ne 0 ]]; then - err_exit + err_exit fi ######################################################## ############################################ # print exec I/O output ############################################ -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ################################### # Remove temp directories ################################### -if [[ "${KEEPDATA}" != "YES" ]] ; then - rm -rf "${DATA}" +if [[ "${KEEPDATA}" != "YES" ]]; then + rm -rf "${DATA}" fi diff --git a/jobs/JGDAS_ATMOS_VERFOZN b/jobs/JGDAS_ATMOS_VERFOZN index 9b19af35a96..a895fa9fb1b 100755 --- a/jobs/JGDAS_ATMOS_VERFOZN +++ b/jobs/JGDAS_ATMOS_VERFOZN @@ -24,7 +24,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ export oznstat="${COMIN_ATMOS_ANALYSIS}/gdas.t${cyc}z.oznstat" export TANKverf_ozn=${TANKverf_ozn:-${COMOUT_ATMOS_OZNMON}} -if [[ ! -d ${TANKverf_ozn} ]]; then mkdir -p "${TANKverf_ozn}" ; fi +if [[ ! -d ${TANKverf_ozn} ]]; then mkdir -p "${TANKverf_ozn}"; fi #------------------------------------------------------- # Execute the script. diff --git a/jobs/JGDAS_ATMOS_VERFRAD b/jobs/JGDAS_ATMOS_VERFRAD index d9ff9c85a02..cc2cf8b1192 100755 --- a/jobs/JGDAS_ATMOS_VERFRAD +++ b/jobs/JGDAS_ATMOS_VERFRAD @@ -29,7 +29,7 @@ export radstat="${COMIN_ATMOS_ANALYSIS}/gdas.t${cyc}z.radstat" export TANKverf_rad=${TANKverf_rad:-${COMOUT_ATMOS_RADMON}} export TANKverf_radM1=${TANKverf_radM1:-${COMIN_ATMOS_RADMON_PREV}} -if [[ ! -d ${TANKverf_rad} ]]; then mkdir -p "${TANKverf_rad}" ; fi +if [[ ! -d ${TANKverf_rad} ]]; then mkdir -p "${TANKverf_rad}"; fi ######################################################## # Execute the script. diff --git a/jobs/JGDAS_ENKF_DIAG b/jobs/JGDAS_ENKF_DIAG index 1fef238927f..b71ee49f2d6 100755 --- a/jobs/JGDAS_ENKF_DIAG +++ b/jobs/JGDAS_ENKF_DIAG @@ -2,7 +2,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "eobs" -c "base anal eobs analdiag ediag" - ############################################## # Set variables used in the script ############################################## @@ -19,15 +18,15 @@ export GDUMP_ENS="enkf${GDUMP}" export CASE=${CASE_ENS} -export OPREFIX="${RUN/enkf}.t${cyc}z." +export OPREFIX="${RUN/enkf/}.t${cyc}z." export APREFIX="${RUN}.t${cyc}z." export GPREFIX="${GDUMP_ENS}.t${gcyc}z." GPREFIX_DET="${GDUMP}.t${gcyc}z." -RUN=${RUN/enkf} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_OBS:COM_OBS_TMPL +RUN=${RUN/enkf/} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ + COMIN_OBS:COM_OBS_TMPL MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL + COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ COMIN_OBS_PREV:COM_OBS_TMPL \ @@ -36,7 +35,6 @@ RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ MEMDIR="ensstat" RUN=${GDUMP_ENS} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ COMIN_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL - export ATMGES_ENSMEAN="${COMIN_ATMOS_HISTORY_PREV}/${GPREFIX}atmf006.ensmean.nc" if [[ ! -f "${ATMGES_ENSMEAN}" ]]; then export err=1 @@ -50,7 +48,7 @@ if [[ ! -f ${PREPQC} ]]; then fi export TCVITL="${COMIN_OBS}/${OPREFIX}syndata.tcvitals.tm00" if [[ ${DONST} = "YES" ]]; then - export NSSTBF="${COMIN_OBS}/${OPREFIX}nsstbufr" + export NSSTBF="${COMIN_OBS}/${OPREFIX}nsstbufr" fi export PREPQCPF="${COMIN_OBS}/${OPREFIX}prepbufr.acft_profiles" @@ -90,7 +88,6 @@ for fstat in ${CNVSTAT} ${OZNSTAT} ${RADSTAT}; do fi done - ############################################################### # Run relevant script @@ -107,8 +104,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## @@ -119,5 +116,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGDAS_ENKF_ECEN b/jobs/JGDAS_ENKF_ECEN index 073e954d8c4..e3024ceb43b 100755 --- a/jobs/JGDAS_ENKF_ECEN +++ b/jobs/JGDAS_ENKF_ECEN @@ -2,7 +2,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "ecen" -c "base ecen" - ############################################## # Set variables used in the script ############################################## @@ -19,21 +18,20 @@ export GDUMP_ENS="enkf${GDUMP}" export CASE=${CASE_ENS} -export OPREFIX="${RUN/enkf}.t${cyc}z." -export APREFIX="${RUN/enkf}.t${cyc}z." +export OPREFIX="${RUN/enkf/}.t${cyc}z." +export APREFIX="${RUN/enkf/}.t${cyc}z." export APREFIX_ENS="${RUN}.t${cyc}z." export GPREFIX="${GDUMP}.t${gcyc}z." export GPREFIX_ENS="${GDUMP_ENS}.t${gcyc}z." -RUN=${RUN/enkf} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_ATMOS_ANALYSIS_DET:COM_ATMOS_ANALYSIS_TMPL +RUN=${RUN/enkf/} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ + COMIN_ATMOS_ANALYSIS_DET:COM_ATMOS_ANALYSIS_TMPL MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMOUT_ATMOS_ANALYSIS_STAT:COM_ATMOS_ANALYSIS_TMPL + COMOUT_ATMOS_ANALYSIS_STAT:COM_ATMOS_ANALYSIS_TMPL MEMDIR="ensstat" RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ - COMIN_ATMOS_HISTORY_STAT_PREV:COM_ATMOS_HISTORY_TMPL - + COMIN_ATMOS_HISTORY_STAT_PREV:COM_ATMOS_HISTORY_TMPL ############################################################### # Run relevant script @@ -51,8 +49,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## @@ -63,5 +61,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGDAS_ENKF_ECEN_FV3JEDI b/jobs/JGDAS_ENKF_ECEN_FV3JEDI index df277635e60..3d2ff374a4f 100755 --- a/jobs/JGDAS_ENKF_ECEN_FV3JEDI +++ b/jobs/JGDAS_ENKF_ECEN_FV3JEDI @@ -21,14 +21,14 @@ GDUMP_ENS="enkfgdas" # Generate COM variables from templates RUN=${GDUMP} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ - COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL + COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ + COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL MEMDIR='ensstat' RUN=${GDUMP_ENS} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_ATMOS_ANALYSIS_ENSSTAT:COM_ATMOS_ANALYSIS_TMPL \ - COMOUT_ATMOS_ANALYSIS_ENSSTAT:COM_ATMOS_ANALYSIS_TMPL \ - COMOUT_CONF:COM_CONF_TMPL + COMIN_ATMOS_ANALYSIS_ENSSTAT:COM_ATMOS_ANALYSIS_TMPL \ + COMOUT_ATMOS_ANALYSIS_ENSSTAT:COM_ATMOS_ANALYSIS_TMPL \ + COMOUT_CONF:COM_CONF_TMPL RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ - COMIN_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL + COMIN_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL mkdir -m 755 -p "${COMOUT_CONF}" @@ -51,8 +51,8 @@ fi # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ############################################## diff --git a/jobs/JGDAS_ENKF_POST b/jobs/JGDAS_ENKF_POST index e078313d1aa..1184c82cf7d 100755 --- a/jobs/JGDAS_ENKF_POST +++ b/jobs/JGDAS_ENKF_POST @@ -2,12 +2,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "epos" -c "base epos" - ############################################## # Set variables used in the script ############################################## - ############################################## # Begin JOB SPECIFIC work ############################################## @@ -15,8 +13,7 @@ export GFS_NCIO=${GFS_NCIO:-"YES"} export PREFIX="${RUN}.t${cyc}z." -export LEVS=$((LEVS-1)) - +export LEVS=$((LEVS - 1)) ############################################################### # Run relevant script @@ -34,8 +31,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## @@ -46,5 +43,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGDAS_ENKF_SELECT_OBS b/jobs/JGDAS_ENKF_SELECT_OBS index 9687efd3ccd..0542a750930 100755 --- a/jobs/JGDAS_ENKF_SELECT_OBS +++ b/jobs/JGDAS_ENKF_SELECT_OBS @@ -2,7 +2,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "eobs" -c "base anal eobs" - ############################################## # Set variables used in the script ############################################## @@ -17,30 +16,30 @@ export gcyc=${GDATE:8:2} export GDUMP="gdas" export GDUMP_ENS="enkf${GDUMP}" -export OPREFIX="${RUN/enkf}.t${cyc}z." +export OPREFIX="${RUN/enkf/}.t${cyc}z." export APREFIX="${RUN}.t${cyc}z." export GPREFIX="${GDUMP_ENS}.t${gcyc}z." -APREFIX_DET="${RUN/enkf}.t${cyc}z." +APREFIX_DET="${RUN/enkf/}.t${cyc}z." GPREFIX_DET="${GDUMP}.t${gcyc}z." export GSUFFIX=".ensmean.nc" # Generate COM variables from templates -RUN=${RUN/enkf} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_OBS:COM_OBS_TMPL +RUN=${RUN/enkf/} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ + COMIN_OBS:COM_OBS_TMPL MEMDIR='ensstat' YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL + COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL declare -rx COMOUT_ATMOS_ANALYSIS_ENS="${COMOUT_ATMOS_ANALYSIS}" -RUN=${RUN/enkf} YMD=${PDY} HH=${cyc} declare_from_tmpl -r \ - COMOUT_ATMOS_ANALYSIS_DET:COM_ATMOS_ANALYSIS_TMPL +RUN=${RUN/enkf/} YMD=${PDY} HH=${cyc} declare_from_tmpl -r \ + COMOUT_ATMOS_ANALYSIS_DET:COM_ATMOS_ANALYSIS_TMPL MEMDIR='ensstat' RUN=${GDUMP_ENS} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ COMIN_ATMOS_ANALYSIS_PREV:COM_ATMOS_ANALYSIS_TMPL \ COMIN_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL RUN="${GDUMP}" YMD=${gPDY} HH=${gcyc} declare_from_tmpl -r \ - COMIN_ATMOS_ANALYSIS_DET_PREV:COM_ATMOS_ANALYSIS_TMPL + COMIN_ATMOS_ANALYSIS_DET_PREV:COM_ATMOS_ANALYSIS_TMPL mkdir -p "${COMOUT_ATMOS_ANALYSIS}" @@ -63,7 +62,7 @@ if [[ ! -f ${PREPQC} ]]; then fi export TCVITL="${COMIN_OBS}/${APREFIX_DET}syndata.tcvitals.tm00" if [[ ${DONST} = "YES" ]]; then - export NSSTBF="${COMIN_OBS}/${OPREFIX}nsstbufr" + export NSSTBF="${COMIN_OBS}/${OPREFIX}nsstbufr" fi export PREPQCPF="${COMIN_OBS}/${OPREFIX}prepbufr.acft_profiles" @@ -108,7 +107,6 @@ for fstat in ${CNVSTAT} ${OZNSTAT} ${RADSTAT}; do fi done - ############################################################### # Run relevant script @@ -121,11 +119,10 @@ fi ############################################## # Send Alerts ############################################## -if [[ "${SENDDBN}" == "YES" ]] ; then - "${DBNROOT}/bin/dbn_alert" MODEL ENKF1_MSC_gsistat "${job}" "${GSISTAT}" +if [[ "${SENDDBN}" == "YES" ]]; then + "${DBNROOT}/bin/dbn_alert" MODEL ENKF1_MSC_gsistat "${job}" "${GSISTAT}" fi - ############################################## # End JOB SPECIFIC work ############################################## @@ -133,8 +130,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## @@ -145,5 +142,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGDAS_ENKF_SFC b/jobs/JGDAS_ENKF_SFC index 807635ed57b..8ff4982e353 100755 --- a/jobs/JGDAS_ENKF_SFC +++ b/jobs/JGDAS_ENKF_SFC @@ -2,7 +2,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "esfc" -c "base esfc" - ############################################## # Set variables used in the script ############################################## @@ -17,25 +16,25 @@ export gcyc=${GDATE:8:2} export GDUMP="gdas" export GDUMP_ENS="enkf${GDUMP}" -export OPREFIX="${RUN/enkf}.t${cyc}z." +export OPREFIX="${RUN/enkf/}.t${cyc}z." export GPREFIX="${GDUMP}.t${gcyc}z." -export APREFIX="${RUN/enkf}.t${cyc}z." +export APREFIX="${RUN/enkf/}.t${cyc}z." export CASE=${CASE_ENS} -export OPREFIX="${RUN/enkf}.t${cyc}z." -export APREFIX="${RUN/enkf}.t${cyc}z." +export OPREFIX="${RUN/enkf/}.t${cyc}z." +export APREFIX="${RUN/enkf/}.t${cyc}z." export APREFIX_ENS="${RUN}.t${cyc}z." export GPREFIX="${GDUMP}.t${gcyc}z." export GPREFIX_ENS="${GDUMP_ENS}.t${gcyc}z." -RUN=${RUN/enkf} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_OBS:COM_OBS_TMPL \ - COMIN_ATMOS_ANALYSIS_DET:COM_ATMOS_ANALYSIS_TMPL +RUN=${RUN/enkf/} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ + COMIN_OBS:COM_OBS_TMPL \ + COMIN_ATMOS_ANALYSIS_DET:COM_ATMOS_ANALYSIS_TMPL RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ - COMIN_OBS_PREV:COM_OBS_TMPL \ - COMIN_ATMOS_ANALYSIS_DET_PREV:COM_ATMOS_ANALYSIS_TMPL + COMIN_OBS_PREV:COM_OBS_TMPL \ + COMIN_ATMOS_ANALYSIS_DET_PREV:COM_ATMOS_ANALYSIS_TMPL ############################################################### # Run relevant script @@ -53,8 +52,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## @@ -65,5 +64,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGDAS_ENKF_UPDATE b/jobs/JGDAS_ENKF_UPDATE index 27e6552a440..428a3b43dc6 100755 --- a/jobs/JGDAS_ENKF_UPDATE +++ b/jobs/JGDAS_ENKF_UPDATE @@ -2,12 +2,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "eupd" -c "base anal eupd" - ############################################## # Set variables used in the script ############################################## - ############################################## # Begin JOB SPECIFIC work ############################################## @@ -22,14 +20,13 @@ export APREFIX="${RUN}.t${cyc}z." export GPREFIX="${GDUMP_ENS}.t${gcyc}z." MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_ATMOS_ANALYSIS_STAT:COM_ATMOS_ANALYSIS_TMPL + COMIN_ATMOS_ANALYSIS_STAT:COM_ATMOS_ANALYSIS_TMPL MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMOUT_ATMOS_ANALYSIS_STAT:COM_ATMOS_ANALYSIS_TMPL + COMOUT_ATMOS_ANALYSIS_STAT:COM_ATMOS_ANALYSIS_TMPL MEMDIR="ensstat" RUN="enkfgdas" YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ - COMIN_ATMOS_HISTORY_STAT_PREV:COM_ATMOS_HISTORY_TMPL - + COMIN_ATMOS_HISTORY_STAT_PREV:COM_ATMOS_HISTORY_TMPL ############################################################### # Run relevant script @@ -43,11 +40,10 @@ fi ############################################## # Send Alerts ############################################## -if [[ "${SENDDBN}" == "YES" ]] ; then - "${DBNROOT}/bin/dbn_alert" "MODEL" "ENKF1_MSC_enkfstat" "${job}" "${COMOUT_ATMOS_ANALYSIS_STAT}/${APREFIX}enkfstat" +if [[ "${SENDDBN}" == "YES" ]]; then + "${DBNROOT}/bin/dbn_alert" "MODEL" "ENKF1_MSC_enkfstat" "${job}" "${COMOUT_ATMOS_ANALYSIS_STAT}/${APREFIX}enkfstat" fi - ############################################## # End JOB SPECIFIC work ############################################## @@ -55,8 +51,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## @@ -67,5 +63,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGDAS_FIT2OBS b/jobs/JGDAS_FIT2OBS index 647c1dbfd93..ee7d9324a76 100755 --- a/jobs/JGDAS_FIT2OBS +++ b/jobs/JGDAS_FIT2OBS @@ -2,7 +2,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "fit2obs" -c "base fit2obs" - ############################################## # Set variables used in the script ############################################## @@ -15,7 +14,7 @@ vcyc=${CDATE:8:2} # These are used by fit2obs, so we can't change them to the standard COM variable names # shellcheck disable=SC2153 YMD=${vday} HH=${vcyc} declare_from_tmpl -rx COMIN_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL -RUN=${RUN/enkf} YMD=${vday} HH=${vcyc} declare_from_tmpl -rx COMIN_OBS:COM_OBS_TMPL +RUN=${RUN/enkf/} YMD=${vday} HH=${vcyc} declare_from_tmpl -rx COMIN_OBS:COM_OBS_TMPL export COM_VRFYARCH=${COM_VRFYARCH:-${ROTDIR}/vrfyarch} @@ -40,8 +39,10 @@ if [[ ! -d "${COMOUT_FITX}" ]]; then mkdir -p "${COMOUT_FITX}" fi -echo "echo err_chk">"${DATA}/err_chk"; chmod 755 "${DATA}/err_chk" -echo "echo postmsg">"${DATA}/postmsg"; chmod 755 "${DATA}/postmsg" +echo "echo err_chk" > "${DATA}/err_chk" +chmod 755 "${DATA}/err_chk" +echo "echo postmsg" > "${DATA}/postmsg" +chmod 755 "${DATA}/postmsg" ############################################## # Check spinup and available inputs @@ -50,46 +51,49 @@ echo "echo postmsg">"${DATA}/postmsg"; chmod 755 "${DATA}/postmsg" # Ignore spelling warning; nothing is misspelled # shellcheck disable=SC2153 if [[ ${CDATE} -gt ${SDATE} ]]; then - for file in ${PRPI} ${sig1} ${sfc1} ${CNVS}; do - if [[ ! -f "${file}" ]]; then - echo "FATAL ERROR: FILE MISSING: ${file}" - exit 1 + for file in ${PRPI} ${sig1} ${sfc1} ${CNVS}; do + if [[ ! -f "${file}" ]]; then + echo "FATAL ERROR: FILE MISSING: ${file}" + exit 1 + fi + done + + ############################################## + # RUN FIT2OBS VERIFICATION + ############################################## + + # Un-export SHELLOPTS before going into the Fit2Obs package (let that package handle logging/errors) + export -n SHELLOPTS + "${SCRIPTSfit2obs}/excfs_gdas_vrfyfits.sh" + err=$? + if [[ ${err} -ne 0 ]]; then + exit "${err}" + fi + + ############################################## + # End JOB SPECIFIC work + ############################################## + + ############################################## + # Final processing + ############################################## + if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi - done - - ############################################## - # RUN FIT2OBS VERIFICATION - ############################################## - - # Un-export SHELLOPTS before going into the Fit2Obs package (let that package handle logging/errors) - export -n SHELLOPTS - "${SCRIPTSfit2obs}/excfs_gdas_vrfyfits.sh" - err=$? - if [[ ${err} -ne 0 ]]; then - exit "${err}" - fi - - ############################################## - # End JOB SPECIFIC work - ############################################## - - ############################################## - # Final processing - ############################################## - if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" - fi else - echo "Too early for FIT2OBS to run. Exiting." + echo "Too early for FIT2OBS to run. Exiting." fi ########################################## # Remove the Temporary working directory ########################################## -cd "${DATAROOT}" || (echo "FATAL ERROR: ${DATAROOT} does not exist. ABORT!"; exit 1) +cd "${DATAROOT}" || ( + echo "FATAL ERROR: ${DATAROOT} does not exist. ABORT!" + exit 1 +) if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi diff --git a/jobs/JGEFS_WAVE_STAT b/jobs/JGEFS_WAVE_STAT index a59987f72b3..f03a917cc28 100755 --- a/jobs/JGEFS_WAVE_STAT +++ b/jobs/JGEFS_WAVE_STAT @@ -1,23 +1,23 @@ #! /usr/bin/env bash source "${HOMEgfs}/ush/jjob_header.sh" -e "wave_stat" -c "base wave wave_stat" -source "${USHgfs}/wave_domain_grid.sh" +source "${USHgfs}/wave_domain_grid.sh" # Set COM Paths for grid in ${wavepostGRD}; do - process_grdID "${grid}" - prod_dir_grid="COMOUT_WAVE_GRID_${grid}" - MEMDIR="ensstat" GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - "${prod_dir_grid}:COM_WAVE_GRID_TMPL" - if [[ ! -d "${!prod_dir_grid}" ]]; then - mkdir -m 775 -p "${!prod_dir_grid}" - fi + process_grdID "${grid}" + prod_dir_grid="COMOUT_WAVE_GRID_${grid}" + MEMDIR="ensstat" GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ + "${prod_dir_grid}:COM_WAVE_GRID_TMPL" + if [[ ! -d "${!prod_dir_grid}" ]]; then + mkdir -m 775 -p "${!prod_dir_grid}" + fi done MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMOUT_WAVE_STATION_ENS:COM_WAVE_STATION_TMPL + COMOUT_WAVE_STATION_ENS:COM_WAVE_STATION_TMPL if [[ ! -d "${COMOUT_WAVE_STATION_ENS}" ]]; then - mkdir -m 775 -p "${COMOUT_WAVE_STATION_ENS}" + mkdir -m 775 -p "${COMOUT_WAVE_STATION_ENS}" fi # Execute the Script @@ -29,7 +29,7 @@ err_chk ########################################### cd "${DATAROOT}" || true if [[ "${KEEPDATA}" != "YES" ]]; then - rm -rf "${DATA}" + rm -rf "${DATA}" fi - + exit 0 diff --git a/jobs/JGEFS_WAVE_STAT_PNT b/jobs/JGEFS_WAVE_STAT_PNT index 840372ac8ca..ff7e51a3ae3 100755 --- a/jobs/JGEFS_WAVE_STAT_PNT +++ b/jobs/JGEFS_WAVE_STAT_PNT @@ -5,9 +5,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "wave_stat_pnt" -c "base wave wave_sta # Set COM Paths MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMOUT_WAVE_STATION_ENS:COM_WAVE_STATION_TMPL + COMOUT_WAVE_STATION_ENS:COM_WAVE_STATION_TMPL if [[ ! -d "${COMOUT_WAVE_STATION_ENS}" ]]; then - mkdir -m 775 -p "${COMOUT_WAVE_STATION_ENS}" + mkdir -m 775 -p "${COMOUT_WAVE_STATION_ENS}" fi # Execute the Script @@ -19,7 +19,7 @@ err_chk ########################################### cd "${DATAROOT}" || true if [[ "${KEEPDATA}" != "YES" ]]; then - rm -rf "${DATA}" + rm -rf "${DATA}" fi exit 0 diff --git a/jobs/JGFS_ATMOS_AWIPS_20KM_1P0DEG b/jobs/JGFS_ATMOS_AWIPS_20KM_1P0DEG index 37a3377bdab..3f8fd1f9f17 100755 --- a/jobs/JGFS_ATMOS_AWIPS_20KM_1P0DEG +++ b/jobs/JGFS_ATMOS_AWIPS_20KM_1P0DEG @@ -15,13 +15,12 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ GRID="0p25" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ COMIN_ATMOS_GRIB_0p25:COM_ATMOS_GRIB_GRID_TMPL -if [[ ! -d "${COMOUT_ATMOS_WMO}" ]] ; then - mkdir -m 775 -p "${COMOUT_ATMOS_WMO}" +if [[ ! -d "${COMOUT_ATMOS_WMO}" ]]; then + mkdir -m 775 -p "${COMOUT_ATMOS_WMO}" fi export pgmout=OUTPUT.$$ - ######################################################## # Execute the script. # Forecast hours from F00 - F84 at 3-hour interval @@ -40,15 +39,14 @@ fi ############################################ # print exec I/O output ############################################ -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ################################### # Remove temp directories ################################### cd "${DATAROOT}" || pass -if [[ "${KEEPDATA}" != "YES" ]] ; then - rm -rf "${DATA}" +if [[ "${KEEPDATA}" != "YES" ]]; then + rm -rf "${DATA}" fi - diff --git a/jobs/JGFS_ATMOS_CYCLONE_GENESIS b/jobs/JGFS_ATMOS_CYCLONE_GENESIS index 805ec885f70..8b6e87a3477 100755 --- a/jobs/JGFS_ATMOS_CYCLONE_GENESIS +++ b/jobs/JGFS_ATMOS_CYCLONE_GENESIS @@ -46,8 +46,8 @@ set_strict ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## @@ -58,5 +58,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGFS_ATMOS_CYCLONE_TRACKER b/jobs/JGFS_ATMOS_CYCLONE_TRACKER index 851405fb155..3b69021ab29 100755 --- a/jobs/JGFS_ATMOS_CYCLONE_TRACKER +++ b/jobs/JGFS_ATMOS_CYCLONE_TRACKER @@ -8,10 +8,10 @@ export COMPONENT="atmos" # Define COM and Data directories ############################################## YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMOUT_ATMOS_TRACK:COM_ATMOS_TRACK_TMPL \ - COMIN_ATMOS_GENESIS:COM_ATMOS_GENESIS_TMPL + COMOUT_ATMOS_TRACK:COM_ATMOS_TRACK_TMPL \ + COMIN_ATMOS_GENESIS:COM_ATMOS_GENESIS_TMPL YMD=${PDY} HH=${cyc} GRID="0p25" declare_from_tmpl -rx \ - COMIN_ATMOS_GRIB_0p25:COM_ATMOS_GRIB_GRID_TMPL + COMIN_ATMOS_GRIB_0p25:COM_ATMOS_GRIB_GRID_TMPL if [[ ! -d "${COMOUT_ATMOS_TRACK}" ]]; then mkdir -p "${COMOUT_ATMOS_TRACK}"; fi @@ -30,8 +30,8 @@ if [[ "${RUN_ENVIR}" == "nco" ]]; then export COMOUTatcf=${COMROOTp1}/nhc/${envir}/atcf mkdir -m 775 -p "${COMOUThur}" "${COMOUTatcf}" else -# export COMOUThur=$COMOUT -# export COMOUTatcf=$COMOUT + # export COMOUThur=$COMOUT + # export COMOUTatcf=$COMOUT export COMOUThur=${DATA} export COMOUTatcf=${DATA} fi @@ -43,7 +43,7 @@ fi ############################################################# # Execute the script export pert="p01" -export cmodel=${RUN/enkf} +export cmodel=${RUN/enkf/} export loopnum=1 #-----------input data checking ----------------- @@ -60,7 +60,6 @@ if [[ ${err} -ne 0 ]]; then err_exit fi - # cat ${DATA}/trak.avnx.atcfunix.${PDY}${cyc} | \ # sed s:AVNX:GFSO:g \ # > ${COMOUT}/gfso.t${cyc}z.cyclone.trackatcfunix @@ -72,8 +71,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## @@ -84,5 +83,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGFS_ATMOS_FBWIND b/jobs/JGFS_ATMOS_FBWIND index 819618e0d24..5dd539447aa 100755 --- a/jobs/JGFS_ATMOS_FBWIND +++ b/jobs/JGFS_ATMOS_FBWIND @@ -16,7 +16,7 @@ export COMPONENT="atmos" GRID="0p25" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COMIN_ATMOS_GRIB_0p25:COM_ATMOS_GRIB_GRID_TMPL YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COMOUT:COM_ATMOS_WMO_TMPL if [[ ! -d "${COMOUT}" ]]; then - mkdir -m 775 -p "${COMOUT}" + mkdir -m 775 -p "${COMOUT}" fi ######################################################## @@ -24,21 +24,20 @@ fi "${SCRgfs}/exgfs_atmos_fbwind.sh" && true export err=$? if [[ ${err} -ne 0 ]]; then - err_exit + err_exit fi ######################################################## ############################################ # print exec I/O output ############################################ -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ################################### # Remove temp directories ################################### -if [[ "${KEEPDATA}" != "YES" ]] ; then - rm -rf "${DATA}" +if [[ "${KEEPDATA}" != "YES" ]]; then + rm -rf "${DATA}" fi - diff --git a/jobs/JGFS_ATMOS_FSU_GENESIS b/jobs/JGFS_ATMOS_FSU_GENESIS index b386183881e..a52a8c24bb9 100755 --- a/jobs/JGFS_ATMOS_FSU_GENESIS +++ b/jobs/JGFS_ATMOS_FSU_GENESIS @@ -31,8 +31,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## @@ -43,5 +43,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGFS_ATMOS_GEMPAK b/jobs/JGFS_ATMOS_GEMPAK index ea05d23acee..51e78c22714 100755 --- a/jobs/JGFS_ATMOS_GEMPAK +++ b/jobs/JGFS_ATMOS_GEMPAK @@ -16,22 +16,22 @@ export DO_HD_PGRB=${DO_HD_PGRB:-YES} # Define COM directories ############################################## for grid in 0p25 0p50 1p00; do - GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMIN_ATMOS_GRIB_${grid}:COM_ATMOS_GRIB_GRID_TMPL" + GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMIN_ATMOS_GRIB_${grid}:COM_ATMOS_GRIB_GRID_TMPL" done for grid in 1p00 0p50 0p25 40km 35km_atl 35km_pac; do - prod_dir="COMOUT_ATMOS_GEMPAK_${grid}" - GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMOUT_ATMOS_GEMPAK_${grid}:COM_ATMOS_GEMPAK_TMPL" + prod_dir="COMOUT_ATMOS_GEMPAK_${grid}" + GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMOUT_ATMOS_GEMPAK_${grid}:COM_ATMOS_GEMPAK_TMPL" - if [[ ! -d "${!prod_dir}" ]] ; then - mkdir -m 775 -p "${!prod_dir}" - fi + if [[ ! -d "${!prod_dir}" ]]; then + mkdir -m 775 -p "${!prod_dir}" + fi done fhr=10#${FHR3} ocean_domain_max=180 -if (( ocean_domain_max > FHMAX_GFS )); then - ocean_domain_max=${FHMAX_GFS} +if ((ocean_domain_max > FHMAX_GFS)); then + ocean_domain_max=${FHMAX_GFS} fi ################################################################# @@ -39,26 +39,26 @@ fi ################################################################## fhmin=0 fhmax=240 -if (( fhr >= fhmin && fhr <= fhmax )); then - if ((fhr % 3 == 0)); then - "${SCRgfs}/exgfs_atmos_nawips.sh" "1p00" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_1p00}" && true - export err=$? - if [[ ${err} -ne 0 ]]; then - err_exit +if ((fhr >= fhmin && fhr <= fhmax)); then + if ((fhr % 3 == 0)); then + "${SCRgfs}/exgfs_atmos_nawips.sh" "1p00" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_1p00}" && true + export err=$? + if [[ ${err} -ne 0 ]]; then + err_exit + fi fi - fi fi fhmin=252 fhmax=384 -if (( fhr >= fhmin && fhr <= fhmax )); then - if ((fhr % 12 == 0)); then - "${SCRgfs}/exgfs_atmos_nawips.sh" "1p00" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_1p00}" && true - export err=$? - if [[ ${err} -ne 0 ]]; then - err_exit +if ((fhr >= fhmin && fhr <= fhmax)); then + if ((fhr % 12 == 0)); then + "${SCRgfs}/exgfs_atmos_nawips.sh" "1p00" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_1p00}" && true + export err=$? + if [[ ${err} -ne 0 ]]; then + err_exit + fi fi - fi fi ################################################################# @@ -66,38 +66,38 @@ fi ################################################################## fhmin=0 fhmax=240 -if (( fhr >= fhmin && fhr <= fhmax )); then - if ((fhr % 3 == 0)); then - "${SCRgfs}/exgfs_atmos_nawips.sh" "0p50" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_0p50}" && true - export err=$? - if [[ ${err} -ne 0 ]]; then - err_exit +if ((fhr >= fhmin && fhr <= fhmax)); then + if ((fhr % 3 == 0)); then + "${SCRgfs}/exgfs_atmos_nawips.sh" "0p50" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_0p50}" && true + export err=$? + if [[ ${err} -ne 0 ]]; then + err_exit + fi fi - fi fi fhmin=246 fhmax=276 -if (( fhr >= fhmin && fhr <= fhmax )); then - if ((fhr % 6 == 0)); then - "${SCRgfs}/exgfs_atmos_nawips.sh" "0p50" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_0p50}" && true - export err=$? - if [[ ${err} -ne 0 ]]; then - err_exit +if ((fhr >= fhmin && fhr <= fhmax)); then + if ((fhr % 6 == 0)); then + "${SCRgfs}/exgfs_atmos_nawips.sh" "0p50" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_0p50}" && true + export err=$? + if [[ ${err} -ne 0 ]]; then + err_exit + fi fi - fi fi fhmin=288 fhmax=384 -if (( fhr >= fhmin && fhr <= fhmax )); then - if ((fhr % 12 == 0)); then - "${SCRgfs}/exgfs_atmos_nawips.sh" "0p50" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_0p50}" && true - export err=$? - if [[ ${err} -ne 0 ]]; then - err_exit +if ((fhr >= fhmin && fhr <= fhmax)); then + if ((fhr % 12 == 0)); then + "${SCRgfs}/exgfs_atmos_nawips.sh" "0p50" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_0p50}" && true + export err=$? + if [[ ${err} -ne 0 ]]; then + err_exit + fi fi - fi fi ################################################################# @@ -105,38 +105,38 @@ fi #################################################################### fhmin=0 fhmax=120 -if (( fhr >= fhmin && fhr <= fhmax )); then - if ((fhr % 1 == 0)); then - "${SCRgfs}/exgfs_atmos_nawips.sh" "0p25" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_0p25}" && true - export err=$? - if [[ ${err} -ne 0 ]]; then - err_exit +if ((fhr >= fhmin && fhr <= fhmax)); then + if ((fhr % 1 == 0)); then + "${SCRgfs}/exgfs_atmos_nawips.sh" "0p25" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_0p25}" && true + export err=$? + if [[ ${err} -ne 0 ]]; then + err_exit + fi fi - fi fi fhmin=123 fhmax=240 -if (( fhr >= fhmin && fhr <= fhmax )); then - if ((fhr % 3 == 0)); then - "${SCRgfs}/exgfs_atmos_nawips.sh" "0p25" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_0p25}" && true - export err=$? - if [[ ${err} -ne 0 ]]; then - err_exit +if ((fhr >= fhmin && fhr <= fhmax)); then + if ((fhr % 3 == 0)); then + "${SCRgfs}/exgfs_atmos_nawips.sh" "0p25" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_0p25}" && true + export err=$? + if [[ ${err} -ne 0 ]]; then + err_exit + fi fi - fi fi fhmin=252 fhmax=384 -if (( fhr >= fhmin && fhr <= fhmax )); then - if ((fhr % 12 == 0)); then - "${SCRgfs}/exgfs_atmos_nawips.sh" "0p25" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_0p25}" && true - export err=$? - if [[ ${err} -ne 0 ]]; then - err_exit +if ((fhr >= fhmin && fhr <= fhmax)); then + if ((fhr % 12 == 0)); then + "${SCRgfs}/exgfs_atmos_nawips.sh" "0p25" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_0p25}" && true + export err=$? + if [[ ${err} -ne 0 ]]; then + err_exit + fi fi - fi fi #################################################################### @@ -144,38 +144,38 @@ fi ##################################################################### fhmin=0 fhmax="${ocean_domain_max}" -if (( fhr >= fhmin && fhr <= fhmax )); then - if ((fhr % 3 == 0)); then - "${SCRgfs}/exgfs_atmos_nawips.sh" "35km_pac" "${FHR3}" "GFS_GEMPAK_WWB" "${COMOUT_ATMOS_GEMPAK_35km_pac}" && true - export err=$? - if [[ ${err} -ne 0 ]]; then - err_exit - fi - - "${SCRgfs}/exgfs_atmos_nawips.sh" "35km_atl" "${FHR3}" "GFS_GEMPAK_WWB" "${COMOUT_ATMOS_GEMPAK_35km_atl}" && true - export err=$? - if [[ ${err} -ne 0 ]]; then - err_exit - fi - - "${SCRgfs}/exgfs_atmos_nawips.sh" "40km" "${FHR3}" "GFS_GEMPAK_WWB" "${COMOUT_ATMOS_GEMPAK_40km}" && true - export err=$? - if [[ ${err} -ne 0 ]]; then - err_exit +if ((fhr >= fhmin && fhr <= fhmax)); then + if ((fhr % 3 == 0)); then + "${SCRgfs}/exgfs_atmos_nawips.sh" "35km_pac" "${FHR3}" "GFS_GEMPAK_WWB" "${COMOUT_ATMOS_GEMPAK_35km_pac}" && true + export err=$? + if [[ ${err} -ne 0 ]]; then + err_exit + fi + + "${SCRgfs}/exgfs_atmos_nawips.sh" "35km_atl" "${FHR3}" "GFS_GEMPAK_WWB" "${COMOUT_ATMOS_GEMPAK_35km_atl}" && true + export err=$? + if [[ ${err} -ne 0 ]]; then + err_exit + fi + + "${SCRgfs}/exgfs_atmos_nawips.sh" "40km" "${FHR3}" "GFS_GEMPAK_WWB" "${COMOUT_ATMOS_GEMPAK_40km}" && true + export err=$? + if [[ ${err} -ne 0 ]]; then + err_exit + fi fi - fi fi ############################################ # print exec I/O output ############################################ -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ################################### # Remove temp directories ################################### -if [[ "${KEEPDATA}" != "YES" ]] ; then - rm -rf "${DATA}" +if [[ "${KEEPDATA}" != "YES" ]]; then + rm -rf "${DATA}" fi diff --git a/jobs/JGFS_ATMOS_GEMPAK_META b/jobs/JGFS_ATMOS_GEMPAK_META index 955535ef98f..814cf0fd9c3 100755 --- a/jobs/JGFS_ATMOS_GEMPAK_META +++ b/jobs/JGFS_ATMOS_GEMPAK_META @@ -7,7 +7,6 @@ ############################################ source "${HOMEgfs}/ush/jjob_header.sh" -e "gempak_meta" -c "base gempak" - ############################################### # Set MP variables ############################################### @@ -26,8 +25,8 @@ export fhbeg=0 export fhend=384 export fhinc=12 -if (( fhend > FHMAX_GFS )); then - export fhend=${FHMAX_GFS} +if ((fhend > FHMAX_GFS)); then + export fhend=${FHMAX_GFS} fi export COMPONENT="atmos" @@ -47,8 +46,8 @@ export COMINnam=${COMINnam:-$(compath.py "${envir}/nam/${nam_ver}")/nam} GRID=1p00 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMIN_ATMOS_GEMPAK_1p00:COM_ATMOS_GEMPAK_TMPL" GRID="meta" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMOUT_ATMOS_GEMPAK_META:COM_ATMOS_GEMPAK_TMPL" -if [[ ! -d "${COMOUT_ATMOS_GEMPAK_META}" ]] ; then - mkdir -m 775 -p "${COMOUT_ATMOS_GEMPAK_META}" +if [[ ! -d "${COMOUT_ATMOS_GEMPAK_META}" ]]; then + mkdir -m 775 -p "${COMOUT_ATMOS_GEMPAK_META}" fi ######################################################## @@ -63,14 +62,13 @@ fi ############################################ # print exec I/O output ############################################ -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ################################### # Remove temp directories ################################### -if [[ "${KEEPDATA}" != "YES" ]] ; then - rm -rf "${DATA}" +if [[ "${KEEPDATA}" != "YES" ]]; then + rm -rf "${DATA}" fi - diff --git a/jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF b/jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF index 4171e139fa6..668a0dd1ada 100755 --- a/jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF +++ b/jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF @@ -11,8 +11,8 @@ export MP_TIMEOUT=2000 # Set up model and cycle specific variables export MODEL=GFS export fend=384 -if (( fend > FHMAX_GFS )); then - export fend="${FHMAX_GFS}" +if ((fend > FHMAX_GFS)); then + export fend="${FHMAX_GFS}" fi # set increment to 6 hours -- 3 hours is available. @@ -29,10 +29,10 @@ GRID=1p00 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMIN_ATMOS_GEMPAK_1p00:CO # Declare COMOUT_ATMOS_GEMPAK_GIF and COMOUT_ATMOS_GEMPAK_UPPER_AIR for grid in gif upper_air; do - _GRID="${grid^^}" - gempak_dir="COMOUT_ATMOS_GEMPAK_${_GRID}" - GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "${gempak_dir}:COM_ATMOS_GEMPAK_TMPL" - if [[ ! -d "${!gempak_dir}" ]]; then mkdir -m 775 -p "${!gempak_dir}"; fi + _GRID="${grid^^}" + gempak_dir="COMOUT_ATMOS_GEMPAK_${_GRID}" + GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "${gempak_dir}:COM_ATMOS_GEMPAK_TMPL" + if [[ ! -d "${!gempak_dir}" ]]; then mkdir -m 775 -p "${!gempak_dir}"; fi done YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COMOUT_ATMOS_WMO:COM_ATMOS_WMO_TMPL @@ -52,13 +52,13 @@ fi ############################################ # print exec I/O output ############################################ -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ################################### # Remove temp directories ################################### -if [[ "${KEEPDATA}" != "YES" ]] ; then - rm -rf "${DATA}" +if [[ "${KEEPDATA}" != "YES" ]]; then + rm -rf "${DATA}" fi diff --git a/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC b/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC index 8f68356cfd0..373bdb50870 100755 --- a/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC +++ b/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC @@ -11,7 +11,7 @@ export EXT="" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COMOUT_ATMOS_GOES:COM_ATMOS_GOES_TMPL GRID=0p25 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMOUT_ATMOS_GEMPAK_0p25:COM_ATMOS_GEMPAK_TMPL" if [[ ! -d "${COMOUT_ATMOS_GEMPAK_0p25}" ]]; then - mkdir -m 775 -p "${COMOUT_ATMOS_GEMPAK_0p25}" + mkdir -m 775 -p "${COMOUT_ATMOS_GEMPAK_0p25}" fi ################################################################# @@ -52,13 +52,13 @@ cd "${DATA}" || exit 1 ############################################ # print exec I/O output ############################################ -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ################################### # Remove temp directories ################################### -if [[ "${KEEPDATA}" != "YES" ]] ; then - rm -rf "${DATA}" +if [[ "${KEEPDATA}" != "YES" ]]; then + rm -rf "${DATA}" fi diff --git a/jobs/JGFS_ATMOS_PGRB2_SPEC_NPOESS b/jobs/JGFS_ATMOS_PGRB2_SPEC_NPOESS index 4e9c785781d..ea20ffd2d59 100755 --- a/jobs/JGFS_ATMOS_PGRB2_SPEC_NPOESS +++ b/jobs/JGFS_ATMOS_PGRB2_SPEC_NPOESS @@ -26,21 +26,20 @@ mkdir -m 775 -p "${COMOUT_ATMOS_GOES}" "${SCRgfs}/exgfs_atmos_grib2_special_npoess.sh" && true export err=$? if [[ ${err} -ne 0 ]]; then - err_exit + err_exit fi ############################################################# ############################################ # print exec I/O output ############################################ -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ################################### # Remove temp directories ################################### -if [[ "${KEEPDATA}" != "YES" ]] ; then - rm -rf "${DATA}" +if [[ "${KEEPDATA}" != "YES" ]]; then + rm -rf "${DATA}" fi - diff --git a/jobs/JGFS_ATMOS_POSTSND b/jobs/JGFS_ATMOS_POSTSND index a3d7814a4d1..d2d7491f9fb 100755 --- a/jobs/JGFS_ATMOS_POSTSND +++ b/jobs/JGFS_ATMOS_POSTSND @@ -11,10 +11,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "postsnd" -c "base postsnd" ############################## YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_ATMOS_HISTORY:COM_ATMOS_HISTORY_TMPL \ - COMOUT_ATMOS_BUFR:COM_ATMOS_BUFR_TMPL \ - COMOUT_ATMOS_WMO:COM_ATMOS_WMO_TMPL \ - COMOUT_ATMOS_GEMPAK:COM_ATMOS_GEMPAK_TMPL + COMIN_ATMOS_HISTORY:COM_ATMOS_HISTORY_TMPL \ + COMOUT_ATMOS_BUFR:COM_ATMOS_BUFR_TMPL \ + COMOUT_ATMOS_WMO:COM_ATMOS_WMO_TMPL \ + COMOUT_ATMOS_GEMPAK:COM_ATMOS_GEMPAK_TMPL if [[ ! -d "${COMOUT_ATMOS_BUFR}" ]]; then mkdir -p "${COMOUT_ATMOS_BUFR}" @@ -26,7 +26,6 @@ if [[ ! -d "${COMOUT_ATMOS_WMO}" ]]; then mkdir -p "${COMOUT_ATMOS_WMO}" fi - ######################################################## # Execute the script. "${SCRgfs}/exgfs_atmos_postsnd.sh" && true @@ -42,8 +41,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## @@ -54,6 +53,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 - diff --git a/jobs/JGFS_ATMOS_VERIFICATION b/jobs/JGFS_ATMOS_VERIFICATION index 91053c61f35..31e56f24172 100755 --- a/jobs/JGFS_ATMOS_VERIFICATION +++ b/jobs/JGFS_ATMOS_VERIFICATION @@ -21,8 +21,8 @@ export CDATE=${PDY}${cyc} # Since this is currently a one-element list, shellcheck things we would rather run this as a command # shellcheck disable=SC2041 for grid in '1p00'; do - prod_dir="COM_ATMOS_GRIB_${grid}" - GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "${prod_dir}:COM_ATMOS_GRIB_GRID_TMPL" + prod_dir="COM_ATMOS_GRIB_${grid}" + GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "${prod_dir}:COM_ATMOS_GRIB_GRID_TMPL" done # TODO: If none of these are on, why are we running this job? @@ -33,10 +33,9 @@ if [[ "${RUN_GRID2GRID_STEP1}" == "YES" || "${RUN_GRID2OBS_STEP1}" == "YES" || " export -n SHELLOPTS bash -x "${VERIF_GLOBALSH}" err=$? - if [[ ${err} -ne 0 ]]; - then exit "${err}" + if [[ ${err} -ne 0 ]]; then + exit "${err}" fi fi -if [[ ${KEEPDATA:-"NO"} = "NO" ]] ; then rm -rf "${DATAROOT}" ; fi # TODO: This should be $DATA - +if [[ ${KEEPDATA:-"NO"} = "NO" ]]; then rm -rf "${DATAROOT}"; fi # TODO: This should be $DATA diff --git a/jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE b/jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE index a0f1a04a45b..44642b5b261 100755 --- a/jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE +++ b/jobs/JGLOBAL_AERO_ANALYSIS_FINALIZE @@ -35,8 +35,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## diff --git a/jobs/JGLOBAL_AERO_ANALYSIS_INITIALIZE b/jobs/JGLOBAL_AERO_ANALYSIS_INITIALIZE index dd6cadd18d0..fca06c3b8cb 100755 --- a/jobs/JGLOBAL_AERO_ANALYSIS_INITIALIZE +++ b/jobs/JGLOBAL_AERO_ANALYSIS_INITIALIZE @@ -48,8 +48,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi exit 0 diff --git a/jobs/JGLOBAL_AERO_ANALYSIS_VARIATIONAL b/jobs/JGLOBAL_AERO_ANALYSIS_VARIATIONAL index 7b28c0f0695..4c3aafca453 100755 --- a/jobs/JGLOBAL_AERO_ANALYSIS_VARIATIONAL +++ b/jobs/JGLOBAL_AERO_ANALYSIS_VARIATIONAL @@ -29,8 +29,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi exit 0 diff --git a/jobs/JGLOBAL_ANALYSIS_STATS b/jobs/JGLOBAL_ANALYSIS_STATS index 33b2a4fd5b4..f4c8c958220 100755 --- a/jobs/JGLOBAL_ANALYSIS_STATS +++ b/jobs/JGLOBAL_ANALYSIS_STATS @@ -6,22 +6,21 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "anlstat" -c "base anlstat" # Set variables used in the script ############################################## - ############################################## # Begin JOB SPECIFIC work ############################################## # Generate COM variables from templates YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COMIN_OBS:COM_OBS_TMPL \ - COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ - COMIN_OCEAN_ANALYSIS:COM_OCEAN_ANALYSIS_TMPL \ - COMIN_AERO_ANALYSIS:COM_CHEM_ANALYSIS_TMPL \ - COMIN_SNOW_ANALYSIS:COM_SNOW_ANALYSIS_TMPL \ - COMOUT_CONF:COM_CONF_TMPL \ - COMOUT_ATMOS_ANLMON:COM_ATMOS_ANLMON_TMPL \ - COMOUT_OCEAN_ANLMON:COM_OCEAN_ANLMON_TMPL \ - COMOUT_AERO_ANLMON:COM_CHEM_ANLMON_TMPL \ - COMOUT_SNOW_ANLMON:COM_SNOW_ANLMON_TMPL + COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ + COMIN_OCEAN_ANALYSIS:COM_OCEAN_ANALYSIS_TMPL \ + COMIN_AERO_ANALYSIS:COM_CHEM_ANALYSIS_TMPL \ + COMIN_SNOW_ANALYSIS:COM_SNOW_ANALYSIS_TMPL \ + COMOUT_CONF:COM_CONF_TMPL \ + COMOUT_ATMOS_ANLMON:COM_ATMOS_ANLMON_TMPL \ + COMOUT_OCEAN_ANLMON:COM_OCEAN_ANLMON_TMPL \ + COMOUT_AERO_ANLMON:COM_CHEM_ANLMON_TMPL \ + COMOUT_SNOW_ANLMON:COM_SNOW_ANLMON_TMPL ############################################################### # Run relevant script @@ -40,8 +39,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi exit 0 diff --git a/jobs/JGLOBAL_ARCHIVE_TARS b/jobs/JGLOBAL_ARCHIVE_TARS index 712fe6667a3..f3b95db93cc 100755 --- a/jobs/JGLOBAL_ARCHIVE_TARS +++ b/jobs/JGLOBAL_ARCHIVE_TARS @@ -2,8 +2,8 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "arch_vrfy" -c "base arch_tars" if [[ "${DO_WAVE}" == "YES" ]]; then - source "${EXPDIR}/config.wave" - source "${USHgfs}/wave_domain_grid.sh" + source "${EXPDIR}/config.wave" + source "${USHgfs}/wave_domain_grid.sh" fi ############################################## @@ -54,7 +54,7 @@ if [[ ! -d ${COMOUT_CONF} ]]; then mkdir -p "${COMOUT_CONF}"; fi for grid in "0p25" "0p50" "1p00"; do YMD=${PDY} HH=${cyc} GRID=${grid} declare_from_tmpl -rx \ - "COMIN_ATMOS_GRIB_${grid}:COM_ATMOS_GRIB_GRID_TMPL" + "COMIN_ATMOS_GRIB_${grid}:COM_ATMOS_GRIB_GRID_TMPL" done ############################################################### @@ -97,14 +97,17 @@ set_strict ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## # Remove the Temporary working directory ########################################## -cd "${DATAROOT}" || (echo "${DATAROOT} does not exist. ABORT!"; exit 1) +cd "${DATAROOT}" || ( + echo "${DATAROOT} does not exist. ABORT!" + exit 1 +) if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi diff --git a/jobs/JGLOBAL_ARCHIVE_VRFY b/jobs/JGLOBAL_ARCHIVE_VRFY index d3bc3ba70cd..e5965c22706 100755 --- a/jobs/JGLOBAL_ARCHIVE_VRFY +++ b/jobs/JGLOBAL_ARCHIVE_VRFY @@ -2,7 +2,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "arch_vrfy" -c "base arch_vrfy" - ############################################## # Set variables used in the script ############################################## @@ -18,7 +17,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ for grid in "0p25" "0p50" "1p00"; do YMD=${PDY} HH=${cyc} GRID=${grid} declare_from_tmpl -rx \ - "COMIN_ATMOS_GRIB_${grid}:COM_ATMOS_GRIB_GRID_TMPL" + "COMIN_ATMOS_GRIB_${grid}:COM_ATMOS_GRIB_GRID_TMPL" done ############################################################### @@ -38,14 +37,17 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## # Remove the Temporary working directory ########################################## -cd "${DATAROOT}" || (echo "${DATAROOT} does not exist. ABORT!"; exit 1) +cd "${DATAROOT}" || ( + echo "${DATAROOT} does not exist. ABORT!" + exit 1 +) if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi diff --git a/jobs/JGLOBAL_ATMENS_ANALYSIS_FINALIZE b/jobs/JGLOBAL_ATMENS_ANALYSIS_FINALIZE index 62b04513b53..79ff131257a 100755 --- a/jobs/JGLOBAL_ATMENS_ANALYSIS_FINALIZE +++ b/jobs/JGLOBAL_ATMENS_ANALYSIS_FINALIZE @@ -38,8 +38,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## diff --git a/jobs/JGLOBAL_ATMENS_ANALYSIS_FV3_INCREMENT b/jobs/JGLOBAL_ATMENS_ANALYSIS_FV3_INCREMENT index 0543080a87f..e0fac0e3292 100755 --- a/jobs/JGLOBAL_ATMENS_ANALYSIS_FV3_INCREMENT +++ b/jobs/JGLOBAL_ATMENS_ANALYSIS_FV3_INCREMENT @@ -29,8 +29,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi exit 0 diff --git a/jobs/JGLOBAL_ATMENS_ANALYSIS_INITIALIZE b/jobs/JGLOBAL_ATMENS_ANALYSIS_INITIALIZE index d81f7d6630c..35e2b21611c 100755 --- a/jobs/JGLOBAL_ATMENS_ANALYSIS_INITIALIZE +++ b/jobs/JGLOBAL_ATMENS_ANALYSIS_INITIALIZE @@ -17,10 +17,10 @@ GDUMP="gdas" ############################################## # Generate COM variables from templates RUN=${GDUMP} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_OBS:COM_OBS_TMPL + COMIN_OBS:COM_OBS_TMPL RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ - COMIN_ATMOS_ANALYSIS_PREV:COM_ATMOS_ANALYSIS_TMPL + COMIN_ATMOS_ANALYSIS_PREV:COM_ATMOS_ANALYSIS_TMPL ############################################################### # Run relevant script @@ -39,8 +39,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi exit 0 diff --git a/jobs/JGLOBAL_ATMENS_ANALYSIS_LETKF b/jobs/JGLOBAL_ATMENS_ANALYSIS_LETKF index a9a419e8b73..b6bc77a4000 100755 --- a/jobs/JGLOBAL_ATMENS_ANALYSIS_LETKF +++ b/jobs/JGLOBAL_ATMENS_ANALYSIS_LETKF @@ -29,8 +29,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi exit 0 diff --git a/jobs/JGLOBAL_ATMENS_ANALYSIS_OBS b/jobs/JGLOBAL_ATMENS_ANALYSIS_OBS index dcedcede856..1b71ad578a3 100755 --- a/jobs/JGLOBAL_ATMENS_ANALYSIS_OBS +++ b/jobs/JGLOBAL_ATMENS_ANALYSIS_OBS @@ -29,8 +29,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi exit 0 diff --git a/jobs/JGLOBAL_ATMENS_ANALYSIS_SOL b/jobs/JGLOBAL_ATMENS_ANALYSIS_SOL index 8becb9f4ab6..ac2291ffe7d 100755 --- a/jobs/JGLOBAL_ATMENS_ANALYSIS_SOL +++ b/jobs/JGLOBAL_ATMENS_ANALYSIS_SOL @@ -29,8 +29,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi exit 0 diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS b/jobs/JGLOBAL_ATMOS_ANALYSIS index 2a68b512b1e..f675c90bc16 100755 --- a/jobs/JGLOBAL_ATMOS_ANALYSIS +++ b/jobs/JGLOBAL_ATMOS_ANALYSIS @@ -2,11 +2,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "anal" -c "base anal" - ############################################## # Set variables used in the script ############################################## -export rCDUMP=${RUN/enkf} +export rCDUMP=${RUN/enkf/} export COMPONENT="atmos" export DO_CALC_ANALYSIS=${DO_CALC_ANALYSIS:-"YES"} @@ -27,8 +26,8 @@ export GPREFIX_ENS="${GDUMP_ENS}.t${gcyc}z." # Generate COM variables from templates YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_OBS:COM_OBS_TMPL \ - COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL + COMIN_OBS:COM_OBS_TMPL \ + COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ COMIN_ATMOS_ANALYSIS_PREV:COM_ATMOS_ANALYSIS_TMPL \ @@ -61,7 +60,6 @@ if [[ "${DOHYBVAR}" == "YES" ]]; then fi fi - # Link observational data export PREPQC="${COMIN_OBS}/${OPREFIX}prepbufr" if [[ ! -f ${PREPQC} ]]; then @@ -79,7 +77,6 @@ if [[ ${RUN} == "gfs" ]]; then cpreq "${FIXgfs}/gsi/prepobs_errtable.global" "${ROTDIR}/fix/" fi - ############################################################### # Run relevant script @@ -92,13 +89,12 @@ fi ############################################## # Send Alerts ############################################## -if [[ "${SENDDBN}" == "YES" ]] && [[ "${RUN}" == "gdas" ]] ; then +if [[ "${SENDDBN}" == "YES" ]] && [[ "${RUN}" == "gdas" ]]; then "${DBNROOT}/bin/dbn_alert" MODEL GDAS_MSC_abias "${job}" "${COMOUT_ATMOS_ANALYSIS}/${APREFIX}abias" "${DBNROOT}/bin/dbn_alert" MODEL GDAS_MSC_abias_pc "${job}" "${COMOUT_ATMOS_ANALYSIS}/${APREFIX}abias_pc" "${DBNROOT}/bin/dbn_alert" MODEL GDAS_MSC_abias_air "${job}" "${COMOUT_ATMOS_ANALYSIS}/${APREFIX}abias_air" fi - ############################################## # End JOB SPECIFIC work ############################################## @@ -106,8 +102,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## @@ -118,5 +114,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC b/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC index 34a12e22ad7..82c6b11c9e2 100755 --- a/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC +++ b/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC @@ -2,14 +2,12 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "analcalc" -c "base anal analcalc" - ############################################## # Set variables used in the script ############################################## -export rCDUMP="${RUN/enkf}" +export rCDUMP="${RUN/enkf/}" export DO_CALC_ANALYSIS=${DO_CALC_ANALYSIS:-"YES"} - ############################################## # Begin JOB SPECIFIC work ############################################## @@ -36,7 +34,6 @@ RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ COMIN_OBS_PREV:COM_OBS_TMPL \ COMIN_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL - export ATMGES="${COMIN_ATMOS_HISTORY_PREV}/${GPREFIX}atmf006.nc" if [[ ! -f "${ATMGES}" ]]; then export err=1 @@ -54,7 +51,6 @@ fi # Generate Gaussian surface analysis # TODO: Should this be removed now that sfcanl is its own job? export DOGAUSFCANL=${DOGAUSFCANL:-"YES"} - ############################################################### # Run relevant script @@ -71,8 +67,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## @@ -83,5 +79,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC_FV3JEDI b/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC_FV3JEDI index 5d900f4ac00..dde79e32c95 100755 --- a/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC_FV3JEDI +++ b/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC_FV3JEDI @@ -14,7 +14,7 @@ GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours") gPDY=${GDATE:0:8} gcyc=${GDATE:8:2} GDUMP="gdas" -export rCDUMP="${RUN/enkf}" +export rCDUMP="${RUN/enkf/}" ############################################## # Begin JOB SPECIFIC work @@ -22,11 +22,11 @@ export rCDUMP="${RUN/enkf}" # Generate COM variables from templates YMD=${PDY} HH=${cyc} RUN=${RUN} declare_from_tmpl -rx \ - COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL + COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL YMD=${PDY} HH=${cyc} RUN=${RUN} declare_from_tmpl -rx \ - COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL + COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ - COMIN_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL + COMIN_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL ############################################## # Run relevant script @@ -50,8 +50,8 @@ echo "${rCDUMP} ${PDY}${cyc} atmanl and sfcanl done at $(date)" > "${COMOUT_ATMO # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ############################################## diff --git a/jobs/JGLOBAL_ATMOS_CHGRES_GEN_CONTROL b/jobs/JGLOBAL_ATMOS_CHGRES_GEN_CONTROL index 96be6e85150..b535cc7af81 100755 --- a/jobs/JGLOBAL_ATMOS_CHGRES_GEN_CONTROL +++ b/jobs/JGLOBAL_ATMOS_CHGRES_GEN_CONTROL @@ -36,5 +36,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGLOBAL_ATMOS_ENSSTAT b/jobs/JGLOBAL_ATMOS_ENSSTAT index 80b1c388817..ab460b1cd11 100755 --- a/jobs/JGLOBAL_ATMOS_ENSSTAT +++ b/jobs/JGLOBAL_ATMOS_ENSSTAT @@ -6,7 +6,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "atmos_ensstat" -c "base atmos_ensstat" - ############################################## # Begin JOB SPECIFIC work ############################################## @@ -15,9 +14,9 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "atmos_ensstat" -c "base atmos_ensstat # Input directories loop over members, so this is done downstream for grid in '0p25' '0p50' '1p00'; do - prod_dir="COMOUT_ATMOS_GRIB_${grid}" - MEMDIR="ensstat" GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "${prod_dir}:COM_ATMOS_GRIB_GRID_TMPL" - if [[ ! -d "${!prod_dir}" ]]; then mkdir -m 775 -p "${!prod_dir}"; fi + prod_dir="COMOUT_ATMOS_GRIB_${grid}" + MEMDIR="ensstat" GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "${prod_dir}:COM_ATMOS_GRIB_GRID_TMPL" + if [[ ! -d "${!prod_dir}" ]]; then mkdir -m 775 -p "${!prod_dir}"; fi done ############################################################### @@ -36,7 +35,7 @@ fi # Final processing ############################################## if [[ -e "${pgmout}" ]]; then - cat "${pgmout}" + cat "${pgmout}" fi ########################################## @@ -47,5 +46,4 @@ if [[ "${KEEPDATA:-NO}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGLOBAL_ATMOS_POST_MANAGER b/jobs/JGLOBAL_ATMOS_POST_MANAGER index d22b5e01f75..d03e527135d 100755 --- a/jobs/JGLOBAL_ATMOS_POST_MANAGER +++ b/jobs/JGLOBAL_ATMOS_POST_MANAGER @@ -4,7 +4,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "post" -c "base post" - #################################### # Specify NET and RUN Name and model #################################### @@ -26,4 +25,3 @@ if [[ ${err} -ne 0 ]]; then err_exit fi ######################################################## - diff --git a/jobs/JGLOBAL_ATMOS_PREP_SFC b/jobs/JGLOBAL_ATMOS_PREP_SFC index b649cf4496e..4f1aec6ff73 100755 --- a/jobs/JGLOBAL_ATMOS_PREP_SFC +++ b/jobs/JGLOBAL_ATMOS_PREP_SFC @@ -28,7 +28,7 @@ mkdir -p "${COMOUT_OBS}" "${SCRgfs}/exglobal_prep_sfc.sh" export err=$? if [[ ${err} -ne 0 ]]; then - err_exit "Surface observation preparation failed!" + err_exit "Surface observation preparation failed!" fi ############################################## @@ -39,7 +39,7 @@ fi # Final processing ############################################## if [[ -e "${pgmout}" ]]; then - cat "${pgmout}" + cat "${pgmout}" fi ########################################## @@ -50,5 +50,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGLOBAL_ATMOS_PRODUCTS b/jobs/JGLOBAL_ATMOS_PRODUCTS index b4f803f8036..9096b822242 100755 --- a/jobs/JGLOBAL_ATMOS_PRODUCTS +++ b/jobs/JGLOBAL_ATMOS_PRODUCTS @@ -2,21 +2,20 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "atmos_products" -c "base atmos_products" - ############################################## # Begin JOB SPECIFIC work ############################################## # Construct COM variables from templates YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ - COMIN_ATMOS_HISTORY:COM_ATMOS_HISTORY_TMPL \ - COMIN_ATMOS_MASTER:COM_ATMOS_MASTER_TMPL + COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ + COMIN_ATMOS_HISTORY:COM_ATMOS_HISTORY_TMPL \ + COMIN_ATMOS_MASTER:COM_ATMOS_MASTER_TMPL for grid in '0p25' '0p50' '1p00'; do - prod_dir="COMOUT_ATMOS_GRIB_${grid}" - GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "${prod_dir}:COM_ATMOS_GRIB_GRID_TMPL" - if [[ ! -d "${!prod_dir}" ]]; then mkdir -m 775 -p "${!prod_dir}"; fi + prod_dir="COMOUT_ATMOS_GRIB_${grid}" + GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "${prod_dir}:COM_ATMOS_GRIB_GRID_TMPL" + if [[ ! -d "${!prod_dir}" ]]; then mkdir -m 775 -p "${!prod_dir}"; fi done # Variables used in this job @@ -38,7 +37,7 @@ fi # Final processing ############################################## if [[ -e "${pgmout}" ]]; then - cat "${pgmout}" + cat "${pgmout}" fi ########################################## @@ -49,5 +48,4 @@ if [[ "${KEEPDATA:-NO}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGLOBAL_ATMOS_SFCANL b/jobs/JGLOBAL_ATMOS_SFCANL index d5912a265a5..6223c4cacf3 100755 --- a/jobs/JGLOBAL_ATMOS_SFCANL +++ b/jobs/JGLOBAL_ATMOS_SFCANL @@ -2,7 +2,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "sfcanl" -c "base sfcanl" - ############################################## # Begin JOB SPECIFIC work ############################################## @@ -13,27 +12,26 @@ export GDATE BKG_RUN="gdas" if [[ "${RUN}" == "gcafs" || "${RUN}" == "gcdas" ]]; then - BKG_RUN="gcdas" + BKG_RUN="gcdas" fi RUN=${BKG_RUN} YMD=${GDATE:0:8} HH=${GDATE:8:2} declare_from_tmpl -rx \ - COMIN_OBS_PREV:COM_OBS_TMPL \ - COMIN_ATMOS_RESTART_PREV:COM_ATMOS_RESTART_TMPL + COMIN_OBS_PREV:COM_OBS_TMPL \ + COMIN_ATMOS_RESTART_PREV:COM_ATMOS_RESTART_TMPL YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_OBS:COM_OBS_TMPL \ - COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ - COMIN_SNOW_ANALYSIS:COM_SNOW_ANALYSIS_TMPL + COMIN_OBS:COM_OBS_TMPL \ + COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ + COMIN_SNOW_ANALYSIS:COM_SNOW_ANALYSIS_TMPL YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMOUT_ATMOS_RESTART:COM_ATMOS_RESTART_TMPL + COMOUT_ATMOS_RESTART:COM_ATMOS_RESTART_TMPL RUN="enkfgdas" MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_ATMOS_ENKF_ANALYSIS_STAT:COM_ATMOS_ANALYSIS_TMPL + COMIN_ATMOS_ENKF_ANALYSIS_STAT:COM_ATMOS_ANALYSIS_TMPL mkdir -p "${COMOUT_ATMOS_RESTART}" - ############################################################### # Run relevant script @@ -50,8 +48,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## @@ -62,5 +60,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGLOBAL_ATMOS_TROPCY_QC_RELOC b/jobs/JGLOBAL_ATMOS_TROPCY_QC_RELOC index 6b8637e32c7..fa0cde8057b 100755 --- a/jobs/JGLOBAL_ATMOS_TROPCY_QC_RELOC +++ b/jobs/JGLOBAL_ATMOS_TROPCY_QC_RELOC @@ -6,30 +6,29 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "prep" -c "base prep" # Begin JOB SPECIFIC work ############################################## -export PROCESS_TROPCY=${PROCESS_TROPCY:-YES} # Turn on tropical cyclone tcvitals QC proc. if YES -export DO_RELOCATE=${DO_RELOCATE:-NO} # Turn on tropical cyclone relocation proc. if YES +export PROCESS_TROPCY=${PROCESS_TROPCY:-YES} # Turn on tropical cyclone tcvitals QC proc. if YES +export DO_RELOCATE=${DO_RELOCATE:-NO} # Turn on tropical cyclone relocation proc. if YES export tmmark=tm00 -export ARCHSYND=${ROTDIR}/syndat # this location is unique, do not change +export ARCHSYND=${ROTDIR}/syndat # this location is unique, do not change if [[ ! -d "${ARCHSYND}" ]]; then mkdir -p "${ARCHSYND}"; fi export HOMENHC=${HOMENHC:-/lfs/h1/ops/prod/dcom/nhc/atcf/ncep} -export TANK_TROPCY=${TANK_TROPCY:-${DCOMROOT}} # path to tropical cyclone record database +export TANK_TROPCY=${TANK_TROPCY:-${DCOMROOT}} # path to tropical cyclone record database ############################################## # Define COM directories ############################################## declare_from_tmpl COMOUT_OBS:COM_OBS_TMPL if [[ ! -d "${COMOUT_OBS}" ]]; then - mkdir -p "${COMOUT_OBS}" + mkdir -p "${COMOUT_OBS}" fi export CRES=${CASE_HIST:1} -export LATB=$((CRES*2)) -export LONB=$((CRES*4)) -export BKGFREQ=1 # for hourly relocation - +export LATB=$((CRES * 2)) +export LONB=$((CRES * 4)) +export BKGFREQ=1 # for hourly relocation ############################################## # Run relevant script @@ -44,8 +43,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## @@ -56,5 +55,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGLOBAL_ATMOS_UPP b/jobs/JGLOBAL_ATMOS_UPP index 3aea98cddba..bf5c70d0eee 100755 --- a/jobs/JGLOBAL_ATMOS_UPP +++ b/jobs/JGLOBAL_ATMOS_UPP @@ -12,12 +12,11 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "upp" -c "base upp" # Construct COM variables from templates YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ - COMIN_ATMOS_HISTORY:COM_ATMOS_HISTORY_TMPL \ - COMOUT_ATMOS_MASTER:COM_ATMOS_MASTER_TMPL + COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ + COMIN_ATMOS_HISTORY:COM_ATMOS_HISTORY_TMPL \ + COMOUT_ATMOS_MASTER:COM_ATMOS_MASTER_TMPL if [[ ! -d ${COMOUT_ATMOS_MASTER} ]]; then mkdir -p "${COMOUT_ATMOS_MASTER}"; fi - ############################################################### # Run relevant exglobal script @@ -35,7 +34,7 @@ fi # Final processing ############################################## if [[ -e "${pgmout}" ]]; then - cat "${pgmout}" + cat "${pgmout}" fi ########################################## @@ -46,5 +45,4 @@ if [[ "${KEEPDATA:-NO}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGLOBAL_ATMOS_VMINMON b/jobs/JGLOBAL_ATMOS_VMINMON index d439b5632fe..4f6abd48aab 100755 --- a/jobs/JGLOBAL_ATMOS_VMINMON +++ b/jobs/JGLOBAL_ATMOS_VMINMON @@ -17,17 +17,17 @@ export gcyc=${GDATE:8:2} # TANKverf - WHERE OUTPUT DATA WILL RESIDE ############################################# YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ - COMOUT_ATMOS_MINMON:COM_ATMOS_MINMON_TMPL + COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ + COMOUT_ATMOS_MINMON:COM_ATMOS_MINMON_TMPL YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ - COMIN_ATMOS_MINMON_PREV:COM_ATMOS_MINMON_TMPL + COMIN_ATMOS_MINMON_PREV:COM_ATMOS_MINMON_TMPL export gsistat="${COMIN_ATMOS_ANALYSIS}/${RUN}.t${cyc}z.gsistat" export M_TANKverf=${M_TANKverf:-${COMOUT_ATMOS_MINMON}} export M_TANKverfM1=${M_TANKverfM1:-${COMIN_ATMOS_MINMON_PREV}} -if [[ ! -d ${M_TANKverf} ]]; then mkdir -p "${M_TANKverf}" ; fi +if [[ ! -d ${M_TANKverf} ]]; then mkdir -p "${M_TANKverf}"; fi ######################################################## # Execute the script. diff --git a/jobs/JGLOBAL_ATM_ANALYSIS_FINALIZE b/jobs/JGLOBAL_ATM_ANALYSIS_FINALIZE index 74d83abd31f..cdb8726127b 100755 --- a/jobs/JGLOBAL_ATM_ANALYSIS_FINALIZE +++ b/jobs/JGLOBAL_ATM_ANALYSIS_FINALIZE @@ -8,15 +8,14 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "atmanlfinal" -c "base atmanl atmanlfi # Set variables used in the script ############################################## - ############################################## # Begin JOB SPECIFIC work ############################################## # Generate COM variables from templates YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ - COMOUT_CONF:COM_CONF_TMPL + COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ + COMOUT_CONF:COM_CONF_TMPL mkdir -m 775 -p "${COMOUT_ATMOS_ANALYSIS}" mkdir -m 775 -p "${COMOUT_CONF}" @@ -38,8 +37,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## diff --git a/jobs/JGLOBAL_ATM_ANALYSIS_FV3_INCREMENT b/jobs/JGLOBAL_ATM_ANALYSIS_FV3_INCREMENT index 399dded27c1..16c10a29067 100755 --- a/jobs/JGLOBAL_ATM_ANALYSIS_FV3_INCREMENT +++ b/jobs/JGLOBAL_ATM_ANALYSIS_FV3_INCREMENT @@ -8,12 +8,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "atmanlfv3inc" -c "base atmanl atmanlf # Set variables used in the script ############################################## - ############################################## # Begin JOB SPECIFIC work ############################################## - ############################################################### # Run relevant script @@ -31,8 +29,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi exit 0 diff --git a/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE b/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE index 1298d011aff..4a470ff3b9b 100755 --- a/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE +++ b/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE @@ -18,11 +18,11 @@ GDUMP="gdas" # Generate COM variables from templates YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_OBS:COM_OBS_TMPL + COMIN_OBS:COM_OBS_TMPL RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ - COMIN_ATMOS_ANALYSIS_PREV:COM_ATMOS_ANALYSIS_TMPL \ - COMIN_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL + COMIN_ATMOS_ANALYSIS_PREV:COM_ATMOS_ANALYSIS_TMPL \ + COMIN_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL mkdir -m 775 -p "${COMIN_ATMOS_ANALYSIS_PREV}" @@ -43,8 +43,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi exit 0 diff --git a/jobs/JGLOBAL_ATM_ANALYSIS_VARIATIONAL b/jobs/JGLOBAL_ATM_ANALYSIS_VARIATIONAL index 764db005dba..5be049694e3 100755 --- a/jobs/JGLOBAL_ATM_ANALYSIS_VARIATIONAL +++ b/jobs/JGLOBAL_ATM_ANALYSIS_VARIATIONAL @@ -8,12 +8,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "atmanlvar" -c "base atmanl atmanlvar" # Set variables used in the script ############################################## - ############################################## # Begin JOB SPECIFIC work ############################################## - ############################################################### # Run relevant script @@ -31,8 +29,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi exit 0 diff --git a/jobs/JGLOBAL_ATM_PREP_IODA_OBS b/jobs/JGLOBAL_ATM_PREP_IODA_OBS index e72a7be71aa..ca0006f11b5 100755 --- a/jobs/JGLOBAL_ATM_PREP_IODA_OBS +++ b/jobs/JGLOBAL_ATM_PREP_IODA_OBS @@ -11,7 +11,7 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "prepatmiodaobs" -c "base prepatmiodao ############################################## # Generate COM variables from templates YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMOUT_OBS:COM_OBS_TMPL + COMOUT_OBS:COM_OBS_TMPL ############################################################### # Run relevant script @@ -20,7 +20,7 @@ ${EXSCRIPT} "${PDY}${cyc}" "${RUN}" "${DMPDIR}" "${PARMgfs}/gdas/ioda/bufr2ioda" export err=$? set +x if [[ ${err} -ne 0 ]]; then - err_exit "Error executing ${EXSCRIPT}" + err_exit "Error executing ${EXSCRIPT}" fi set_trace @@ -32,7 +32,7 @@ set_trace # Final processing ############################################## if [[ -e "${pgmout}" ]]; then - cat "${pgmout}" + cat "${pgmout}" fi exit 0 diff --git a/jobs/JGLOBAL_CLEANUP b/jobs/JGLOBAL_CLEANUP index 94b19a7c117..1325d1f9a32 100755 --- a/jobs/JGLOBAL_CLEANUP +++ b/jobs/JGLOBAL_CLEANUP @@ -19,4 +19,3 @@ rm -rf "${DATAROOT}" echo "Cleanup ${DATAROOT} completed!" exit 0 - diff --git a/jobs/JGLOBAL_ENS_ARCHIVE_TARS b/jobs/JGLOBAL_ENS_ARCHIVE_TARS index f6820f20358..fd5a54d59d1 100755 --- a/jobs/JGLOBAL_ENS_ARCHIVE_TARS +++ b/jobs/JGLOBAL_ENS_ARCHIVE_TARS @@ -2,20 +2,19 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "earc_tars" -c "base arch_tars earc_tars earc_groups" - ############################################## # Set variables used in the script ############################################## MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_ATMOS_ANALYSIS_ENSSTAT:COM_ATMOS_ANALYSIS_TMPL \ - COMIN_ATMOS_HISTORY_ENSSTAT:COM_ATMOS_HISTORY_TMPL \ - COMIN_ICE_ANALYSIS_ENSSTAT:COM_ICE_ANALYSIS_TMPL \ - COMIN_OCEAN_ANALYSIS_ENSSTAT:COM_OCEAN_ANALYSIS_TMPL \ - COMIN_SNOW_ANALYSIS_ENSSTAT:COM_SNOW_ANALYSIS_TMPL \ - COMIN_CONF:COM_CONF_TMPL + COMIN_ATMOS_ANALYSIS_ENSSTAT:COM_ATMOS_ANALYSIS_TMPL \ + COMIN_ATMOS_HISTORY_ENSSTAT:COM_ATMOS_HISTORY_TMPL \ + COMIN_ICE_ANALYSIS_ENSSTAT:COM_ICE_ANALYSIS_TMPL \ + COMIN_OCEAN_ANALYSIS_ENSSTAT:COM_OCEAN_ANALYSIS_TMPL \ + COMIN_SNOW_ANALYSIS_ENSSTAT:COM_SNOW_ANALYSIS_TMPL \ + COMIN_CONF:COM_CONF_TMPL -RUN=${RUN/enkf} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_ATMOS_HISTORY:COM_ATMOS_HISTORY_TMPL +RUN=${RUN/enkf/} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ + COMIN_ATMOS_HISTORY:COM_ATMOS_HISTORY_TMPL if [[ ! -d ${COMIN_CONF} ]]; then mkdir -p "${COMIN_CONF}"; fi @@ -44,15 +43,17 @@ set_strict ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi - ########################################## # Remove the Temporary working directory ########################################## -cd "${DATAROOT}" || (echo "${DATAROOT} does not exist. ABORT!"; exit 1) +cd "${DATAROOT}" || ( + echo "${DATAROOT} does not exist. ABORT!" + exit 1 +) if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi diff --git a/jobs/JGLOBAL_ENS_ARCHIVE_VRFY b/jobs/JGLOBAL_ENS_ARCHIVE_VRFY index 2e30a1de727..832ff9a0277 100755 --- a/jobs/JGLOBAL_ENS_ARCHIVE_VRFY +++ b/jobs/JGLOBAL_ENS_ARCHIVE_VRFY @@ -2,14 +2,13 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "earc_vrfy" -c "base earc_vrfy" - ############################################## # Set variables used in the script ############################################## MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_ATMOS_ANALYSIS_ENSSTAT:COM_ATMOS_ANALYSIS_TMPL \ - COMIN_ATMOS_HISTORY_ENSSTAT:COM_ATMOS_HISTORY_TMPL \ - COMIN_SNOW_ANALYSIS_ENSSTAT:COM_SNOW_ANALYSIS_TMPL + COMIN_ATMOS_ANALYSIS_ENSSTAT:COM_ATMOS_ANALYSIS_TMPL \ + COMIN_ATMOS_HISTORY_ENSSTAT:COM_ATMOS_HISTORY_TMPL \ + COMIN_SNOW_ANALYSIS_ENSSTAT:COM_SNOW_ANALYSIS_TMPL ############################################################### # Run archive script @@ -30,14 +29,17 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## # Remove the Temporary working directory ########################################## -cd "${DATAROOT}" || (echo "${DATAROOT} does not exist. ABORT!"; exit 1) +cd "${DATAROOT}" || ( + echo "${DATAROOT} does not exist. ABORT!" + exit 1 +) if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi diff --git a/jobs/JGLOBAL_ENS_GLOBUS_ARCH b/jobs/JGLOBAL_ENS_GLOBUS_ARCH index 46ab85b4604..d196f956e1b 100755 --- a/jobs/JGLOBAL_ENS_GLOBUS_ARCH +++ b/jobs/JGLOBAL_ENS_GLOBUS_ARCH @@ -2,13 +2,11 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "globus_earc" -c "base globus earc_groups" - ############################################## # Set variables used in the script ############################################## MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_CONF:COM_CONF_TMPL - + COMIN_CONF:COM_CONF_TMPL ############################################################### # Run globus script @@ -28,11 +26,10 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi - ########################################## # Remove the Temporary working directory ########################################## diff --git a/jobs/JGLOBAL_EXTRACTVARS b/jobs/JGLOBAL_EXTRACTVARS index 03800937ead..72b4f9accaf 100755 --- a/jobs/JGLOBAL_EXTRACTVARS +++ b/jobs/JGLOBAL_EXTRACTVARS @@ -5,9 +5,9 @@ source "${USHgfs}/wave_domain_grid.sh" # Set COM Paths for grid in '0p25' '0p50' '1p00'; do - prod_dir="COMIN_ATMOS_GRIB_${grid}" - GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "${prod_dir}:COM_ATMOS_GRIB_GRID_TMPL" - if [[ ! -d "${!prod_dir}" ]]; then mkdir -p "${!prod_dir}"; fi + prod_dir="COMIN_ATMOS_GRIB_${grid}" + GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "${prod_dir}:COM_ATMOS_GRIB_GRID_TMPL" + if [[ ! -d "${!prod_dir}" ]]; then mkdir -p "${!prod_dir}"; fi done YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx \ @@ -24,17 +24,17 @@ YMD=${PDY} HH=${cyc} GRDRESNAME=${grdNAME} declare_from_tmpl -rx \ "COMIN_WAVE_GRID_${GRDREGION}_${GRDRES}:COM_WAVE_GRID_RES_TMPL" if [[ "${DO_ATM}" == "YES" ]]; then - if [[ ! -d "${ARC_RFCST_PROD_ATMOS_F2D}" ]]; then mkdir -p "${ARC_RFCST_PROD_ATMOS_F2D}"; fi - if [[ ! -d "${ARC_RFCST_PROD_ATMOS_F3D}" ]]; then mkdir -p "${ARC_RFCST_PROD_ATMOS_F3D}"; fi + if [[ ! -d "${ARC_RFCST_PROD_ATMOS_F2D}" ]]; then mkdir -p "${ARC_RFCST_PROD_ATMOS_F2D}"; fi + if [[ ! -d "${ARC_RFCST_PROD_ATMOS_F3D}" ]]; then mkdir -p "${ARC_RFCST_PROD_ATMOS_F3D}"; fi fi if [[ "${DO_OCN}" == "YES" ]]; then - if [[ ! -d "${ARC_RFCST_PROD_OCN}" ]]; then mkdir -p "${ARC_RFCST_PROD_OCN}"; fi + if [[ ! -d "${ARC_RFCST_PROD_OCN}" ]]; then mkdir -p "${ARC_RFCST_PROD_OCN}"; fi fi if [[ "${DO_ICE}" == "YES" ]]; then - if [[ ! -d "${ARC_RFCST_PROD_ICE}" ]]; then mkdir -p "${ARC_RFCST_PROD_ICE}"; fi + if [[ ! -d "${ARC_RFCST_PROD_ICE}" ]]; then mkdir -p "${ARC_RFCST_PROD_ICE}"; fi fi if [[ "${DO_WAVE}" == "YES" ]]; then - if [[ ! -d "${ARC_RFCST_PROD_WAV}" ]]; then mkdir -p "${ARC_RFCST_PROD_WAV}"; fi + if [[ ! -d "${ARC_RFCST_PROD_WAV}" ]]; then mkdir -p "${ARC_RFCST_PROD_WAV}"; fi fi # Execute the Script diff --git a/jobs/JGLOBAL_FETCH b/jobs/JGLOBAL_FETCH index 1eebdc6ed2a..3648bd269da 100755 --- a/jobs/JGLOBAL_FETCH +++ b/jobs/JGLOBAL_FETCH @@ -5,13 +5,13 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "fetch" -c "base fetch" # Execute fetching # Do not export shell opts to the bash scripts in the htar/hsi wrappers export -n SHELLOPTS -"${SCRgfs}/exglobal_fetch.py" +"${SCRgfs}/exglobal_fetch.py" err=$? ############################################################### # Check for errors and exit if any of the above failed if [[ ${err} -ne 0 ]]; then - err_exit "Unable to fetch ICs to ${ROTDIR}; ABORT!" + err_exit "Unable to fetch ICs to ${ROTDIR}; ABORT!" fi ########################################## diff --git a/jobs/JGLOBAL_FORECAST b/jobs/JGLOBAL_FORECAST index 04366caf93f..9a858e31762 100755 --- a/jobs/JGLOBAL_FORECAST +++ b/jobs/JGLOBAL_FORECAST @@ -1,13 +1,13 @@ #! /usr/bin/env bash -if (( 10#${ENSMEM:-0} > 0 )); then - export DATAjob="${DATAROOT}/${RUN}efcs${ENSMEM}.${PDY:-}${cyc}" - export DATA="${DATAjob}/${jobid}" - source "${HOMEgfs}/ush/jjob_header.sh" -e "efcs" -c "base fcst efcs" +if ((10#${ENSMEM:-0} > 0)); then + export DATAjob="${DATAROOT}/${RUN}efcs${ENSMEM}.${PDY:-}${cyc}" + export DATA="${DATAjob}/${jobid}" + source "${HOMEgfs}/ush/jjob_header.sh" -e "efcs" -c "base fcst efcs" else - export DATAjob="${DATAROOT}/${RUN}fcst.${PDY:-}${cyc}" - export DATA="${DATAjob}/${jobid}" - source "${HOMEgfs}/ush/jjob_header.sh" -e "fcst" -c "base fcst" + export DATAjob="${DATAROOT}/${RUN}fcst.${PDY:-}${cyc}" + export DATA="${DATAjob}/${jobid}" + source "${HOMEgfs}/ush/jjob_header.sh" -e "fcst" -c "base fcst" fi # Create the directory to hold restarts and output from the model in stmp @@ -36,69 +36,68 @@ declare -rx gcyc="${GDATE:8:2}" # Construct COM variables from templates (see config.com) YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx \ - COMIN_ATMOS_INPUT:COM_ATMOS_INPUT_TMPL \ - COMOUT_CONF:COM_CONF_TMPL \ - COMOUT_ATMOS_RESTART:COM_ATMOS_RESTART_TMPL \ - COMIN_ATMOS_RESTART:COM_ATMOS_RESTART_TMPL \ - COMOUT_ATMOS_HISTORY:COM_ATMOS_HISTORY_TMPL \ - COMOUT_ATMOS_MASTER:COM_ATMOS_MASTER_TMPL + COMIN_ATMOS_INPUT:COM_ATMOS_INPUT_TMPL \ + COMOUT_CONF:COM_CONF_TMPL \ + COMOUT_ATMOS_RESTART:COM_ATMOS_RESTART_TMPL \ + COMIN_ATMOS_RESTART:COM_ATMOS_RESTART_TMPL \ + COMOUT_ATMOS_HISTORY:COM_ATMOS_HISTORY_TMPL \ + COMOUT_ATMOS_MASTER:COM_ATMOS_MASTER_TMPL RUN="${rCDUMP}" YMD="${gPDY}" HH="${gcyc}" declare_from_tmpl -rx \ - COMIN_ATMOS_RESTART_PREV:COM_ATMOS_RESTART_TMPL + COMIN_ATMOS_RESTART_PREV:COM_ATMOS_RESTART_TMPL # GCAFS/GCDAS uses an offline atmospheric analysis if [[ "${RUN}" =~ "gcafs" ]] || [[ "${RUN}" =~ "gcdas" ]]; then - YMD="${PDY}" HH="${cyc}" RUN="${rCDUMP}" declare_from_tmpl -rx \ - COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL + YMD="${PDY}" HH="${cyc}" RUN="${rCDUMP}" declare_from_tmpl -rx \ + COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL else - # other runs use their own atmospheric analysis - YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx \ - COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL + # other runs use their own atmospheric analysis + YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx \ + COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL fi if [[ "${DO_WAVE}" == "YES" ]]; then - YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx \ - COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \ - COMOUT_WAVE_RESTART:COM_WAVE_RESTART_TMPL \ - COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL - RUN="${rCDUMP}" YMD="${gPDY}" HH="${gcyc}" declare_from_tmpl -rx \ - COMIN_WAVE_RESTART_PREV:COM_WAVE_RESTART_TMPL + YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx \ + COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \ + COMOUT_WAVE_RESTART:COM_WAVE_RESTART_TMPL \ + COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL + RUN="${rCDUMP}" YMD="${gPDY}" HH="${gcyc}" declare_from_tmpl -rx \ + COMIN_WAVE_RESTART_PREV:COM_WAVE_RESTART_TMPL fi if [[ "${DO_OCN}" == "YES" ]]; then - YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx \ - COMIN_OCEAN_ANALYSIS:COM_OCEAN_ANALYSIS_TMPL \ - COMIN_OCEAN_INPUT:COM_OCEAN_INPUT_TMPL \ - COMOUT_MED_RESTART:COM_MED_RESTART_TMPL \ - COMOUT_OCEAN_RESTART:COM_OCEAN_RESTART_TMPL \ - COMOUT_OCEAN_HISTORY:COM_OCEAN_HISTORY_TMPL - RUN="${rCDUMP}" YMD="${gPDY}" HH="${gcyc}" declare_from_tmpl -rx \ - COMIN_OCEAN_RESTART_PREV:COM_OCEAN_RESTART_TMPL \ - COMIN_MED_RESTART_PREV:COM_MED_RESTART_TMPL + YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx \ + COMIN_OCEAN_ANALYSIS:COM_OCEAN_ANALYSIS_TMPL \ + COMIN_OCEAN_INPUT:COM_OCEAN_INPUT_TMPL \ + COMOUT_MED_RESTART:COM_MED_RESTART_TMPL \ + COMOUT_OCEAN_RESTART:COM_OCEAN_RESTART_TMPL \ + COMOUT_OCEAN_HISTORY:COM_OCEAN_HISTORY_TMPL + RUN="${rCDUMP}" YMD="${gPDY}" HH="${gcyc}" declare_from_tmpl -rx \ + COMIN_OCEAN_RESTART_PREV:COM_OCEAN_RESTART_TMPL \ + COMIN_MED_RESTART_PREV:COM_MED_RESTART_TMPL fi if [[ "${DO_ICE}" == "YES" ]]; then - YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx \ - COMIN_ICE_INPUT:COM_ICE_INPUT_TMPL \ - COMIN_ICE_ANALYSIS:COM_ICE_ANALYSIS_TMPL \ - COMOUT_ICE_RESTART:COM_ICE_RESTART_TMPL \ - COMOUT_ICE_HISTORY:COM_ICE_HISTORY_TMPL - RUN="${rCDUMP}" YMD="${gPDY}" HH="${gcyc}" declare_from_tmpl -rx \ - COMIN_ICE_RESTART_PREV:COM_ICE_RESTART_TMPL + YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx \ + COMIN_ICE_INPUT:COM_ICE_INPUT_TMPL \ + COMIN_ICE_ANALYSIS:COM_ICE_ANALYSIS_TMPL \ + COMOUT_ICE_RESTART:COM_ICE_RESTART_TMPL \ + COMOUT_ICE_HISTORY:COM_ICE_HISTORY_TMPL + RUN="${rCDUMP}" YMD="${gPDY}" HH="${gcyc}" declare_from_tmpl -rx \ + COMIN_ICE_RESTART_PREV:COM_ICE_RESTART_TMPL fi if [[ "${DO_AERO_FCST}" == "YES" ]]; then - YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx \ - COMOUT_CHEM_HISTORY:COM_CHEM_HISTORY_TMPL - YMD="${PDY}" HH="${cyc}" RUN="${rCDUMP}" declare_from_tmpl -rx \ - COMIN_TRACER_RESTART:COM_ATMOS_RESTART_TMPL + YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx \ + COMOUT_CHEM_HISTORY:COM_CHEM_HISTORY_TMPL + YMD="${PDY}" HH="${cyc}" RUN="${rCDUMP}" declare_from_tmpl -rx \ + COMIN_TRACER_RESTART:COM_ATMOS_RESTART_TMPL fi - ############################################################### # Run relevant exglobal script ############################################################### -"${FORECASTSH:-${SCRgfs}/exglobal_forecast.sh}" && true # The && true prevents the shell from exiting when set -e +"${FORECASTSH:-${SCRgfs}/exglobal_forecast.sh}" && true # The && true prevents the shell from exiting when set -e export err=$? if [[ ${err} -ne 0 ]]; then err_exit @@ -107,12 +106,12 @@ fi # Send DBN alerts for EnKF # TODO: Should these be in post manager instead? if [[ "${RUN}" =~ "enkf" ]] && [[ "${SENDDBN:-}" == YES ]]; then - for (( fhr = FHOUT; fhr <= FHMAX; fhr + FHOUT )); do - if (( fhr % 3 == 0 )); then - fhr3=$(printf %03i "${fhr}") - "${DBNROOT}/bin/dbn_alert" MODEL GFS_ENKF "${job}" "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.sfcf${fhr3}.nc" - fi - done + for ((fhr = FHOUT; fhr <= FHMAX; fhr + FHOUT)); do + if ((fhr % 3 == 0)); then + fhr3=$(printf %03i "${fhr}") + "${DBNROOT}/bin/dbn_alert" MODEL GFS_ENKF "${job}" "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.sfcf${fhr3}.nc" + fi + done fi ############################################## @@ -122,8 +121,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## @@ -132,15 +131,15 @@ fi cd "${DATAROOT}" || true # do not remove DATAjob. It contains DATAoutput if [[ "${KEEPDATA}" == "NO" ]]; then - rm -rf "${DATA}" - - # Determine if this is the last segment - commas="${FCST_SEGMENTS//[^,]}" - n_segs=${#commas} - if (( n_segs - 1 == ${FCST_SEGMENT:-0} )); then - # Only delete temporary restarts if it is the last segment - rm -rf "${DATArestart}" - fi + rm -rf "${DATA}" + + # Determine if this is the last segment + commas="${FCST_SEGMENTS//[^,]/}" + n_segs=${#commas} + if ((n_segs - 1 == ${FCST_SEGMENT:-0})); then + # Only delete temporary restarts if it is the last segment + rm -rf "${DATArestart}" + fi fi exit 0 diff --git a/jobs/JGLOBAL_GLOBUS_ARCH b/jobs/JGLOBAL_GLOBUS_ARCH index 28b381aef0f..3870dc90418 100755 --- a/jobs/JGLOBAL_GLOBUS_ARCH +++ b/jobs/JGLOBAL_GLOBUS_ARCH @@ -24,11 +24,10 @@ err=$? ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi - ########################################## # Remove the Temporary working directory ########################################## diff --git a/jobs/JGLOBAL_MARINE_ANALYSIS_CHECKPOINT b/jobs/JGLOBAL_MARINE_ANALYSIS_CHECKPOINT index 50bb03e1258..28491144b2c 100755 --- a/jobs/JGLOBAL_MARINE_ANALYSIS_CHECKPOINT +++ b/jobs/JGLOBAL_MARINE_ANALYSIS_CHECKPOINT @@ -5,7 +5,6 @@ export DATAens="${DATAjob}/ensdata" export DATA="${DATAjob}/marineanlvar" source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlchkpt" -c "base marineanl marineanlchkpt" - ############################################## # Set variables used in the script ############################################## @@ -31,8 +30,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi exit 0 diff --git a/jobs/JGLOBAL_MARINE_ANALYSIS_ECEN b/jobs/JGLOBAL_MARINE_ANALYSIS_ECEN index 1e4966a3c69..b67ea8474d1 100755 --- a/jobs/JGLOBAL_MARINE_ANALYSIS_ECEN +++ b/jobs/JGLOBAL_MARINE_ANALYSIS_ECEN @@ -1,6 +1,6 @@ #!/bin/bash -export DATAjob="${DATAROOT/enkf}/marineanalysis.${PDY:-}${cyc}" +export DATAjob="${DATAROOT/enkf/}/marineanalysis.${PDY:-}${cyc}" export DATA="${DATAjob}/marineanlecen" export DATAens="${DATAjob}/ensdata" @@ -17,21 +17,21 @@ export gcyc=${GDATE:8:2} export GDUMP="gdas" RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ - COMIN_OCEAN_HISTORY_PREV:COM_OCEAN_HISTORY_TMPL \ - COMIN_ICE_HISTORY_PREV:COM_ICE_HISTORY_TMPL + COMIN_OCEAN_HISTORY_PREV:COM_OCEAN_HISTORY_TMPL \ + COMIN_ICE_HISTORY_PREV:COM_ICE_HISTORY_TMPL YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ COMIN_OCEAN_HISTORY_ENS_PREV:COM_OCEAN_HISTORY_TMPL \ COMIN_ICE_HISTORY_ENS_PREV:COM_ICE_HISTORY_TMPL RUN=${GDUMP} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMOUT_OCEAN_ANALYSIS:COM_OCEAN_ANALYSIS_TMPL \ - COMIN_ICE_RESTART:COM_ICE_RESTART_TMPL \ - COMOUT_ICE_ANALYSIS:COM_ICE_ANALYSIS_TMPL + COMOUT_OCEAN_ANALYSIS:COM_OCEAN_ANALYSIS_TMPL \ + COMIN_ICE_RESTART:COM_ICE_RESTART_TMPL \ + COMOUT_ICE_ANALYSIS:COM_ICE_ANALYSIS_TMPL export NMEM_ENS_MAX=${NMEM_ENS} if [[ "${RUN}" == "enkfgfs" ]]; then - NMEM_ENS=${NMEM_ENS_GFS} + NMEM_ENS=${NMEM_ENS_GFS} fi ############################################## @@ -55,14 +55,14 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## # Remove the Temporary working directory ########################################## -cd "${DATAROOT/enkf}" && true +cd "${DATAROOT/enkf/}" && true export err=$? if [[ ${err} -ne 0 ]]; then err_exit diff --git a/jobs/JGLOBAL_MARINE_ANALYSIS_FINALIZE b/jobs/JGLOBAL_MARINE_ANALYSIS_FINALIZE index d75f4a21b39..c5ce8515a00 100755 --- a/jobs/JGLOBAL_MARINE_ANALYSIS_FINALIZE +++ b/jobs/JGLOBAL_MARINE_ANALYSIS_FINALIZE @@ -17,15 +17,15 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlfinal" -c "base marineanl ma YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COMIN_OBS:COM_OBS_TMPL YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMOUT_OCEAN_ANALYSIS:COM_OCEAN_ANALYSIS_TMPL \ - COMOUT_ICE_ANALYSIS:COM_ICE_ANALYSIS_TMPL \ - COMOUT_ICE_RESTART:COM_ICE_RESTART_TMPL \ - COMOUT_CONF:COM_CONF_TMPL - -mkdir -m 775 -p "${COMOUT_OCEAN_ANALYSIS}" -mkdir -m 775 -p "${COMOUT_ICE_ANALYSIS}" -mkdir -m 775 -p "${COMOUT_ICE_RESTART}" -mkdir -m 775 -p "${COMOUT_CONF}" + COMOUT_OCEAN_ANALYSIS:COM_OCEAN_ANALYSIS_TMPL \ + COMOUT_ICE_ANALYSIS:COM_ICE_ANALYSIS_TMPL \ + COMOUT_ICE_RESTART:COM_ICE_RESTART_TMPL \ + COMOUT_CONF:COM_CONF_TMPL + +mkdir -m 775 -p "${COMOUT_OCEAN_ANALYSIS}" +mkdir -m 775 -p "${COMOUT_ICE_ANALYSIS}" +mkdir -m 775 -p "${COMOUT_ICE_RESTART}" +mkdir -m 775 -p "${COMOUT_CONF}" ############################################################### # Run relevant script diff --git a/jobs/JGLOBAL_MARINE_ANALYSIS_INITIALIZE b/jobs/JGLOBAL_MARINE_ANALYSIS_INITIALIZE index 95e5ab12385..de8beb20afc 100755 --- a/jobs/JGLOBAL_MARINE_ANALYSIS_INITIALIZE +++ b/jobs/JGLOBAL_MARINE_ANALYSIS_INITIALIZE @@ -5,7 +5,6 @@ export DATAens="${DATAjob}/ensdata" export DATA="${DATAjob}/marineanlvar" source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlinit" -c "base marineanl marineanlinit" - ############################################## # Set variables used in the script ############################################## @@ -22,16 +21,16 @@ export GDUMP=${GDUMP:-"gdas"} # Generate COM variables from templates YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_OBS:COM_OBS_TMPL + COMIN_OBS:COM_OBS_TMPL RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ - COMIN_OCEAN_HISTORY_PREV:COM_OCEAN_HISTORY_TMPL \ - COMIN_ICE_HISTORY_PREV:COM_ICE_HISTORY_TMPL \ - COMIN_ICE_RESTART_PREV:COM_ICE_RESTART_TMPL + COMIN_OCEAN_HISTORY_PREV:COM_OCEAN_HISTORY_TMPL \ + COMIN_ICE_HISTORY_PREV:COM_ICE_HISTORY_TMPL \ + COMIN_ICE_RESTART_PREV:COM_ICE_RESTART_TMPL YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_OCEAN_BMATRIX:COM_OCEAN_BMATRIX_TMPL \ - COMIN_ICE_BMATRIX:COM_ICE_BMATRIX_TMPL + COMIN_OCEAN_BMATRIX:COM_OCEAN_BMATRIX_TMPL \ + COMIN_ICE_BMATRIX:COM_ICE_BMATRIX_TMPL ############################################################### # Run relevant script @@ -50,8 +49,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi exit 0 diff --git a/jobs/JGLOBAL_MARINE_ANALYSIS_LETKF b/jobs/JGLOBAL_MARINE_ANALYSIS_LETKF index 1584bf217b0..0539b8dc355 100755 --- a/jobs/JGLOBAL_MARINE_ANALYSIS_LETKF +++ b/jobs/JGLOBAL_MARINE_ANALYSIS_LETKF @@ -1,7 +1,7 @@ #!/bin/bash # Use ${DATAROOT/enkf} because DATAjob is created by a gdas_marineanlinit job -export DATAjob="${DATAROOT/enkf}/marineanalysis.${PDY:-}${cyc}" +export DATAjob="${DATAROOT/enkf/}/marineanalysis.${PDY:-}${cyc}" export DATA="${DATAjob}/marineanlletkf" export DATAens="${DATAjob}/ensdata" if [[ ! -d "${DATAens}" ]]; then mkdir -p "${DATAens}"; fi @@ -22,26 +22,26 @@ export GDUMP_ENS="enkf${GDUMP}" ec_offset=${NMEM_ENS_GFS_OFFSET:-20} export NMEM_ENS_MAX=${NMEM_ENS} -if [[ "${RUN/enkf}" == "gfs" && "${DOHYBVAR_OCN}" == "YES" ]]; then - NMEM_ENS=${NMEM_ENS_GFS} - export mem_offset=$((ec_offset * cyc/assim_freq)) +if [[ "${RUN/enkf/}" == "gfs" && "${DOHYBVAR_OCN}" == "YES" ]]; then + NMEM_ENS=${NMEM_ENS_GFS} + export mem_offset=$((ec_offset * cyc / assim_freq)) else - export mem_offset=0 + export mem_offset=0 fi RUN="${GDUMP}" YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ - COMIN_OCEAN_HISTORY_PREV:COM_OCEAN_HISTORY_TMPL \ - COMIN_ICE_HISTORY_PREV:COM_ICE_HISTORY_TMPL + COMIN_OCEAN_HISTORY_PREV:COM_OCEAN_HISTORY_TMPL \ + COMIN_ICE_HISTORY_PREV:COM_ICE_HISTORY_TMPL RUN="${GDUMP}" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_OBS:COM_OBS_TMPL \ + COMIN_OBS:COM_OBS_TMPL YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMOUT_OCEAN_LETKF:COM_OCEAN_LETKF_TMPL \ - COMOUT_ICE_LETKF:COM_ICE_LETKF_TMPL + COMOUT_OCEAN_LETKF:COM_OCEAN_LETKF_TMPL \ + COMOUT_ICE_LETKF:COM_ICE_LETKF_TMPL YMD=${PDY} HH=${cyc} MEMDIR="ensstat" declare_from_tmpl -rx \ - COMOUT_CONF:COM_CONF_TMPL + COMOUT_CONF:COM_CONF_TMPL if [[ ! -d ${COMOUT_CONF} ]]; then mkdir -p "${COMOUT_CONF}"; fi ############################################## @@ -65,15 +65,15 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## # Remove the Temporary working directory ########################################## # Use ${DATAROOT/enkf} because DATAjob is created by a gdas_marineanlinit job -cd "${DATAROOT/enkf}" && true +cd "${DATAROOT/enkf/}" && true export err=$? if [[ ${err} -ne 0 ]]; then err_exit diff --git a/jobs/JGLOBAL_MARINE_ANALYSIS_VARIATIONAL b/jobs/JGLOBAL_MARINE_ANALYSIS_VARIATIONAL index 9a97107efa4..6cb9030f851 100755 --- a/jobs/JGLOBAL_MARINE_ANALYSIS_VARIATIONAL +++ b/jobs/JGLOBAL_MARINE_ANALYSIS_VARIATIONAL @@ -10,12 +10,10 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlvar" -c "base marineanl mari # Set variables used in the script ############################################## - ############################################## # Begin JOB SPECIFIC work ############################################## - ############################################################### # Run relevant script @@ -33,8 +31,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi exit 0 diff --git a/jobs/JGLOBAL_MARINE_BMAT b/jobs/JGLOBAL_MARINE_BMAT index 801ee70a457..c5379030f61 100755 --- a/jobs/JGLOBAL_MARINE_BMAT +++ b/jobs/JGLOBAL_MARINE_BMAT @@ -24,13 +24,13 @@ gcyc=${GDATE:8:2} export GDUMP="gdas" export GDUMP_ENS="enkf${GDUMP}" -ec_offset=${NMEM_ENS_GFS_OFFSET:-20} +ec_offset=${NMEM_ENS_GFS_OFFSET:-20} export NMEM_ENS_MAX=${NMEM_ENS} -if [[ "${RUN}" == "gfs" && "${DOHYBVAR_OCN}" == "YES" ]]; then - NMEM_ENS=${NMEM_ENS_GFS} - export mem_offset=$((ec_offset * cyc/assim_freq)) +if [[ "${RUN}" == "gfs" && "${DOHYBVAR_OCN}" == "YES" ]]; then + NMEM_ENS=${NMEM_ENS_GFS} + export mem_offset=$((ec_offset * cyc / assim_freq)) else - export mem_offset=0 + export mem_offset=0 fi ############################################## @@ -39,17 +39,17 @@ fi # Generate COM variables from templates RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ - COMIN_OCEAN_HISTORY_PREV:COM_OCEAN_HISTORY_TMPL \ - COMIN_ICE_HISTORY_PREV:COM_ICE_HISTORY_TMPL + COMIN_OCEAN_HISTORY_PREV:COM_OCEAN_HISTORY_TMPL \ + COMIN_ICE_HISTORY_PREV:COM_ICE_HISTORY_TMPL RUN=${GDUMP_ENS} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ COMIN_OCEAN_HISTORY_ENS_PREV:COM_OCEAN_HISTORY_TMPL \ COMIN_ICE_HISTORY_ENS_PREV:COM_ICE_HISTORY_TMPL YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMOUT_OCEAN_BMATRIX:COM_OCEAN_BMATRIX_TMPL \ - COMOUT_ICE_BMATRIX:COM_ICE_BMATRIX_TMPL \ - COMOUT_CONF:COM_CONF_TMPL + COMOUT_OCEAN_BMATRIX:COM_OCEAN_BMATRIX_TMPL \ + COMOUT_ICE_BMATRIX:COM_ICE_BMATRIX_TMPL \ + COMOUT_CONF:COM_CONF_TMPL mkdir -m 775 -p "${COMOUT_OCEAN_BMATRIX}" mkdir -m 775 -p "${COMOUT_ICE_BMATRIX}" @@ -72,8 +72,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi exit 0 diff --git a/jobs/JGLOBAL_MARINE_BMAT_INITIALIZE b/jobs/JGLOBAL_MARINE_BMAT_INITIALIZE index 81226043e13..470c5b253dc 100755 --- a/jobs/JGLOBAL_MARINE_BMAT_INITIALIZE +++ b/jobs/JGLOBAL_MARINE_BMAT_INITIALIZE @@ -1,6 +1,5 @@ #!/bin/bash - export DATAjob="${DATAROOT}/marineanalysis.${PDY:-}${cyc}" # Create the directory to hold the BMAT initialization data export DATA="${DATAjob}/marinebmat" @@ -24,13 +23,13 @@ gcyc=${GDATE:8:2} export GDUMP="gdas" export GDUMP_ENS="enkf${GDUMP}" -ec_offset=${NMEM_ENS_GFS_OFFSET:-20} +ec_offset=${NMEM_ENS_GFS_OFFSET:-20} export NMEM_ENS_MAX=${NMEM_ENS} -if [[ "${RUN}" == "gfs" && "${DOHYBVAR_OCN}" == "YES" ]]; then - NMEM_ENS=${NMEM_ENS_GFS} - export mem_offset=$((ec_offset * cyc/assim_freq)) +if [[ "${RUN}" == "gfs" && "${DOHYBVAR_OCN}" == "YES" ]]; then + NMEM_ENS=${NMEM_ENS_GFS} + export mem_offset=$((ec_offset * cyc / assim_freq)) else - export mem_offset=0 + export mem_offset=0 fi ############################################## @@ -39,16 +38,16 @@ fi # Generate COM variables from templates RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ - COMIN_OCEAN_HISTORY_PREV:COM_OCEAN_HISTORY_TMPL \ - COMIN_ICE_HISTORY_PREV:COM_ICE_HISTORY_TMPL + COMIN_OCEAN_HISTORY_PREV:COM_OCEAN_HISTORY_TMPL \ + COMIN_ICE_HISTORY_PREV:COM_ICE_HISTORY_TMPL RUN=${GDUMP_ENS} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ COMIN_OCEAN_HISTORY_ENS_PREV:COM_OCEAN_HISTORY_TMPL \ COMIN_ICE_HISTORY_ENS_PREV:COM_ICE_HISTORY_TMPL YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMOUT_OCEAN_BMATRIX:COM_OCEAN_BMATRIX_TMPL \ - COMOUT_ICE_BMATRIX:COM_ICE_BMATRIX_TMPL + COMOUT_OCEAN_BMATRIX:COM_OCEAN_BMATRIX_TMPL \ + COMOUT_ICE_BMATRIX:COM_ICE_BMATRIX_TMPL mkdir -p "${COMOUT_OCEAN_BMATRIX}" mkdir -p "${COMOUT_ICE_BMATRIX}" @@ -69,8 +68,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi exit 0 diff --git a/jobs/JGLOBAL_OCEANICE_PRODUCTS b/jobs/JGLOBAL_OCEANICE_PRODUCTS index 9174c90a8ce..2d7718017ca 100755 --- a/jobs/JGLOBAL_OCEANICE_PRODUCTS +++ b/jobs/JGLOBAL_OCEANICE_PRODUCTS @@ -2,7 +2,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "oceanice_products" -c "base oceanice_products" - ############################################## # Begin JOB SPECIFIC work ############################################## @@ -28,7 +27,7 @@ fi # Final processing ############################################## if [[ -e "${pgmout}" ]]; then - cat "${pgmout}" + cat "${pgmout}" fi ########################################## @@ -39,5 +38,4 @@ if [[ "${KEEPDATA:-NO}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGLOBAL_OFFLINE_ATMOS_ANALYSIS b/jobs/JGLOBAL_OFFLINE_ATMOS_ANALYSIS index eed7a482ead..4e457b185d7 100755 --- a/jobs/JGLOBAL_OFFLINE_ATMOS_ANALYSIS +++ b/jobs/JGLOBAL_OFFLINE_ATMOS_ANALYSIS @@ -21,15 +21,15 @@ export APREFIX="${RUN}.t${cyc}z." export GPREFIX="${GDUMP}.t${gcyc}z." RUN="gdas" DUMP="gdas" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_OBSPROC:COM_OBSPROC_TMPL \ - COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL + COMIN_OBSPROC:COM_OBSPROC_TMPL \ + COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMOUT_OBS:COM_OBS_TMPL \ - COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL + COMOUT_OBS:COM_OBS_TMPL \ + COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ - COMIN_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL + COMIN_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL mkdir -p "${COMOUT_ATMOS_ANALYSIS}" mkdir -p "${COMOUT_OBS}" @@ -40,13 +40,16 @@ ${EXSCRIPT} export err=$? if [[ ${err} -ne 0 ]]; then - err_exit "${EXSCRIPT} returned a non-zero status!" + err_exit "${EXSCRIPT} returned a non-zero status!" fi ########################################## # Remove the Temporary working directory ########################################## -cd "${DATAROOT}" || (echo "${DATAROOT} does not exist. ABORT!"; exit 1) +cd "${DATAROOT}" || ( + echo "${DATAROOT} does not exist. ABORT!" + exit 1 +) if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi diff --git a/jobs/JGLOBAL_PREP_EMISSIONS b/jobs/JGLOBAL_PREP_EMISSIONS index b545547fcb4..72c9d40604b 100755 --- a/jobs/JGLOBAL_PREP_EMISSIONS +++ b/jobs/JGLOBAL_PREP_EMISSIONS @@ -29,8 +29,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi exit 0 diff --git a/jobs/JGLOBAL_PREP_OBS_AERO b/jobs/JGLOBAL_PREP_OBS_AERO index bb303dc117f..7b1d19cf084 100755 --- a/jobs/JGLOBAL_PREP_OBS_AERO +++ b/jobs/JGLOBAL_PREP_OBS_AERO @@ -9,7 +9,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "prepobsaero" -c "base prepobsaero" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COMOUT_OBS:COM_OBS_TMPL YMD=${PDY} HH=${cyc} RUN='gdas' declare_from_tmpl -rx COMIN_OBSPROC:COM_OBSPROC_TMPL - ############################################## # Begin JOB SPECIFIC work ############################################## @@ -31,8 +30,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## diff --git a/jobs/JGLOBAL_PREP_OCEAN_OBS b/jobs/JGLOBAL_PREP_OCEAN_OBS index a2fbd4dc59a..fd51214b4cc 100755 --- a/jobs/JGLOBAL_PREP_OCEAN_OBS +++ b/jobs/JGLOBAL_PREP_OCEAN_OBS @@ -1,7 +1,6 @@ #!/bin/bash source "${HOMEgfs}/ush/jjob_header.sh" -e "prepoceanobs" -c "base marineanl prepoceanobs" - ############################################## # Set variables used in the script ############################################## @@ -22,7 +21,6 @@ if [[ ${err} -ne 0 ]]; then err_exit fi - ############################################## # End JOB SPECIFIC work ############################################## @@ -30,8 +28,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## @@ -39,7 +37,7 @@ fi ########################################## cd "${DATAROOT}" || true if [[ "${KEEPDATA}" == "NO" ]]; then - rm -rf "${DATA}" + rm -rf "${DATA}" fi exit 0 diff --git a/jobs/JGLOBAL_SNOWENS_ANALYSIS b/jobs/JGLOBAL_SNOWENS_ANALYSIS index 6ee69c360d1..fef9a4aa92c 100755 --- a/jobs/JGLOBAL_SNOWENS_ANALYSIS +++ b/jobs/JGLOBAL_SNOWENS_ANALYSIS @@ -9,15 +9,15 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "esnowanl" -c "base esnowanl" # shellcheck disable=SC2153 GDUMP="gdas" export GDUMP -CDUMP=${RUN/enkf} +CDUMP=${RUN/enkf/} export CDUMP export NMEM_ENS_MAX=${NMEM_ENS} if [[ "${RUN}" == "enkfgfs" ]]; then - NMEM_ENS=${NMEM_ENS_GFS} - export mem_offset=$((NMEM_ENS_GFS_OFFSET * cyc/assim_freq)) + NMEM_ENS=${NMEM_ENS_GFS} + export mem_offset=$((NMEM_ENS_GFS_OFFSET * cyc / assim_freq)) else - export mem_offset=0 + export mem_offset=0 fi ############################################## # Begin JOB SPECIFIC work @@ -36,8 +36,7 @@ for imem in $(seq 1 "${NMEM_ENS}"); do mkdir -p "${COMOUT_SNOW_ANALYSIS}" done -MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -x\ - COMOUT_SNOW_ANALYSIS:COM_SNOW_ANALYSIS_TMPL +MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -x COMOUT_SNOW_ANALYSIS:COM_SNOW_ANALYSIS_TMPL mkdir -p "${COMOUT_SNOW_ANALYSIS}" "${COMOUT_CONF}" @@ -58,8 +57,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## diff --git a/jobs/JGLOBAL_SNOW_ANALYSIS b/jobs/JGLOBAL_SNOW_ANALYSIS index fde1c038d55..5bd19608a16 100755 --- a/jobs/JGLOBAL_SNOW_ANALYSIS +++ b/jobs/JGLOBAL_SNOW_ANALYSIS @@ -43,8 +43,8 @@ fi ############################################## # Final processing ############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" +if [[ -e "${pgmout}" ]]; then + cat "${pgmout}" fi ########################################## diff --git a/jobs/JGLOBAL_STAGE_IC b/jobs/JGLOBAL_STAGE_IC index a14a34a9ec8..6a2f9571166 100755 --- a/jobs/JGLOBAL_STAGE_IC +++ b/jobs/JGLOBAL_STAGE_IC @@ -9,14 +9,17 @@ err=$? ############################################################### # Check for errors and exit if any of the above failed if [[ "${err}" -ne 0 ]]; then - echo "Unable to stage ICs to ${ROTDIR}; ABORT!" - exit "${err}" + echo "Unable to stage ICs to ${ROTDIR}; ABORT!" + exit "${err}" fi ########################################## # Remove the Temporary working directory ########################################## -cd "${DATAROOT}" || (echo "${DATAROOT} does not exist. ABORT!"; exit 1) +cd "${DATAROOT}" || ( + echo "${DATAROOT} does not exist. ABORT!" + exit 1 +) if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi diff --git a/jobs/JGLOBAL_WAVE_GEMPAK b/jobs/JGLOBAL_WAVE_GEMPAK index 4b86373b1f3..288a2643a38 100755 --- a/jobs/JGLOBAL_WAVE_GEMPAK +++ b/jobs/JGLOBAL_WAVE_GEMPAK @@ -9,14 +9,14 @@ source "${USHgfs}/wave_domain_grid.sh" export DBN_ALERT_TYPE=GFS_WAVE_GEMPAK YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMOUT_WAVE_GEMPAK:COM_WAVE_GEMPAK_TMPL + COMOUT_WAVE_GEMPAK:COM_WAVE_GEMPAK_TMPL if [[ -n "${GEMPAK_GRIDS}" ]]; then - for grdID in ${GEMPAK_GRIDS}; do - process_grdID "${grdID}" - YMD=${PDY} HH=${cyc} GRDRESNAME=${grdNAME} declare_from_tmpl -rx \ - "COMIN_WAVE_GRID_${GRDREGION}_${GRDRES}:COM_WAVE_GRID_RES_TMPL" - done + for grdID in ${GEMPAK_GRIDS}; do + process_grdID "${grdID}" + YMD=${PDY} HH=${cyc} GRDRESNAME=${grdNAME} declare_from_tmpl -rx \ + "COMIN_WAVE_GRID_${GRDREGION}_${GRDRES}:COM_WAVE_GRID_RES_TMPL" + done else echo "'GEMPAK_GRIDS' is empty. No grids to process." fi @@ -35,7 +35,7 @@ fi # Remove temp directories cd "${DATAROOT}" || true if [[ "${KEEPDATA}" != "YES" ]]; then - rm -rf "${DATA}" + rm -rf "${DATA}" fi exit 0 diff --git a/jobs/JGLOBAL_WAVE_INIT b/jobs/JGLOBAL_WAVE_INIT index eaeb53eb659..d97d6887a88 100755 --- a/jobs/JGLOBAL_WAVE_INIT +++ b/jobs/JGLOBAL_WAVE_INIT @@ -26,7 +26,7 @@ fi ########################################## cd "${DATAROOT}" || true if [[ "${KEEPDATA}" != "YES" ]]; then - rm -rf "${DATA}" + rm -rf "${DATA}" fi exit 0 diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNT b/jobs/JGLOBAL_WAVE_POST_BNDPNT index 725fc93faa9..0cc1606062f 100755 --- a/jobs/JGLOBAL_WAVE_POST_BNDPNT +++ b/jobs/JGLOBAL_WAVE_POST_BNDPNT @@ -6,24 +6,24 @@ export MP_PULSE=0 # Set COM Paths YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \ - COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \ - COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL + COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \ + COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \ + COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then mkdir -p "${COMOUT_WAVE_STATION}"; fi export CFP_VERBOSE=1 export FHMAX_WAV_PNT=${FHMAX_WAV_IBP} -export DOSPC_WAV='YES' # Spectral post -export DOBLL_WAV='NO' # Bulletin post -export DOBNDPNT_WAV='YES' # Boundary points +export DOSPC_WAV='YES' # Spectral post +export DOBLL_WAV='NO' # Bulletin post +export DOBNDPNT_WAV='YES' # Boundary points # Execute the Script "${SCRgfs}/exgfs_wave_post_pnt.sh" && true export err=$? if [[ ${err} -ne 0 ]]; then - err_exit "ex-script of JGLOBAL_WAVE_POST_BNDPNT failed!" + err_exit "ex-script of JGLOBAL_WAVE_POST_BNDPNT failed!" fi ########################################## @@ -34,5 +34,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL index aae12a63259..a895c056f36 100755 --- a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL +++ b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL @@ -8,18 +8,18 @@ export MP_PULSE=0 # Set COM Paths YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \ - COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \ - COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL + COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \ + COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \ + COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then mkdir -p "${COMOUT_WAVE_STATION}"; fi export CFP_VERBOSE=1 export FHMAX_WAV_PNT=${FHMAX_WAV_IBP} -export DOSPC_WAV='NO' # Spectral post -export DOBLL_WAV='YES' # Bulletin post -export DOBNDPNT_WAV='YES' # Boundary points +export DOSPC_WAV='NO' # Spectral post +export DOBLL_WAV='YES' # Bulletin post +export DOBNDPNT_WAV='YES' # Boundary points # Execute the Script "${SCRgfs}/exgfs_wave_post_pnt.sh" && true @@ -36,5 +36,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGLOBAL_WAVE_POST_PNT b/jobs/JGLOBAL_WAVE_POST_PNT index 40b51c243dd..aa1f7f593f1 100755 --- a/jobs/JGLOBAL_WAVE_POST_PNT +++ b/jobs/JGLOBAL_WAVE_POST_PNT @@ -6,25 +6,24 @@ export MP_PULSE=0 # Set COM Paths YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \ - COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \ - COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL + COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \ + COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \ + COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then mkdir -p "${COMOUT_WAVE_STATION}"; fi export CFP_VERBOSE=1 -export FHMAX_WAV_PNT=$(( FHMAX_WAV - OFFSET_START_HOUR )) -export DOSPC_WAV='YES' # Spectral post -export DOBLL_WAV='YES' # Bulletin post -export DOBNDPNT_WAV='NO' #not boundary points - +export FHMAX_WAV_PNT=$((FHMAX_WAV - OFFSET_START_HOUR)) +export DOSPC_WAV='YES' # Spectral post +export DOBLL_WAV='YES' # Bulletin post +export DOBNDPNT_WAV='NO' #not boundary points # Execute the Script "${SCRgfs}/exgfs_wave_post_pnt.sh" && true export err=$? if [[ ${err} -ne 0 ]]; then - err_exit "ex-script of JGLOBAL_WAVE_POST_PNT failed!" + err_exit "ex-script of JGLOBAL_WAVE_POST_PNT failed!" fi ########################################## @@ -35,5 +34,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGLOBAL_WAVE_POST_SBS b/jobs/JGLOBAL_WAVE_POST_SBS index f643509269d..690614e5e04 100755 --- a/jobs/JGLOBAL_WAVE_POST_SBS +++ b/jobs/JGLOBAL_WAVE_POST_SBS @@ -12,23 +12,23 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ if [[ ! -d "${COMOUT_WAVE_GRID}" ]]; then mkdir -p "${COMOUT_WAVE_GRID}"; fi if [[ -n "${wavepostGRD}" || -n "${waveinterpGRD}" ]]; then - for grdID in ${wavepostGRD} ${waveinterpGRD}; do - process_grdID "${grdID}" - YMD=${PDY} HH=${cyc} GRDRESNAME=${grdNAME} declare_from_tmpl -rx \ - "COMOUT_WAVE_GRID_${GRDREGION}_${GRDRES}:COM_WAVE_GRID_RES_TMPL" - out_dir_varname="COMOUT_WAVE_GRID_${GRDREGION}_${GRDRES}" - out_dir=${!out_dir_varname} - if [[ ! -d "${out_dir}" ]]; then mkdir -p "${out_dir}"; fi - done + for grdID in ${wavepostGRD} ${waveinterpGRD}; do + process_grdID "${grdID}" + YMD=${PDY} HH=${cyc} GRDRESNAME=${grdNAME} declare_from_tmpl -rx \ + "COMOUT_WAVE_GRID_${GRDREGION}_${GRDRES}:COM_WAVE_GRID_RES_TMPL" + out_dir_varname="COMOUT_WAVE_GRID_${GRDREGION}_${GRDRES}" + out_dir=${!out_dir_varname} + if [[ ! -d "${out_dir}" ]]; then mkdir -p "${out_dir}"; fi + done else - echo "Both wavepostGRD and waveinterpGRD are empty. No grids to process." + echo "Both wavepostGRD and waveinterpGRD are empty. No grids to process." fi # Execute the Script "${SCRgfs}/exgfs_wave_post_gridded_sbs.sh" && true export err=$? if [[ ${err} -ne 0 ]]; then - err_exit "ex-script of gridded wave post failed!" + err_exit "ex-script of gridded wave post failed!" fi ########################################## @@ -36,7 +36,7 @@ fi ########################################## cd "${DATAROOT}" || true if [[ "${KEEPDATA}" != "YES" ]]; then - rm -rf "${DATA}" + rm -rf "${DATA}" fi exit 0 diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS index f41e490df66..bee46d165e3 100755 --- a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS +++ b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS @@ -25,8 +25,7 @@ fi # Remove temp directories cd "${DATAROOT}" || true if [[ "${KEEPDATA}" != "YES" ]]; then - rm -rf "${DATA}" + rm -rf "${DATA}" fi - exit 0 diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED index 5c89ce42941..316c601534c 100755 --- a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED +++ b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED @@ -14,7 +14,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ if [[ ! -d "${COMOUT_WAVE_WMO}" ]]; then mkdir -p "${COMOUT_WAVE_WMO}"; fi if [[ -n "${GEMPAK_GRIDS}" ]]; then - for grdID in ${GEMPAK_GRIDS}; do + for grdID in ${GEMPAK_GRIDS}; do process_grdID "${grdID}" YMD=${PDY} HH=${cyc} GRDRESNAME=${grdNAME} declare_from_tmpl -rx \ "COMIN_WAVE_GRID_${GRDREGION}_${GRDRES}:COM_WAVE_GRID_RES_TMPL" @@ -37,7 +37,7 @@ fi ################################### cd "${DATAROOT}" || true if [[ "${KEEPDATA}" != "YES" ]]; then - rm -rf "${DATA}" + rm -rf "${DATA}" fi exit 0 diff --git a/jobs/JGLOBAL_WAVE_PREP b/jobs/JGLOBAL_WAVE_PREP index 683b9237f5e..7ecf936a73c 100755 --- a/jobs/JGLOBAL_WAVE_PREP +++ b/jobs/JGLOBAL_WAVE_PREP @@ -13,10 +13,10 @@ export CDO=${CDO_ROOT}/bin/cdo # Set COM Paths YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ - COMIN_OBS:COM_OBS_TMPL \ - COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \ - COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL \ - COMINrtofs:COM_RTOFS_TMPL + COMIN_OBS:COM_OBS_TMPL \ + COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \ + COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL \ + COMINrtofs:COM_RTOFS_TMPL if [[ ! -d ${COMOUT_WAVE_PREP} ]]; then mkdir -p "${COMOUT_WAVE_PREP}"; fi # Execute the Script @@ -35,5 +35,4 @@ if [[ "${KEEPDATA}" == "NO" ]]; then rm -rf "${DATA}" fi - exit 0 From 651d28bc20c5af43e889b11167e454ded60d1502 Mon Sep 17 00:00:00 2001 From: "Walter.Kolczynski" Date: Fri, 3 Oct 2025 03:32:34 +0000 Subject: [PATCH 3/4] Convert = to == in jjob test statements --- jobs/JGDAS_ENKF_DIAG | 4 ++-- jobs/JGDAS_ENKF_SELECT_OBS | 4 ++-- jobs/JGFS_ATMOS_VERIFICATION | 2 +- jobs/JGLOBAL_ATMOS_ANALYSIS | 6 +++--- jobs/JGLOBAL_ATMOS_ANALYSIS_CALC | 2 +- jobs/JGLOBAL_ATMOS_ANALYSIS_CALC_FV3JEDI | 2 +- jobs/JGLOBAL_ENS_GLOBUS_ARCH | 2 +- jobs/JGLOBAL_FORECAST | 2 +- jobs/JGLOBAL_GLOBUS_ARCH | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jobs/JGDAS_ENKF_DIAG b/jobs/JGDAS_ENKF_DIAG index b71ee49f2d6..8ef29061568 100755 --- a/jobs/JGDAS_ENKF_DIAG +++ b/jobs/JGDAS_ENKF_DIAG @@ -38,7 +38,7 @@ MEMDIR="ensstat" RUN=${GDUMP_ENS} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ export ATMGES_ENSMEAN="${COMIN_ATMOS_HISTORY_PREV}/${GPREFIX}atmf006.ensmean.nc" if [[ ! -f "${ATMGES_ENSMEAN}" ]]; then export err=1 - err_exit "FILE MISSING: ATMGES_ENSMEAN = ${ATMGES_ENSMEAN}" + err_exit "FILE MISSING: ATMGES_ENSMEAN == ${ATMGES_ENSMEAN}" fi # Link observational data @@ -47,7 +47,7 @@ if [[ ! -f ${PREPQC} ]]; then echo "WARNING: Global PREPBUFR FILE ${PREPQC} MISSING" fi export TCVITL="${COMIN_OBS}/${OPREFIX}syndata.tcvitals.tm00" -if [[ ${DONST} = "YES" ]]; then +if [[ ${DONST} == "YES" ]]; then export NSSTBF="${COMIN_OBS}/${OPREFIX}nsstbufr" fi export PREPQCPF="${COMIN_OBS}/${OPREFIX}prepbufr.acft_profiles" diff --git a/jobs/JGDAS_ENKF_SELECT_OBS b/jobs/JGDAS_ENKF_SELECT_OBS index 0542a750930..2cca77e6103 100755 --- a/jobs/JGDAS_ENKF_SELECT_OBS +++ b/jobs/JGDAS_ENKF_SELECT_OBS @@ -46,7 +46,7 @@ mkdir -p "${COMOUT_ATMOS_ANALYSIS}" export ATMGES_ENSMEAN="${COMIN_ATMOS_HISTORY_PREV}/${GPREFIX}atmf006${GSUFFIX}" if [[ ! -f ${ATMGES_ENSMEAN} ]]; then export err=1 - err_exit "FILE MISSING: ATMGES_ENSMEAN = ${ATMGES_ENSMEAN}" + err_exit "FILE MISSING: ATMGES_ENSMEAN == ${ATMGES_ENSMEAN}" fi LEVS=$(${NCLEN} "${ATMGES}" pfull) && true @@ -61,7 +61,7 @@ if [[ ! -f ${PREPQC} ]]; then echo "WARNING: Global PREPBUFR FILE ${PREPQC} MISSING" fi export TCVITL="${COMIN_OBS}/${APREFIX_DET}syndata.tcvitals.tm00" -if [[ ${DONST} = "YES" ]]; then +if [[ ${DONST} == "YES" ]]; then export NSSTBF="${COMIN_OBS}/${OPREFIX}nsstbufr" fi export PREPQCPF="${COMIN_OBS}/${OPREFIX}prepbufr.acft_profiles" diff --git a/jobs/JGFS_ATMOS_VERIFICATION b/jobs/JGFS_ATMOS_VERIFICATION index 31e56f24172..e15020e2aec 100755 --- a/jobs/JGFS_ATMOS_VERIFICATION +++ b/jobs/JGFS_ATMOS_VERIFICATION @@ -38,4 +38,4 @@ if [[ "${RUN_GRID2GRID_STEP1}" == "YES" || "${RUN_GRID2OBS_STEP1}" == "YES" || " fi fi -if [[ ${KEEPDATA:-"NO"} = "NO" ]]; then rm -rf "${DATAROOT}"; fi # TODO: This should be $DATA +if [[ ${KEEPDATA:-"NO"} == "NO" ]]; then rm -rf "${DATAROOT}"; fi # TODO: This should be $DATA diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS b/jobs/JGLOBAL_ATMOS_ANALYSIS index f675c90bc16..8598f281b83 100755 --- a/jobs/JGLOBAL_ATMOS_ANALYSIS +++ b/jobs/JGLOBAL_ATMOS_ANALYSIS @@ -41,7 +41,7 @@ mkdir -p "${COMOUT_ATMOS_ANALYSIS}" export ATMGES="${COMIN_ATMOS_HISTORY_PREV}/${GPREFIX}atmf006.nc" if [[ ! -f "${ATMGES}" ]]; then export err=1 - err_exit "FILE MISSING: ATMGES = ${ATMGES}" + err_exit "FILE MISSING: ATMGES == ${ATMGES}" fi # Get LEVS @@ -56,7 +56,7 @@ if [[ "${DOHYBVAR}" == "YES" ]]; then export ATMGES_ENSMEAN="${COMIN_ATMOS_HISTORY_ENS_PREV}/${GPREFIX_ENS}atmf006.ensmean.nc" if [[ ! -f "${ATMGES_ENSMEAN}" ]]; then export err=2 - err_exit "FILE MISSING: ATMGES_ENSMEAN = ${ATMGES_ENSMEAN}" + err_exit "FILE MISSING: ATMGES_ENSMEAN == ${ATMGES_ENSMEAN}" fi fi @@ -66,7 +66,7 @@ if [[ ! -f ${PREPQC} ]]; then echo "WARNING: Global PREPBUFR FILE ${PREPQC} MISSING" fi export TCVITL="${COMIN_OBS}/${OPREFIX}syndata.tcvitals.tm00" -if [[ ${DONST} = "YES" ]]; then +if [[ ${DONST} == "YES" ]]; then export NSSTBF="${COMIN_OBS}/${OPREFIX}nsstbufr" fi export PREPQCPF="${COMIN_OBS}/${OPREFIX}prepbufr.acft_profiles" diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC b/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC index 82c6b11c9e2..4d1bed36a9d 100755 --- a/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC +++ b/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC @@ -37,7 +37,7 @@ RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ export ATMGES="${COMIN_ATMOS_HISTORY_PREV}/${GPREFIX}atmf006.nc" if [[ ! -f "${ATMGES}" ]]; then export err=1 - err_exit "FILE MISSING: ATMGES = ${ATMGES}" + err_exit "FILE MISSING: ATMGES == ${ATMGES}" fi # Get LEVS diff --git a/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC_FV3JEDI b/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC_FV3JEDI index dde79e32c95..83da8f5dd88 100755 --- a/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC_FV3JEDI +++ b/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC_FV3JEDI @@ -65,7 +65,7 @@ if [[ ${err} -ne 0 ]]; then err_exit "${DATAROOT} does not exist, ABORT!" fi set_trace -if [[ ${KEEPDATA} = "NO" ]]; then +if [[ ${KEEPDATA} == "NO" ]]; then rm -rf "${DATA}" fi diff --git a/jobs/JGLOBAL_ENS_GLOBUS_ARCH b/jobs/JGLOBAL_ENS_GLOBUS_ARCH index d196f956e1b..6a6924383dd 100755 --- a/jobs/JGLOBAL_ENS_GLOBUS_ARCH +++ b/jobs/JGLOBAL_ENS_GLOBUS_ARCH @@ -34,6 +34,6 @@ fi # Remove the Temporary working directory ########################################## cd "${DATAROOT}" || true -[[ ${KEEPDATA} = "NO" ]] && rm -rf "${DATA}" +[[ ${KEEPDATA} == "NO" ]] && rm -rf "${DATA}" exit 0 diff --git a/jobs/JGLOBAL_FORECAST b/jobs/JGLOBAL_FORECAST index 9a858e31762..f66f26c68b6 100755 --- a/jobs/JGLOBAL_FORECAST +++ b/jobs/JGLOBAL_FORECAST @@ -106,7 +106,7 @@ fi # Send DBN alerts for EnKF # TODO: Should these be in post manager instead? if [[ "${RUN}" =~ "enkf" ]] && [[ "${SENDDBN:-}" == YES ]]; then - for ((fhr = FHOUT; fhr <= FHMAX; fhr + FHOUT)); do + for ((fhr == FHOUT; fhr <= FHMAX; fhr + FHOUT)); do if ((fhr % 3 == 0)); then fhr3=$(printf %03i "${fhr}") "${DBNROOT}/bin/dbn_alert" MODEL GFS_ENKF "${job}" "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.sfcf${fhr3}.nc" diff --git a/jobs/JGLOBAL_GLOBUS_ARCH b/jobs/JGLOBAL_GLOBUS_ARCH index 3870dc90418..61bb7bdb8cc 100755 --- a/jobs/JGLOBAL_GLOBUS_ARCH +++ b/jobs/JGLOBAL_GLOBUS_ARCH @@ -32,6 +32,6 @@ fi # Remove the Temporary working directory ########################################## cd "${DATAROOT}" || true -[[ ${KEEPDATA} = "NO" ]] && rm -rf "${DATA}" +[[ ${KEEPDATA} == "NO" ]] && rm -rf "${DATA}" exit 0 From 395d02c581955ab0d30e547a3aa4953ed63f5b27 Mon Sep 17 00:00:00 2001 From: "Walter.Kolczynski" Date: Mon, 6 Oct 2025 06:23:29 +0000 Subject: [PATCH 4/4] Remove unnecessary directory checks and prefer normal test --- jobs/JGFS_ATMOS_GEMPAK | 18 +++++++++--------- jobs/JGFS_ATMOS_GEMPAK_META | 8 +++----- jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF | 2 +- jobs/JGLOBAL_ATMOS_ENSSTAT | 2 +- jobs/JGLOBAL_ATMOS_PRODUCTS | 2 +- jobs/JGLOBAL_ATMOS_TROPCY_QC_RELOC | 6 ++---- jobs/JGLOBAL_ATMOS_UPP | 2 +- jobs/JGLOBAL_ATMOS_VMINMON | 2 +- jobs/JGLOBAL_ENS_ARCHIVE_TARS | 2 +- jobs/JGLOBAL_EXTRACTVARS | 12 ++++++------ jobs/JGLOBAL_WAVE_POST_BNDPNT | 2 +- jobs/JGLOBAL_WAVE_POST_BNDPNTBLL | 2 +- jobs/JGLOBAL_WAVE_POST_PNT | 2 +- jobs/JGLOBAL_WAVE_POST_SBS | 4 ++-- jobs/JGLOBAL_WAVE_PRDGEN_BULLS | 2 +- jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED | 2 +- 16 files changed, 33 insertions(+), 37 deletions(-) diff --git a/jobs/JGFS_ATMOS_GEMPAK b/jobs/JGFS_ATMOS_GEMPAK index 51e78c22714..29fd97b5faf 100755 --- a/jobs/JGFS_ATMOS_GEMPAK +++ b/jobs/JGFS_ATMOS_GEMPAK @@ -39,7 +39,7 @@ fi ################################################################## fhmin=0 fhmax=240 -if ((fhr >= fhmin && fhr <= fhmax)); then +if [[ "${fhr}" -ge "${fhmin}" ]] && [[ "${fhr}" -le "${fhmax}" ]]; then if ((fhr % 3 == 0)); then "${SCRgfs}/exgfs_atmos_nawips.sh" "1p00" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_1p00}" && true export err=$? @@ -51,7 +51,7 @@ fi fhmin=252 fhmax=384 -if ((fhr >= fhmin && fhr <= fhmax)); then +if [[ "${fhr}" -ge "${fhmin}" ]] && [[ "${fhr}" -le "${fhmax}" ]]; then if ((fhr % 12 == 0)); then "${SCRgfs}/exgfs_atmos_nawips.sh" "1p00" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_1p00}" && true export err=$? @@ -66,7 +66,7 @@ fi ################################################################## fhmin=0 fhmax=240 -if ((fhr >= fhmin && fhr <= fhmax)); then +if [[ "${fhr}" -ge "${fhmin}" ]] && [[ "${fhr}" -le "${fhmax}" ]]; then if ((fhr % 3 == 0)); then "${SCRgfs}/exgfs_atmos_nawips.sh" "0p50" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_0p50}" && true export err=$? @@ -78,7 +78,7 @@ fi fhmin=246 fhmax=276 -if ((fhr >= fhmin && fhr <= fhmax)); then +if [[ "${fhr}" -ge "${fhmin}" ]] && [[ "${fhr}" -le "${fhmax}" ]]; then if ((fhr % 6 == 0)); then "${SCRgfs}/exgfs_atmos_nawips.sh" "0p50" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_0p50}" && true export err=$? @@ -90,7 +90,7 @@ fi fhmin=288 fhmax=384 -if ((fhr >= fhmin && fhr <= fhmax)); then +if [[ "${fhr}" -ge "${fhmin}" ]] && [[ "${fhr}" -le "${fhmax}" ]]; then if ((fhr % 12 == 0)); then "${SCRgfs}/exgfs_atmos_nawips.sh" "0p50" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_0p50}" && true export err=$? @@ -105,7 +105,7 @@ fi #################################################################### fhmin=0 fhmax=120 -if ((fhr >= fhmin && fhr <= fhmax)); then +if [[ "${fhr}" -ge "${fhmin}" ]] && [[ "${fhr}" -le "${fhmax}" ]]; then if ((fhr % 1 == 0)); then "${SCRgfs}/exgfs_atmos_nawips.sh" "0p25" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_0p25}" && true export err=$? @@ -117,7 +117,7 @@ fi fhmin=123 fhmax=240 -if ((fhr >= fhmin && fhr <= fhmax)); then +if [[ "${fhr}" -ge "${fhmin}" ]] && [[ "${fhr}" -le "${fhmax}" ]]; then if ((fhr % 3 == 0)); then "${SCRgfs}/exgfs_atmos_nawips.sh" "0p25" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_0p25}" && true export err=$? @@ -129,7 +129,7 @@ fi fhmin=252 fhmax=384 -if ((fhr >= fhmin && fhr <= fhmax)); then +if [[ "${fhr}" -ge "${fhmin}" ]] && [[ "${fhr}" -le "${fhmax}" ]]; then if ((fhr % 12 == 0)); then "${SCRgfs}/exgfs_atmos_nawips.sh" "0p25" "${FHR3}" "GFS_GEMPAK" "${COMOUT_ATMOS_GEMPAK_0p25}" && true export err=$? @@ -144,7 +144,7 @@ fi ##################################################################### fhmin=0 fhmax="${ocean_domain_max}" -if ((fhr >= fhmin && fhr <= fhmax)); then +if [[ "${fhr}" -ge "${fhmin}" ]] && [[ "${fhr}" -le "${fhmax}" ]]; then if ((fhr % 3 == 0)); then "${SCRgfs}/exgfs_atmos_nawips.sh" "35km_pac" "${FHR3}" "GFS_GEMPAK_WWB" "${COMOUT_ATMOS_GEMPAK_35km_pac}" && true export err=$? diff --git a/jobs/JGFS_ATMOS_GEMPAK_META b/jobs/JGFS_ATMOS_GEMPAK_META index 814cf0fd9c3..3537ecf93f4 100755 --- a/jobs/JGFS_ATMOS_GEMPAK_META +++ b/jobs/JGFS_ATMOS_GEMPAK_META @@ -25,8 +25,8 @@ export fhbeg=0 export fhend=384 export fhinc=12 -if ((fhend > FHMAX_GFS)); then - export fhend=${FHMAX_GFS} +if [[ "${fhend}" -gt "${FHMAX_GFS}" ]]; then + export fhend="${FHMAX_GFS}" fi export COMPONENT="atmos" @@ -46,9 +46,7 @@ export COMINnam=${COMINnam:-$(compath.py "${envir}/nam/${nam_ver}")/nam} GRID=1p00 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMIN_ATMOS_GEMPAK_1p00:COM_ATMOS_GEMPAK_TMPL" GRID="meta" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMOUT_ATMOS_GEMPAK_META:COM_ATMOS_GEMPAK_TMPL" -if [[ ! -d "${COMOUT_ATMOS_GEMPAK_META}" ]]; then - mkdir -m 775 -p "${COMOUT_ATMOS_GEMPAK_META}" -fi +mkdir -m 775 -p "${COMOUT_ATMOS_GEMPAK_META}" ######################################################## # Execute the script. diff --git a/jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF b/jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF index 668a0dd1ada..064a3447bf1 100755 --- a/jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF +++ b/jobs/JGFS_ATMOS_GEMPAK_NCDC_UPAPGIF @@ -11,7 +11,7 @@ export MP_TIMEOUT=2000 # Set up model and cycle specific variables export MODEL=GFS export fend=384 -if ((fend > FHMAX_GFS)); then +if [[ "${fend}" -gt "${FHMAX_GFS}" ]]; then export fend="${FHMAX_GFS}" fi diff --git a/jobs/JGLOBAL_ATMOS_ENSSTAT b/jobs/JGLOBAL_ATMOS_ENSSTAT index ab460b1cd11..e11a9db67bc 100755 --- a/jobs/JGLOBAL_ATMOS_ENSSTAT +++ b/jobs/JGLOBAL_ATMOS_ENSSTAT @@ -16,7 +16,7 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "atmos_ensstat" -c "base atmos_ensstat for grid in '0p25' '0p50' '1p00'; do prod_dir="COMOUT_ATMOS_GRIB_${grid}" MEMDIR="ensstat" GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "${prod_dir}:COM_ATMOS_GRIB_GRID_TMPL" - if [[ ! -d "${!prod_dir}" ]]; then mkdir -m 775 -p "${!prod_dir}"; fi + mkdir -m 775 -p "${!prod_dir}" done ############################################################### diff --git a/jobs/JGLOBAL_ATMOS_PRODUCTS b/jobs/JGLOBAL_ATMOS_PRODUCTS index 9096b822242..8625d8e9a3d 100755 --- a/jobs/JGLOBAL_ATMOS_PRODUCTS +++ b/jobs/JGLOBAL_ATMOS_PRODUCTS @@ -15,7 +15,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ for grid in '0p25' '0p50' '1p00'; do prod_dir="COMOUT_ATMOS_GRIB_${grid}" GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "${prod_dir}:COM_ATMOS_GRIB_GRID_TMPL" - if [[ ! -d "${!prod_dir}" ]]; then mkdir -m 775 -p "${!prod_dir}"; fi + mkdir -m 775 -p "${!prod_dir}" done # Variables used in this job diff --git a/jobs/JGLOBAL_ATMOS_TROPCY_QC_RELOC b/jobs/JGLOBAL_ATMOS_TROPCY_QC_RELOC index fa0cde8057b..21d948c3ca2 100755 --- a/jobs/JGLOBAL_ATMOS_TROPCY_QC_RELOC +++ b/jobs/JGLOBAL_ATMOS_TROPCY_QC_RELOC @@ -11,7 +11,7 @@ export DO_RELOCATE=${DO_RELOCATE:-NO} # Turn on tropical cyclone relocati export tmmark=tm00 export ARCHSYND=${ROTDIR}/syndat # this location is unique, do not change -if [[ ! -d "${ARCHSYND}" ]]; then mkdir -p "${ARCHSYND}"; fi +mkdir -p "${ARCHSYND}" export HOMENHC=${HOMENHC:-/lfs/h1/ops/prod/dcom/nhc/atcf/ncep} @@ -21,9 +21,7 @@ export TANK_TROPCY=${TANK_TROPCY:-${DCOMROOT}} # path to tropical cyclone record # Define COM directories ############################################## declare_from_tmpl COMOUT_OBS:COM_OBS_TMPL -if [[ ! -d "${COMOUT_OBS}" ]]; then - mkdir -p "${COMOUT_OBS}" -fi +mkdir -p "${COMOUT_OBS}" export CRES=${CASE_HIST:1} export LATB=$((CRES * 2)) diff --git a/jobs/JGLOBAL_ATMOS_UPP b/jobs/JGLOBAL_ATMOS_UPP index bf5c70d0eee..8452e69ec25 100755 --- a/jobs/JGLOBAL_ATMOS_UPP +++ b/jobs/JGLOBAL_ATMOS_UPP @@ -15,7 +15,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ COMIN_ATMOS_HISTORY:COM_ATMOS_HISTORY_TMPL \ COMOUT_ATMOS_MASTER:COM_ATMOS_MASTER_TMPL -if [[ ! -d ${COMOUT_ATMOS_MASTER} ]]; then mkdir -p "${COMOUT_ATMOS_MASTER}"; fi +mkdir -p "${COMOUT_ATMOS_MASTER}" ############################################################### # Run relevant exglobal script diff --git a/jobs/JGLOBAL_ATMOS_VMINMON b/jobs/JGLOBAL_ATMOS_VMINMON index 4f6abd48aab..9eeca3b4178 100755 --- a/jobs/JGLOBAL_ATMOS_VMINMON +++ b/jobs/JGLOBAL_ATMOS_VMINMON @@ -27,7 +27,7 @@ export gsistat="${COMIN_ATMOS_ANALYSIS}/${RUN}.t${cyc}z.gsistat" export M_TANKverf=${M_TANKverf:-${COMOUT_ATMOS_MINMON}} export M_TANKverfM1=${M_TANKverfM1:-${COMIN_ATMOS_MINMON_PREV}} -if [[ ! -d ${M_TANKverf} ]]; then mkdir -p "${M_TANKverf}"; fi +mkdir -p "${M_TANKverf}" ######################################################## # Execute the script. diff --git a/jobs/JGLOBAL_ENS_ARCHIVE_TARS b/jobs/JGLOBAL_ENS_ARCHIVE_TARS index fd5a54d59d1..093877876d4 100755 --- a/jobs/JGLOBAL_ENS_ARCHIVE_TARS +++ b/jobs/JGLOBAL_ENS_ARCHIVE_TARS @@ -16,7 +16,7 @@ MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ RUN=${RUN/enkf/} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ COMIN_ATMOS_HISTORY:COM_ATMOS_HISTORY_TMPL -if [[ ! -d ${COMIN_CONF} ]]; then mkdir -p "${COMIN_CONF}"; fi +mkdir -p "${COMIN_CONF}" ############################################################### # Run archive script diff --git a/jobs/JGLOBAL_EXTRACTVARS b/jobs/JGLOBAL_EXTRACTVARS index 72b4f9accaf..12aee592ad5 100755 --- a/jobs/JGLOBAL_EXTRACTVARS +++ b/jobs/JGLOBAL_EXTRACTVARS @@ -7,7 +7,7 @@ source "${USHgfs}/wave_domain_grid.sh" for grid in '0p25' '0p50' '1p00'; do prod_dir="COMIN_ATMOS_GRIB_${grid}" GRID=${grid} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "${prod_dir}:COM_ATMOS_GRIB_GRID_TMPL" - if [[ ! -d "${!prod_dir}" ]]; then mkdir -p "${!prod_dir}"; fi + mkdir -p "${!prod_dir}" done YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx \ @@ -24,17 +24,17 @@ YMD=${PDY} HH=${cyc} GRDRESNAME=${grdNAME} declare_from_tmpl -rx \ "COMIN_WAVE_GRID_${GRDREGION}_${GRDRES}:COM_WAVE_GRID_RES_TMPL" if [[ "${DO_ATM}" == "YES" ]]; then - if [[ ! -d "${ARC_RFCST_PROD_ATMOS_F2D}" ]]; then mkdir -p "${ARC_RFCST_PROD_ATMOS_F2D}"; fi - if [[ ! -d "${ARC_RFCST_PROD_ATMOS_F3D}" ]]; then mkdir -p "${ARC_RFCST_PROD_ATMOS_F3D}"; fi + mkdir -p "${ARC_RFCST_PROD_ATMOS_F2D}" + mkdir -p "${ARC_RFCST_PROD_ATMOS_F3D}" fi if [[ "${DO_OCN}" == "YES" ]]; then - if [[ ! -d "${ARC_RFCST_PROD_OCN}" ]]; then mkdir -p "${ARC_RFCST_PROD_OCN}"; fi + mkdir -p "${ARC_RFCST_PROD_OCN}" fi if [[ "${DO_ICE}" == "YES" ]]; then - if [[ ! -d "${ARC_RFCST_PROD_ICE}" ]]; then mkdir -p "${ARC_RFCST_PROD_ICE}"; fi + mkdir -p "${ARC_RFCST_PROD_ICE}" fi if [[ "${DO_WAVE}" == "YES" ]]; then - if [[ ! -d "${ARC_RFCST_PROD_WAV}" ]]; then mkdir -p "${ARC_RFCST_PROD_WAV}"; fi + mkdir -p "${ARC_RFCST_PROD_WAV}" fi # Execute the Script diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNT b/jobs/JGLOBAL_WAVE_POST_BNDPNT index 0cc1606062f..93a428dcd27 100755 --- a/jobs/JGLOBAL_WAVE_POST_BNDPNT +++ b/jobs/JGLOBAL_WAVE_POST_BNDPNT @@ -10,7 +10,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \ COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL -if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then mkdir -p "${COMOUT_WAVE_STATION}"; fi +mkdir -p "${COMOUT_WAVE_STATION}" export CFP_VERBOSE=1 diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL index a895c056f36..756ebe37299 100755 --- a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL +++ b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL @@ -12,7 +12,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \ COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL -if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then mkdir -p "${COMOUT_WAVE_STATION}"; fi +mkdir -p "${COMOUT_WAVE_STATION}" export CFP_VERBOSE=1 diff --git a/jobs/JGLOBAL_WAVE_POST_PNT b/jobs/JGLOBAL_WAVE_POST_PNT index aa1f7f593f1..39f29acb1ed 100755 --- a/jobs/JGLOBAL_WAVE_POST_PNT +++ b/jobs/JGLOBAL_WAVE_POST_PNT @@ -10,7 +10,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \ COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL -if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then mkdir -p "${COMOUT_WAVE_STATION}"; fi +mkdir -p "${COMOUT_WAVE_STATION}" export CFP_VERBOSE=1 diff --git a/jobs/JGLOBAL_WAVE_POST_SBS b/jobs/JGLOBAL_WAVE_POST_SBS index 690614e5e04..ff92d88b450 100755 --- a/jobs/JGLOBAL_WAVE_POST_SBS +++ b/jobs/JGLOBAL_WAVE_POST_SBS @@ -9,7 +9,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \ COMOUT_WAVE_GRID:COM_WAVE_GRID_TMPL -if [[ ! -d "${COMOUT_WAVE_GRID}" ]]; then mkdir -p "${COMOUT_WAVE_GRID}"; fi +mkdir -p "${COMOUT_WAVE_GRID}" if [[ -n "${wavepostGRD}" || -n "${waveinterpGRD}" ]]; then for grdID in ${wavepostGRD} ${waveinterpGRD}; do @@ -18,7 +18,7 @@ if [[ -n "${wavepostGRD}" || -n "${waveinterpGRD}" ]]; then "COMOUT_WAVE_GRID_${GRDREGION}_${GRDRES}:COM_WAVE_GRID_RES_TMPL" out_dir_varname="COMOUT_WAVE_GRID_${GRDREGION}_${GRDRES}" out_dir=${!out_dir_varname} - if [[ ! -d "${out_dir}" ]]; then mkdir -p "${out_dir}"; fi + mkdir -p "${out_dir}" done else echo "Both wavepostGRD and waveinterpGRD are empty. No grids to process." diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS index bee46d165e3..d7f2ec152ef 100755 --- a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS +++ b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS @@ -10,7 +10,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ COMIN_WAVE_STATION:COM_WAVE_STATION_TMPL \ COMOUT_WAVE_WMO:COM_WAVE_WMO_TMPL -if [[ ! -d "${COMOUT_WAVE_WMO}" ]]; then mkdir -p "${COMOUT_WAVE_WMO}"; fi +mkdir -p "${COMOUT_WAVE_WMO}" ################################### # Execute the Script diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED index 316c601534c..2dacae9efba 100755 --- a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED +++ b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED @@ -11,7 +11,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ COMIN_WAVE_GRID:COM_WAVE_GRID_TMPL \ COMOUT_WAVE_WMO:COM_WAVE_WMO_TMPL -if [[ ! -d "${COMOUT_WAVE_WMO}" ]]; then mkdir -p "${COMOUT_WAVE_WMO}"; fi +mkdir -p "${COMOUT_WAVE_WMO}" if [[ -n "${GEMPAK_GRIDS}" ]]; then for grdID in ${GEMPAK_GRIDS}; do