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

Fix/cpld sfs rt + Pull in units updates from FV3 #2467 #2475

Merged
merged 14 commits into from
Nov 5, 2024
2 changes: 1 addition & 1 deletion FV3
2 changes: 1 addition & 1 deletion tests/bl_date.conf
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20241028
export BL_DATE=20241031
636 changes: 281 additions & 355 deletions tests/logs/RegressionTests_gaea.log

Large diffs are not rendered by default.

878 changes: 373 additions & 505 deletions tests/logs/RegressionTests_hera.log

Large diffs are not rendered by default.

1,168 changes: 370 additions & 798 deletions tests/logs/RegressionTests_hercules.log

Large diffs are not rendered by default.

525 changes: 258 additions & 267 deletions tests/logs/RegressionTests_jet.log

Large diffs are not rendered by default.

575 changes: 289 additions & 286 deletions tests/logs/RegressionTests_orion.log

Large diffs are not rendered by default.

528 changes: 229 additions & 299 deletions tests/logs/RegressionTests_wcoss2.log

Large diffs are not rendered by default.

191 changes: 154 additions & 37 deletions tests/test_changes.list
Original file line number Diff line number Diff line change
@@ -1,37 +1,154 @@
cpld_control_p8_mixedmode intel
cpld_control_gfsv17 intel
cpld_control_gfsv17_iau intel
cpld_restart_gfsv17 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_bmark_p8 intel
cpld_restart_bmark_p8 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_c48 intel
cpld_warmstart_c48 intel
cpld_restart_c48 intel
cpld_control_p8_faster intel
cpld_control_pdlib_p8 intel
cpld_restart_pdlib_p8 intel
cpld_mpi_pdlib_p8 intel
cpld_debug_pdlib_p8 intel
atm_ds2s_docn_dice intel
cpld_control_nowave_noaero_p8 gnu
cpld_control_pdlib_p8 gnu
cpld_debug_pdlib_p8 gnu
atm_ds2s_docn_pcice intel
atmaero_control_p8 intel
atmaero_control_p8_rad intel
atmaero_control_p8_rad_micro intel
atmwav_control_noaero_p8 intel
control_CubedSphereGrid_debug intel
control_CubedSphereGrid intel
control_CubedSphereGrid_parallel intel
control_c48.v2.sfc intel
control_c48 gnu
control_csawmg_debug gnu
control_csawmg_debug intel
control_csawmg gnu
control_csawmg intel
control_debug_p8 gnu
control_debug_p8 intel
control_diag_debug gnu
control_diag_debug intel
control_flake gnu
control_flake intel
control_latlon intel
control_lndp_debug intel
control_p8_atmlnd_debug intel
control_p8_atmlnd intel
control_p8_atmlnd_sbs intel
control_p8_faster intel
control_p8 gnu
control_p8_ugwpv1 gnu
control_ras_debug gnu
control_ras_debug intel
control_ras gnu
control_ras intel
control_stochy_debug gnu
control_stochy_debug intel
control_stochy gnu
control_wam_debug gnu
control_wam intel
control_wrtGauss_netcdf_parallel_debug intel
control_wrtGauss_netcdf_parallel intel
conus13km_control gnu
conus13km_control intel
conus13km_debug_2threads gnu
conus13km_debug_2threads intel
conus13km_debug gnu
conus13km_debug intel
conus13km_debug_qr gnu
conus13km_debug_qr intel
conus13km_radar_tten_debug gnu
conus13km_radar_tten_debug intel
cpld_2threads_p8 intel
cpld_bmark_p8 intel
cpld_control_c192_p8 intel
cpld_control_c48 intel
cpld_control_ciceC_p8 intel
cpld_control_gfsv17 intel
cpld_control_noaero_p8_agrid intel
cpld_control_noaero_p8 intel
cpld_control_nowave_noaero_p8 gnu
cpld_control_nowave_noaero_p8 intel
cpld_control_p8.v2.sfc intel
cpld_control_p8 intel
cpld_control_p8_mixedmode intel
cpld_control_pdlib_p8 gnu
cpld_control_qr_p8 intel
cpld_control_sfs intel
cpld_debug_gfsv17 intel
cpld_debug_noaero_p8 intel
cpld_debug_p8 intel
cpld_debug_pdlib_p8 gnu
cpld_decomp_p8 intel
cpld_mpi_gfsv17 intel
cpld_mpi_p8 intel
cpld_regional_atm_fbh intel
cpld_s2sa_p8 intel
cpld_warmstart_c48 intel
gnv1_c96_no_nest_debug gnu
gnv1_c96_no_nest_debug intel
hafs_global_1nest_atm intel
hafs_global_multiple_4nests_atm intel
hafs_global_storm_following_1nest_atm intel
hafs_regional_1nest_atm intel
hafs_regional_atm intel
hafs_regional_atm_ocn intel
hafs_regional_atm_ocn_wav intel
hafs_regional_atm_thompson_gfdlsf intel
hafs_regional_atm_wav intel
hafs_regional_docn intel
hafs_regional_docn_oisst intel
hafs_regional_specified_moving_1nest_atm intel
hafs_regional_storm_following_1nest_atm intel
hafs_regional_storm_following_1nest_atm_ocn_debug intel
hafs_regional_storm_following_1nest_atm_ocn intel
hafs_regional_storm_following_1nest_atm_ocn_wav_inline intel
hafs_regional_storm_following_1nest_atm_ocn_wav intel
hafs_regional_storm_following_1nest_atm_ocn_wav_mom6 intel
hafs_regional_telescopic_2nests_atm intel
hrrr_c3_debug gnu
hrrr_c3_debug intel
hrrr_control_2threads_dyn32_phy32 intel
hrrr_control_debug_dyn32_phy32 gnu
hrrr_control_debug_dyn32_phy32 intel
hrrr_control_debug gnu
hrrr_control_debug intel
hrrr_control_decomp_dyn32_phy32 gnu
hrrr_control_decomp_dyn32_phy32 intel
hrrr_control_decomp gnu
hrrr_control_dyn32_phy32 gnu
hrrr_control_dyn32_phy32 intel
hrrr_control gnu
hrrr_control_noqr gnu
hrrr_gf_debug gnu
hrrr_gf_debug intel
rap_2threads_dyn32_phy32 gnu
rap_2threads_dyn32_phy32 intel
rap_2threads gnu
rap_cires_ugwp_debug intel
rap_clm_lake_debug gnu
rap_clm_lake_debug intel
rap_control_debug_dyn32_phy32 gnu
rap_control_debug_dyn32_phy32 intel
rap_control_debug gnu
rap_control_debug intel
rap_control_dyn32_phy32 gnu
rap_control_dyn32_phy32 intel
rap_control_dyn64_phy32_debug gnu
rap_control_dyn64_phy32_debug intel
rap_control_dyn64_phy32 gnu
rap_control_dyn64_phy32 intel
rap_control gnu
rap_decomp gnu
rap_diag_debug gnu
rap_diag_debug intel
rap_flake_debug gnu
rap_flake_debug intel
rap_lndp_debug intel
rap_noah_debug intel
rap_noah_sfcdiff_cires_ugwp_debug gnu
rap_noah_sfcdiff_cires_ugwp_debug intel
rap_progcld_thompson_debug gnu
rap_progcld_thompson_debug intel
rap_sfcdiff_debug intel
rap_sfcdiff_decomp gnu
rap_sfcdiff gnu
rap_unified_drag_suite_debug intel
rap_unified_ugwp_debug intel
regional_atmaq_debug intel
regional_control_faster intel
regional_debug gnu
regional_debug intel
regional_spp_sppt_shum_skeb_dyn32_phy32 intel
rrfs_v1beta_debug gnu
rrfs_v1beta_debug intel
rrfs_v1beta gnu
rrfs_v1nssl_nohailnoccn intel
4 changes: 4 additions & 0 deletions tests/tests/cpld_control_pdlib_p8
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ if [[ $MACHINE_ID = orion ]] || [[ $RT_COMPILER = gnu ]]; then
WLCLK=50
fi

if [[ $MACHINE_ID = jet ]]; then
WLCLK=50
fi

export K_SPLIT=4
export N_SPLIT=5

Expand Down
3 changes: 3 additions & 0 deletions tests/tests/cpld_control_sfs
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ fi
export K_SPLIT=2
export N_SPLIT=5

export NUDGE_QV=.false.
export VTDM4=0.05

# HR4 GFSv17 GWD update
export DO_GWD_OPT_PSL=.true.
export DO_GSL_DRAG_SS=.false.
2 changes: 1 addition & 1 deletion tests/tests/cpld_mpi_pdlib_p8
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export N_SPLIT=5
export DO_GWD_OPT_PSL=.true.
export DO_GSL_DRAG_SS=.false.

if [[ $MACHINE_ID = hera ]] || [[ $MACHINE_ID = orion ]]; then
if [[ $MACHINE_ID = hera ]] || [[ $MACHINE_ID = orion ]] || [[ $MACHINE_ID = jet ]]; then
WLCLK=50
fi
if [[ $MACHINE_ID = wcoss2 ]]; then
Expand Down