Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add advective edmf #2213

Merged
merged 1 commit into from
Oct 19, 2023
Merged

Add advective edmf #2213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 53 additions & 0 deletions .buildkite/pipeline.yml
View file
Open in desktop
szy21 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,58 @@ steps:
julia --color=yes --project=examples examples/hybrid/driver.jl
--config_file $CONFIG_PATH/sphere_baroclinic_wave_rhoe_equilmoist_edmfx.yml
artifact_paths: "sphere_baroclinic_wave_rhoe_equilmoist_edmfx/*"
soft_fail: true
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know why I broke this sphere flux form edmfx :( But we will remove it anyway.

agents:
slurm_mem: 20GB

- label: ":genie: Advective EDMFX advection test in a box"
command: >
julia --color=yes --project=examples examples/hybrid/driver.jl
--config_file $CONFIG_PATH/advective_edmfx_adv_test_box.yml
artifact_paths: "advective_edmfx_adv_test_box/*"
agents:
slurm_mem: 20GB

- label: ":genie: Advective EDMFX GABLS in a box"
command: >
julia --color=yes --project=examples examples/hybrid/driver.jl
--config_file $CONFIG_PATH/advective_edmfx_gabls_box.yml
artifact_paths: "advective_edmfx_gabls_box/*"
agents:
slurm_mem: 20GB

- label: ":genie: Advective EDMFX Bomex in a box"
command: >
julia --color=yes --project=examples examples/hybrid/driver.jl
--config_file $CONFIG_PATH/advective_edmfx_bomex_box.yml
artifact_paths: "advective_edmfx_bomex_box/*"
soft_fail: true
agents:
slurm_mem: 20GB

- label: ":genie: Advective EDMFX Dycoms RF01 in a box"
command: >
julia --color=yes --project=examples examples/hybrid/driver.jl
--config_file $CONFIG_PATH/advective_edmfx_dycoms_rf01_box.yml
artifact_paths: "advective_edmfx_dycoms_rf01_box/*"
agents:
slurm_mem: 20GB

- label: ":genie: Advective EDMFX Rico in a box"
command: >
julia --color=yes --project=examples examples/hybrid/driver.jl
--config_file $CONFIG_PATH/advective_edmfx_rico_box.yml
artifact_paths: "advective_edmfx_rico_box/*"
soft_fail: true
agents:
slurm_mem: 20GB

- label: ":genie: Advective EDMFX TRMM in a box"
command: >
julia --color=yes --project=examples examples/hybrid/driver.jl
--config_file $CONFIG_PATH/advective_edmfx_trmm_box.yml
artifact_paths: "advective_edmfx_trmm_box/*"
soft_fail: true
agents:
slurm_mem: 20GB

Expand Down Expand Up @@ -1043,6 +1095,7 @@ steps:
julia --color=yes --project=perf perf/flame.jl
$PERF_CONFIG_PATH/flame_perf_target_edmfx.yml
artifact_paths: "flame_perf_target_edmfx/*"
soft_fail: true
agents:
slurm_mem: 20GB

Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/longrun_aquaplanet_amip.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ turbconv: "diagnostic_edmfx"
prognostic_tke: true
edmfx_upwinding: "first_order"
edmfx_entr_model: "ConstantTimescale"
edmfx_detr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
edmfx_nh_pressure: true
edmfx_sgs_mass_flux: true
edmfx_sgs_diffusive_flux: true
Expand Down
23 changes: 23 additions & 0 deletions config/model_configs/advective_edmfx_adv_test_box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
job_id: "advective_edmfx_adv_test_box"
initial_condition: "MoistAdiabaticProfileEDMFX"
advection_test: true
turbconv: "advective_edmfx"
ode_algo: "SSP33ShuOsher"
edmfx_upwinding: "first_order"
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]
30 changes: 30 additions & 0 deletions config/model_configs/advective_edmfx_bomex_box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
job_id: "advective_edmfx_bomex_box"
initial_condition: "Bomex"
subsidence: "Bomex"
edmf_coriolis: "Bomex"
ls_adv: "Bomex"
surface_setup: "Bomex"
turbconv: "advective_edmfx"
edmfx_upwinding: first_order
edmfx_entr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
edmfx_sgs_mass_flux: true
edmfx_sgs_diffusive_flux: true
edmfx_nh_pressure: true
prognostic_tke: false
moist: "equil"
config: "box"
hyperdiff: "true"
kappa_4: 1.0e12
x_max: 1e5
y_max: 1e5
z_max: 3e3
x_elem: 2
y_elem: 2
z_elem: 60
z_stretch: false
perturb_initstate: false
dt: "5secs"
t_end: "6hours"
dt_save_to_disk: "5mins"
toml: [toml/advective_edmfx_box.toml]
29 changes: 29 additions & 0 deletions config/model_configs/advective_edmfx_dycoms_rf01_box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
job_id: advective_edmfx_dycoms_rf01_box
initial_condition: DYCOMS_RF01
subsidence: DYCOMS
edmf_coriolis: DYCOMS_RF01
rad: DYCOMS_RF01
surface_setup: DYCOMS_RF01
turbconv: advective_edmfx
edmfx_upwinding: first_order
edmfx_entr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
edmfx_sgs_mass_flux: true
edmfx_sgs_diffusive_flux: true
edmfx_nh_pressure: true
prognostic_tke: false
moist: equil
config: box
hyperdiff: "true"
kappa_4: 1e12
x_max: 1e5
y_max: 1e5
z_max: 1500
x_elem: 2
y_elem: 2
z_elem: 30
z_stretch: false
dt: 5secs
t_end: 4hours
dt_save_to_disk: 10mins
toml: [toml/advective_edmfx_box.toml]
29 changes: 29 additions & 0 deletions config/model_configs/advective_edmfx_gabls_box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
job_id: "advective_edmfx_gabls_box"
initial_condition: GABLS
edmf_coriolis: GABLS
surface_setup: GABLS
turbconv: "advective_edmfx"
edmfx_upwinding: "first_order"
edmfx_entr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
edmfx_sgs_mass_flux: true
edmfx_sgs_diffusive_flux: true
edmfx_nh_pressure: true
prognostic_tke: false
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
FLOAT_TYPE: "Float64"
toml: [toml/advective_edmfx_box.toml]
30 changes: 30 additions & 0 deletions config/model_configs/advective_edmfx_rico_box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
job_id: "advective_edmfx_rico_box"
initial_condition: "Rico"
subsidence: "Rico"
ls_adv: "Rico"
surface_setup: "Rico"
turbconv: "advective_edmfx"
edmfx_upwinding: first_order
edmfx_entr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
edmfx_sgs_mass_flux: true
edmfx_sgs_diffusive_flux: true
edmfx_nh_pressure: true
prognostic_tke: false
moist: "equil"
precip_model: "0M"
config: "box"
hyperdiff: "true"
kappa_4: 1e12
x_max: 1e5
y_max: 1e5
z_max: 4e3
x_elem: 2
y_elem: 2
z_elem: 100
z_stretch: false
perturb_initstate: false
dt: "5secs"
t_end: "6hours"
dt_save_to_disk: "10mins"
toml: [toml/advective_edmfx_box.toml]
30 changes: 30 additions & 0 deletions config/model_configs/advective_edmfx_trmm_box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
job_id: advective_edmfx_trmm_box
initial_condition: TRMM_LBA
rad: TRMM_LBA
surface_setup: TRMM_LBA
turbconv: advective_edmfx
edmfx_upwinding: first_order
edmfx_entr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
edmfx_sgs_mass_flux: true
edmfx_sgs_diffusive_flux: true
edmfx_nh_pressure: true
prognostic_tke: false
moist: equil
apply_limiter: false
precip_model: "0M"
config: box
hyperdiff: "true"
kappa_4: 1e12
x_max: 1e5
y_max: 1e5
z_max: 16400
x_elem: 2
y_elem: 2
z_elem: 82
z_stretch: false
dt: 5secs
t_end: 6hours
dt_save_to_disk: 10mins
FLOAT_TYPE: "Float64"
toml: [toml/advective_edmfx_box.toml]
2 changes: 1 addition & 1 deletion config/model_configs/diagnostic_edmfx_aquaplanet_tke.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ turbconv: diagnostic_edmfx
prognostic_tke: true
edmfx_upwinding: first_order
edmfx_entr_model: "ConstantTimescale"
edmfx_detr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
edmfx_nh_pressure: true
edmfx_sgs_mass_flux: true
edmfx_sgs_diffusive_flux: true
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/diagnostic_edmfx_bomex_box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ turbconv: "diagnostic_edmfx"
prognostic_tke: true
edmfx_upwinding: "first_order"
edmfx_entr_model: "ConstantTimescale"
edmfx_detr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
edmfx_nh_pressure: true
edmfx_sgs_mass_flux: true
edmfx_sgs_diffusive_flux: true
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ turbconv: "diagnostic_edmfx"
prognostic_tke: true
edmfx_upwinding: "first_order"
edmfx_entr_model: "ConstantTimescale"
edmfx_detr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
edmfx_nh_pressure: true
edmfx_sgs_mass_flux: true
edmfx_sgs_diffusive_flux: true
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ turbconv: diagnostic_edmfx
prognostic_tke: true
edmfx_upwinding: first_order
edmfx_entr_model: "ConstantTimescale"
edmfx_detr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
edmfx_nh_pressure: true
edmfx_sgs_mass_flux: true
edmfx_sgs_diffusive_flux: true
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/diagnostic_edmfx_gabls_box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ turbconv: diagnostic_edmfx
prognostic_tke: true
edmfx_upwinding: first_order
edmfx_entr_model: "ConstantTimescale"
edmfx_detr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
edmfx_nh_pressure: true
edmfx_sgs_mass_flux: true
edmfx_sgs_diffusive_flux: true
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/diagnostic_edmfx_rico_box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ turbconv: diagnostic_edmfx
prognostic_tke: true
edmfx_upwinding: first_order
edmfx_entr_model: "ConstantTimescale"
edmfx_detr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
edmfx_nh_pressure: true
edmfx_sgs_mass_flux: true
edmfx_sgs_diffusive_flux: true
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/diagnostic_edmfx_trmm_box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ turbconv: diagnostic_edmfx
prognostic_tke: true
edmfx_upwinding: first_order
edmfx_entr_model: "ConstantTimescale"
edmfx_detr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
edmfx_nh_pressure: true
edmfx_sgs_mass_flux: true
edmfx_sgs_diffusive_flux: true
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ turbconv: diagnostic_edmfx
prognostic_tke: true
edmfx_upwinding: first_order
edmfx_entr_model: "ConstantTimescale"
edmfx_detr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
edmfx_nh_pressure: true
edmfx_sgs_mass_flux: true
edmfx_sgs_diffusive_flux: true
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/edmfx_bomex_box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ surface_setup: "Bomex"
turbconv: "edmfx"
edmfx_upwinding: first_order
edmfx_entr_model: "ConstantCoefficient"
edmfx_detr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
edmfx_sgs_mass_flux: true
edmfx_sgs_diffusive_flux: true
edmfx_nh_pressure: true
Expand Down
6 changes: 3 additions & 3 deletions config/model_configs/edmfx_dycoms_rf01_box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ surface_setup: DYCOMS_RF01
turbconv: edmfx
edmfx_upwinding: first_order
edmfx_entr_model: "ConstantCoefficient"
edmfx_detr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
edmfx_sgs_mass_flux: true
edmfx_sgs_diffusive_flux: true
edmfx_nh_pressure: true
Expand All @@ -23,7 +23,7 @@ x_elem: 2
y_elem: 2
z_elem: 30
z_stretch: false
dt: 2secs
dt: 5secs
t_end: 4hours
dt_save_to_disk: 10secs
dt_save_to_disk: 10mins
toml: [toml/edmfx_box.toml]
2 changes: 1 addition & 1 deletion config/model_configs/edmfx_gabls_box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ surface_setup: GABLS
turbconv: "edmfx"
edmfx_upwinding: "first_order"
edmfx_entr_model: "ConstantCoefficient"
edmfx_detr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
edmfx_sgs_mass_flux: true
edmfx_sgs_diffusive_flux: true
edmfx_nh_pressure: true
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/edmfx_rico_box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ surface_setup: "Rico"
turbconv: "edmfx"
edmfx_upwinding: first_order
edmfx_entr_model: "ConstantCoefficient"
edmfx_detr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
edmfx_sgs_mass_flux: true
edmfx_sgs_diffusive_flux: true
edmfx_nh_pressure: true
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/edmfx_trmm_box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ surface_setup: TRMM_LBA
turbconv: edmfx
edmfx_upwinding: first_order
edmfx_entr_model: "ConstantCoefficient"
edmfx_detr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
edmfx_sgs_mass_flux: true
edmfx_sgs_diffusive_flux: true
edmfx_nh_pressure: true
Expand Down
3 changes: 2 additions & 1 deletion config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_edmfx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ dt_save_to_disk: "30secs"
initial_condition: "MoistBaroclinicWaveWithEDMF"
dt: "1secs"
edmfx_entr_model: "ConstantCoefficient"
edmfx_detr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
edmfx_nh_pressure: true
t_end: "6mins"
turbconv: "edmfx"
ode_algo: "SSP33ShuOsher"
Expand Down
2 changes: 1 addition & 1 deletion config/perf_configs/flame_perf_target_diagnostic_edmfx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ prognostic_tke: true
edmfx_sgs_flux: true
turbconv: "diagnostic_edmfx"
job_id: "flame_perf_target_diagnostic_edmfx"
edmfx_detr_model: "ConstantCoefficient"
edmfx_detr_model: "BOverW"
Loading
Loading