Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update high resolution tests and fix minor wave issues #3289

Merged
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
d52977d
update fix for wave
JessicaMeixner-NOAA Jan 22, 2025
26765f6
do not copy temp files to COM as they are not needed
JessicaMeixner-NOAA Jan 24, 2025
ac141b6
remove un-used COMOUT_WAVE_PREP in JGLOBAL_WAVE_POST_SBS
JessicaMeixner-NOAA Jan 24, 2025
9ac3313
change name of restart variables
JessicaMeixner-NOAA Jan 24, 2025
02ca6ae
update ic date
JessicaMeixner-NOAA Jan 27, 2025
5b97753
Merge remote-tracking branch 'EMC/develop' into fixhighrestest
JessicaMeixner-NOAA Jan 27, 2025
754f0b0
Merge remote-tracking branch 'EMC/develop' into fixhighrestest
JessicaMeixner-NOAA Jan 28, 2025
3342450
changes requested by NCO for v16 adding to develop
JessicaMeixner-NOAA Jan 29, 2025
e54d216
Merge remote-tracking branch 'EMC/develop' into fixhighrestest
JessicaMeixner-NOAA Jan 29, 2025
a06de0f
add environment variable for fcst job for hercules/orion
JessicaMeixner-NOAA Jan 29, 2025
a9d8f7e
update WW3 IC error handling
JessicaMeixner-NOAA Jan 30, 2025
ee352fe
remove loop in JGLOBAL_WAVE_POST_SBS
JessicaMeixner-NOAA Jan 30, 2025
583e2fb
Merge branch 'NOAA-EMC:develop' into fixhighrestest
JessicaMeixner-NOAA Feb 5, 2025
300f8f0
update ufs weather model hash
JessicaMeixner-NOAA Feb 5, 2025
02210bf
updating script for shell check
JessicaMeixner-NOAA Feb 6, 2025
bbd9bd8
add fv3 output variable to model_configure
JessicaMeixner-NOAA Feb 7, 2025
df709ba
Merge branch 'NOAA-EMC:develop' into fixhighrestest
JessicaMeixner-NOAA Feb 11, 2025
5bb8f70
point to ww3 with point updates
JessicaMeixner-NOAA Feb 11, 2025
dd9a74c
revert accidental commit to this branch
JessicaMeixner-NOAA Feb 11, 2025
d4701a5
fix gitmodules
JessicaMeixner-NOAA Feb 11, 2025
3867efa
update git modules
JessicaMeixner-NOAA Feb 11, 2025
32baf2b
remove space
JessicaMeixner-NOAA Feb 11, 2025
c3f5bb5
define ww3 binary restart variable for calm case
JessicaMeixner-NOAA Feb 11, 2025
d581344
Merge branch 'fixhighrestest' of github.com:JessicaMeixner-NOAA/globa…
JessicaMeixner-NOAA Feb 11, 2025
7207ad9
Merge branch 'NOAA-EMC:develop' into fixhighrestest
JessicaMeixner-NOAA Feb 13, 2025
c707bff
update comments
JessicaMeixner-NOAA Feb 14, 2025
7de44e0
Merge branch 'NOAA-EMC:develop' into fixhighrestest
JessicaMeixner-NOAA Feb 18, 2025
d092366
Merge branch 'NOAA-EMC:develop' into fixhighrestest
JessicaMeixner-NOAA Feb 18, 2025
32f2468
update IC date of ci/cases/pr/C48mx500_3DVarAOWCDA.yaml
JessicaMeixner-NOAA Feb 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions env/HERCULES.env
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ case ${step} in
"fcst" | "efcs")

export OMP_STACKSIZE=512M
export FI_MLX_INJECT_LIMIT=0

(( nnodes = (ntasks+tasks_per_node-1)/tasks_per_node ))
(( ufs_ntasks = nnodes*tasks_per_node ))
Expand Down
2 changes: 2 additions & 0 deletions env/ORION.env
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,8 @@ elif [[ "${step}" = "eupd" ]]; then

