diff --git a/config/longrun_configs/longrun_aquaplanet_amip.yml b/config/longrun_configs/longrun_aquaplanet_amip.yml index aef59ce6c8..9225b35bff 100644 --- a/config/longrun_configs/longrun_aquaplanet_amip.yml +++ b/config/longrun_configs/longrun_aquaplanet_amip.yml @@ -6,6 +6,7 @@ dz_top: 3000.0 kappa_4: 1e16 moist: "equil" precip_model: "0M" +override_τ_precip: false rad: "allskywithclear" idealized_insolation: false dt_rad: "1hours" diff --git a/config/model_configs/diagnostic_edmfx_aquaplanet.yml b/config/model_configs/diagnostic_edmfx_aquaplanet.yml index 57e41abb71..246f57f69a 100644 --- a/config/model_configs/diagnostic_edmfx_aquaplanet.yml +++ b/config/model_configs/diagnostic_edmfx_aquaplanet.yml @@ -1,5 +1,4 @@ job_id: diagnostic_edmfx_aquaplanet -vert_diff: "true" surface_setup: DefaultExchangeCoefficients rad: gray turbconv: diagnostic_edmfx @@ -12,7 +11,8 @@ edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true moist: equil precip_model: 0M +override_τ_precip: false dt: 10secs t_end: 1hours dt_save_to_disk: 600secs -toml: [toml/diagnostic_edmfx_box.toml] +toml: [toml/diagnostic_edmfx_trmm_box.toml] diff --git a/config/model_configs/prognostic_edmfx_aquaplanet.yml b/config/model_configs/prognostic_edmfx_aquaplanet.yml index 88bbf1c49a..77029bf15a 100644 --- a/config/model_configs/prognostic_edmfx_aquaplanet.yml +++ b/config/model_configs/prognostic_edmfx_aquaplanet.yml @@ -1,5 +1,4 @@ job_id: prognostic_edmfx_aquaplanet -vert_diff: "true" surface_setup: DefaultExchangeCoefficients rad: gray turbconv: prognostic_edmfx diff --git a/perf/flame.jl b/perf/flame.jl index 5cc4f2c5b6..72e626875c 100644 --- a/perf/flame.jl +++ b/perf/flame.jl @@ -63,13 +63,13 @@ allocs_limit["flame_perf_target"] = 4656 allocs_limit["flame_perf_target_tracers"] = 204288 allocs_limit["flame_perf_target_edmfx"] = 253440 allocs_limit["flame_perf_diagnostics"] = 3016328 -allocs_limit["flame_perf_target_diagnostic_edmfx"] = 920960 +allocs_limit["flame_perf_target_diagnostic_edmfx"] = 893504 allocs_limit["flame_sphere_baroclinic_wave_rhoe_equilmoist_expvdiff"] = 67443909648 allocs_limit["flame_perf_target_threaded"] = 5857808 allocs_limit["flame_perf_target_callbacks"] = 46407936 allocs_limit["flame_perf_gw"] = 4868951088 -allocs_limit["flame_perf_target_prognostic_edmfx_aquaplanet"] = 942928 +allocs_limit["flame_perf_target_prognostic_edmfx_aquaplanet"] = 898768 if allocs < allocs_limit[job_id] * buffer @info "TODO: lower `allocs_limit[$job_id]` to: $(allocs)" diff --git a/toml/longrun_aquaplanet_amip.toml b/toml/longrun_aquaplanet_amip.toml index 933e241bce..747a3953c1 100644 --- a/toml/longrun_aquaplanet_amip.toml +++ b/toml/longrun_aquaplanet_amip.toml @@ -8,6 +8,11 @@ alias = "zd_rayleigh" value = 35000.0 type = "float" +[precipitation_timescale] +alias = "τ_precip" +value = 100 +type = "float" + [entr_tau] alias = "entr_tau" value = 0.001