Update ideal RT configuration to increase output frequency, decrease …

…resource usage, and make the test check against baseline data.
LarissaReames-NOAA · Jan 16, 2025 · ea5a6f5 · ea5a6f5
1 parent a98c954
commit ea5a6f5
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 517 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/parm/diag_table/diag_table_ideal b/tests/parm/diag_table/diag_table_ideal
@@ -1,10 +1,10 @@
-20181015.00Z
+20220522.20Z
 2022 05 22 20 0 0
 
 "grid_spec",              -1,  "months",   1, "days",  "time"
 "atmos_static",           -1,  "hours",    1, "hours", "time"
 "atmos_4xdaily",           6,  "hours",    1, "days",  "time"
-"fv3_history",             3,  "hours",    1, "hours", "time"
+"fv3_history",             15,  "minutes",    1, "minutes", "time"
 "fv3_history2d",           3,  "hours",    1, "hours", "time"
 
 #

diff --git a/tests/parm/ideal_supercell.nml.IN b/tests/parm/ideal_supercell.nml.IN
@@ -83,16 +83,16 @@
     hord_vt = 6
     hydrostatic = .false.
     io_layout = 1, 1
-    k_split = 2
+    k_split = 3
     ke_bg = 0.0
     kord_mt = 9
     kord_tm = -9
     kord_tr = 9
     kord_wz = 9
-    layout = 1, 1
+    layout = @[INPES],@[JNPES]
     make_nh = .true.
     mountain = .false.
-    n_split = 0
+    n_split = 2
     n_sponge = 9
     n_zs_filter = 0
     na_init = 1
@@ -209,7 +209,7 @@
     pdfcld = .false.
     pre_rad = .false.
     print_diff_pgr = .true.
-    prslrd0 = 0.0
+    prslrd0 = 5000.0
     random_clds = .false.
     redrag = .true.
     satmedmf = .false.

diff --git a/tests/parm/model_configure_ideal.IN b/tests/parm/model_configure_ideal.IN
@@ -41,5 +41,5 @@ dy:       3000.0
 #dlon:                     0.025
 #dlat:                     0.025
 
-output_fh:               1.0 -1
+output_fh:               0.25 -1
 nsout:                   -1
diff --git a/tests/rt.conf b/tests/rt.conf
@@ -489,4 +489,4 @@ RUN | datm_cdeps_control_cfsr                           | + hera hercules
 
 # Minimal physics idealized test
 COMPILE | ideal_doubly_periodic | intel | -DAPP=ATM -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8,FV3_ideal_mp_nssl -DCCPP_32BIT=ON | + hera | fv3 |
-RUN | ideal_supercell                                   | + hera            |           |
+RUN | ideal_supercell                                   | + hera            | baseline |
diff --git a/tests/test_changes.list b/tests/test_changes.list
@@ -1,70 +1 @@
-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_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_noaero_p8_agrid 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
-control_CubedSphereGrid intel
-control_CubedSphereGrid_parallel intel
-control_latlon intel
-control_wrtGauss_netcdf_parallel intel
-control_c48 intel
-control_c48_lnd_iau intel
-control_c192 intel
-control_c384 intel
-control_p8 intel
-control_p8.v2.sfc intel
-control_p8_ugwpv1 intel
-control_restart_p8 intel
-control_noqr_p8 intel
-control_restart_noqr_p8 intel
-control_decomp_p8 intel
-control_2threads_p8 intel
-control_p8_lndp intel
-merra2_thompson intel
-control_p8_faster intel
-control_CubedSphereGrid_debug intel
-control_wrtGauss_netcdf_parallel_debug intel
-control_debug_p8 intel
-atm_ds2s_docn_pcice intel
-atm_ds2s_docn_dice intel
-control_p8_atmlnd_sbs intel
-control_p8_atmlnd intel
-control_restart_p8_atmlnd intel
-control_p8_atmlnd_debug intel
-atmwav_control_noaero_p8 intel
-atmaero_control_p8 intel
-atmaero_control_p8_rad intel
-atmaero_control_p8_rad_micro intel
-control_c48 gnu
-control_p8 gnu
-control_p8_ugwpv1 gnu
-control_debug_p8 gnu
-cpld_control_nowave_noaero_p8 gnu
-cpld_control_pdlib_p8 gnu
+ideal_supercell intel
diff --git a/tests/tests/ideal_supercell b/tests/tests/ideal_supercell
@@ -1,19 +1,20 @@
 ###############################################################################
 #
-#   Doubly periodic idealized bubble (supercell) 1km with minimal physics (only microphysics) 
+#   Doubly periodic idealized bubble (supercell) 3km with minimal physics (only microphysics) 
 #
 ###############################################################################
 
 export TEST_DESCR="Compare idealized, minimal physics run with results with previous trunk version"
 
 export CNTL_DIR=fv3_ideal_supercell
 
-export LIST_FILES=""
+export LIST_FILES="fv3_history.nc"
 
 export_fv3
 
-export INPES=1
-export JNPES=1
+export INPES=5
+export JNPES=5
+export NTILES=1
 export QUILTING=.false.
 
 export FV3_RUN=ideal_run.IN
+1 −1		atmos_cubed_sphere
+0 −1		ccpp/suites/suite_FV3_ideal_mp_nssl.xml
+0 −30		ccpp/suites/suite_FV3_ideal_pbl_mp_nssl.xml