From 3ff6551b0594d7daa5c9ac90353637f402512cf2 Mon Sep 17 00:00:00 2001 From: Zhaoyi Shen <11598433+szy21@users.noreply.github.com> Date: Wed, 15 May 2024 10:49:59 -0700 Subject: [PATCH] explicit updraft --- .buildkite/pipeline.yml | 17 ++++++-- config/model_configs/aquaplanet_diagedmf.yml | 2 +- .../diagnostic_edmfx_aquaplanet.yml | 2 +- .../diagnostic_edmfx_bomex_box.yml | 2 +- .../diagnostic_edmfx_bomex_stretched_box.yml | 2 +- .../diagnostic_edmfx_dycoms_rf01_box.yml | 2 +- ...gnostic_edmfx_dycoms_rf01_explicit_box.yml | 2 +- .../diagnostic_edmfx_gabls_box.yml | 2 +- .../diagnostic_edmfx_rico_box.yml | 2 +- .../diagnostic_edmfx_test_box.yml | 2 +- .../diagnostic_edmfx_trmm_box.yml | 2 +- .../diagnostic_edmfx_trmm_box_0M.yml | 2 +- .../diagnostic_edmfx_trmm_stretched_box.yml | 2 +- .../gpu_diagnostic_edmfx_aquaplanet.yml | 2 +- .../prognostic_edmfx_bomex_column.yml | 5 +-- ...prognostic_edmfx_bomex_implicit_column.yml | 36 ++++++++++++++++ ...prognostic_edmfx_bomex_pigroup_column.yml} | 8 +--- ...rognostic_edmfx_bomex_stretched_column.yml | 5 +-- .../prognostic_edmfx_dycoms_rf01_column.yml | 7 ++-- .../prognostic_edmfx_gabls_column.yml | 5 +-- .../prognostic_edmfx_gcmdriven_column.yml | 5 +-- .../prognostic_edmfx_rico_column.yml | 5 +-- .../prognostic_edmfx_trmm_column.yml | 5 +-- .../prognostic_edmfx_trmm_column_0M.yml | 5 +-- post_processing/ci_plots.jl | 23 ++++++----- ...c_edmfx_box.toml => diagnostic_edmfx.toml} | 0 ...m_box_0M.toml => diagnostic_edmfx_0M.toml} | 0 toml/diagnostic_edmfx_trmm_box.toml | 20 --------- toml/prognostic_edmfx_bomex.toml | 5 +-- ...ml => prognostic_edmfx_bomex_pigroup.toml} | 0 toml/prognostic_edmfx_dycoms_rf01.toml | 41 ------------------- 31 files changed, 94 insertions(+), 124 deletions(-) create mode 100644 config/model_configs/prognostic_edmfx_bomex_implicit_column.yml rename config/model_configs/{prognostic_edmfx_bomex_explicit_column.yml => prognostic_edmfx_bomex_pigroup_column.yml} (84%) rename toml/{diagnostic_edmfx_box.toml => diagnostic_edmfx.toml} (100%) rename toml/{diagnostic_edmfx_trmm_box_0M.toml => diagnostic_edmfx_0M.toml} (100%) delete mode 100644 toml/diagnostic_edmfx_trmm_box.toml rename toml/{prognostic_edmfx_bomex_explicit.toml => prognostic_edmfx_bomex_pigroup.toml} (100%) delete mode 100644 toml/prognostic_edmfx_dycoms_rf01.toml diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index eb51c21b1f..09e3b1c0c0 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -629,12 +629,12 @@ steps: agents: slurm_mem: 20GB - - label: ":genie: Prognostic EDMFX Bomex in a column (explicit)" + - label: ":genie: Prognostic EDMFX Bomex in a column (pi group)" command: > julia --color=yes --project=examples examples/hybrid/driver.jl - --config_file $CONFIG_PATH/prognostic_edmfx_bomex_explicit_column.yml - --job_id prognostic_edmfx_bomex_explicit_column - artifact_paths: "prognostic_edmfx_bomex_explicit_column/output_active/*" + --config_file $CONFIG_PATH/prognostic_edmfx_bomex_pigroup_column.yml + --job_id prognostic_edmfx_bomex_pigroup_column + artifact_paths: "prognostic_edmfx_bomex_pigroup_column/output_active/*" agents: slurm_mem: 20GB @@ -664,6 +664,15 @@ steps: artifact_paths: "prognostic_edmfx_bomex_column/output_active/*" agents: slurm_mem: 20GB + + - label: ":genie: Prognostic EDMFX Bomex in a column (implicit)" + command: > + julia --color=yes --project=examples examples/hybrid/driver.jl + --config_file $CONFIG_PATH/prognostic_edmfx_bomex_implicit_column.yml + --job_id prognostic_edmfx_bomex_column_implicit + artifact_paths: "prognostic_edmfx_bomex_column_implicit/output_active/*" + agents: + slurm_mem: 20GB - label: ":genie: Prognostic EDMFX Dycoms RF01 in a column" command: > diff --git a/config/model_configs/aquaplanet_diagedmf.yml b/config/model_configs/aquaplanet_diagedmf.yml index c087b0215f..3a29effc43 100644 --- a/config/model_configs/aquaplanet_diagedmf.yml +++ b/config/model_configs/aquaplanet_diagedmf.yml @@ -25,4 +25,4 @@ edmfx_sgs_diffusive_flux: true precip_model: 0M dt: 100secs t_end: 12hours -toml: [toml/diagnostic_edmfx_box.toml] +toml: [toml/diagnostic_edmfx.toml] diff --git a/config/model_configs/diagnostic_edmfx_aquaplanet.yml b/config/model_configs/diagnostic_edmfx_aquaplanet.yml index c9d006a3ba..1f0195d41c 100644 --- a/config/model_configs/diagnostic_edmfx_aquaplanet.yml +++ b/config/model_configs/diagnostic_edmfx_aquaplanet.yml @@ -17,4 +17,4 @@ dt: 100secs t_end: 12hours dt_save_state_to_disk: 12hours regression_test: true -toml: [toml/diagnostic_edmfx_trmm_box.toml] +toml: [toml/diagnostic_edmfx_0M.toml] diff --git a/config/model_configs/diagnostic_edmfx_bomex_box.yml b/config/model_configs/diagnostic_edmfx_bomex_box.yml index 98bd47afcd..5ae394a8ab 100644 --- a/config/model_configs/diagnostic_edmfx_bomex_box.yml +++ b/config/model_configs/diagnostic_edmfx_bomex_box.yml @@ -26,7 +26,7 @@ z_stretch: false dt: "100secs" t_end: "6hours" dt_save_state_to_disk: "10mins" -toml: [toml/diagnostic_edmfx_box.toml] +toml: [toml/diagnostic_edmfx.toml] netcdf_interpolation_num_points: [8, 8, 60] diagnostics: - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl] diff --git a/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml b/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml index 4b8bd8e86d..a4225b5431 100644 --- a/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml +++ b/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml @@ -27,7 +27,7 @@ dz_top: 200.0 dt: "200secs" t_end: "6hours" dt_save_state_to_disk: "10mins" -toml: [toml/diagnostic_edmfx_box.toml] +toml: [toml/diagnostic_edmfx.toml] netcdf_interpolation_num_points: [8, 8, 30] diagnostics: - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl] diff --git a/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml b/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml index db0f7dad75..2a30397531 100644 --- a/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml +++ b/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml @@ -26,7 +26,7 @@ z_stretch: false dt: 100secs t_end: 4hours dt_save_state_to_disk: 10mins -toml: [toml/diagnostic_edmfx_box.toml] +toml: [toml/diagnostic_edmfx.toml] netcdf_interpolation_num_points: [8, 8, 30] diagnostics: - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl] diff --git a/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml b/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml index 5070a4ff65..700b9445dc 100644 --- a/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml +++ b/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml @@ -24,7 +24,7 @@ z_stretch: false dt: 20secs t_end: 4hours dt_save_state_to_disk: 10mins -toml: [toml/diagnostic_edmfx_box.toml] +toml: [toml/diagnostic_edmfx.toml] netcdf_interpolation_num_points: [8, 8, 30] diagnostics: - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl] diff --git a/config/model_configs/diagnostic_edmfx_gabls_box.yml b/config/model_configs/diagnostic_edmfx_gabls_box.yml index 2c42b0db23..1b2be79983 100644 --- a/config/model_configs/diagnostic_edmfx_gabls_box.yml +++ b/config/model_configs/diagnostic_edmfx_gabls_box.yml @@ -24,7 +24,7 @@ z_stretch: false dt: 200secs t_end: 9hours dt_save_state_to_disk: 10mins -toml: [toml/diagnostic_edmfx_box.toml] +toml: [toml/diagnostic_edmfx.toml] netcdf_interpolation_num_points: [8, 8, 8] diagnostics: - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl] diff --git a/config/model_configs/diagnostic_edmfx_rico_box.yml b/config/model_configs/diagnostic_edmfx_rico_box.yml index 34c211c336..1e50ac5486 100644 --- a/config/model_configs/diagnostic_edmfx_rico_box.yml +++ b/config/model_configs/diagnostic_edmfx_rico_box.yml @@ -27,7 +27,7 @@ z_stretch: false dt: 100secs t_end: 8hours dt_save_state_to_disk: 10mins -toml: [toml/diagnostic_edmfx_trmm_box.toml] +toml: [toml/diagnostic_edmfx.toml] netcdf_interpolation_num_points: [8, 8, 100] diagnostics: - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl] diff --git a/config/model_configs/diagnostic_edmfx_test_box.yml b/config/model_configs/diagnostic_edmfx_test_box.yml index 2eae3eda39..18eaf61205 100644 --- a/config/model_configs/diagnostic_edmfx_test_box.yml +++ b/config/model_configs/diagnostic_edmfx_test_box.yml @@ -11,7 +11,7 @@ x_elem: 2 dz_bottom: 30.0 config: "box" moist: "equil" -toml: [toml/diagnostic_edmfx_box.toml] +toml: [toml/diagnostic_edmfx.toml] netcdf_interpolation_num_points: [8, 8, 45] diagnostics: - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl] diff --git a/config/model_configs/diagnostic_edmfx_trmm_box.yml b/config/model_configs/diagnostic_edmfx_trmm_box.yml index d87ff446ab..e2a519e512 100644 --- a/config/model_configs/diagnostic_edmfx_trmm_box.yml +++ b/config/model_configs/diagnostic_edmfx_trmm_box.yml @@ -27,7 +27,7 @@ dt: 200secs t_end: 6hours dt_save_state_to_disk: 10mins FLOAT_TYPE: "Float64" -toml: [toml/diagnostic_edmfx_trmm_box.toml] +toml: [toml/diagnostic_edmfx.toml] netcdf_interpolation_num_points: [8, 8, 82] diagnostics: - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl] diff --git a/config/model_configs/diagnostic_edmfx_trmm_box_0M.yml b/config/model_configs/diagnostic_edmfx_trmm_box_0M.yml index df7dd4126c..2afe16ddd1 100644 --- a/config/model_configs/diagnostic_edmfx_trmm_box_0M.yml +++ b/config/model_configs/diagnostic_edmfx_trmm_box_0M.yml @@ -28,7 +28,7 @@ dt: 200secs t_end: 6hours dt_save_state_to_disk: 10mins FLOAT_TYPE: "Float64" -toml: [toml/diagnostic_edmfx_trmm_box_0M.toml] +toml: [toml/diagnostic_edmfx_0M.toml] netcdf_output_at_levels: true netcdf_interpolation_num_points: [8, 8, 82] diagnostics: diff --git a/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml b/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml index a664cd455b..e9e28398c7 100644 --- a/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml +++ b/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml @@ -30,7 +30,7 @@ dt: 300secs t_end: 6hours dt_save_state_to_disk: 10mins FLOAT_TYPE: "Float64" -toml: [toml/diagnostic_edmfx_trmm_box.toml] +toml: [toml/diagnostic_edmfx.toml] netcdf_interpolation_num_points: [8, 8, 30] diagnostics: - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl] diff --git a/config/model_configs/gpu_diagnostic_edmfx_aquaplanet.yml b/config/model_configs/gpu_diagnostic_edmfx_aquaplanet.yml index be250df69a..77e02ceb90 100644 --- a/config/model_configs/gpu_diagnostic_edmfx_aquaplanet.yml +++ b/config/model_configs/gpu_diagnostic_edmfx_aquaplanet.yml @@ -16,4 +16,4 @@ moist: equil precip_model: 0M dt: 100secs t_end: 6hours -toml: [toml/diagnostic_edmfx_box.toml] +toml: [toml/diagnostic_edmfx_0M.toml] diff --git a/config/model_configs/prognostic_edmfx_bomex_column.yml b/config/model_configs/prognostic_edmfx_bomex_column.yml index dbfab47ba7..f9114908a6 100644 --- a/config/model_configs/prognostic_edmfx_bomex_column.yml +++ b/config/model_configs/prognostic_edmfx_bomex_column.yml @@ -5,9 +5,8 @@ ls_adv: "Bomex" surface_setup: "Bomex" turbconv: "prognostic_edmfx" implicit_diffusion: true -implicit_sgs_advection: true +implicit_sgs_advection: false approximate_linear_solve_iters: 2 -max_newton_iters_ode: 3 edmfx_upwinding: first_order edmfx_entr_model: "Generalized" edmfx_detr_model: "Generalized" @@ -22,7 +21,7 @@ z_max: 3e3 z_elem: 60 z_stretch: false perturb_initstate: false -dt: "50secs" +dt: "10secs" t_end: "6hours" dt_save_to_disk: "10mins" toml: [toml/prognostic_edmfx_bomex.toml] diff --git a/config/model_configs/prognostic_edmfx_bomex_implicit_column.yml b/config/model_configs/prognostic_edmfx_bomex_implicit_column.yml new file mode 100644 index 0000000000..dbfab47ba7 --- /dev/null +++ b/config/model_configs/prognostic_edmfx_bomex_implicit_column.yml @@ -0,0 +1,36 @@ +initial_condition: "Bomex" +subsidence: "Bomex" +edmf_coriolis: "Bomex" +ls_adv: "Bomex" +surface_setup: "Bomex" +turbconv: "prognostic_edmfx" +implicit_diffusion: true +implicit_sgs_advection: true +approximate_linear_solve_iters: 2 +max_newton_iters_ode: 3 +edmfx_upwinding: first_order +edmfx_entr_model: "Generalized" +edmfx_detr_model: "Generalized" +edmfx_sgs_mass_flux: true +edmfx_sgs_diffusive_flux: true +edmfx_nh_pressure: true +edmfx_filter: true +prognostic_tke: true +moist: "equil" +config: "column" +z_max: 3e3 +z_elem: 60 +z_stretch: false +perturb_initstate: false +dt: "50secs" +t_end: "6hours" +dt_save_to_disk: "10mins" +toml: [toml/prognostic_edmfx_bomex.toml] +netcdf_interpolation_num_points: [2, 2, 60] +diagnostics: + - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl] + period: 10mins + - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, taen, thetaaen, haen, husen, huren, clwen, clien, tke] + period: 10mins + - short_name: [entr, detr, lmix, lmixw, lmixtke, lmixb, bgrad, strain, edt, evu] + period: 10mins diff --git a/config/model_configs/prognostic_edmfx_bomex_explicit_column.yml b/config/model_configs/prognostic_edmfx_bomex_pigroup_column.yml similarity index 84% rename from config/model_configs/prognostic_edmfx_bomex_explicit_column.yml rename to config/model_configs/prognostic_edmfx_bomex_pigroup_column.yml index 7d938f7cb3..681af9e256 100644 --- a/config/model_configs/prognostic_edmfx_bomex_explicit_column.yml +++ b/config/model_configs/prognostic_edmfx_bomex_pigroup_column.yml @@ -4,10 +4,6 @@ edmf_coriolis: "Bomex" ls_adv: "Bomex" surface_setup: "Bomex" turbconv: "prognostic_edmfx" -implicit_diffusion: false -implicit_sgs_advection: false -approximate_linear_solve_iters: 2 -max_newton_iters_ode: 3 edmfx_upwinding: first_order edmfx_entr_model: "PiGroups" edmfx_detr_model: "PiGroups" @@ -23,10 +19,10 @@ z_max: 3e3 z_elem: 60 z_stretch: false perturb_initstate: false -dt: "1secs" +dt: "5secs" t_end: "6hours" dt_save_to_disk: "10mins" -toml: [toml/prognostic_edmfx_bomex_explicit.toml] +toml: [toml/prognostic_edmfx_bomex_pigroup.toml] netcdf_interpolation_num_points: [2, 2, 60] diagnostics: - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl] diff --git a/config/model_configs/prognostic_edmfx_bomex_stretched_column.yml b/config/model_configs/prognostic_edmfx_bomex_stretched_column.yml index de94462152..840611a78e 100644 --- a/config/model_configs/prognostic_edmfx_bomex_stretched_column.yml +++ b/config/model_configs/prognostic_edmfx_bomex_stretched_column.yml @@ -5,9 +5,8 @@ ls_adv: "Bomex" surface_setup: "Bomex" turbconv: "prognostic_edmfx" implicit_diffusion: true -implicit_sgs_advection: true +implicit_sgs_advection: false approximate_linear_solve_iters: 2 -max_newton_iters_ode: 3 edmfx_upwinding: first_order edmfx_entr_model: "Generalized" edmfx_detr_model: "Generalized" @@ -26,7 +25,7 @@ z_elem: 30 dz_bottom: 50.0 dz_top: 200.0 perturb_initstate: false -dt: "50secs" +dt: "10secs" t_end: "6hours" dt_save_state_to_disk: "10mins" toml: [toml/prognostic_edmfx_bomex.toml] diff --git a/config/model_configs/prognostic_edmfx_dycoms_rf01_column.yml b/config/model_configs/prognostic_edmfx_dycoms_rf01_column.yml index cd33eff3ec..718e7df823 100644 --- a/config/model_configs/prognostic_edmfx_dycoms_rf01_column.yml +++ b/config/model_configs/prognostic_edmfx_dycoms_rf01_column.yml @@ -5,9 +5,8 @@ rad: DYCOMS_RF01 surface_setup: DYCOMS_RF01 turbconv: prognostic_edmfx implicit_diffusion: true -implicit_sgs_advection: true +implicit_sgs_advection: false approximate_linear_solve_iters: 2 -max_newton_iters_ode: 3 edmfx_upwinding: first_order edmfx_sgsflux_upwinding: first_order edmfx_entr_model: "Generalized" @@ -25,10 +24,10 @@ x_elem: 2 y_elem: 2 z_elem: 30 z_stretch: false -dt: 40secs +dt: 10secs t_end: 4hours dt_save_state_to_disk: 10mins -toml: [toml/prognostic_edmfx_dycoms_rf01.toml] +toml: [toml/prognostic_edmfx.toml] netcdf_interpolation_num_points: [2, 2, 30] diagnostics: - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl] diff --git a/config/model_configs/prognostic_edmfx_gabls_column.yml b/config/model_configs/prognostic_edmfx_gabls_column.yml index 2365aa51c5..4aa7374c2e 100644 --- a/config/model_configs/prognostic_edmfx_gabls_column.yml +++ b/config/model_configs/prognostic_edmfx_gabls_column.yml @@ -3,9 +3,8 @@ edmf_coriolis: GABLS surface_setup: GABLS turbconv: "prognostic_edmfx" implicit_diffusion: true -implicit_sgs_advection: true +implicit_sgs_advection: false approximate_linear_solve_iters: 2 -max_newton_iters_ode: 3 edmfx_upwinding: "first_order" edmfx_entr_model: "Generalized" edmfx_detr_model: "Generalized" @@ -22,7 +21,7 @@ x_elem: 2 y_elem: 2 z_elem: 8 z_stretch: false -dt: "60secs" +dt: "10secs" t_end: "9hours" dt_save_state_to_disk: "30mins" perturb_initstate: false diff --git a/config/model_configs/prognostic_edmfx_gcmdriven_column.yml b/config/model_configs/prognostic_edmfx_gcmdriven_column.yml index b734c2d740..d3aa32a2a2 100644 --- a/config/model_configs/prognostic_edmfx_gcmdriven_column.yml +++ b/config/model_configs/prognostic_edmfx_gcmdriven_column.yml @@ -4,9 +4,8 @@ external_forcing_file: "/groups/esm/zhaoyi/GCMForcedLES/cfsite/07/HadGEM2-A/amip surface_setup: "GCM" turbconv: "prognostic_edmfx" implicit_diffusion: true -implicit_sgs_advection: true +implicit_sgs_advection: false approximate_linear_solve_iters: 2 -max_newton_iters_ode: 3 edmfx_upwinding: first_order edmfx_entr_model: "Generalized" edmfx_detr_model: "Generalized" @@ -21,7 +20,7 @@ z_max: 3e3 z_elem: 60 z_stretch: false perturb_initstate: false -dt: "50secs" +dt: "10secs" t_end: "6hours" dt_save_to_disk: "10mins" toml: [toml/prognostic_edmfx_bomex.toml] diff --git a/config/model_configs/prognostic_edmfx_rico_column.yml b/config/model_configs/prognostic_edmfx_rico_column.yml index 68b1716034..b2e3ceb7d4 100644 --- a/config/model_configs/prognostic_edmfx_rico_column.yml +++ b/config/model_configs/prognostic_edmfx_rico_column.yml @@ -4,9 +4,8 @@ ls_adv: "Rico" surface_setup: "Rico" turbconv: "prognostic_edmfx" implicit_diffusion: true -implicit_sgs_advection: true +implicit_sgs_advection: false approximate_linear_solve_iters: 2 -max_newton_iters_ode: 3 edmfx_upwinding: first_order edmfx_entr_model: "Generalized" edmfx_detr_model: "Generalized" @@ -24,7 +23,7 @@ y_elem: 2 z_elem: 100 z_stretch: false perturb_initstate: false -dt: "50secs" +dt: "10secs" t_end: "6hours" dt_save_state_to_disk: "10mins" toml: [toml/prognostic_edmfx.toml] diff --git a/config/model_configs/prognostic_edmfx_trmm_column.yml b/config/model_configs/prognostic_edmfx_trmm_column.yml index 818ffd6fe1..59383b8de6 100644 --- a/config/model_configs/prognostic_edmfx_trmm_column.yml +++ b/config/model_configs/prognostic_edmfx_trmm_column.yml @@ -3,9 +3,8 @@ rad: TRMM_LBA surface_setup: TRMM_LBA turbconv: prognostic_edmfx implicit_diffusion: true -implicit_sgs_advection: true +implicit_sgs_advection: false approximate_linear_solve_iters: 2 -max_newton_iters_ode: 3 edmfx_upwinding: first_order edmfx_entr_model: "Generalized" edmfx_detr_model: "Generalized" @@ -23,7 +22,7 @@ x_elem: 2 y_elem: 2 z_elem: 82 z_stretch: false -dt: 50secs +dt: 10secs t_end: 6hours dt_save_state_to_disk: 10mins FLOAT_TYPE: "Float64" diff --git a/config/model_configs/prognostic_edmfx_trmm_column_0M.yml b/config/model_configs/prognostic_edmfx_trmm_column_0M.yml index 267a6d912e..384b2df555 100644 --- a/config/model_configs/prognostic_edmfx_trmm_column_0M.yml +++ b/config/model_configs/prognostic_edmfx_trmm_column_0M.yml @@ -3,9 +3,8 @@ rad: TRMM_LBA surface_setup: TRMM_LBA turbconv: prognostic_edmfx implicit_diffusion: true -implicit_sgs_advection: true +implicit_sgs_advection: false approximate_linear_solve_iters: 2 -max_newton_iters_ode: 3 edmfx_upwinding: first_order edmfx_entr_model: "Generalized" edmfx_detr_model: "Generalized" @@ -23,7 +22,7 @@ x_elem: 2 y_elem: 2 z_elem: 82 z_stretch: false -dt: 50secs +dt: 10secs t_end: 6hours dt_save_state_to_disk: 10mins FLOAT_TYPE: "Float64" diff --git a/post_processing/ci_plots.jl b/post_processing/ci_plots.jl index afc3ce6f10..42865f32e0 100644 --- a/post_processing/ci_plots.jl +++ b/post_processing/ci_plots.jl @@ -1022,12 +1022,13 @@ EDMFBoxPlots = Union{ Val{:prognostic_edmfx_gabls_column}, Val{:prognostic_edmfx_bomex_fixtke_column}, Val{:prognostic_edmfx_bomex_column}, - Val{:prognostic_edmfx_gcmdriven_column}, Val{:prognostic_edmfx_bomex_stretched_column}, - Val{:prognostic_edmfx_bomex_explicit_column}, + Val{:prognostic_edmfx_bomex_pigroup_column}, + Val{:prognostic_edmfx_bomex_implicit_column}, Val{:prognostic_edmfx_dycoms_rf01_column}, Val{:prognostic_edmfx_trmm_column_0M}, Val{:prognostic_edmfx_simpleplume_column}, + Val{:prognostic_edmfx_gcmdriven_column}, Val{:prognostic_edmfx_bomex_box}, } @@ -1122,22 +1123,22 @@ function make_plots( precip_names = sim_type isa EDMFBoxPlotsWithPrecip ? ("husra", "hussn") : () short_names = [ - "ua", "wa", - "thetaa", - "thetaaup", + "waup", "ta", "taup", - "ha", - "haup", - "waup", - "tke", - "lmix", - "arup", "hus", "husup", + "arup", + "tke", + "ua", + "thetaa", + "thetaaup", + "ha", + "haup", "hur", "hurup", + "lmix", "cl", "clw", "clwup", diff --git a/toml/diagnostic_edmfx_box.toml b/toml/diagnostic_edmfx.toml similarity index 100% rename from toml/diagnostic_edmfx_box.toml rename to toml/diagnostic_edmfx.toml diff --git a/toml/diagnostic_edmfx_trmm_box_0M.toml b/toml/diagnostic_edmfx_0M.toml similarity index 100% rename from toml/diagnostic_edmfx_trmm_box_0M.toml rename to toml/diagnostic_edmfx_0M.toml diff --git a/toml/diagnostic_edmfx_trmm_box.toml b/toml/diagnostic_edmfx_trmm_box.toml deleted file mode 100644 index 051739d21e..0000000000 --- a/toml/diagnostic_edmfx_trmm_box.toml +++ /dev/null @@ -1,20 +0,0 @@ -[entr_inv_tau] -value = 0.002 - -[entr_coeff] -value = 0 - -[detr_inv_tau] -value = 0 - -[detr_vertdiv_coeff] -value = 0.6 - -[detr_buoy_coeff] -value = 0.12 - -[min_area_limiter_scale] -value = 0 - -[max_area_limiter_scale] -value = 0 diff --git a/toml/prognostic_edmfx_bomex.toml b/toml/prognostic_edmfx_bomex.toml index 5be8788fc4..3d6a8c492c 100644 --- a/toml/prognostic_edmfx_bomex.toml +++ b/toml/prognostic_edmfx_bomex.toml @@ -8,7 +8,7 @@ value = 1.0e-5 value = 0.7 [entr_inv_tau] -value = 0.0002 +value = 0.0001 [entr_coeff] value = 0.3 @@ -16,9 +16,6 @@ value = 0.3 [min_area_limiter_scale] value = 0 -[min_area_limiter_power] -value = 10 - [detr_inv_tau] value = 0 diff --git a/toml/prognostic_edmfx_bomex_explicit.toml b/toml/prognostic_edmfx_bomex_pigroup.toml similarity index 100% rename from toml/prognostic_edmfx_bomex_explicit.toml rename to toml/prognostic_edmfx_bomex_pigroup.toml diff --git a/toml/prognostic_edmfx_dycoms_rf01.toml b/toml/prognostic_edmfx_dycoms_rf01.toml deleted file mode 100644 index 023ace6560..0000000000 --- a/toml/prognostic_edmfx_dycoms_rf01.toml +++ /dev/null @@ -1,41 +0,0 @@ -[EDMF_surface_area] -value = 0.1 - -[EDMF_min_area] -value = 1.0e-5 - -[EDMF_max_area] -value = 0.7 - -[entr_inv_tau] -value = 0.0001 - -[entr_coeff] -value = 0.1 - -[min_area_limiter_scale] -value = 0 - -[min_area_limiter_power] -value = 100 - -[detr_inv_tau] -value = 0 - -[detr_coeff] -value = 0 - -[detr_buoy_coeff] -value = 0 - -[detr_vertdiv_coeff] -value = 0 - -[detr_massflux_vertdiv_coeff] -value = 1 - -[max_area_limiter_scale] -value = 0.01 - -[pressure_normalmode_drag_coeff] -value = 40.0