From 5eea65c83e12f0df94d53ffcdd5c1d5c55cbfa20 Mon Sep 17 00:00:00 2001 From: Zhaoyi Shen <11598433+szy21@users.noreply.github.com> Date: Mon, 16 Oct 2023 15:47:39 -0700 Subject: [PATCH] constant entrainment --- .buildkite/pipeline.yml | 9 -------- .../advective_edmfx_adv_test_central_box.yml | 22 ------------------- .../advective_edmfx_bomex_box.yml | 2 +- .../advective_edmfx_gabls_box.yml | 2 +- .../advective_edmfx_rico_box.yml | 2 +- .../advective_edmfx_trmm_box.yml | 2 +- src/prognostic_equations/advection.jl | 5 ----- src/prognostic_equations/edmfx_entr_detr.jl | 5 +---- toml/advective_edmfx_box.toml | 6 ++--- 9 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 config/model_configs/advective_edmfx_adv_test_central_box.yml diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 01a0bbb5ab1..3cbc0a25585 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -734,15 +734,6 @@ steps: soft_fail: true agents: slurm_mem: 20GB - - - label: ":genie: Advective EDMFX advection test central in a box" - command: > - julia --color=yes --project=examples examples/hybrid/driver.jl - --config_file $CONFIG_PATH/advective_edmfx_adv_test_central_box.yml - artifact_paths: "advective_edmfx_adv_test_central_box/*" - soft_fail: true - agents: - slurm_mem: 20GB - label: ":genie: Advective EDMFX GABLS in a box" command: > diff --git a/config/model_configs/advective_edmfx_adv_test_central_box.yml b/config/model_configs/advective_edmfx_adv_test_central_box.yml deleted file mode 100644 index 95b6591d289..00000000000 --- a/config/model_configs/advective_edmfx_adv_test_central_box.yml +++ /dev/null @@ -1,22 +0,0 @@ -job_id: "advective_edmfx_adv_test_central_box" -initial_condition: "MoistAdiabaticProfileEDMFX" -advection_test: true -turbconv: "advective_edmfx" -ode_algo: "SSP33ShuOsher" -config: "box" -moist: "equil" -hyperdiff: "true" -kappa_4: 1e8 -x_max: 1e4 -y_max: 1e4 -z_max: 5.5e4 -x_elem: 2 -y_elem: 2 -z_elem: 63 -dz_bottom: 30.0 -dz_top: 3000.0 -dt: "10secs" -t_end: "3600secs" -dt_save_to_disk: "100secs" -FLOAT_TYPE: "Float64" -toml: [toml/edmfx_box_advection.toml] diff --git a/config/model_configs/advective_edmfx_bomex_box.yml b/config/model_configs/advective_edmfx_bomex_box.yml index e33fc87bae6..e6ade08d706 100644 --- a/config/model_configs/advective_edmfx_bomex_box.yml +++ b/config/model_configs/advective_edmfx_bomex_box.yml @@ -6,7 +6,7 @@ ls_adv: "Bomex" surface_setup: "Bomex" turbconv: "advective_edmfx" edmfx_upwinding: first_order -edmfx_entr_model: "ConstantCoefficient" +edmfx_entr_model: "ConstantTimescale" edmfx_detr_model: "ConstantCoefficient" edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true diff --git a/config/model_configs/advective_edmfx_gabls_box.yml b/config/model_configs/advective_edmfx_gabls_box.yml index 6944e8307e6..630c94521e1 100644 --- a/config/model_configs/advective_edmfx_gabls_box.yml +++ b/config/model_configs/advective_edmfx_gabls_box.yml @@ -4,7 +4,7 @@ edmf_coriolis: GABLS surface_setup: GABLS turbconv: "advective_edmfx" edmfx_upwinding: "first_order" -edmfx_entr_model: "ConstantCoefficient" +edmfx_entr_model: "ConstantTimescale" edmfx_detr_model: "ConstantCoefficient" edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true diff --git a/config/model_configs/advective_edmfx_rico_box.yml b/config/model_configs/advective_edmfx_rico_box.yml index 5875a17aed3..e1181c624a5 100644 --- a/config/model_configs/advective_edmfx_rico_box.yml +++ b/config/model_configs/advective_edmfx_rico_box.yml @@ -5,7 +5,7 @@ ls_adv: "Rico" surface_setup: "Rico" turbconv: "advective_edmfx" edmfx_upwinding: first_order -edmfx_entr_model: "ConstantCoefficient" +edmfx_entr_model: "ConstantTimescale" edmfx_detr_model: "ConstantCoefficient" edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true diff --git a/config/model_configs/advective_edmfx_trmm_box.yml b/config/model_configs/advective_edmfx_trmm_box.yml index 2688641e274..3bb3470370a 100644 --- a/config/model_configs/advective_edmfx_trmm_box.yml +++ b/config/model_configs/advective_edmfx_trmm_box.yml @@ -4,7 +4,7 @@ rad: TRMM_LBA surface_setup: TRMM_LBA turbconv: advective_edmfx edmfx_upwinding: first_order -edmfx_entr_model: "ConstantCoefficient" +edmfx_entr_model: "ConstantTimescale" edmfx_detr_model: "ConstantCoefficient" edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true diff --git a/src/prognostic_equations/advection.jl b/src/prognostic_equations/advection.jl index f60949a254d..84e336ed010 100644 --- a/src/prognostic_equations/advection.jl +++ b/src/prognostic_equations/advection.jl @@ -158,11 +158,6 @@ NVTX.@annotate function explicit_vertical_advection_tendency!(Yₜ, Y, p, t) ᶠinterp(ᶜρʲs.:($$j)[colidx] - ᶜρ_ref[colidx]) * ᶠgradᵥ_ᶜΦ[colidx] ) / ᶠinterp(ᶜρʲs.:($$j)[colidx]) - # @. Yₜ.f.sgsʲs.:($$j).u₃[colidx] -= - # ( - # ᶠinterp(ᶜρʲs.:($$j)[colidx] - Y.c.ρ[colidx]) * - # ᶠgradᵥ_ᶜΦ[colidx] - # ) / ᶠinterp(ᶜρʲs.:($$j)[colidx]) end # TODO: Move this to implicit_vertical_advection_tendency!. diff --git a/src/prognostic_equations/edmfx_entr_detr.jl b/src/prognostic_equations/edmfx_entr_detr.jl index bbbb07137bb..e67c187cea1 100644 --- a/src/prognostic_equations/edmfx_entr_detr.jl +++ b/src/prognostic_equations/edmfx_entr_detr.jl @@ -106,10 +106,7 @@ function entrainment( ::ConstantCoefficientEntrainment, ) where {FT} entr_coeff = CAP.entr_coeff(params) - min_area_limiter = FT(2e-3) * exp(-12 * ᶜaʲ) - #entr = min(entr_coeff * abs(ᶜwʲ) / (ᶜz - z_sfc), 1 / dt) - entr = - min(abs(ᶜwʲ) * (entr_coeff / (ᶜz - z_sfc) + min_area_limiter), 1 / dt) + entr = min(entr_coeff * abs(ᶜwʲ) / (ᶜz - z_sfc), 1 / dt) return entr end diff --git a/toml/advective_edmfx_box.toml b/toml/advective_edmfx_box.toml index 5571e6ff7fb..3c8a8e76d5d 100644 --- a/toml/advective_edmfx_box.toml +++ b/toml/advective_edmfx_box.toml @@ -18,7 +18,7 @@ alias = "entr_coeff" value = 0.1 type = "float" -[pressure_normalmode_buoy_coeff1] -alias = "pressure_normalmode_buoy_coeff1" -value = 0.144 +[entr_tau] +alias = "entr_tau" +value = 1800 type = "float"