From 79f2600b27d7496f59a2b95e5f0bfa6fac8bc5ab Mon Sep 17 00:00:00 2001 From: Gabriele Bozzola Date: Tue, 13 Aug 2024 15:10:00 -0700 Subject: [PATCH] This is now not --- config/model_configs/aquaplanet_diagedmf.yml | 4 ++-- config/model_configs/diagnostic_edmfx_aquaplanet.yml | 10 ++++++++-- config/model_configs/diagnostic_edmfx_trmm_box.yml | 2 +- config/model_configs/diagnostic_edmfx_trmm_box_0M.yml | 2 +- .../diagnostic_edmfx_trmm_stretched_box.yml | 3 +-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/config/model_configs/aquaplanet_diagedmf.yml b/config/model_configs/aquaplanet_diagedmf.yml index 1cfcbce1a2..765e45c1e5 100644 --- a/config/model_configs/aquaplanet_diagedmf.yml +++ b/config/model_configs/aquaplanet_diagedmf.yml @@ -24,6 +24,6 @@ edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true cloud_model: diagnostic_edmfx precip_model: 0M -dt: 90secs -t_end: 1days +dt: 50secs +t_end: 12hours toml: [toml/diagnostic_edmfx.toml] diff --git a/config/model_configs/diagnostic_edmfx_aquaplanet.yml b/config/model_configs/diagnostic_edmfx_aquaplanet.yml index 83aff92ed5..1e9f581123 100644 --- a/config/model_configs/diagnostic_edmfx_aquaplanet.yml +++ b/config/model_configs/diagnostic_edmfx_aquaplanet.yml @@ -3,7 +3,7 @@ rad: clearsky turbconv: diagnostic_edmfx implicit_diffusion: true approximate_linear_solve_iters: 2 -prognostic_tke: true +prognostic_tke: false edmfx_upwinding: first_order edmfx_entr_model: "Generalized" edmfx_detr_model: "Generalized" @@ -14,8 +14,14 @@ moist: equil cloud_model: diagnostic_edmfx precip_model: 0M override_τ_precip: false -dt: 100secs +dt: 50secs t_end: 12hours dt_save_state_to_disk: 12hours regression_test: true toml: [toml/diagnostic_edmfx_0M.toml] +restart_file: "output/diagnostic_edmfx_aquaplanet/output_0001/day0.24600.hdf5" +diagnostics: + - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl, pr] + period: 100secs + - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix] + period: 100secs diff --git a/config/model_configs/diagnostic_edmfx_trmm_box.yml b/config/model_configs/diagnostic_edmfx_trmm_box.yml index bf92780268..dee0b6d614 100644 --- a/config/model_configs/diagnostic_edmfx_trmm_box.yml +++ b/config/model_configs/diagnostic_edmfx_trmm_box.yml @@ -24,7 +24,7 @@ y_elem: 2 z_elem: 82 z_max: 16400 z_stretch: false -dt: 200secs +dt: 60secs t_end: 6hours dt_save_state_to_disk: 10mins FLOAT_TYPE: "Float64" diff --git a/config/model_configs/diagnostic_edmfx_trmm_box_0M.yml b/config/model_configs/diagnostic_edmfx_trmm_box_0M.yml index 65d5f60f08..b3b2c225b8 100644 --- a/config/model_configs/diagnostic_edmfx_trmm_box_0M.yml +++ b/config/model_configs/diagnostic_edmfx_trmm_box_0M.yml @@ -24,7 +24,7 @@ y_elem: 2 z_elem: 82 z_max: 16400 z_stretch: false -dt: 200secs +dt: 60secs t_end: 6hours dt_save_state_to_disk: 10mins FLOAT_TYPE: "Float64" diff --git a/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml b/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml index e807386ee7..834940fd18 100644 --- a/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml +++ b/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml @@ -1,4 +1,3 @@ - initial_condition: TRMM_LBA rad: TRMM_LBA surface_setup: TRMM_LBA @@ -26,7 +25,7 @@ z_elem: 30 z_max: 16400 dz_bottom: 50 dz_top: 2000 -dt: 300secs +dt: 60secs t_end: 6hours dt_save_state_to_disk: 10mins FLOAT_TYPE: "Float64"