add advective edmf

CliMA · Oct 17, 2023 · 1c14194 · 1c14194
1 parent 2da96b1
commit 1c14194
Show file tree

Hide file tree

Showing 44 changed files with 945 additions and 110 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -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
+        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
 

diff --git a/config/longrun_configs/longrun_aquaplanet_amip.yml b/config/longrun_configs/longrun_aquaplanet_amip.yml
@@ -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

diff --git a/config/model_configs/advective_edmfx_adv_test_box.yml b/config/model_configs/advective_edmfx_adv_test_box.yml
@@ -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]
diff --git a/config/model_configs/advective_edmfx_bomex_box.yml b/config/model_configs/advective_edmfx_bomex_box.yml
@@ -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]
diff --git a/config/model_configs/advective_edmfx_dycoms_rf01_box.yml b/config/model_configs/advective_edmfx_dycoms_rf01_box.yml
@@ -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]
diff --git a/config/model_configs/advective_edmfx_gabls_box.yml b/config/model_configs/advective_edmfx_gabls_box.yml
@@ -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]
diff --git a/config/model_configs/advective_edmfx_rico_box.yml b/config/model_configs/advective_edmfx_rico_box.yml
@@ -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]
diff --git a/config/model_configs/advective_edmfx_trmm_box.yml b/config/model_configs/advective_edmfx_trmm_box.yml
@@ -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]
diff --git a/config/model_configs/diagnostic_edmfx_aquaplanet_tke.yml b/config/model_configs/diagnostic_edmfx_aquaplanet_tke.yml
@@ -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

diff --git a/config/model_configs/diagnostic_edmfx_bomex_box.yml b/config/model_configs/diagnostic_edmfx_bomex_box.yml
@@ -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

diff --git a/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml b/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml
@@ -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

diff --git a/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml b/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml
@@ -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

diff --git a/config/model_configs/diagnostic_edmfx_gabls_box.yml b/config/model_configs/diagnostic_edmfx_gabls_box.yml
@@ -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

diff --git a/config/model_configs/diagnostic_edmfx_rico_box.yml b/config/model_configs/diagnostic_edmfx_rico_box.yml
@@ -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

diff --git a/config/model_configs/diagnostic_edmfx_trmm_box.yml b/config/model_configs/diagnostic_edmfx_trmm_box.yml
@@ -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

diff --git a/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml b/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml
@@ -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

diff --git a/config/model_configs/edmfx_bomex_box.yml b/config/model_configs/edmfx_bomex_box.yml
@@ -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

diff --git a/config/model_configs/edmfx_dycoms_rf01_box.yml b/config/model_configs/edmfx_dycoms_rf01_box.yml
@@ -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
@@ -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]
diff --git a/config/model_configs/edmfx_gabls_box.yml b/config/model_configs/edmfx_gabls_box.yml
@@ -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

diff --git a/config/model_configs/edmfx_rico_box.yml b/config/model_configs/edmfx_rico_box.yml
@@ -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

diff --git a/config/model_configs/edmfx_trmm_box.yml b/config/model_configs/edmfx_trmm_box.yml
@@ -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

diff --git a/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_edmfx.yml b/config/model_configs/sphere_baroclinic_wave_rhoe_equilmoist_edmfx.yml
@@ -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"

diff --git a/config/perf_configs/flame_perf_target_diagnostic_edmfx.yml b/config/perf_configs/flame_perf_target_diagnostic_edmfx.yml
@@ -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"
diff --git a/config/perf_configs/flame_perf_target_edmfx.yml b/config/perf_configs/flame_perf_target_edmfx.yml
@@ -3,7 +3,7 @@ reference_job_id: "sphere_baroclinic_wave_rhoe_equilmoist"
 ode_algo: "SSP33ShuOsher"
 initial_condition: "MoistBaroclinicWaveWithEDMF"
 edmfx_entr_model: "ConstantCoefficient"
-edmfx_detr_model: "ConstantCoefficient"
+edmfx_detr_model: "BOverW"
 edmfx_sgs_flux: true
 turbconv: "edmfx"
 job_id: "flame_perf_target_edmfx"