add advective edmf type

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]

config/model_configs/advective_edmfx_adv_test_central_box.yml

@@ -0,0 +1,22 @@
+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]

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: "ConstantCoefficient"
+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/edmfx_box.toml]

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: "ConstantTimescale"
+edmfx_detr_model: "ConstantCoefficient"
+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/edmfx_box.toml]

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: "ConstantCoefficient"
+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: "1mins"
+perturb_initstate: false
+FLOAT_TYPE: "Float64"
+toml: [toml/edmfx_box.toml]

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: "ConstantCoefficient"
+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/edmfx_box.toml]

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: "ConstantCoefficient"
+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/edmfx_box.toml]

config/model_configs/edmfx_dycoms_rf01_box.yml

@@ -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]

examples/hybrid/driver.jl

@@ -40,6 +40,7 @@ reference_job_id = isnothing(ref_job_id) ? simulation.job_id : ref_job_id
 
 is_edmfx =
     atmos.turbconv_model isa CA.EDMFX ||
+    atmos.turbconv_model isa CA.AdvectiveEDMFX ||
     atmos.turbconv_model isa CA.DiagnosticEDMFX
 if is_edmfx && config.parsed_args["post_process"]
     contours_and_profiles(simulation.output_dir, reference_job_id)

src/ClimaAtmos.jl

@@ -26,6 +26,7 @@ include(joinpath("TurbulenceConvection_deprecated", "TurbulenceConvection.jl"))
 import .TurbulenceConvection as TC
 
 include(joinpath("cache", "edmf_precomputed_quantities.jl"))
+include(joinpath("cache", "advective_edmf_precomputed_quantities.jl"))
 include(joinpath("cache", "diagnostic_edmf_precomputed_quantities.jl"))
 include(joinpath("cache", "precomputed_quantities.jl"))