From 7ff150ebcabd73cc70b0402333a5f119271773e0 Mon Sep 17 00:00:00 2001 From: henrywinterbottom-wxdev Date: Thu, 7 Dec 2023 09:32:52 -0700 Subject: [PATCH 1/6] Updated/renamed datapaths; linter cleanup. --- jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC | 56 ++++++++++++++----------------- 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC b/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC index 183465e82d..4551733e43 100755 --- a/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC +++ b/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC @@ -1,7 +1,5 @@ #! /usr/bin/env bash -# TODO (#1222) This job is not part of the rocoto suite - ############################################ # GFS_PGRB2_SPEC_GEMPAK PRODUCT GENERATION ############################################ @@ -12,12 +10,12 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "gempak_spec" -c "base" ################################ # Set up the HOME directory ################################ -export EXECgfs=${EXECgfs:-${HOMEgfs}/exec} -export PARMgfs=${PARMgfs:-${HOMEgfs}/parm} -export EXPDIR=${EXPDIR:-${HOMEgfs}/parm/config} -export FIXgempak=${FIXgempak:-${HOMEgfs}/gempak/fix} -export USHgempak=${USHgempak:-${HOMEgfs}/gempak/ush} -export SRCgfs=${SRCgfs:-${HOMEgfs}/scripts} +export EXECgfs="${EXECgfs:-${HOMEgfs}/exec}" +export PARMgfs="${PARMgfs:-${HOMEgfs}/parm}" +export EXPDIR="${EXPDIR:-${HOMEgfs}/parm/config}" +export FIXgempak="${FIXgempak:-${HOMEgfs}/gempak/fix}" +export USHgempak="${USHgempak:-${HOMEgfs}/gempak/ush}" +export SRCgfs="${SRCgfs:-${HOMEgfs}/scripts}" # For half-degree P Grib files #export DO_HD_PGRB=YES @@ -33,25 +31,21 @@ export EXT="" ############################################## # Define COM directories ############################################## -export COMIN=${COMIN:-$(compath.py ${envir}/${NET}/${gfs_ver})/${RUN}.${PDY}/${cyc}/${COMPONENT}} -export COMOUT=${COMOUT:-$(compath.py -o ${NET}/${gfs_ver}/${NET}.${PDY})/${cyc}/${COMPONENT}/gempak} - -export SENDDBN=${SENDDBN:-NO} -export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn} - -mkdir -m 775 -p ${COMOUT} - +export COMIN="${COMIN:-$(compath.py "${envir}"/"${NET}"/"${gfs_ver}")/${RUN}.${PDY}/${cyc}/${COMPONENT}}" +export COMOUT="${COMOUT:-$(compath.py -o "${NET}"/"${gfs_ver}"/"${NET}"."${PDY}")/${cyc}/${COMPONENT}/gempak}" -# TODO - Assess what is going on with overwriting $DATA here (#1224) +export SENDDBN="${SENDDBN:-NO}" +export DBNROOT="${DBNROOT:-${UTILROOT}/fakedbn}" -export DATA_HOLD=${DATA} +mkdir -m 775 -p "${COMOUT}" ################################################################# # Execute the script for the regular grib ################################################################# -export DATA=${DATA_HOLD}/SPECIAL -mkdir -p ${DATA} -cd ${DATA} +export DATA_SPECIAL="${DATA}/SPECIAL" +mkdir -p "${DATA_SPECIAL}" +# shellcheck disable=SC2164 +cd "${DATA_SPECIAL}" export DBN_ALERT_TYPE=GFS_GOESSIM_GEMPAK export RUN2=gfs_goessim @@ -65,14 +59,15 @@ echo "RUNS the Program" ######################################################## # Execute the script. -${SRCgfs}/exgfs_atmos_goes_nawips.sh +"${SRCgfs}/exgfs_atmos_goes_nawips.sh" ################################################################# # Execute the script for the 221 grib -export DATA=${DATA_HOLD}/SPECIAL221 -mkdir -p ${DATA} -cd ${DATA} +export DATA_SPECIAL221="${DATA}/SPECIAL221" +mkdir -p "${DATA_SPECIAL221}" +# shellcheck disable=SC2164 +cd "${DATA_SPECIAL221}" export DBN_ALERT_TYPE=GFS_GOESSIM221_GEMPAK export RUN2=gfs_goessim221 @@ -86,12 +81,13 @@ echo "RUNS the Program" ######################################################## # Execute the script. -${SRCgfs}/exgfs_atmos_goes_nawips.sh +"${SRCgfs}/exgfs_atmos_goes_nawips.sh" export err=$?; err_chk ######################################################## echo "end of program" -cd ${DATA_HOLD} +# shellcheck disable=SC2164 +cd "${DATA}" echo "######################################" echo " SPECIAL.OUT " echo "######################################" @@ -99,14 +95,14 @@ echo "######################################" ############################################ # 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 +if [[ "${KEEPDATA}" != "YES" ]] ; then rm -rf "${DATA}" fi From 1d91a07cc4d650859b600d1d25e251df0e2938dc Mon Sep 17 00:00:00 2001 From: henrywinterbottom-wxdev Date: Thu, 7 Dec 2023 13:57:43 -0700 Subject: [PATCH 2/6] Corrected typo. --- workflow/rocoto/tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/rocoto/tasks.py b/workflow/rocoto/tasks.py index 06000338be..7d09d729cf 100644 --- a/workflow/rocoto/tasks.py +++ b/workflow/rocoto/tasks.py @@ -26,7 +26,7 @@ class Tasks: 'metp', 'tracker', 'genesis', 'genesis_fsu', 'postsnd', 'awips_g2', 'awips_20km_1p0deg', 'fbwinds', - 'gempak', 'gempakmeta', 'gempakmetancdc', 'gempakncdcupapgif', 'gempakpgrb2spec', 'npoess_pgrb2_0p5deg' + 'gempak', 'gempakmeta', 'gempakmetancdc', 'gempakncdcupagif', 'gempakpgrb2spec', 'npoess_pgrb2_0p5deg', 'waveawipsbulls', 'waveawipsgridded', 'wavegempak', 'waveinit', 'wavepostbndpnt', 'wavepostbndpntbll', 'wavepostpnt', 'wavepostsbs', 'waveprep', 'npoess'] From ad6e8f96304154c2abc89e64b47163074e2e5aa1 Mon Sep 17 00:00:00 2001 From: henrywinterbottom-wxdev Date: Wed, 13 Dec 2023 09:05:04 -0700 Subject: [PATCH 3/6] Corrections based on reviewer comments. --- jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC b/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC index 4551733e43..0b36dcff6a 100755 --- a/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC +++ b/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC @@ -44,8 +44,7 @@ mkdir -m 775 -p "${COMOUT}" ################################################################# export DATA_SPECIAL="${DATA}/SPECIAL" mkdir -p "${DATA_SPECIAL}" -# shellcheck disable=SC2164 -cd "${DATA_SPECIAL}" +cd "${DATA_SPECIAL}" || exit export DBN_ALERT_TYPE=GFS_GOESSIM_GEMPAK export RUN2=gfs_goessim @@ -66,8 +65,7 @@ echo "RUNS the Program" export DATA_SPECIAL221="${DATA}/SPECIAL221" mkdir -p "${DATA_SPECIAL221}" -# shellcheck disable=SC2164 -cd "${DATA_SPECIAL221}" +cd "${DATA_SPECIAL221}" || exit export DBN_ALERT_TYPE=GFS_GOESSIM221_GEMPAK export RUN2=gfs_goessim221 @@ -86,8 +84,7 @@ export err=$?; err_chk ######################################################## echo "end of program" -# shellcheck disable=SC2164 -cd "${DATA}" +cd "${DATA}" || exit echo "######################################" echo " SPECIAL.OUT " echo "######################################" From 904ee1dda4451faae6970e3d4714fbe5fc57315c Mon Sep 17 00:00:00 2001 From: "Henry R. Winterbottom" <49202169+HenryWinterbottom-NOAA@users.noreply.github.com> Date: Wed, 13 Dec 2023 16:06:58 -0700 Subject: [PATCH 4/6] Update jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC Co-authored-by: Walter Kolczynski - NOAA --- jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC b/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC index 0b36dcff6a..632a52876a 100755 --- a/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC +++ b/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC @@ -44,7 +44,7 @@ mkdir -m 775 -p "${COMOUT}" ################################################################# export DATA_SPECIAL="${DATA}/SPECIAL" mkdir -p "${DATA_SPECIAL}" -cd "${DATA_SPECIAL}" || exit +cd "${DATA_SPECIAL}" || exit 1 export DBN_ALERT_TYPE=GFS_GOESSIM_GEMPAK export RUN2=gfs_goessim From 3d9ac267e0e568036a1156c4d00ddf2a5b2ce997 Mon Sep 17 00:00:00 2001 From: "Henry R. Winterbottom" <49202169+HenryWinterbottom-NOAA@users.noreply.github.com> Date: Wed, 13 Dec 2023 16:07:06 -0700 Subject: [PATCH 5/6] Update jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC Co-authored-by: Walter Kolczynski - NOAA --- jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC b/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC index 632a52876a..b358d6e1e8 100755 --- a/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC +++ b/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC @@ -84,7 +84,7 @@ export err=$?; err_chk ######################################################## echo "end of program" -cd "${DATA}" || exit +cd "${DATA}" || exit 1 echo "######################################" echo " SPECIAL.OUT " echo "######################################" From 2a21b5d96e26b1fd88008372691461a0f8860ae6 Mon Sep 17 00:00:00 2001 From: "Henry R. Winterbottom" <49202169+HenryWinterbottom-NOAA@users.noreply.github.com> Date: Wed, 13 Dec 2023 16:07:17 -0700 Subject: [PATCH 6/6] Update jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC Co-authored-by: Walter Kolczynski - NOAA --- jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC b/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC index b358d6e1e8..47415a39ff 100755 --- a/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC +++ b/jobs/JGFS_ATMOS_GEMPAK_PGRB2_SPEC @@ -65,7 +65,7 @@ echo "RUNS the Program" export DATA_SPECIAL221="${DATA}/SPECIAL221" mkdir -p "${DATA_SPECIAL221}" -cd "${DATA_SPECIAL221}" || exit +cd "${DATA_SPECIAL221}" || exit 1 export DBN_ALERT_TYPE=GFS_GOESSIM221_GEMPAK export RUN2=gfs_goessim221