From 4b342672a335d11273c1712d7c9ca83ff8034bb7 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Tue, 8 Oct 2024 10:26:41 -0500 Subject: [PATCH] Add several tests using Intel LLVM compiler to rt.conf --- tests/rt.conf | 93 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 67 insertions(+), 26 deletions(-) diff --git a/tests/rt.conf b/tests/rt.conf index 407dcde958..6f784a2f36 100644 --- a/tests/rt.conf +++ b/tests/rt.conf @@ -19,7 +19,10 @@ # Item 4: Controls whether the run creates its own baseline or it uses the baseline from a different (control) test. # Item 5: Test name to compare baselines with if not itself. -### Intel Tests ### +############################# +### Intel (Classic) Tests ### +############################# + ### S2S tests ### COMPILE | s2swa_32bit | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8,FV3_GFS_v17_coupled_p8_ugwpv1 | | fv3 | RUN | cpld_control_p8_mixedmode | - noaacloud | baseline | @@ -146,12 +149,9 @@ COMPILE | csawmg | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v1 RUN | control_csawmg | - noaacloud | baseline | RUN | control_ras | - noaacloud | baseline | -COMPILE | csawmg | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_ras | + hera hercules | fv3 | -RUN | control_csawmg | + hera hercules | baseline | - # Run WAM test in REPRO mode to avoid numerical instability in the deep atmosphere COMPILE | wam | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v17_p8 -D32BIT=ON -DMULTI_GASES=ON | - noaacloud | fv3 | -RUN | control_wam | - noaacloud | baseline | +RUN | control_wam | - noaacloud | baseline | COMPILE | atm_faster_dyn32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DFASTER=ON | | fv3 | RUN | control_p8_faster | - noaacloud | baseline | @@ -190,10 +190,10 @@ COMPILE | atm_debug_dyn32 | gnu | -DAPP=ATM -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES= RUN | control_csawmg_debug | + hera hercules | baseline | COMPILE | wam_debug | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v17_p8 -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON | - noaacloud | fv3 | -RUN | control_wam_debug | - noaacloud hercules | baseline | +RUN | control_wam_debug | - noaacloud hercules | baseline | ### 32-bit physics tests ### -COMPILE | rrfs_dyn32_phy32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON | - noaacloud | fv3 | +COMPILE | rrfs_dyn32_phy32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON | - noaacloud | fv3 | RUN | regional_spp_sppt_shum_skeb_dyn32_phy32 | - noaacloud | baseline | RUN | rap_control_dyn32_phy32 | - noaacloud | baseline | RUN | hrrr_control_dyn32_phy32 | - noaacloud | baseline | @@ -213,21 +213,21 @@ RUN | conus13km_restart_mismatch | - noaacloud # RUN | conus13km_decomp | - noaacloud | | conus13km_control COMPILE | rrfs_dyn64_phy32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -DCCPP_32BIT=ON | - noaacloud | fv3 | -RUN | rap_control_dyn64_phy32 | - noaacloud | baseline | +RUN | rap_control_dyn64_phy32 | - noaacloud | baseline | COMPILE | rrfs_dyn32_phy32_debug | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR,FV3_HRRR_gf -D32BIT=ON -DCCPP_32BIT=ON -DDEBUG=ON | - noaacloud | fv3 | -RUN | rap_control_debug_dyn32_phy32 | - noaacloud | baseline | -RUN | hrrr_control_debug_dyn32_phy32 | - noaacloud | baseline | -RUN | conus13km_debug | - noaacloud | baseline | -RUN | conus13km_debug_qr | - noaacloud | | -RUN | conus13km_debug_2threads | - noaacloud | | -RUN | conus13km_radar_tten_debug | - noaacloud | baseline | +RUN | rap_control_debug_dyn32_phy32 | - noaacloud | baseline | +RUN | hrrr_control_debug_dyn32_phy32 | - noaacloud | baseline | +RUN | conus13km_debug | - noaacloud | baseline | +RUN | conus13km_debug_qr | - noaacloud | | +RUN | conus13km_debug_2threads | - noaacloud | | +RUN | conus13km_radar_tten_debug | - noaacloud | baseline | # Expected to fail: -# RUN | conus13km_debug_decomp | - noaacloud | | +# RUN | conus13km_debug_decomp | - noaacloud | | COMPILE | rrfs_dyn64_phy32_debug | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -DCCPP_32BIT=ON -DDEBUG=ON | - noaacloud | fv3 | -RUN | rap_control_dyn64_phy32_debug | - noaacloud | baseline | +RUN | rap_control_dyn64_phy32_debug | - noaacloud | baseline | ### HAFS tests ### COMPILE | hafsw | intel | -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v1_gfdlmp_tedmf,FV3_HAFS_v1_gfdlmp_tedmf_nonsst,FV3_HAFS_v1_thompson_tedmf_gfdlsf,FV3_global_nest_v1 -D32BIT=ON | | fv3 | @@ -322,9 +322,53 @@ RUN | atmaero_control_p8_rad_micro | - noaacloud #RUN | regional_atmaq | - jet s4 | baseline | COMPILE | atmaq_debug | intel | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DDEBUG=ON -D32BIT=ON | - jet noaacloud s4 | fv3 | -RUN | regional_atmaq_debug | - hera jet s4 noaacloud | baseline | +RUN | regional_atmaq_debug | - hera jet s4 noaacloud | baseline | + +### ATM-FBH test ### +COMPILE | atm_fbh | intel | -DAPP=ATMF -DCCPP_SUITES=FV3_HRRR -D32BIT=ON | - wcoss2 noaacloud acorn | fv3 | +RUN | cpld_regional_atm_fbh | - wcoss2 noaacloud acorn | baseline | + + + +############################# +### Intel (LLVM) Tests ###### +############################# + + +# Coupled gfs17 tests on Gaea +COMPILE | s2swa_32bit_pdlib | intelllvm | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON | + gaea | fv3 | +RUN | cpld_control_gfsv17 | + gaea | baseline | + +COMPILE | s2swa_32bit_pdlib_debug | intelllvm | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON -DDEBUG=ON | + gaea | fv3 | +RUN | cpld_debug_gfsv17 | + gaea | baseline | + +# Regional RRFS tests on Hera +COMPILE | rrfs_dyn32_phy32 | intelllvm | -DAPP=ATM -DCCPP_SUITES=FV3_RAP -D32BIT=ON -DCCPP_32BIT=ON | + hera | fv3 | +RUN | rap_control_dyn32_phy32 | + hera | baseline | + +COMPILE | rrfs_dyn32_phy32_debug | intelllvm | -DAPP=ATM -DCCPP_SUITES=FV3_RAP -D32BIT=ON -DCCPP_32BIT=ON -DDEBUG=ON | + hera | fv3 | +RUN | rap_control_debug_dyn32_phy32 | + hera | baseline | + +# HAFS tests on Orion +COMPILE | hafsw | intelllvm | -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v1_gfdlmp_tedmf_nonsst -D32BIT=ON | + orion | fv3 | +RUN | hafs_regional_storm_following_1nest_atm_ocn | + orion | baseline | + +COMPILE | hafsw_debug | intelllvm | -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v1_gfdlmp_tedmf_nonsst -D32BIT=ON -DDEBUG=ON | + orion | fv3 | +RUN | hafs_regional_storm_following_1nest_atm_ocn_debug | + orion | baseline | + +# DATM/CDEPS tests on Hercules +COMPILE | datm_cdeps | intelllvm | -DAPP=NG-GODAS | + hercules | fv3 | +RUN | datm_cdeps_control_cfsr | + hercules | baseline | + +COMPILE | datm_cdeps_debug | intelllvm | -DAPP=NG-GODAS -DDEBUG=ON | + hercules | fv3 | +RUN | datm_cdeps_debug_cfsr | + hercules | baseline | + + + +############################# +### Gnu Tests ############### +############################# -### GNU TESTS ### ### CCPP PROD tests ### COMPILE | atm | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v17_p8_ugwpv1 | + hera hercules | fv3 | RUN | control_c48 | + hera hercules | baseline | @@ -350,6 +394,9 @@ RUN | hrrr_control_restart | + hera hercules RUN | hrrr_control_restart_noqr | + hera hercules | | hrrr_control_noqr RUN | rrfs_v1beta | + hera hercules | baseline | +COMPILE | csawmg | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_ras | + hera hercules | fv3 | +RUN | control_csawmg | + hera hercules | baseline | + ### CCPP DEBUG tests ### # Exercise compilation without specifying suites (i.e. compile all suites) in DEBUG mode (faster than in PROD mode) COMPILE | atm_dyn32_debug | gnu | -DAPP=ATM -D32BIT=ON -DDEBUG=ON | + hera hercules | fv3 | @@ -370,10 +417,8 @@ RUN | rap_flake_debug | + hera hercules RUN | rap_clm_lake_debug | + hera hercules | baseline | RUN | gnv1_c96_no_nest_debug | + hera hercules | baseline | - COMPILE | wam_debug | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v17_p8 -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON | + hera hercules | fv3 | -RUN | control_wam_debug | + hercules | baseline | - +RUN | control_wam_debug | + hercules | baseline | ### 32-bit physics tests ### COMPILE | rrfs_dyn32_phy32 | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON | + hera hercules | fv3 | @@ -424,12 +469,8 @@ COMPILE | s2sw_pdlib | gnu | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugw RUN | cpld_control_pdlib_p8 | + hera hercules | baseline | COMPILE | s2sw_pdlib_debug | gnu | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON -DDEBUG=ON | + hera hercules | fv3 | -RUN | cpld_debug_pdlib_p8 | + hercules | baseline | +RUN | cpld_debug_pdlib_p8 | + hercules | baseline | ### CDEPS Data Atmosphere test ### COMPILE | datm_cdeps | gnu | -DAPP=NG-GODAS | + hera hercules | fv3 | RUN | datm_cdeps_control_cfsr | + hera hercules | baseline | - -### ATM-FBH test ### -COMPILE | atm_fbh | intel | -DAPP=ATMF -DCCPP_SUITES=FV3_HRRR -D32BIT=ON | - wcoss2 noaacloud acorn | fv3 | -RUN | cpld_regional_atm_fbh | - wcoss2 noaacloud acorn | baseline |