Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion tests/fv3_conf/cpld_control_run.IN
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,11 @@ else
RFILE=ufs.cpld.ww3.r.${RESTART_FILE_SUFFIX_SECS}.nc
cp ../${DEP_RUN}${SUFFIX}/${RFILE} .
if [[ $WW3_DOMAIN == 'global_270k' ]]; then
cp ../${DEP_RUN}${SUFFIX}/out.pnt_wght.ww3.nc pnt_wght.ww3.nc
if [[ -f ../${DEP_RUN}${SUFFIX}/out.pnt_wght.ww3.nc ]]; then
cp ../${DEP_RUN}${SUFFIX}/out.pnt_wght.ww3.nc pnt_wght.ww3.nc
else
cp ../${DEP_RUN}${SUFFIX}/pnt_wght.ww3.nc pnt_wght.ww3.nc
fi
fi
fi

Expand Down
871 changes: 413 additions & 458 deletions tests/logs/RegressionTests_hera.log

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions tests/rt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ COMPILE | s2swa_32bit_pdlib | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_
RUN | cpld_control_gfsv17 | - noaacloud | baseline |
RUN | cpld_control_gfsv17_iau | - noaacloud | baseline | cpld_control_gfsv17
RUN | cpld_restart_gfsv17 | - noaacloud | | cpld_control_gfsv17
RUN | cpld_restart_gfsv17_iau | - noaacloud | | cpld_control_gfsv17_iau
RUN | cpld_mpi_gfsv17 | - noaacloud | |
RUN | cpld_control_gfsv17_nowav_iau | - noaacloud | baseline | cpld_control_gfsv17
RUN | cpld_restart_gfsv17_nowav_iau | - noaacloud | | cpld_control_gfsv17_nowav_iau

#SFS
COMPILE | s2swa_32bit_pdlib_sfs | intel | -DAPP=S2SWA -D32BIT=ON -DHYDRO=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON | - noaacloud | fv3 |
Expand Down
3 changes: 2 additions & 1 deletion tests/rt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,8 @@ if [[ "${CREATE_BASELINE}" == false ]] ; then
fi

INPUTDATA_ROOT=${INPUTDATA_ROOT:-${DISKNM}/NEMSfv3gfs/input-data-20250507}
INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20250225
#INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20250225
INPUTDATA_ROOT_WW3=/scratch4/NCEPDEV/marine/Ming.Chen/ufs_iau_timefix/WW3_input_data_20250715
INPUTDATA_LM4=${INPUTDATA_LM4:-${INPUTDATA_ROOT}/LM4_input_data}

shift $((OPTIND-1))
Expand Down
50 changes: 1 addition & 49 deletions tests/test_changes.list
Original file line number Diff line number Diff line change
@@ -1,55 +1,7 @@
cpld_control_p8_mixedmode intel
cpld_control_gefs intel
cpld_restart_gefs intel
cpld_dcp_gefs intel
cpld_control_gfsv17 intel
cpld_control_gfsv17_iau intel
cpld_restart_gfsv17 intel
cpld_control_gfsv17_nowav_iau intel
cpld_restart_gfsv17_nowav_iau intel
cpld_restart_gfsv17_iau intel
cpld_mpi_gfsv17 intel
cpld_control_sfs intel
cpld_debug_gfsv17 intel
cpld_control_p8 intel
cpld_control_p8.v2.sfc intel
cpld_restart_p8 intel
cpld_control_qr_p8 intel
cpld_restart_qr_p8 intel
cpld_2threads_p8 intel
cpld_decomp_p8 intel
cpld_mpi_p8 intel
cpld_control_ciceC_p8 intel
cpld_control_c192_p8 intel
cpld_restart_c192_p8 intel
cpld_control_p8_lnd intel
cpld_restart_p8_lnd intel
cpld_s2sa_p8 intel
cpld_control_noaero_p8 intel
cpld_control_nowave_noaero_p8 intel
cpld_debug_p8 intel
cpld_debug_noaero_p8 intel
cpld_control_noaero_p8_agrid intel
cpld_control_p8_faster intel
cpld_control_pdlib_p8 intel
cpld_restart_pdlib_p8 intel
cpld_mpi_pdlib_p8 intel
cpld_control_c48_5deg intel
cpld_warmstart_c48_5deg intel
cpld_restart_c48_5deg intel
cpld_control_c24_5deg intel
cpld_warmstart_c24_5deg intel
cpld_restart_c24_5deg intel
cpld_control_c24_9deg intel
cpld_warmstart_c24_9deg intel
cpld_restart_c24_9deg intel
cpld_control_c12_9deg intel
cpld_warmstart_c12_9deg intel
cpld_restart_c12_9deg intel
cpld_debug_pdlib_p8 intel
atm_ds2s_docn_pcice intel
atm_ds2s_docn_dice intel
cpld_control_p8 gnu
cpld_control_nowave_noaero_p8 gnu
cpld_debug_p8 gnu
cpld_control_pdlib_p8 gnu
cpld_debug_pdlib_p8 gnu
61 changes: 0 additions & 61 deletions tests/tests/cpld_control_gfsv17_nowav_iau

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
# cpld_control GFSv17 restart test with IAU
#

source ${PATHRT}/tests/cpld_control_gfsv17_nowav_iau
#source ${PATHRT}/tests/cpld_control_gfsv17_nowav_iau
source ${PATHRT}/tests/cpld_control_gfsv17_iau
export TEST_DESCR+=" restart"

export FHROT=18 #restart after any IAU
Expand Down