remove EDMFX

.buildkite/pipeline.yml

@@ -649,131 +649,54 @@ steps:
         artifact_paths: "diagnostic_edmfx_trmm_stretched_box/*"
         agents:
           slurm_mem: 20GB
-
-      - label: ":genie: Diagnostic EDMFX aquaplanet with TKE"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/diagnostic_edmfx_aquaplanet_tke.yml
-        artifact_paths: "diagnostic_edmfx_aquaplanet_tke/*"
-        agents:
-          slurm_mem: 20GB
-
-      - label: ":genie: EDMFX advection test in a box"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/edmfx_adv_test_box.yml
-        artifact_paths: "edmfx_adv_test_box/*"
-        agents:
-          slurm_mem: 20GB
-
-      - label: ":genie: EDMFX GABLS in a box"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/edmfx_gabls_box.yml
-        artifact_paths: "edmfx_gabls_box/*"
-        agents:
-          slurm_mem: 20GB
-
-      - label: ":genie: EDMFX Dycoms RF01 in a box"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --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
-
-      - label: ":genie: EDMFX advection test in a sphere"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/edmfx_adv_test_sphere.yml
-        artifact_paths: "edmfx_adv_test_sphere/*"
-        agents:
-          slurm_mem: 20GB
-
-      - label: ":genie: explicit baroclinic wave (ρe) equilmoist with EDMFX"
-        command: >
-          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/*"
+          --config_file $CONFIG_PATH/prognostic_edmfx_adv_test_box.yml
+        artifact_paths: "prognostic_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/*"
+          --config_file $CONFIG_PATH/prognostic_edmfx_gabls_box.yml
+        artifact_paths: "prognostic_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/*"
+          --config_file $CONFIG_PATH/prognostic_edmfx_bomex_box.yml
+        artifact_paths: "prognostic_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/*"
+          --config_file $CONFIG_PATH/prognostic_edmfx_dycoms_rf01_box.yml
+        artifact_paths: "prognostic_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/*"
+          --config_file $CONFIG_PATH/prognostic_edmfx_rico_box.yml
+        artifact_paths: "prognostic_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/*"
+          --config_file $CONFIG_PATH/prognostic_edmfx_trmm_box.yml
+        artifact_paths: "prognostic_edmfx_trmm_box/*"
         soft_fail: true
         agents:
           slurm_mem: 20GB

config/default_configs/default_edmf_config.yml

@@ -1,6 +1,6 @@
 # EDMF configuration
 turbconv:
-  help: "Turbulence convection scheme [`nothing` (default), `edmf`]"
+  help: "Turbulence convection scheme [`nothing` (default), `edmf`, 'prognostic_edmfx', 'diagnostic_edmfx']"
   value: ~
 test_edmf_consistency:
   help: "Test edmf equation consistency [`false` (default), `true`]"

config/model_configs/advective_edmfx_adv_test_box.yml → config/model_configs/prognostic_edmfx_adv_test_box.yml

@@ -1,7 +1,7 @@
-job_id: "advective_edmfx_adv_test_box"
+job_id: "prognostic_edmfx_adv_test_box"
 initial_condition: "MoistAdiabaticProfileEDMFX"
 advection_test: true
-turbconv: "advective_edmfx"
+turbconv: "prognostic_edmfx"
 ode_algo: "SSP33ShuOsher"
 edmfx_upwinding: "first_order"
 config: "box"
@@ -20,4 +20,4 @@ dt: "10secs"
 t_end: "3600secs"
 dt_save_to_disk: "100secs"
 FLOAT_TYPE: "Float64"
-toml: [toml/edmfx_box_advection.toml]
+toml: [toml/prognostic_edmfx_box_advection.toml]

config/model_configs/advective_edmfx_bomex_box.yml → config/model_configs/prognostic_edmfx_bomex_box.yml

@@ -1,10 +1,10 @@
-job_id: "advective_edmfx_bomex_box"
+job_id: "prognostic_edmfx_bomex_box"
 initial_condition: "Bomex"
 subsidence: "Bomex"
 edmf_coriolis: "Bomex"
 ls_adv: "Bomex"
 surface_setup: "Bomex"
-turbconv: "advective_edmfx"
+turbconv: "prognostic_edmfx"
 edmfx_upwinding: first_order
 edmfx_entr_model: "ConstantCoefficient"
 edmfx_detr_model: "BOverW"
@@ -27,4 +27,4 @@ perturb_initstate: false
 dt: "5secs"
 t_end: "6hours"
 dt_save_to_disk: "5mins"
-toml: [toml/advective_edmfx_box.toml]
+toml: [toml/prognostic_edmfx_box.toml]

config/model_configs/edmfx_dycoms_rf01_box.yml → config/model_configs/prognostic_edmfx_dycoms_rf01_box.yml

@@ -1,10 +1,10 @@
-job_id: edmfx_dycoms_rf01_box
+job_id: prognostic_edmfx_dycoms_rf01_box
 initial_condition: DYCOMS_RF01
 subsidence: DYCOMS
 edmf_coriolis: DYCOMS_RF01
 rad: DYCOMS_RF01
 surface_setup: DYCOMS_RF01
-turbconv: edmfx
+turbconv: prognostic_edmfx
 edmfx_upwinding: first_order
 edmfx_entr_model: "ConstantCoefficient"
 edmfx_detr_model: "BOverW"
@@ -26,4 +26,4 @@ z_stretch: false
 dt: 5secs
 t_end: 4hours
 dt_save_to_disk: 10mins
-toml: [toml/edmfx_box.toml]
+toml: [toml/prognostic_edmfx_box.toml]