Merge #2119

2119: Add more prognostic EDMFX cases to CI r=trontrytel a=trontrytel

The next step is to make them run longer and not fail...

Closing #2104 

Co-authored-by: Anna Jaruga <ajaruga@caltech.edu>

.buildkite/pipeline.yml

@@ -643,20 +643,47 @@ steps:
         agents:
           slurm_mem: 20GB
 
-      - label: ":genie: EDMFX Bomex in a box entr 1 detr 0.001 dt 1 t_end 3hrs"
+      - label: ":genie: EDMFX GABLS in a box"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/edmfx_bomex_box_v1.yml
-        artifact_paths: "edmfx_bomex_box_v1/*"
+          --config_file $CONFIG_PATH/edmfx_gabls_box.yml
+        artifact_paths: "edmfx_gabls_box/*"
         soft_fail: true
         agents:
           slurm_mem: 20GB
 
-      - label: ":genie: EDMFX Bomex in a box entr 1 detr 0.01 dt 1 t_end 3hrs"
+      - label: ":genie: EDMFX Dycoms RF01 in a box"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/edmfx_bomex_box_v2.yml
-        artifact_paths: "edmfx_bomex_box_v2/*"
+          --config_file $CONFIG_PATH/edmfx_dycoms_rf01_box.yml
+        artifact_paths: "edmfx_dycoms_rf01_box/*"
+        soft_fail: true
+        agents:
+          slurm_mem: 20GB
+
+      - label: ":genie: EDMFX Bomex in a box"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/edmfx_bomex_box.yml
+        artifact_paths: "edmfx_bomex_box/*"
+        soft_fail: true
+        agents:
+          slurm_mem: 20GB
+
+      - label: ":genie: EDMFX Rico in a box"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/edmfx_rico_box.yml
+        artifact_paths: "edmfx_rico_box/*"
+        soft_fail: true
+        agents:
+          slurm_mem: 20GB
+
+      - label: ":genie: EDMFX TRMM in a box"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/edmfx_trmm_box.yml
+        artifact_paths: "edmfx_trmm_box/*"
         soft_fail: true
         agents:
           slurm_mem: 20GB

config/model_configs/edmfx_bomex_box_v1.yml → config/model_configs/edmfx_bomex_box.yml

@@ -1,27 +1,29 @@
-edmf_coriolis: "Bomex"
-dt_save_to_disk: "60secs"
+job_id: "edmfx_bomex_box"
 initial_condition: "Bomex"
-x_max: 100000.0
-hyperdiff: "true"
-z_elem: 60
-dt: "1secs"
-edmfx_upwinding: first_order
+subsidence: "Bomex"
+edmf_coriolis: "Bomex"
+ls_adv: "Bomex"
 surface_setup: "Bomex"
-perturb_initstate: false
-edmfx_entr_model: "ConstantCoefficient" 
-edmfx_detr_model: "ConstantCoefficient" 
-t_end: "10800secs"
-y_max: 100000.0
-y_elem: 2
 turbconv: "edmfx"
-z_stretch: false
-vert_diff: "true"
-x_elem: 2
+edmfx_upwinding: first_order
+edmfx_entr_model: "ConstantCoefficient"
+edmfx_detr_model: "ConstantCoefficient"
+edmfx_sgs_flux: true
+edmfx_nh_pressure: false
+prognostic_tke: false
+moist: "equil"
 config: "box"
-subsidence: "Bomex"
+hyperdiff: "true"
 kappa_4: 1.0e12
-z_max: 3000.0
-ls_adv: "Bomex"
-job_id: "edmfx_bomex_box_v1"
-moist: "equil"
-toml: [toml/edmfx_bomex_box_v1.toml]
+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: "1secs"
+t_end: "10800secs"
+dt_save_to_disk: "10secs"
+toml: [toml/edmfx_box.toml]

config/model_configs/edmfx_dycoms_rf01_box.yml

@@ -0,0 +1,28 @@
+job_id: edmfx_dycoms_rf01_box
+initial_condition: DYCOMS_RF01
+subsidence: DYCOMS
+edmf_coriolis: DYCOMS_RF01
+rad: DYCOMS_RF01
+surface_setup: DYCOMS_RF01
+turbconv: edmfx
+edmfx_upwinding: first_order
+edmfx_entr_model: "ConstantCoefficient"
+edmfx_detr_model: "ConstantCoefficient"
+edmfx_sgs_flux: true
+edmfx_nh_pressure: false
+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: 1secs
+t_end: 2400secs
+dt_save_to_disk: 2secs
+toml: [toml/edmfx_box.toml]

config/model_configs/edmfx_gabls_box.yml

@@ -0,0 +1,28 @@
+job_id: "edmfx_gabls_box"
+initial_condition: GABLS
+edmf_coriolis: GABLS
+surface_setup: GABLS
+turbconv: "edmfx"
+edmfx_upwinding: "first_order"
+edmfx_entr_model: "ConstantCoefficient"
+edmfx_detr_model: "ConstantCoefficient"
+edmfx_sgs_flux: true
+edmfx_nh_pressure: false
+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: "10secs"
+t_end: "9hours"
+dt_save_to_disk: "10mins"
+perturb_initstate: false
+FLOAT_TYPE: "Float64"
+toml: [toml/edmfx_box_gabls.toml]

config/model_configs/edmfx_rico_box.yml

@@ -0,0 +1,29 @@
+job_id: "edmfx_rico_box"
+initial_condition: "Rico"
+subsidence: "Rico"
+ls_adv: "Rico"
+surface_setup: "Rico"
+turbconv: "edmfx"
+edmfx_upwinding: first_order
+edmfx_entr_model: "ConstantCoefficient"
+edmfx_detr_model: "ConstantCoefficient"
+edmfx_sgs_flux: true
+edmfx_nh_pressure: false
+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: "1secs"
+t_end: "10800secs"
+dt_save_to_disk: "10secs"
+toml: [toml/edmfx_box.toml]

config/model_configs/edmfx_trmm_box.yml

@@ -0,0 +1,29 @@
+job_id: edmfx_trmm_box
+initial_condition: TRMM_LBA
+rad: TRMM_LBA
+surface_setup: TRMM_LBA
+turbconv: edmfx
+edmfx_upwinding: first_order
+edmfx_entr_model: "ConstantCoefficient"
+edmfx_detr_model: "ConstantCoefficient"
+edmfx_sgs_flux: true
+edmfx_nh_pressure: false
+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: 1secs
+t_end: 6hours
+dt_save_to_disk: 10mins
+FLOAT_TYPE: "Float64"
+toml: [toml/edmfx_box.toml]

toml/edmfx_bomex_box_v2.toml → toml/edmfx_box_gabls.toml

@@ -3,7 +3,7 @@ alias = "C_E"
 value = 0.044
 type = "float"
 
-[detr_coeff]
-alias = "detr_coeff"
-value = 0.01
+[EDMF_surface_area]
+alias = "surface_area"
+value = 1e-4
 type = "float"