From 761e6715c47bdbb15b899359be62d8879b1e1fbd Mon Sep 17 00:00:00 2001 From: "Walter.Kolczynski" Date: Thu, 11 Apr 2024 19:23:39 -0500 Subject: [PATCH 1/3] Update fbwind for COM refactor Updates fbwind job for the COM refactor and some other cleanup. fbwind IS STILL NON-FUNCTIONAL after this commit. The exectuable is failing to read the grib1 index file. The grib1 data file looks fine, so this appears to me a problem either with the GRBINDEX executable or with GETGB. Refs: #289 Refs: #2160 --- jobs/JGFS_ATMOS_FBWIND | 21 ++++++++------- scripts/exgfs_atmos_fbwind.sh | 51 ++++++++++++++++------------------- 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/jobs/JGFS_ATMOS_FBWIND b/jobs/JGFS_ATMOS_FBWIND index dbfca496103..38e524afeaa 100755 --- a/jobs/JGFS_ATMOS_FBWIND +++ b/jobs/JGFS_ATMOS_FBWIND @@ -17,33 +17,34 @@ export COMPONENT="atmos" ############################################## # 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}/${RUN}.${PDY})/${cyc}/${COMPONENT}} -export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo} + +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}" +fi export SENDDBN=${SENDDBN:-NO} export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn} -mkdir -m 775 -p ${COMOUT} ${COMOUTwmo} - ######################################################## # Execute the script. -${SCRgfs}/exgfs_atmos_fbwind.sh +"${SCRgfs}/exgfs_atmos_fbwind.sh" export err=$?;err_chk ######################################################## ############################################ # 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/scripts/exgfs_atmos_fbwind.sh b/scripts/exgfs_atmos_fbwind.sh index de8e448a013..c04d50432b7 100755 --- a/scripts/exgfs_atmos_fbwind.sh +++ b/scripts/exgfs_atmos_fbwind.sh @@ -14,15 +14,15 @@ # echo " Nov 2019 - B Vuong Removed WINTEMV bulletin (retired)" ##################################################################### -source "${USHgfs}/preamble.sh" +source "${HOMEgfs}/ush/preamble.sh" -cd $DATA +cd "${DATA}" || exit 2 ###################### # Set up Here Files. ###################### -job_name=$(echo $job|sed 's/[jpt]gfs/gfs/') +job_name="${job/[jpt]gfs/gfs}" set +x echo " " @@ -34,20 +34,17 @@ echo " " set_trace export pgm=bulls_fbwndgfs -. prep_step - -for fhr in 006 012 024 -do - - cp $COMIN/gfs.${cycle}.pgrb2.0p25.f${fhr} tmp_pgrb2_0p25${fhr} - cp $COMIN/gfs.${cycle}.pgrb2b.0p25.f${fhr} tmp_pgrb2b_0p25${fhr} - cat tmp_pgrb2_0p25${fhr} tmp_pgrb2b_0p25${fhr} > tmp0p25filef${fhr} - $WGRIB2 tmp0p25filef${fhr} | grep -F -f ${PARMgfs}/product/gfs_fbwnd_parmlist_g2 | $WGRIB2 -i -grib tmpfilef${fhr} tmp0p25filef${fhr} - $CNVGRIB -g21 tmpfilef${fhr} tmpfilef${fhr}.grib1 - $GRBINDEX tmpfilef${fhr}.grib1 tmpfilef${fhr}.grib1i - mv tmpfilef${fhr}.grib1 gfs.t${cyc}z.grbf${fhr}_grb1 - mv tmpfilef${fhr}.grib1i gfs.t${cyc}z.grbif${fhr}_grb1 - +source prep_step + +for fhr3 in 006 012 024; do + cp "${COMIN_ATMOS_GRIB_0p25}/gfs.${cycle}.pgrb2.0p25.f${fhr3}" "tmp_pgrb2_0p25${fhr3}" + cp "${COMIN_ATMOS_GRIB_0p25}/gfs.${cycle}.pgrb2b.0p25.f${fhr3}" "tmp_pgrb2b_0p25${fhr3}" + cat "tmp_pgrb2_0p25${fhr3}" "tmp_pgrb2b_0p25${fhr3}" > "tmp0p25filef${fhr3}" + # shellcheck disable=SC2312 + ${WGRIB2} "tmp0p25filef${fhr3}" | grep -F -f "${PARMgfs}/product/gfs_fbwnd_parmlist_g2" | \ + ${WGRIB2} -i -grib "tmpfilef${fhr3}" "tmp0p25filef${fhr3}" + ${CNVGRIB} -g21 "tmpfilef${fhr3}" "gfs.t${cyc}z.grbf${fhr3}_grb1" + ${GRBINDEX} "gfs.t${cyc}z.grbf${fhr3}_grb1" "gfs.t${cyc}z.grbf${fhr3}_grb1.idx" done export FORT11="gfs.t${cyc}z.grbf006_grb1" @@ -56,9 +53,9 @@ export FORT13="gfs.t${cyc}z.grbf024_grb1" # GFS grib index files -export FORT31="gfs.t${cyc}z.grbif006_grb1" -export FORT32="gfs.t${cyc}z.grbif012_grb1" -export FORT33="gfs.t${cyc}z.grbif024_grb1" +export FORT31="gfs.t${cyc}z.grbf006_grb1.idx" +export FORT32="gfs.t${cyc}z.grbf012_grb1.idx" +export FORT33="gfs.t${cyc}z.grbf024_grb1.idx" # # 1280 byte transmission file @@ -66,18 +63,16 @@ export FORT33="gfs.t${cyc}z.grbif024_grb1" export FORT51="tran.fbwnd_pacific" -startmsg +cp "${PARMgfs}/product/fbwnd_pacific.stnlist" fbwnd_pacific.stnlist -$EXECgfs/fbwndgfs < ${PARMgfs}/product/fbwnd_pacific.stnlist >> $pgmout 2> errfile +"${EXECgfs}/fbwndgfs.x" < fbwnd_pacific.stnlist >> "${pgmout}" 2> errfile export err=$?; err_chk +cp tran.fbwnd_pacific "${COMOUT}/tran.fbwnd_pacific.${job_name}" -cp tran.fbwnd_pacific ${COMOUTwmo}/tran.fbwnd_pacific.$job_name - -if test "$SENDDBN" = 'YES' -then -# make_ntc_bull.pl WMOBH NONE KWNO NONE tran.fbwnd_pacific ${COMOUTwmo}/tran.fbwnd_pacific.$job_name - ${USHgfs}/make_ntc_bull.pl WMOBH NONE KWNO NONE tran.fbwnd_pacific ${COMOUTwmo}/tran.fbwnd_pacific.$job_name +if [[ "${SENDDBN}" == 'YES' ]]; then + # Should this really be in a SENDDBN block? + "${USHgfs}/make_ntc_bull.pl" WMOBH NONE KWNO NONE tran.fbwnd_pacific "${COMOUT}/tran.fbwnd_pacific.${job_name}" fi ##################################################################### From 71864e1ad6561f2f60e5b2c10af98f9dde64786c Mon Sep 17 00:00:00 2001 From: "Walter.Kolczynski" Date: Fri, 12 Apr 2024 15:58:33 -0500 Subject: [PATCH 2/3] Rename fbwind output filename --- scripts/exgfs_atmos_fbwind.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/exgfs_atmos_fbwind.sh b/scripts/exgfs_atmos_fbwind.sh index c04d50432b7..d48d3ce5d91 100755 --- a/scripts/exgfs_atmos_fbwind.sh +++ b/scripts/exgfs_atmos_fbwind.sh @@ -22,7 +22,7 @@ cd "${DATA}" || exit 2 # Set up Here Files. ###################### -job_name="${job/[jpt]gfs/gfs}" +outfile_name="${COMOUT}/${RUN}.atmos.t${cyc}z.fbwind.pacific.ascii" set +x echo " " @@ -68,11 +68,11 @@ cp "${PARMgfs}/product/fbwnd_pacific.stnlist" fbwnd_pacific.stnlist "${EXECgfs}/fbwndgfs.x" < fbwnd_pacific.stnlist >> "${pgmout}" 2> errfile export err=$?; err_chk -cp tran.fbwnd_pacific "${COMOUT}/tran.fbwnd_pacific.${job_name}" +cp tran.fbwnd_pacific "${outfile_name}" if [[ "${SENDDBN}" == 'YES' ]]; then # Should this really be in a SENDDBN block? - "${USHgfs}/make_ntc_bull.pl" WMOBH NONE KWNO NONE tran.fbwnd_pacific "${COMOUT}/tran.fbwnd_pacific.${job_name}" + "${USHgfs}/make_ntc_bull.pl" WMOBH NONE KWNO NONE tran.fbwnd_pacific "${outfile_name}" fi ##################################################################### From 1490110d111441b6524adb7429d9041491418ac4 Mon Sep 17 00:00:00 2001 From: "Walter.Kolczynski" Date: Fri, 12 Apr 2024 18:57:48 -0500 Subject: [PATCH 3/3] Update gfs-utils to remove SENDCOM --- scripts/exgfs_atmos_fbwind.sh | 10 +--------- sorc/gfs_utils.fd | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/scripts/exgfs_atmos_fbwind.sh b/scripts/exgfs_atmos_fbwind.sh index d48d3ce5d91..401ce513803 100755 --- a/scripts/exgfs_atmos_fbwind.sh +++ b/scripts/exgfs_atmos_fbwind.sh @@ -68,14 +68,6 @@ cp "${PARMgfs}/product/fbwnd_pacific.stnlist" fbwnd_pacific.stnlist "${EXECgfs}/fbwndgfs.x" < fbwnd_pacific.stnlist >> "${pgmout}" 2> errfile export err=$?; err_chk -cp tran.fbwnd_pacific "${outfile_name}" - -if [[ "${SENDDBN}" == 'YES' ]]; then - # Should this really be in a SENDDBN block? - "${USHgfs}/make_ntc_bull.pl" WMOBH NONE KWNO NONE tran.fbwnd_pacific "${outfile_name}" -fi - -##################################################################### - +"${USHgfs}/make_ntc_bull.pl" WMOBH NONE KWNO NONE tran.fbwnd_pacific "${outfile_name}" ############################### END OF SCRIPT ####################### diff --git a/sorc/gfs_utils.fd b/sorc/gfs_utils.fd index de3708bfb00..d77c3c99a3b 160000 --- a/sorc/gfs_utils.fd +++ b/sorc/gfs_utils.fd @@ -1 +1 @@ -Subproject commit de3708bfb00cd51900e813b84fdf2a3be5d398b0 +Subproject commit d77c3c99a3bc6e993c38b8ea987ceb4e68c11ebb