Merge remote-tracking branch 'origin/operations' into sync/operations…

…_v16.0.9 * origin/operations: bugfix for not removing last point from list in wave post pnt jobs Update util_shared module version to 1.3.0 for wave footer fix Revert addition of ecflow trigger for wavepostbndpntbll job update ufs-weather-model tag to GFS.v16.0.16 add ecflow updates for new wave bndpntbll job Additional WAFS tag update to gfs_wafs.v6.0.21 for GFSv16.0.8 Back out updates to add config.resources.nco.static WAFS tag update to gfs_wafs.v6.0.20 in Externals.cfg WAFS tag update (gfs_wafs.v6.0.20) for v16 post-implementation fixes fix for missing wave boundary cbull and bull files Fix cycle date in bull and cbull wave files Reverting transfer parm file changes committed at 39bab45 Component tag updates for nwprod/gfsv16.0.7 Updated transfer parm files for gdas, enkf, and gfs dissemination Issue #215 - GFSv15.3.5 ops updates for gempak and bufrlib versions Clean up commments Updated sorc/checkout.sh to pick gfsda.v15.3.3 ( EUM bufr changes ) Refs: #309
NOAA-EMC · May 10, 2021 · dd4d187 · dd4d187
2 parents fc727f4 + 68b9157
commit dd4d187
Show file tree

Hide file tree

Showing 33 changed files with 407 additions and 1,063 deletions.
diff --git a/Externals.cfg b/Externals.cfg
@@ -1,7 +1,7 @@
 # External sub-modules of global-workflow
 
 [FV3GFS]
-tag = GFS.v16.0.15
+tag = GFS.v16.0.16
 local_path = sorc/fv3gfs.fd
 repo_url = https://github.com/ufs-community/ufs-weather-model.git
 protocol = git
@@ -43,7 +43,7 @@ protocol = git
 required = True
 
 [EMC_gfs_wafs]
-tag = gfs_wafs.v6.0.18
+tag = gfs_wafs.v6.0.21
 local_path = sorc/gfs_wafs.fd
 repo_url = https://github.com/NOAA-EMC/EMC_gfs_wafs.git
 protocol = git

diff --git a/ecflow/ecf/scripts/gfs/wave/post/jgfs_wave_post_bndpntbll.ecf b/ecflow/ecf/scripts/gfs/wave/post/jgfs_wave_post_bndpntbll.ecf
@@ -0,0 +1,69 @@
+#BSUB -L /bin/sh
+#BSUB -J %E%%RUN%_wave_post_bndpntbll_%CYC%
+#BSUB -o %COM%/output/%ENVIR%/today/%RUN%_wave_post_bndpntbll_%CYC%.o%J
+#BSUB -q %QUEUE%
+#BSUB -P %PROJ%
+#BSUB -cwd /tmp
+#BSUB -W 01:00
+#BSUB -R span[ptile=28]; -R affinity[core(1)]
+#BSUB -n 280
+
+%include <head.h>
+%include <envir-p3.h>
+
+set -x
+
+export NODES=10
+export ntasks=280
+export ptile=28
+export threads=1
+
+export NET=%NET:gfs%
+export RUN=%RUN%
+export CDUMP=%RUN%
+
+model=gfs
+%include <model_ver.h>
+
+############################################################
+## Load modules
+############################################################
+module load lsf/${lsf_ver}
+module load impi/${impi_ver}
+module load CFP/${CFP_ver}
+
+module list
+
+############################################################
+## WCOSS_C environment settings
+############################################################
+export cyc=%CYC%
+export cycle=t%CYC%z
+
+############################################################
+# CALL executable job script here
+############################################################
+${HOMEgfs}/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
+
+if [ $? -ne 0 ]; then
+   ecflow_client --msg="***JOB ${ECF_NAME} ERROR RUNNING J-SCRIPT ***"
+   ecflow_client --abort
+   exit
+fi
+
+%include <tail.h>
+%manual
+######################################################################
+# Purpose:
+#
+#
+######################################################################
+
+######################################################################
+# Job specific troubleshooting instructions:
+#  see generic troubleshoot manual page
+#
+######################################################################
+
+# include manual page below
+%end
diff --git a/ecflow/ecf/versions/gfs.ver b/ecflow/ecf/versions/gfs.ver
@@ -22,7 +22,7 @@ export dumpjb_ver="5.1.0"
 export NCL_ver="6.4.0"
 export python_ver="3.6.3"
 export prod_envir_ver="1.1.0"
