Skip to content

Commit

Permalink
Update buoys file and fix boundary point jobs (NOAA-EMC#1465)
Browse files Browse the repository at this point in the history
The buoy file used by the wave jobs ([wave_gfs.buoys](https://github.com/NOAA-EMC/global-workflow/blob/develop/parm/wave/wave_gfs.buoys)) was just a copy of [wave_gfs.buoys.dat](https://github.com/NOAA-EMC/global-workflow/blob/develop/parm/wave/wave_gfs.buoys.dat). In addition to being a duplicate, the file was a truncated version without any boundary points, causing boundary point jobs to fail.

The duplicate file has been removed and replaced by a symlink to the full buoy list [wave_gfs.buoys.full](https://github.com/NOAA-EMC/global-workflow/blob/develop/parm/wave/wave_gfs.buoys.full). This maintains the provenance of the file and prevents the former duplicate from becoming out-of-sync. Users who still want to use the truncated buoy can change the target of the symlink to wave_gfs.buoys.dat.

There are also a few minor bugs fixes that were necessary to get boundary point jobs to run:
- `FHMAX_WAV_IBP` had been set in the bndpnt config file but not used in the j-job. This was invisible unless a user changed the value, since the config and j-job used the same default.
- Checks against `FHMAX_WAV` would set the unused `FHMAX_WAV_IBP` to the max value instead of the `FHMAX_WAV_PNT` used for the loop. This is a problem when running for less than 180 h (the default value).
- The boundary point bulletin job was not in the env job list for Orion (other machines have it).
    
Now the boundary point jobs set `FHMAX_WAV_PNT` to `$FHMAX_WAV_IBP`. `FHMAX_WAV_IBP` was moved from the bndpnt config to config.wave so it is visible to bndpntbll as well.

Fixes NOAA-EMC#1464
  • Loading branch information
WalterKolczynski-NOAA authored Apr 14, 2023
1 parent e496e39 commit d47f33f
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 622 deletions.
2 changes: 1 addition & 1 deletion env/ORION.env
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
export sys_tp="ORION"
export launcher_PREP="srun"

elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostpnt" ]]; then
elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]]|| [[ "${step}" = "wavepostpnt" ]]; then

export CFP_MP="YES"
if [[ "${step}" = "waveprep" ]]; then export MP_PULSE=0 ; fi
Expand Down
3 changes: 1 addition & 2 deletions jobs/JGLOBAL_WAVE_POST_BNDPNT
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ 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 FHMAX_WAV_PNT=${FHMAX_WAV_IBP}
export DOSPC_WAV='YES' # Spectral post
export DOBLL_WAV='NO' # Bulletin post
export DOBNDPNT_WAV='YES' #not boundary points
Expand Down
3 changes: 1 addition & 2 deletions jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ 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 FHMAX_WAV_PNT=${FHMAX_WAV_IBP}
export DOSPC_WAV='NO' # Spectral post
export DOBLL_WAV='YES' # Bulletin post
export DOBNDPNT_WAV='YES' #boundary points
Expand Down
2 changes: 2 additions & 0 deletions parm/config/config.wave
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ export FHMIN_WAV=${FHMIN_WAV:-0}
export FHOUT_WAV=${FHOUT_WAV:-3}
export FHMAX_HF_WAV=${FHMAX_HF_WAV:-120}
export FHOUT_HF_WAV=${FHOUT_HF_WAV:-1}
export FHMAX_WAV_IBP=180
if (( FHMAX_WAV < FHMAX_WAV_IBP )); then export FHMAX_WAV_IBP=${FHMAX_GFS} ; fi

# gridded and point output rate
export DTFLD_WAV=$(expr $FHOUT_HF_WAV \* 3600)
Expand Down
3 changes: 0 additions & 3 deletions parm/config/config.wavepostbndpnt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,4 @@ echo "BEGIN: config.wavepostbndpnt"
# Get task specific resources
. $EXPDIR/config.resources wavepostbndpnt

export FHMAX_WAV_IBP=180
if [[ "$FHMAX_GFS" -lt "$FHMAX_WAV_IBP" ]] ; then export FHMAX_WAV_IBP=$FHMAX_GFS ; fi

echo "END: config.wavepostbndpnt"
Loading

0 comments on commit d47f33f

Please sign in to comment.