Skip to content

Commit ea5a6f5

Browse files
committed
Update ideal RT configuration to increase output frequency, decrease resource usage, and make the test check against baseline data.
1 parent a98c954 commit ea5a6f5

File tree

8 files changed

+30
-517
lines changed

8 files changed

+30
-517
lines changed

FV3

Submodule FV3 updated from 406089e to f86afff

tests/logs/RegressionTests_hera.log

Lines changed: 15 additions & 434 deletions
Large diffs are not rendered by default.

tests/parm/diag_table/diag_table_ideal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
20181015.00Z
1+
20220522.20Z
22
2022 05 22 20 0 0
33

44
"grid_spec", -1, "months", 1, "days", "time"
55
"atmos_static", -1, "hours", 1, "hours", "time"
66
"atmos_4xdaily", 6, "hours", 1, "days", "time"
7-
"fv3_history", 3, "hours", 1, "hours", "time"
7+
"fv3_history", 15, "minutes", 1, "minutes", "time"
88
"fv3_history2d", 3, "hours", 1, "hours", "time"
99

1010
#

tests/parm/ideal_supercell.nml.IN

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,16 @@
8383
hord_vt = 6
8484
hydrostatic = .false.
8585
io_layout = 1, 1
86-
k_split = 2
86+
k_split = 3
8787
ke_bg = 0.0
8888
kord_mt = 9
8989
kord_tm = -9
9090
kord_tr = 9
9191
kord_wz = 9
92-
layout = 1, 1
92+
layout = @[INPES],@[JNPES]
9393
make_nh = .true.
9494
mountain = .false.
95-
n_split = 0
95+
n_split = 2
9696
n_sponge = 9
9797
n_zs_filter = 0
9898
na_init = 1
@@ -209,7 +209,7 @@
209209
pdfcld = .false.
210210
pre_rad = .false.
211211
print_diff_pgr = .true.
212-
prslrd0 = 0.0
212+
prslrd0 = 5000.0
213213
random_clds = .false.
214214
redrag = .true.
215215
satmedmf = .false.

tests/parm/model_configure_ideal.IN

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ dy: 3000.0
4141
#dlon: 0.025
4242
#dlat: 0.025
4343

44-
output_fh: 1.0 -1
44+
output_fh: 0.25 -1
4545
nsout: -1

tests/rt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,4 +489,4 @@ RUN | datm_cdeps_control_cfsr | + hera hercules
489489

490490
# Minimal physics idealized test
491491
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 |
492-
RUN | ideal_supercell | + hera | |
492+
RUN | ideal_supercell | + hera | baseline |

tests/test_changes.list

Lines changed: 1 addition & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1 @@
1-
cpld_control_p8_mixedmode intel
2-
cpld_control_gfsv17 intel
3-
cpld_control_gfsv17_iau intel
4-
cpld_restart_gfsv17 intel
5-
cpld_mpi_gfsv17 intel
6-
cpld_control_sfs intel
7-
cpld_debug_gfsv17 intel
8-
cpld_control_p8 intel
9-
cpld_control_p8.v2.sfc intel
10-
cpld_restart_p8 intel
11-
cpld_control_qr_p8 intel
12-
cpld_restart_qr_p8 intel
13-
cpld_2threads_p8 intel
14-
cpld_decomp_p8 intel
15-
cpld_mpi_p8 intel
16-
cpld_control_ciceC_p8 intel
17-
cpld_bmark_p8 intel
18-
cpld_restart_bmark_p8 intel
19-
cpld_s2sa_p8 intel
20-
cpld_control_noaero_p8 intel
21-
cpld_control_nowave_noaero_p8 intel
22-
cpld_debug_p8 intel
23-
cpld_debug_noaero_p8 intel
24-
cpld_control_noaero_p8_agrid intel
25-
cpld_control_c48 intel
26-
cpld_warmstart_c48 intel
27-
cpld_restart_c48 intel
28-
cpld_control_p8_faster intel
29-
cpld_control_pdlib_p8 intel
30-
cpld_restart_pdlib_p8 intel
31-
cpld_mpi_pdlib_p8 intel
32-
cpld_debug_pdlib_p8 intel
33-
control_CubedSphereGrid intel
34-
control_CubedSphereGrid_parallel intel
35-
control_latlon intel
36-
control_wrtGauss_netcdf_parallel intel
37-
control_c48 intel
38-
control_c48_lnd_iau intel
39-
control_c192 intel
40-
control_c384 intel
41-
control_p8 intel
42-
control_p8.v2.sfc intel
43-
control_p8_ugwpv1 intel
44-
control_restart_p8 intel
45-
control_noqr_p8 intel
46-
control_restart_noqr_p8 intel
47-
control_decomp_p8 intel
48-
control_2threads_p8 intel
49-
control_p8_lndp intel
50-
merra2_thompson intel
51-
control_p8_faster intel
52-
control_CubedSphereGrid_debug intel
53-
control_wrtGauss_netcdf_parallel_debug intel
54-
control_debug_p8 intel
55-
atm_ds2s_docn_pcice intel
56-
atm_ds2s_docn_dice intel
57-
control_p8_atmlnd_sbs intel
58-
control_p8_atmlnd intel
59-
control_restart_p8_atmlnd intel
60-
control_p8_atmlnd_debug intel
61-
atmwav_control_noaero_p8 intel
62-
atmaero_control_p8 intel
63-
atmaero_control_p8_rad intel
64-
atmaero_control_p8_rad_micro intel
65-
control_c48 gnu
66-
control_p8 gnu
67-
control_p8_ugwpv1 gnu
68-
control_debug_p8 gnu
69-
cpld_control_nowave_noaero_p8 gnu
70-
cpld_control_pdlib_p8 gnu
1+
ideal_supercell intel

tests/tests/ideal_supercell

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
###############################################################################
22
#
3-
# Doubly periodic idealized bubble (supercell) 1km with minimal physics (only microphysics)
3+
# Doubly periodic idealized bubble (supercell) 3km with minimal physics (only microphysics)
44
#
55
###############################################################################
66

77
export TEST_DESCR="Compare idealized, minimal physics run with results with previous trunk version"
88

99
export CNTL_DIR=fv3_ideal_supercell
1010

11-
export LIST_FILES=""
11+
export LIST_FILES="fv3_history.nc"
1212

1313
export_fv3
1414

15-
export INPES=1
16-
export JNPES=1
15+
export INPES=5
16+
export JNPES=5
17+
export NTILES=1
1718
export QUILTING=.false.
1819

1920
export FV3_RUN=ideal_run.IN

0 commit comments

Comments
 (0)