-export util_shared_ver="1.1.2"
+export util_shared_ver="1.3.0"
 export prod_util_ver="1.1.4"
 export metplus_ver="2.1"
 export w3emc_para_ver="2.4.0"

diff --git a/env/HERA.env b/env/HERA.env
@@ -42,7 +42,7 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then
     export BACK="NO"
     export sys_tp="HERA"
 
-elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostpnt" ]; then
+elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostbndpntbll" -o $step = "wavepostpnt" ]; then
 
     export mpmd="--multi-prog"
     export CFP_MP="YES"

diff --git a/env/JET.env b/env/JET.env
@@ -37,7 +37,7 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then
     export BACK=${BACK:-"YES"}
     export sys_tp="Cray-CS400"
 
-elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostpnt" ]; then
+elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostbndpntbll" -o $step = "wavepostpnt" ]; then
 
     if [ $step = "waveprep" ]; then export MP_PULSE=0 ; fi
     export wavempexec=${launcher}

diff --git a/env/WCOSS_C.env b/env/WCOSS_C.env
@@ -37,7 +37,7 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then
     export POE=${POE:-"YES"}
     export sys_tp="Cray-XC40"
 
-elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostpnt" ]; then
+elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostbndpntbll" -o $step = "wavepostpnt" ]; then
     if [ $step = "waveprep" ]; then export MP_PULSE=0 ; fi
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd}

diff --git a/env/WCOSS_DELL_P3.env b/env/WCOSS_DELL_P3.env
@@ -45,7 +45,7 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then
     export BACK=${BACK:-"off"}
     export sys_tp="Dell-p3"
 
-elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostpnt" ]; then
+elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostbndpntbll"  -o $step = "wavepostpnt" ]; then
 
     if [ $step = "waveprep" ]; then export MP_PULSE=0 ; fi
     export wavempexec=${launcher}

diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNT b/jobs/JGLOBAL_WAVE_POST_BNDPNT
@@ -66,10 +66,6 @@ fi
 export COMIN=${COMIN:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENT}
 export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENT}
 
-export COMINice=${COMINice:-${COMROOTp2}/omb/prod}
-export COMINwnd=${COMINwnd:-${COMROOT}/gfs/prod}
-export COMIN_WAV_CUR=${COMIN_WAV_CUR:-${COMROOTp2}/rtofs/prod}
-
 mkdir -p $COMOUT/station
 
 env | sort
@@ -85,8 +81,14 @@ export WAV_MOD_TAG=${CDUMP}wave${waveMEMB}
 
 export CFP_VERBOSE=1
 
+export FHMAX_WAV_PNT=180
+if [ $FHMAX_WAV -lt $FHMAX_WAV_PNT ] ; then export FHMAX_WAV_IBP=$FHMAX_WAV ; fi
+export DOSPC_WAV='YES' # Spectral post
+export DOBLL_WAV='NO' # Bulletin post
+export DOBNDPNT_WAV='YES'  #not boundary points
+
 # Execute the Script  
-$HOMEgfs/scripts/exgfs_wave_post_bndpnt.sh
+$HOMEgfs/scripts/exgfs_wave_post_pnt.sh
 err=$?
 if [ $err -ne 0 ]; then
   msg="FATAL ERROR: ex-script of GWES_POST failed!"

diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
@@ -0,0 +1,108 @@
+#!/bin/bash
+
+date
+export RUN_ENVIR=${RUN_ENVIR:-"nco"}
+export PS4=' $SECONDS + '
+set -x -e
+
+#############################
+# Source relevant config files
+#############################
+configs="base wave wavepostsbs wavepostbndpnt"
+export EXPDIR=${EXPDIR:-$HOMEgfs/parm/config}
+config_path=${EXPDIR:-$NWROOT/gfs.${gfs_ver}/parm/config}
+for config in $configs; do
+    . $config_path/config.$config
+    status=$?
+    [[ $status -ne 0 ]] && exit $status
+done
+
+##########################################
+# Source machine runtime environment
+##########################################
+. $HOMEgfs/env/${machine}.env wavepostbndpntbll
+status=$?
+[[ $status -ne 0 ]] && exit $status
+
+# PATH for working directory
+export NET=${NET:-gfs}
+export RUN=${RUN:-gfs}
+export COMPONENT=${COMPONENT:-wave}
+
+export HOMEgefs=${HOMEgefs:-$NWROOT/$NET.${gefs_ver}}
+export HOMEgfs=${HOMEgfs:-$NWROOT/$NET.${gfs_ver}}
+
+# Add default errchk = err_chk
+export errchk=${errchk:-err_chk}
+
+# Create and go to DATA directory
+export DATA=${DATA:-${DATAROOT:?}/${jobid}}
+mkdir -p $DATA
+cd $DATA
+
+export cyc=${cyc:-00}
+export cycle=${cycle:-t${cyc}z}
+
+# Set PDY
+setpdy.sh
+. PDY
+
+export CDATE=$PDY$cyc
+
+export pgmout=OUTPUT.$$
+
+export MP_PULSE=0
+
+# Path to HOME Directory
+export FIXwave=${FIXwave:-$HOMEgfs/fix/fix_wave_${NET}}
+export PARMwave=${PARMwave:-$HOMEgfs/parm/wave}
+export USHwave=${USHwave:-$HOMEgfs/ush}
+export EXECwave=${EXECwave:-$HOMEgfs/exec}
+
+# Set COM Paths and GETGES environment
+if [ $RUN_ENVIR = "nco" ]; then
+    export ROTDIR=${COMROOT:?}/$NET/$envir
+fi
+export COMIN=${COMIN:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENT}
+export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENT}
+
+
+mkdir -p $COMOUT/station
+
+env | sort
+
+# Set wave model ID tag to include member number
+# if ensemble; waveMEMB var empty in deterministic
+# Set wave model ID tag to include member number
+# if ensemble; waveMEMB var empty in deterministic
+membTAG='p'
+if [ "${waveMEMB}" == "00" ]; then membTAG='c'; fi
+export membTAG
+export WAV_MOD_TAG=${CDUMP}wave${waveMEMB}
+
+export CFP_VERBOSE=1
+
+export FHMAX_WAV_PNT=180
+if [ $FHMAX_WAV -lt $FHMAX_WAV_PNT ] ; then export FHMAX_WAV_IBP=$FHMAX_WAV ; fi
+export DOSPC_WAV='NO' # Spectral post
+export DOBLL_WAV='YES' # Bulletin post
+export DOBNDPNT_WAV='YES'  #boundary points
+
+# Execute the Script
+$HOMEgfs/scripts/exgfs_wave_post_pnt.sh
+err=$?
+if [ $err -ne 0 ]; then
+  msg="FATAL ERROR: ex-script of GFS_WAVE_POST_PNT failed!"
+else
+  msg="$job completed normally!"
+fi
+postmsg "$jlogfile" "$msg"
+
+##########################################
+# Remove the Temporary working directory
+##########################################
+cd $DATAROOT
+[[ $KEEPDATA = "NO" ]] && rm -rf $DATA
+
+date
+exit 0
diff --git a/jobs/JGLOBAL_WAVE_POST_PNT b/jobs/JGLOBAL_WAVE_POST_PNT
@@ -66,10 +66,6 @@ fi
 export COMIN=${COMIN:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENT}
 export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/$COMPONENT}
 