elif [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then

export FI_MLX_INJECT_LIMIT=0

(( nnodes = (ntasks+tasks_per_node-1)/tasks_per_node ))
(( ufs_ntasks = nnodes*tasks_per_node ))
# With ESMF threading, the model wants to use the full node
Expand Down
5 changes: 1 addition & 4 deletions jobs/JGLOBAL_WAVE_POST_SBS
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,9 @@ export MP_PULSE=0
YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL \
COMOUT_WAVE_GRID:COM_WAVE_GRID_TMPL

for out_dir in "${COMOUT_WAVE_PREP}" "${COMOUT_WAVE_GRID}"; do
if [[ ! -d "${out_dir}" ]]; then mkdir -p "${out_dir}"; fi
done
if [[ ! -d "${COMOUT_WAVE_GRID}" ]]; then mkdir -p "${COMOUT_WAVE_GRID}"; fi

if [[ -n "${wavepostGRD}" || -n "${waveinterpGRD}" ]]; then
for grdID in ${wavepostGRD} ${waveinterpGRD}; do
Expand Down
20 changes: 10 additions & 10 deletions scripts/exgfs_wave_post_pnt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -618,13 +618,13 @@ source "${USHgfs}/preamble.sh"
if [ ${CFP_MP:-"NO"} = "YES" ] && [ "$DOBLL_WAV" = "YES" ]; then
if [ "$DOBNDPNT_WAV" = YES ]; then
if [ "$DOSPC_WAV" = YES ]; then
echo "$nm ${USHgfs}/wave_tar.sh $WAV_MOD_TAG ibp $Nb > ${WAV_MOD_TAG}_spec_tar.out 2>&1 " >> cmdtarfile
echo "$nm ${USHgfs}/wave_tar.sh $WAV_MOD_TAG ibp $Nb > ${WAV_MOD_TAG}_ibp_tar.out 2>&1 " >> cmdtarfile
nm=$(( nm + 1 ))
fi
if [ "$DOBLL_WAV" = YES ]; then
echo "$nm ${USHgfs}/wave_tar.sh $WAV_MOD_TAG ibpbull $Nb > ${WAV_MOD_TAG}_spec_tar.out 2>&1 " >> cmdtarfile
echo "$nm ${USHgfs}/wave_tar.sh $WAV_MOD_TAG ibpbull $Nb > ${WAV_MOD_TAG}_ibpbull_tar.out 2>&1 " >> cmdtarfile
nm=$(( nm + 1 ))
echo "$nm ${USHgfs}/wave_tar.sh $WAV_MOD_TAG ibpcbull $Nb > ${WAV_MOD_TAG}_spec_tar.out 2>&1 " >> cmdtarfile
echo "$nm ${USHgfs}/wave_tar.sh $WAV_MOD_TAG ibpcbull $Nb > ${WAV_MOD_TAG}_ibpcbull_tar.out 2>&1 " >> cmdtarfile
nm=$(( nm + 1 ))
fi
else
Expand All @@ -633,28 +633,28 @@ source "${USHgfs}/preamble.sh"
nm=$(( nm + 1 ))
fi
if [ "$DOBLL_WAV" = YES ]; then
echo "$nm ${USHgfs}/wave_tar.sh $WAV_MOD_TAG bull $Nb > ${WAV_MOD_TAG}_spec_tar.out 2>&1 " >> cmdtarfile
echo "$nm ${USHgfs}/wave_tar.sh $WAV_MOD_TAG bull $Nb > ${WAV_MOD_TAG}_bull_tar.out 2>&1 " >> cmdtarfile
nm=$(( nm + 1 ))
echo "$nm ${USHgfs}/wave_tar.sh $WAV_MOD_TAG cbull $Nb > ${WAV_MOD_TAG}_spec_tar.out 2>&1 " >> cmdtarfile
echo "$nm ${USHgfs}/wave_tar.sh $WAV_MOD_TAG cbull $Nb > ${WAV_MOD_TAG}_cbull_tar.out 2>&1 " >> cmdtarfile
nm=$(( nm + 1 ))
fi
fi
else
if [ "$DOBNDPNT_WAV" = YES ]; then
if [ "$DOSPC_WAV" = YES ]; then
echo "${USHgfs}/wave_tar.sh $WAV_MOD_TAG ibp $Nb > ${WAV_MOD_TAG}_spec_tar.out 2>&1 " >> cmdtarfile
echo "${USHgfs}/wave_tar.sh $WAV_MOD_TAG ibp $Nb > ${WAV_MOD_TAG}_ibp_tar.out 2>&1 " >> cmdtarfile
fi
if [ "$DOBLL_WAV" = YES ]; then
echo "${USHgfs}/wave_tar.sh $WAV_MOD_TAG ibpbull $Nb > ${WAV_MOD_TAG}_spec_tar.out 2>&1 " >> cmdtarfile
echo "${USHgfs}/wave_tar.sh $WAV_MOD_TAG ibpcbull $Nb > ${WAV_MOD_TAG}_spec_tar.out 2>&1 " >> cmdtarfile
echo "${USHgfs}/wave_tar.sh $WAV_MOD_TAG ibpbull $Nb > ${WAV_MOD_TAG}_ibpbull_tar.out 2>&1 " >> cmdtarfile
echo "${USHgfs}/wave_tar.sh $WAV_MOD_TAG ibpcbull $Nb > ${WAV_MOD_TAG}_ibpcbull_tar.out 2>&1 " >> cmdtarfile
fi
else
if [ "$DOSPC_WAV" = YES ]; then
echo "${USHgfs}/wave_tar.sh $WAV_MOD_TAG spec $Nb > ${WAV_MOD_TAG}_spec_tar.out 2>&1 " >> cmdtarfile
fi
if [ "$DOBLL_WAV" = YES ]; then
echo "${USHgfs}/wave_tar.sh $WAV_MOD_TAG bull $Nb > ${WAV_MOD_TAG}_spec_tar.out 2>&1 " >> cmdtarfile
echo "${USHgfs}/wave_tar.sh $WAV_MOD_TAG cbull $Nb > ${WAV_MOD_TAG}_spec_tar.out 2>&1 " >> cmdtarfile
echo "${USHgfs}/wave_tar.sh $WAV_MOD_TAG bull $Nb > ${WAV_MOD_TAG}_bull_tar.out 2>&1 " >> cmdtarfile
echo "${USHgfs}/wave_tar.sh $WAV_MOD_TAG cbull $Nb > ${WAV_MOD_TAG}_cbull_tar.out 2>&1 " >> cmdtarfile
fi
fi
fi
Expand Down
20 changes: 7 additions & 13 deletions ush/forecast_postdet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -367,24 +367,18 @@ WW3_postdet() {
elif [[ -s "${ww3_binary_restart_file}" ]]; then
# found binary ww3 restart file
export WW3_restart_from_binary=true
if [[ -f "${DATA}/ufs.cpld.cpl.r.nc" ]]; then
#if this is a cmeps continue then the wave restart name is different
seconds=$(to_seconds "${restart_date:8:2}0000") # convert HHMMSS to seconds
local ww3_restart_dest_file="ufs.cpld.ww3.r.${restart_date:0:4}-${restart_date:4:2}-${restart_date:6:2}-${seconds}"
${NCP} "${ww3_binary_restart_file}" "${DATA}/${ww3_restart_dest_file}" \
|| ( echo "FATAL ERROR: Unable to copy binary WW3 IC, ABORT!"; exit 1 )
else
${NCP} "${ww3_binary_restart_file}" "${DATA}/restart.ww3" \
|| ( echo "FATAL ERROR: Unable to copy binary WW3 IC, ABORT!"; exit 1 )
fi
seconds=$(to_seconds "${restart_date:8:2}0000") # convert HHMMSS to seconds
local ww3_restart_dest_file="ufs.cpld.ww3.r.${restart_date:0:4}-${restart_date:4:2}-${restart_date:6:2}-${seconds}"
${NCP} "${ww3_binary_restart_file}" "${DATA}/${ww3_restart_dest_file}" \
|| ( echo "FATAL ERROR: Unable to copy binary WW3 IC, ABORT!"; exit 1 )
else
if [[ "${RERUN}" == "YES" ]]; then
if [[ "${RERUN}" == "YES" ]] || [[ -f "${DATA}/ufs.cpld.cpl.r.nc" ]]; then
# In the case of a RERUN, the WW3 restart file is required
echo "FATAL ERROR: WW3 binary | netcdf restart file '${ww3_binary_restart_file}' | '${ww3_netcdf_restart_file}' not found for RERUN='${RERUN}', ABORT!"
# In the case of runtype=continue, if no wave restart when using PIO, the model will fail
echo "FATAL ERROR: WW3 binary | netcdf restart file '${ww3_binary_restart_file}' | '${ww3_netcdf_restart_file}' not found for RERUN='${RERUN}' or runtype=continue, ABORT!"
exit 1
else
echo "WARNING: WW3 binary | netcdf restart file '${ww3_binary_restart_file}' | '${ww3_netcdf_restart_file}' not found for warm_start='${warm_start}', will start from rest!"
export WW3_restart_from_binary=true
fi
fi

Expand Down
32 changes: 2 additions & 30 deletions ush/wave_grid_interp_sbs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,15 @@ source "${USHgfs}/preamble.sh"
set_trace

if [[ -z "${PDY}" ]] || [[ -z "${cyc}" ]] || [[ -z "${cycle}" ]] || [[ -z "${EXECgfs}" ]] || \
[[ -z "${COMOUT_WAVE_PREP}" ]] || [[ -z "${WAV_MOD_TAG}" ]] || [[ -z "${SENDDBN}" ]] || \
[ -z "${waveGRD}" ]
[[ -z "${waveGRD}" ]] || [[ -z "${WAV_MOD_TAG}" ]] || [[ -z "${SENDDBN}" ]]
then
set +x
echo ' '
echo '***************************************************'
echo '*** EXPORTED VARIABLES IN postprocessor NOT SET ***'
echo '***************************************************'
echo ' '
echo "${PDY}${cyc} ${cycle} ${EXECgfs} ${COMOUT_WAVE_PREP} ${WAV_MOD_TAG} ${SENDDBN} ${waveGRD}"
echo "${PDY}${cyc} ${cycle} ${EXECgfs} ${WAV_MOD_TAG} ${SENDDBN} ${waveGRD}"
set_trace
exit 1
fi
Expand Down Expand Up @@ -142,14 +141,6 @@ source "${USHgfs}/preamble.sh"
"${EXECgfs}/${pgm}" 1> gint.${grdID}.out 2>&1
export err=$?;err_chk

# Write interpolation file to main TEMP dir area if not there yet
if [ "wht_OK" = 'no' ] # FIXME: This is never going to evaluate to true, wht_OK is a string and needs to be ${wht_OK}. With ${wht_OK}, the next line is trying to copy into ${FIXgfs} space. This leads to a Permission denied error. The logic here needs to be evaluated and recoded. #TODO
then
cp -f ./WHTGRIDINT.bin ${DATA}/ww3_gint.WHTGRIDINT.bin.${grdID}
cp -f ./WHTGRIDINT.bin ${FIXgfs}/wave/ww3_gint.WHTGRIDINT.bin.${grdID}
fi


if [ "$err" != '0' ]
then
set +x
Expand All @@ -168,25 +159,6 @@ source "${USHgfs}/preamble.sh"
rm -f mod_def.*
mv out_grd.$grdID ${DATA}/output_${ymdh}0000/out_grd.$grdID

# 1.c Save in /com

set +x
echo " Saving GRID file as ${COMOUT_WAVE_PREP}/${WAV_MOD_TAG}.out_grd.${grdID}.${PDY}${cyc}"
set_trace
cp "${DATA}/output_${ymdh}0000/out_grd.${grdID}" "${COMOUT_WAVE_PREP}/${WAV_MOD_TAG}.out_grd.${grdID}.${PDY}${cyc}"

# if [ "$SENDDBN" = 'YES' ]
# then
# set +x
# echo " Alerting GRID file as $COMOUT/rundata/$WAV_MOD_TAG.out_grd.$grdID.${PDY}${cyc}
# set_trace

#
# PUT DBNET ALERT HERE ....
#

# fi

# --------------------------------------------------------------------------- #
# 2. Clean up the directory

Expand Down
2 changes: 1 addition & 1 deletion versions/fix.ver
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ export reg2grb2_ver=20220805
export sfc_climo_ver=20220805
export ugwd_ver=20240624
export verif_ver=20220805
export wave_ver=20240105
export wave_ver=20250110
export orog_nest_ver=global-nest.20240419
export ugwd_nest_ver=global-nest.20240419
4 changes: 2 additions & 2 deletions versions/ic.ver
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ic_versions['C384C192']=20240610
ic_versions['C384mx025']=20241120

ic_versions['C768']=20241120
ic_versions['C768mx025']=20241120
ic_versions['C768mx025']=20250115

ic_versions['C1152']=20241120
ic_versions['C1152mx025']=20241120
ic_versions['C1152mx025']=20250115