Merge pull request #2339 from CliMA/zs/progedmf_cases

update prognostic edmf cases in buildkite

.buildkite/pipeline.yml

@@ -651,23 +651,16 @@ steps:
         artifact_paths: "prognostic_edmfx_gabls_box/*"
         agents:
           slurm_mem: 20GB
-      
-      - label: ":genie: Prognostic EDMFX GABLS with TKE 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_gabls_tke_box.yml
-        artifact_paths: "prognostic_edmfx_gabls_tke_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
 
-      - 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"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
@@ -676,24 +669,6 @@ steps:
         soft_fail: true
         agents:
           slurm_mem: 20GB
-
-      - label: ":genie: Prognostic EDMFX Bomex in a column"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/prognostic_edmfx_bomex_column.yml
-        artifact_paths: "prognostic_edmfx_bomex_column/*"
-        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"
         command: >
@@ -703,20 +678,20 @@ steps:
         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

config/model_configs/prognostic_edmfx_bomex_box.yml

@@ -11,91 +11,20 @@ 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"
-kappa_4: 1.0e12
-x_max: 1e5
-y_max: 1e5
+kappa_4: 1.0e21
+x_max: 1e8
+y_max: 1e8
 z_max: 3e3
 x_elem: 2
 y_elem: 2
 z_elem: 60
 z_stretch: false
 perturb_initstate: false
-dt: "5secs"
+dt: "10secs"
 t_end: "6hours"
 dt_save_to_disk: "10mins"
-toml: [toml/prognostic_edmfx_bomex_box.toml]
-diagnostics:
-  - short_name: ts
-    period: 10mins
-  - short_name: ta
-    period: 10mins
-  - short_name: thetaa
-    period: 10mins
-  - short_name: ha
-    period: 10mins
-  - short_name: pfull
-    period: 10mins
-  - short_name: rhoa
-    period: 10mins
-  - short_name: ua
-    period: 10mins
-  - short_name: va
-    period: 10mins
-  - short_name: wa
-    period: 10mins
-  - short_name: hur
-    period: 10mins
-  - short_name: hus
-    period: 10mins
-  - short_name: clw
-    period: 10mins
-  - short_name: cli
-    period: 10mins
-  - short_name: hussfc
-    period: 10mins
-  - short_name: evspsbl
-    period: 10mins
-  - short_name: arup
-    period: 10mins
-  - short_name: waup
-    period: 10mins
-  - short_name: taup
-    period: 10mins
-  - short_name: thetaaup
-    period: 10mins
-  - short_name: haup
-    period: 10mins
-  - short_name: husup
-    period: 10mins
-  - short_name: hurup
-    period: 10mins
-  - short_name: clwup
-    period: 10mins
-  - short_name: cliup
-    period: 10mins
-  - short_name: rhoaen
-    period: 10mins
-  - short_name: waen
-    period: 10mins
-  - short_name: taen
-    period: 10mins
-  - short_name: thetaaen
-    period: 10mins
-  - short_name: haen
-    period: 10mins
-  - short_name: husen
-    period: 10mins
-  - short_name: huren
-    period: 10mins
-  - short_name: clwen
-    period: 10mins
-  - short_name: clien
-    period: 10mins
-  - short_name: tke
-    period: 10mins
-  - short_name: lmix
-    period: 10mins
+toml: [toml/prognostic_edmfx_box.toml]

config/model_configs/prognostic_edmfx_bomex_fixtke_box.yml

@@ -0,0 +1,101 @@
+job_id: "prognostic_edmfx_bomex_fixtke_box"
+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: 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: "10mins"
+toml: [toml/prognostic_edmfx_box.toml]
+diagnostics:
+  - short_name: ts
+    period: 10mins
+  - short_name: ta
+    period: 10mins
+  - short_name: thetaa
+    period: 10mins
+  - short_name: ha
+    period: 10mins
+  - short_name: pfull
+    period: 10mins
+  - short_name: rhoa
+    period: 10mins
+  - short_name: ua
+    period: 10mins
+  - short_name: va
+    period: 10mins
+  - short_name: wa
+    period: 10mins
+  - short_name: hur
+    period: 10mins
+  - short_name: hus
+    period: 10mins
+  - short_name: clw
+    period: 10mins
+  - short_name: cli
+    period: 10mins
+  - short_name: hussfc
+    period: 10mins
+  - short_name: evspsbl
+    period: 10mins
+  - short_name: arup
+    period: 10mins
+  - short_name: waup
+    period: 10mins
+  - short_name: taup
+    period: 10mins
+  - short_name: thetaaup
+    period: 10mins
+  - short_name: haup
+    period: 10mins
+  - short_name: husup
+    period: 10mins
+  - short_name: hurup
+    period: 10mins
+  - short_name: clwup
+    period: 10mins
+  - short_name: cliup
+    period: 10mins
+  - short_name: rhoaen
+    period: 10mins
+  - short_name: waen
+    period: 10mins
+  - short_name: taen
+    period: 10mins
+  - short_name: thetaaen
+    period: 10mins
+  - short_name: haen
+    period: 10mins
+  - short_name: husen
+    period: 10mins
+  - short_name: huren
+    period: 10mins
+  - short_name: clwen
+    period: 10mins
+  - short_name: clien
+    period: 10mins
+  - short_name: tke
+    period: 10mins
+  - short_name: lmix
+    period: 10mins

config/model_configs/prognostic_edmfx_dycoms_rf01_box.yml

@@ -6,24 +6,25 @@ 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
+kappa_4: 1.0e21
+x_max: 1e8
+y_max: 1e8
 z_max: 1500
 x_elem: 2
 y_elem: 2
 z_elem: 30
 z_stretch: false
-dt: 5secs
+dt: 10secs
 t_end: 4hours
 dt_save_to_disk: 10mins
-toml: [toml/prognostic_edmfx_box.toml]
+toml: [toml/prognostic_edmfx_dycoms_rf01_box.toml]

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"