diff --git a/dev/jobs/analdiag.sh b/dev/jobs/analdiag.sh index 2849a41d7e6..7b4badebb88 100755 --- a/dev/jobs/analdiag.sh +++ b/dev/jobs/analdiag.sh @@ -15,7 +15,7 @@ export jobid="${job}.$$" ############################################################### # Execute the JJOB -"${HOMEgfs}/jobs/JGDAS_ATMOS_ANALYSIS_DIAG" +"${HOMEgfs}/jobs/JGLOBAL_ATMOS_ANALYSIS_DIAG" status=$? exit "${status}" diff --git a/dev/jobs/earc_tars.sh b/dev/jobs/earc_tars.sh index 16508f162dc..15b7ad421a1 100755 --- a/dev/jobs/earc_tars.sh +++ b/dev/jobs/earc_tars.sh @@ -15,7 +15,7 @@ export jobid="${job}.$$" ############################################################### # Execute the JJOB -"${HOMEgfs}/jobs/JGLOBAL_ENS_ARCHIVE_TARS" +"${HOMEgfs}/jobs/JGLOBAL_ENKF_ARCHIVE_TARS" status=$? exit "${status}" diff --git a/dev/jobs/earc_vrfy.sh b/dev/jobs/earc_vrfy.sh index 1f6b437046c..6556a35304a 100755 --- a/dev/jobs/earc_vrfy.sh +++ b/dev/jobs/earc_vrfy.sh @@ -15,7 +15,7 @@ export jobid="${job}.$$" ############################################################### # Execute the JJOB -"${HOMEgfs}/jobs/JGLOBAL_ENS_ARCHIVE_VRFY" +"${HOMEgfs}/jobs/JGLOBAL_ENKF_ARCHIVE_VRFY" status=$? exit "${status}" diff --git a/dev/jobs/ecen.sh b/dev/jobs/ecen.sh index b202fdd291e..5d4168be54d 100755 --- a/dev/jobs/ecen.sh +++ b/dev/jobs/ecen.sh @@ -22,7 +22,7 @@ for fhr in ${fhrlst}; do export job=ecen export jobid="${job}.$$" - "${HOMEgfs}/jobs/JGDAS_ENKF_ECEN" + "${HOMEgfs}/jobs/JGLOBAL_ENKF_ECEN" status=$? if [[ ${status} -ne 0 ]]; then exit "${status}" diff --git a/dev/jobs/ecen_fv3jedi.sh b/dev/jobs/ecen_fv3jedi.sh index 0d3f13c6c57..5c4cc21f780 100755 --- a/dev/jobs/ecen_fv3jedi.sh +++ b/dev/jobs/ecen_fv3jedi.sh @@ -13,6 +13,6 @@ export jobid="${job}.$$" ############################################################### # Execute the JJOB -"${HOMEgfs}"/jobs/JGDAS_ENKF_ECEN_FV3JEDI +"${HOMEgfs}"/jobs/JGLOBAL_ENKF_ECEN_FV3JEDI status=$? exit "${status}" diff --git a/dev/jobs/ediag.sh b/dev/jobs/ediag.sh index df628a147c6..44808e42094 100755 --- a/dev/jobs/ediag.sh +++ b/dev/jobs/ediag.sh @@ -15,7 +15,7 @@ export jobid="${job}.$$" ############################################################### # Execute the JJOB -"${HOMEgfs}/jobs/JGDAS_ENKF_DIAG" +"${HOMEgfs}/jobs/JGLOBAL_ENKF_DIAG" status=$? exit "${status}" diff --git a/dev/jobs/eobs.sh b/dev/jobs/eobs.sh index 5821bf0f186..1c5e7fd1458 100755 --- a/dev/jobs/eobs.sh +++ b/dev/jobs/eobs.sh @@ -15,7 +15,7 @@ export jobid="${job}.$$" ############################################################### # Execute the JJOB -"${HOMEgfs}/jobs/JGDAS_ENKF_SELECT_OBS" +"${HOMEgfs}/jobs/JGLOBAL_ENKF_SELECT_OBS" status=$? exit "${status}" diff --git a/dev/jobs/esfc.sh b/dev/jobs/esfc.sh index 756134fb153..ecac9e02e86 100755 --- a/dev/jobs/esfc.sh +++ b/dev/jobs/esfc.sh @@ -15,7 +15,7 @@ export jobid="${job}.$$" ############################################################### # Execute the JJOB -"${HOMEgfs}/jobs/JGDAS_ENKF_SFC" +"${HOMEgfs}/jobs/JGLOBAL_ENKF_SFC" status=$? exit "${status}" diff --git a/dev/jobs/eupd.sh b/dev/jobs/eupd.sh index a9a992dd529..8a3fd4112e1 100755 --- a/dev/jobs/eupd.sh +++ b/dev/jobs/eupd.sh @@ -15,7 +15,7 @@ export jobid="${job}.$$" ############################################################### # Execute the JJOB -"${HOMEgfs}/jobs/JGDAS_ENKF_UPDATE" +"${HOMEgfs}/jobs/JGLOBAL_ENKF_UPDATE" status=$? exit "${status}" diff --git a/jobs/JGDAS_ATMOS_ANALYSIS_DIAG b/jobs/JGLOBAL_ATMOS_ANALYSIS_DIAG similarity index 100% rename from jobs/JGDAS_ATMOS_ANALYSIS_DIAG rename to jobs/JGLOBAL_ATMOS_ANALYSIS_DIAG diff --git a/jobs/JGLOBAL_ENS_ARCHIVE_TARS b/jobs/JGLOBAL_ENKF_ARCHIVE_TARS similarity index 97% rename from jobs/JGLOBAL_ENS_ARCHIVE_TARS rename to jobs/JGLOBAL_ENKF_ARCHIVE_TARS index 093877876d4..2e22ada681b 100755 --- a/jobs/JGLOBAL_ENS_ARCHIVE_TARS +++ b/jobs/JGLOBAL_ENKF_ARCHIVE_TARS @@ -25,7 +25,7 @@ mkdir -p "${COMIN_CONF}" # Calls an external bash command; do not fail on unassigned/error set +eu export -n SHELLOPTS -"${SCRgfs}/exgdas_enkf_earc_tars.py" +"${SCRgfs}/exglobal_enkf_earc_tars.py" export err=$? set +x if [[ ${err} -ne 0 ]]; then diff --git a/jobs/JGLOBAL_ENS_ARCHIVE_VRFY b/jobs/JGLOBAL_ENKF_ARCHIVE_VRFY similarity index 97% rename from jobs/JGLOBAL_ENS_ARCHIVE_VRFY rename to jobs/JGLOBAL_ENKF_ARCHIVE_VRFY index 832ff9a0277..77c3d1973fc 100755 --- a/jobs/JGLOBAL_ENS_ARCHIVE_VRFY +++ b/jobs/JGLOBAL_ENKF_ARCHIVE_VRFY @@ -14,7 +14,7 @@ MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ # Run archive script ############################################################### -"${SCRgfs}/exgdas_enkf_earc_vrfy.py" +"${SCRgfs}/exglobal_enkf_earc_vrfy.py" err=$? if [[ ${err} -ne 0 ]]; then exit "${err}" diff --git a/jobs/JGDAS_ENKF_DIAG b/jobs/JGLOBAL_ENKF_DIAG similarity index 100% rename from jobs/JGDAS_ENKF_DIAG rename to jobs/JGLOBAL_ENKF_DIAG diff --git a/jobs/JGDAS_ENKF_ECEN b/jobs/JGLOBAL_ENKF_ECEN similarity index 96% rename from jobs/JGDAS_ENKF_ECEN rename to jobs/JGLOBAL_ENKF_ECEN index e3024ceb43b..0d8a67fc324 100755 --- a/jobs/JGDAS_ENKF_ECEN +++ b/jobs/JGLOBAL_ENKF_ECEN @@ -36,7 +36,7 @@ MEMDIR="ensstat" RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ ############################################################### # Run relevant script -${ENKFRECENSH:-${SCRgfs}/exgdas_enkf_ecen.sh} && true +${ENKFRECENSH:-${SCRgfs}/exglobal_enkf_ecen.sh} && true export err=$? if [[ ${err} -ne 0 ]]; then err_exit diff --git a/jobs/JGDAS_ENKF_ECEN_FV3JEDI b/jobs/JGLOBAL_ENKF_ECEN_FV3JEDI similarity index 96% rename from jobs/JGDAS_ENKF_ECEN_FV3JEDI rename to jobs/JGLOBAL_ENKF_ECEN_FV3JEDI index 3d2ff374a4f..12fe96146db 100755 --- a/jobs/JGDAS_ENKF_ECEN_FV3JEDI +++ b/jobs/JGLOBAL_ENKF_ECEN_FV3JEDI @@ -36,7 +36,7 @@ mkdir -m 755 -p "${COMOUT_CONF}" # Run relevant script ############################################## -EXSCRIPT=${GDASATMRUNPY:-${SCRgfs}/exgdas_enkf_ecen_fv3jedi.py} +EXSCRIPT=${GDASATMRUNPY:-${SCRgfs}/exglobal_enkf_ecen_fv3jedi.py} ${EXSCRIPT} && true export err=$? if [[ ${err} -ne 0 ]]; then diff --git a/jobs/JGDAS_ENKF_SELECT_OBS b/jobs/JGLOBAL_ENKF_SELECT_OBS similarity index 98% rename from jobs/JGDAS_ENKF_SELECT_OBS rename to jobs/JGLOBAL_ENKF_SELECT_OBS index f5fe813ef9d..f038f524b5f 100755 --- a/jobs/JGDAS_ENKF_SELECT_OBS +++ b/jobs/JGLOBAL_ENKF_SELECT_OBS @@ -109,7 +109,7 @@ done ############################################################### # Run relevant script -${INVOBSSH:-${SCRgfs}/exgdas_enkf_select_obs.sh} && true +${INVOBSSH:-${SCRgfs}/exglobal_enkf_select_obs.sh} && true export err=$? if [[ ${err} -ne 0 ]]; then err_exit diff --git a/jobs/JGDAS_ENKF_SFC b/jobs/JGLOBAL_ENKF_SFC similarity index 97% rename from jobs/JGDAS_ENKF_SFC rename to jobs/JGLOBAL_ENKF_SFC index c2bfc6f33e4..0e33d9e4dac 100755 --- a/jobs/JGDAS_ENKF_SFC +++ b/jobs/JGLOBAL_ENKF_SFC @@ -42,7 +42,7 @@ export USE_CFP=YES ############################################################### # Run relevant script -${ENKFRESFCSH:-${SCRgfs}/exgdas_enkf_sfc.sh} && true +${ENKFRESFCSH:-${SCRgfs}/exglobal_enkf_sfc.sh} && true export err=$? if [[ ${err} -ne 0 ]]; then err_exit diff --git a/jobs/JGDAS_ENKF_UPDATE b/jobs/JGLOBAL_ENKF_UPDATE similarity index 97% rename from jobs/JGDAS_ENKF_UPDATE rename to jobs/JGLOBAL_ENKF_UPDATE index 43d39b21735..47d2fb0640b 100755 --- a/jobs/JGDAS_ENKF_UPDATE +++ b/jobs/JGLOBAL_ENKF_UPDATE @@ -28,7 +28,7 @@ MEMDIR="ensstat" RUN="enkfgdas" YMD=${GDATE:0:8} HH=${GDATE:8:2} declare_from_tm ############################################################### # Run relevant script -${ENKFUPDSH:-${SCRgfs}/exgdas_enkf_update.sh} && true +${ENKFUPDSH:-${SCRgfs}/exglobal_enkf_update.sh} && true export err=$? if [[ ${err} -ne 0 ]]; then err_exit diff --git a/scripts/exglobal_atmos_analysis.sh b/scripts/exglobal_atmos_analysis.sh index 6eb8804a59d..a53153d97e8 100755 --- a/scripts/exglobal_atmos_analysis.sh +++ b/scripts/exglobal_atmos_analysis.sh @@ -20,7 +20,9 @@ # Set environment. # Directories. +# shellcheck disable=SC2153 cd "${DATA}" || exit 1 + # Base variables rCDUMP=${rCDUMP:-"gdas"} GDUMP=${GDUMP:-"gdas"} diff --git a/scripts/exgdas_enkf_earc_tars.py b/scripts/exglobal_enkf_earc_tars.py similarity index 100% rename from scripts/exgdas_enkf_earc_tars.py rename to scripts/exglobal_enkf_earc_tars.py diff --git a/scripts/exgdas_enkf_earc_vrfy.py b/scripts/exglobal_enkf_earc_vrfy.py similarity index 100% rename from scripts/exgdas_enkf_earc_vrfy.py rename to scripts/exglobal_enkf_earc_vrfy.py diff --git a/scripts/exgdas_enkf_ecen.sh b/scripts/exglobal_enkf_ecen.sh similarity index 100% rename from scripts/exgdas_enkf_ecen.sh rename to scripts/exglobal_enkf_ecen.sh diff --git a/scripts/exgdas_enkf_ecen_fv3jedi.py b/scripts/exglobal_enkf_ecen_fv3jedi.py similarity index 100% rename from scripts/exgdas_enkf_ecen_fv3jedi.py rename to scripts/exglobal_enkf_ecen_fv3jedi.py diff --git a/scripts/exgdas_enkf_select_obs.sh b/scripts/exglobal_enkf_select_obs.sh similarity index 100% rename from scripts/exgdas_enkf_select_obs.sh rename to scripts/exglobal_enkf_select_obs.sh diff --git a/scripts/exgdas_enkf_sfc.sh b/scripts/exglobal_enkf_sfc.sh similarity index 100% rename from scripts/exgdas_enkf_sfc.sh rename to scripts/exglobal_enkf_sfc.sh diff --git a/scripts/exgdas_enkf_update.sh b/scripts/exglobal_enkf_update.sh similarity index 100% rename from scripts/exgdas_enkf_update.sh rename to scripts/exglobal_enkf_update.sh