diff --git a/tests/rt.conf b/tests/rt.conf index 07fa091e1b..af678f72ca 100644 --- a/tests/rt.conf +++ b/tests/rt.conf @@ -125,11 +125,6 @@ RUN | regional_netcdf_parallel | - acorn RUN | regional_2dwrtdecomp | | | RUN | regional_wofs | - jet s4 | baseline | -COMPILE | ifi | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DREQUIRE_IFI=ON | + acorn | fv3 | -RUN | regional_ifi_control | + acorn | baseline | -RUN | regional_ifi_decomp | + acorn | | -RUN | regional_ifi_2threads | + acorn | | - COMPILE | rrfs | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON | | fv3 | RUN | rap_control | | baseline | RUN | regional_spp_sppt_shum_skeb | | baseline | diff --git a/tests/tests/regional_ifi_2threads b/tests/tests/regional_ifi_2threads deleted file mode 100644 index 8e1db314cd..0000000000 --- a/tests/tests/regional_ifi_2threads +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################### -# -# FV3 regional threading test -# -############################################################################### - -export TEST_DESCR="Compare FV3 regional threading results with previous trunk version" - -export CNTL_DIR=regional_ifi_control - -export LIST_FILES="dynf000.nc \ - dynf006.nc \ - phyf000.nc \ - phyf006.nc \ - PRSLEV.GrbF00 \ - PRSLEV.GrbF06 \ - NATLEV.GrbF00 \ - NATLEV.GrbF06" - -export_fv3_v16 - -export FV3_RUN=regional_run.IN - -export OZ_PHYS_OLD=.false. -export OZ_PHYS_NEW=.true. -export H2O_PHYS=.true. -export HYBEDMF=.false. -export WRITE_DOPOST=.true. -export POSTAPP='lam' - -export CCPP_SUITE=FV3_GFS_v15_thompson_mynn_lam3km -export INPUT_NML=regional.nml.IN -export MODEL_CONFIGURE=model_configure_regional.IN -export DIAG_TABLE=diag_table_lam -export FIELD_TABLE=field_table_regional - -export WLCLK=15 -export FHMAX=6 -export INPES=10 -export JNPES=11 -export atm_omp_num_threads=2 -export OUTPUT_FH="3 -1" -WRITE_GROUP=1 -WRTTASK_PER_GROUP=10 -NTILES=1 diff --git a/tests/tests/regional_ifi_control b/tests/tests/regional_ifi_control deleted file mode 100644 index 089d372a78..0000000000 --- a/tests/tests/regional_ifi_control +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################### -# -# FV3 regional control with IFI (hi-res 3km, small domain) test -# -############################################################################### - -export TEST_DESCR="Compare FV3 regional control results with IFI against previous trunk version" - -export CNTL_DIR=regional_ifi_control - -export LIST_FILES="dynf000.nc \ - dynf006.nc \ - phyf000.nc \ - phyf006.nc \ - PRSLEV.GrbF00 \ - PRSLEV.GrbF06 \ - NATLEV.GrbF00 \ - NATLEV.GrbF06" - -export_fv3_v16 - -export FV3_RUN=regional_run.IN - -export OZ_PHYS_OLD=.false. -export OZ_PHYS_NEW=.true. -export H2O_PHYS=.true. -export HYBEDMF=.false. -export RESTART_INTERVAL="3 -1" -export WRITE_DOPOST=.true. -export POSTAPP='lam' - -export CCPP_SUITE=FV3_GFS_v15_thompson_mynn_lam3km -export INPUT_NML=regional.nml.IN -export MODEL_CONFIGURE=model_configure_regional.IN -export DIAG_TABLE=diag_table_lam -export FIELD_TABLE=field_table_regional - -export WLCLK=15 -export FHMAX=6 -export INPES=10 -export JNPES=11 -export OUTPUT_FH="3 -1" -WRITE_GROUP=1 -WRTTASK_PER_GROUP=10 -NTILES=1 diff --git a/tests/tests/regional_ifi_decomp b/tests/tests/regional_ifi_decomp deleted file mode 100644 index 815587548a..0000000000 --- a/tests/tests/regional_ifi_decomp +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################### -# -# FV3 regional + IFI with different MPI decomposition (hi-res 3km, small domain) test -# -############################################################################### - -export TEST_DESCR="Compare FV3 regional with IFI; different decomposition results with previous trunk version" - -export CNTL_DIR=regional_ifi_control - -export LIST_FILES="dynf000.nc \ - dynf006.nc \ - phyf000.nc \ - phyf006.nc \ - PRSLEV.GrbF00 \ - PRSLEV.GrbF06 \ - NATLEV.GrbF00 \ - NATLEV.GrbF06" - -export_fv3_v16 - -export FV3_RUN=regional_run.IN - -export OZ_PHYS_OLD=.false. -export OZ_PHYS_NEW=.true. -export H2O_PHYS=.true. -export HYBEDMF=.false. -export RESTART_INTERVAL="0" -export WRITE_DOPOST=.true. -export POSTAPP='lam' - -export CCPP_SUITE=FV3_GFS_v15_thompson_mynn_lam3km -export INPUT_NML=regional.nml.IN -export MODEL_CONFIGURE=model_configure_regional.IN -export DIAG_TABLE=diag_table_lam -export FIELD_TABLE=field_table_regional - -export WLCLK=15 -export FHMAX=6 -export INPES=11 -export JNPES=10 -export OUTPUT_FH="3 -1" -WRITE_GROUP=1 -WRTTASK_PER_GROUP=10 -NTILES=1