-export COMINice=${COMINice:-${COMROOTp2}/omb/prod}
-export COMINwnd=${COMINwnd:-${COMROOT}/gfs/prod}
-export COMIN_WAV_CUR=${COMIN_WAV_CUR:-${COMROOTp2}/rtofs/prod}
-
 mkdir -p $COMOUT/station
 
 env | sort
@@ -85,6 +81,12 @@ export WAV_MOD_TAG=${CDUMP}wave${waveMEMB}
 
 export CFP_VERBOSE=1
 
+export FHMAX_WAV_PNT=${FHMAX_WAV}
+export DOSPC_WAV='YES' # Spectral post
+export DOBLL_WAV='YES' # Bulletin post
+export DOBNDPNT_WAV='NO'  #not boundary points
+
+
 # Execute the Script  
 $HOMEgfs/scripts/exgfs_wave_post_pnt.sh
 err=$?

diff --git a/jobs/rocoto/wavepostbndpntbll.sh b/jobs/rocoto/wavepostbndpntbll.sh
@@ -0,0 +1,21 @@
+#!/bin/ksh -x
+
+###############################################################
+echo
+echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ==============="
+. $HOMEgfs/ush/load_fv3gfs_modules.sh
+status=$?
+[[ $status -ne 0 ]] && exit $status
+
+###############################################################
+echo
+echo "=============== START TO RUN WAVE_POST_BNDPNT ==============="
+# Execute the JJOB
+$HOMEgfs/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
+status=$?
+[[ $status -ne 0 ]] && exit $status
+
+###############################################################
+# Force Exit out cleanly
+if [ ${KEEPDATA:-"NO"} = "NO" ] ; then rm -rf $DATAROOT ; fi
+exit 0
diff --git a/modulefiles/module_base.wcoss_dell_p3 b/modulefiles/module_base.wcoss_dell_p3
@@ -27,11 +27,11 @@ module load HDF5-parallel/1.10.6
 module use -a /gpfs/dell1/nco/ops/nwprod/modulefiles/
 module load gempak/7.3.3
 module load g2tmpl/1.6.0
+module load util_shared/1.3.0
 
 # Load for WAFS
 module load bufr_dumplist/2.0.0
 module load dumpjb/5.1.0
-module load util_shared/1.1.2
 
 # python
 module load python/3.6.3

diff --git a/parm/config/config.resources b/parm/config/config.resources
@@ -10,7 +10,7 @@ if [ $# -ne 1 ]; then
     echo "argument can be any one of the following:"
     echo "anal analcalc analdiag gldas fcst post vrfy metp arch echgres"
     echo "eobs ediag eomg eupd ecen esfc efcs epos earc"
-    echo "waveinit waveprep wavepostsbs wavepostbndpnt wavepostpnt"
+    echo "waveinit waveprep wavepostsbs wavepostbndpnt wavepostbndpntbll wavepostpnt"
     echo "wavegempak waveawipsbulls waveawipsgridded"
     echo "postsnd awips gempak"
     echo "wafs wafsgrib2 wafsblending wafsgrib20p25 wafsblending0p25 wafsgcip"
@@ -76,6 +76,14 @@ elif [ $step = "wavepostbndpnt" ]; then
     export npe_node_wavepostbndpnt=$(echo "$npe_node_max / $nth_wavepostbndpnt" | bc)
     export NTASKS=${npe_wavepostbndpnt}
 
+elif [ $step = "wavepostbndpntbll" ]; then
+
+    export wtime_wavepostbndpntbll="01:00:00"
+    export npe_wavepostbndpntbll=280
+    export nth_wavepostbndpntbll=1
+    export npe_node_wavepostbndpntbll=$(echo "$npe_node_max / $nth_wavepostbndpntbll" | bc)
+    export NTASKS=${npe_wavepostbndpntbll}
+
 elif [ $step = "wavepostpnt" ]; then
 
     export wtime_wavepostpnt="02:00:00"