diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 7d94f55c37b..39822a6ecb4 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -651,28 +651,12 @@ steps: artifact_paths: "prognostic_edmfx_gabls_box/*" agents: slurm_mem: 20GB - - - label: ":genie: Prognostic EDMFX GABLS with TKE in a box" - command: > - julia --color=yes --project=examples examples/hybrid/driver.jl - --config_file $CONFIG_PATH/prognostic_edmfx_gabls_tke_box.yml - artifact_paths: "prognostic_edmfx_gabls_tke_box/*" - agents: - slurm_mem: 20GB - - - label: ":genie: Prognostic EDMFX GABLS with TKE in a column" - command: > - julia --color=yes --project=examples examples/hybrid/driver.jl - --config_file $CONFIG_PATH/prognostic_edmfx_gabls_tke_column.yml - artifact_paths: "prognostic_edmfx_gabls_tke_column/*" - agents: - slurm_mem: 20GB - - label: ":genie: Prognostic EDMFX Bomex in a box" + - label: ":genie: Prognostic EDMFX Bomex with precribed TKE in a box" command: > julia --color=yes --project=examples examples/hybrid/driver.jl - --config_file $CONFIG_PATH/prognostic_edmfx_bomex_box.yml - artifact_paths: "prognostic_edmfx_bomex_box/*" + --config_file $CONFIG_PATH/prognostic_edmfx_bomex_fixtke_box.yml + artifact_paths: "prognostic_edmfx_bomex_fixtke_box/*" soft_fail: true agents: slurm_mem: 20GB @@ -685,38 +669,29 @@ steps: soft_fail: true agents: slurm_mem: 20GB - - - label: ":genie: Prognostic EDMFX Bomex with TKE in a column" - command: > - julia --color=yes --project=examples examples/hybrid/driver.jl - --config_file $CONFIG_PATH/prognostic_edmfx_bomex_tke_column.yml - artifact_paths: "prognostic_edmfx_bomex_tke_column/*" - soft_fail: true - agents: - slurm_mem: 20GB - - label: ":genie: Prognostic EDMFX Dycoms RF01 in a box" + - label: ":genie: Prognostic EDMFX Dycoms RF01 in a column" command: > julia --color=yes --project=examples examples/hybrid/driver.jl - --config_file $CONFIG_PATH/prognostic_edmfx_dycoms_rf01_box.yml - artifact_paths: "prognostic_edmfx_dycoms_rf01_box/*" + --config_file $CONFIG_PATH/prognostic_edmfx_dycoms_rf01_column.yml + artifact_paths: "prognostic_edmfx_dycoms_rf01_column/*" agents: slurm_mem: 20GB - - label: ":genie: Prognostic EDMFX Rico in a box" + - label: ":genie: Prognostic EDMFX Rico in a column" command: > julia --color=yes --project=examples examples/hybrid/driver.jl - --config_file $CONFIG_PATH/prognostic_edmfx_rico_box.yml - artifact_paths: "prognostic_edmfx_rico_box/*" + --config_file $CONFIG_PATH/prognostic_edmfx_rico_column.yml + artifact_paths: "prognostic_edmfx_rico_column/*" soft_fail: true agents: slurm_mem: 20GB - - label: ":genie: Prognostic EDMFX TRMM in a box" + - label: ":genie: Prognostic EDMFX TRMM in a column" command: > julia --color=yes --project=examples examples/hybrid/driver.jl - --config_file $CONFIG_PATH/prognostic_edmfx_trmm_box.yml - artifact_paths: "prognostic_edmfx_trmm_box/*" + --config_file $CONFIG_PATH/prognostic_edmfx_trmm_column.yml + artifact_paths: "prognostic_edmfx_trmm_column/*" soft_fail: true agents: slurm_mem: 20GB diff --git a/config/model_configs/prognostic_edmfx_bomex_column.yml b/config/model_configs/prognostic_edmfx_bomex_column.yml index 575f5a39521..2b82de58fe7 100644 --- a/config/model_configs/prognostic_edmfx_bomex_column.yml +++ b/config/model_configs/prognostic_edmfx_bomex_column.yml @@ -11,7 +11,7 @@ edmfx_detr_model: "ConstantArea" edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true edmfx_nh_pressure: true -prognostic_tke: false +prognostic_tke: true moist: "equil" config: "column" hyperdiff: "false" @@ -22,4 +22,4 @@ perturb_initstate: false dt: "5secs" t_end: "6hours" dt_save_to_disk: "10mins" -toml: [toml/prognostic_edmfx_bomex_box.toml] +toml: [toml/prognostic_edmfx_box.toml] diff --git a/config/model_configs/prognostic_edmfx_bomex_box.yml b/config/model_configs/prognostic_edmfx_bomex_fixtke_box.yml similarity index 95% rename from config/model_configs/prognostic_edmfx_bomex_box.yml rename to config/model_configs/prognostic_edmfx_bomex_fixtke_box.yml index d12c9ce41c3..35b2be1f76e 100644 --- a/config/model_configs/prognostic_edmfx_bomex_box.yml +++ b/config/model_configs/prognostic_edmfx_bomex_fixtke_box.yml @@ -1,4 +1,4 @@ -job_id: "prognostic_edmfx_bomex_box" +job_id: "prognostic_edmfx_bomex_fixtke_box" initial_condition: "Bomex" subsidence: "Bomex" edmf_coriolis: "Bomex" @@ -27,7 +27,7 @@ perturb_initstate: false dt: "5secs" t_end: "6hours" dt_save_to_disk: "10mins" -toml: [toml/prognostic_edmfx_bomex_box.toml] +toml: [toml/prognostic_edmfx_box.toml] diagnostics: - short_name: ts period: 10mins diff --git a/config/model_configs/prognostic_edmfx_bomex_tke_column.yml b/config/model_configs/prognostic_edmfx_bomex_tke_column.yml deleted file mode 100644 index 53a61508893..00000000000 --- a/config/model_configs/prognostic_edmfx_bomex_tke_column.yml +++ /dev/null @@ -1,25 +0,0 @@ -job_id: "prognostic_edmfx_bomex_tke_column" -initial_condition: "Bomex" -subsidence: "Bomex" -edmf_coriolis: "Bomex" -ls_adv: "Bomex" -surface_setup: "Bomex" -turbconv: "prognostic_edmfx" -edmfx_upwinding: first_order -edmfx_entr_model: "Generalized" -edmfx_detr_model: "ConstantArea" -edmfx_sgs_mass_flux: true -edmfx_sgs_diffusive_flux: true -edmfx_nh_pressure: true -prognostic_tke: true -moist: "equil" -config: "column" -hyperdiff: "false" -z_max: 3e3 -z_elem: 60 -z_stretch: false -perturb_initstate: false -dt: "5secs" -t_end: "6hours" -dt_save_to_disk: "10mins" -toml: [toml/prognostic_edmfx_bomex_box.toml] diff --git a/config/model_configs/prognostic_edmfx_dycoms_rf01_box.yml b/config/model_configs/prognostic_edmfx_dycoms_rf01_column.yml similarity index 72% rename from config/model_configs/prognostic_edmfx_dycoms_rf01_box.yml rename to config/model_configs/prognostic_edmfx_dycoms_rf01_column.yml index 86b41c84168..27d481235c5 100644 --- a/config/model_configs/prognostic_edmfx_dycoms_rf01_box.yml +++ b/config/model_configs/prognostic_edmfx_dycoms_rf01_column.yml @@ -1,4 +1,4 @@ -job_id: prognostic_edmfx_dycoms_rf01_box +job_id: prognostic_edmfx_dycoms_rf01_column initial_condition: DYCOMS_RF01 subsidence: DYCOMS edmf_coriolis: DYCOMS_RF01 @@ -6,18 +6,15 @@ rad: DYCOMS_RF01 surface_setup: DYCOMS_RF01 turbconv: prognostic_edmfx edmfx_upwinding: first_order +edmfx_sgsflux_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 -prognostic_tke: false +prognostic_tke: true moist: equil -config: box -hyperdiff: "true" -kappa_4: 1e12 -x_max: 1e5 -y_max: 1e5 +config: column z_max: 1500 x_elem: 2 y_elem: 2 @@ -26,4 +23,4 @@ z_stretch: false dt: 5secs t_end: 4hours dt_save_to_disk: 10mins -toml: [toml/prognostic_edmfx_box.toml] +toml: [toml/prognostic_edmfx_dycoms_rf01_box.toml] diff --git a/config/model_configs/prognostic_edmfx_gabls_box.yml b/config/model_configs/prognostic_edmfx_gabls_box.yml index 76a2ac48875..40af4d7419a 100644 --- a/config/model_configs/prognostic_edmfx_gabls_box.yml +++ b/config/model_configs/prognostic_edmfx_gabls_box.yml @@ -5,11 +5,11 @@ surface_setup: GABLS turbconv: "prognostic_edmfx" edmfx_upwinding: "first_order" edmfx_entr_model: "Generalized" -edmfx_detr_model: "Generalized" +edmfx_detr_model: "ConstantArea" edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true edmfx_nh_pressure: true -prognostic_tke: false +prognostic_tke: true moist: "equil" config: "box" hyperdiff: "true" diff --git a/config/model_configs/prognostic_edmfx_gabls_tke_box.yml b/config/model_configs/prognostic_edmfx_gabls_tke_box.yml deleted file mode 100644 index 410026923ca..00000000000 --- a/config/model_configs/prognostic_edmfx_gabls_tke_box.yml +++ /dev/null @@ -1,28 +0,0 @@ -job_id: "prognostic_edmfx_gabls_tke_box" -initial_condition: GABLS -edmf_coriolis: GABLS -surface_setup: GABLS -turbconv: "prognostic_edmfx" -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 -prognostic_tke: true -moist: "equil" -config: "box" -hyperdiff: "true" -kappa_4: 1e12 -x_max: 1e5 -y_max: 1e5 -z_max: 400 -x_elem: 2 -y_elem: 2 -z_elem: 8 -z_stretch: false -dt: "5secs" -t_end: "9hours" -dt_save_to_disk: "10mins" -perturb_initstate: false -toml: [toml/prognostic_edmfx_box.toml] diff --git a/config/model_configs/prognostic_edmfx_gabls_tke_column.yml b/config/model_configs/prognostic_edmfx_gabls_tke_column.yml deleted file mode 100644 index d2c901580ad..00000000000 --- a/config/model_configs/prognostic_edmfx_gabls_tke_column.yml +++ /dev/null @@ -1,25 +0,0 @@ -job_id: "prognostic_edmfx_gabls_tke_column" -initial_condition: GABLS -edmf_coriolis: GABLS -surface_setup: GABLS -turbconv: "prognostic_edmfx" -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 -prognostic_tke: true -moist: "equil" -config: "column" -hyperdiff: "false" -z_max: 400 -x_elem: 2 -y_elem: 2 -z_elem: 8 -z_stretch: false -dt: "5secs" -t_end: "9hours" -dt_save_to_disk: "10mins" -perturb_initstate: false -toml: [toml/prognostic_edmfx_box.toml] diff --git a/config/model_configs/prognostic_edmfx_rico_box.yml b/config/model_configs/prognostic_edmfx_rico_column.yml similarity index 74% rename from config/model_configs/prognostic_edmfx_rico_box.yml rename to config/model_configs/prognostic_edmfx_rico_column.yml index ea61cef47cf..615bde96dad 100644 --- a/config/model_configs/prognostic_edmfx_rico_box.yml +++ b/config/model_configs/prognostic_edmfx_rico_column.yml @@ -1,4 +1,4 @@ -job_id: "prognostic_edmfx_rico_box" +job_id: "prognostic_edmfx_rico_column" initial_condition: "Rico" subsidence: "Rico" ls_adv: "Rico" @@ -6,18 +6,14 @@ surface_setup: "Rico" turbconv: "prognostic_edmfx" edmfx_upwinding: first_order edmfx_entr_model: "Generalized" -edmfx_detr_model: "Generalized" +edmfx_detr_model: "ConstantArea" edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true edmfx_nh_pressure: true -prognostic_tke: false +prognostic_tke: true moist: "equil" precip_model: "0M" -config: "box" -hyperdiff: "true" -kappa_4: 1e12 -x_max: 1e5 -y_max: 1e5 +config: "column" z_max: 4e3 x_elem: 2 y_elem: 2 diff --git a/config/model_configs/prognostic_edmfx_trmm_box.yml b/config/model_configs/prognostic_edmfx_trmm_column.yml similarity index 74% rename from config/model_configs/prognostic_edmfx_trmm_box.yml rename to config/model_configs/prognostic_edmfx_trmm_column.yml index ff40d2a0787..2664810c7c7 100644 --- a/config/model_configs/prognostic_edmfx_trmm_box.yml +++ b/config/model_configs/prognostic_edmfx_trmm_column.yml @@ -1,23 +1,19 @@ -job_id: prognostic_edmfx_trmm_box +job_id: prognostic_edmfx_trmm_column initial_condition: TRMM_LBA rad: TRMM_LBA surface_setup: TRMM_LBA turbconv: prognostic_edmfx edmfx_upwinding: first_order edmfx_entr_model: "Generalized" -edmfx_detr_model: "Generalized" +edmfx_detr_model: "ConstantArea" edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true edmfx_nh_pressure: true -prognostic_tke: false +prognostic_tke: true moist: equil apply_limiter: false precip_model: "0M" -config: box -hyperdiff: "true" -kappa_4: 1e12 -x_max: 1e5 -y_max: 1e5 +config: column z_max: 16400 x_elem: 2 y_elem: 2 diff --git a/toml/prognostic_edmfx_box.toml b/toml/prognostic_edmfx_box.toml index fc5cb4455fb..9a109d2cfa7 100644 --- a/toml/prognostic_edmfx_box.toml +++ b/toml/prognostic_edmfx_box.toml @@ -10,12 +10,12 @@ type = "float" [EDMF_max_area] alias = "max_area" -value = 0.6 +value = 0.9 type = "float" [entr_tau] alias = "entr_tau" -value = 0.001 +value = 0.002 type = "float" [entr_coeff] @@ -25,12 +25,12 @@ type = "float" [min_area_limiter_scale] alias = "min_area_limiter_scale" -value = 1e-4 +value = 0 type = "float" [detr_tau] alias = "detr_tau" -value = 0.001 +value = 0 type = "float" [detr_coeff] @@ -40,10 +40,10 @@ type = "float" [detr_buoy_coeff] alias = "detr_buoy_coeff" -value = 0.12 +value = 0 type = "float" [max_area_limiter_scale] alias = "max_area_limiter_scale" -value = 0.01 +value = 0 type = "float" diff --git a/toml/prognostic_edmfx_bomex_box.toml b/toml/prognostic_edmfx_dycoms_rf01_box.toml similarity index 78% rename from toml/prognostic_edmfx_bomex_box.toml rename to toml/prognostic_edmfx_dycoms_rf01_box.toml index 6935d378034..73afbf49521 100644 --- a/toml/prognostic_edmfx_bomex_box.toml +++ b/toml/prognostic_edmfx_dycoms_rf01_box.toml @@ -6,26 +6,31 @@ type = "float" [EDMF_min_area] alias = "min_area" value = 1.0e-5 -type = "float" +type = "float" [EDMF_max_area] alias = "max_area" -value = 0.6 +value = 0.7 type = "float" [entr_tau] alias = "entr_tau" -value = 0.002 +value = 0 type = "float" [entr_coeff] alias = "entr_coeff" -value = 0 +value = 0.2 type = "float" [min_area_limiter_scale] alias = "min_area_limiter_scale" -value = 0 +value = 0.01 +type = "float" + +[min_area_limiter_power] +alias = "min_area_limiter_power" +value = 100 type = "float" [detr_tau] @@ -35,15 +40,15 @@ type = "float" [detr_coeff] alias = "detr_coeff" -value = 0 +value = 2e-3 type = "float" [detr_buoy_coeff] alias = "detr_buoy_coeff" -value = 0 +value = 0.3 type = "float" [max_area_limiter_scale] alias = "max_area_limiter_scale" -value = 0 +value = 0.01 type = "float"