change prognostic edmf cases to single column

.buildkite/pipeline.yml

@@ -532,11 +532,11 @@ steps:
   - group: "Prognostic EDMFX"
     steps:
 
-      - label: ":genie: Prognostic EDMFX advection test in a box"
+      - label: ":genie: Prognostic EDMFX advection test in a column"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/prognostic_edmfx_adv_test_box.yml
-        artifact_paths: "prognostic_edmfx_adv_test_box/*"
+          --config_file $CONFIG_PATH/prognostic_edmfx_adv_test_column.yml
+        artifact_paths: "prognostic_edmfx_adv_test_column/*"
         agents:
           slurm_mem: 20GB
 
@@ -548,35 +548,27 @@ steps:
         agents:
           slurm_mem: 20GB
 
-      - label: ":genie: Prognostic EDMFX GABLS in a box"
+      - label: ":genie: Prognostic EDMFX GABLS in a column"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/prognostic_edmfx_gabls_box.yml
-        artifact_paths: "prognostic_edmfx_gabls_box/*"
+          --config_file $CONFIG_PATH/prognostic_edmfx_gabls_column.yml
+        artifact_paths: "prognostic_edmfx_gabls_column/*"
         agents:
           slurm_mem: 20GB
 
-      - label: ":genie: Prognostic EDMFX Bomex with precribed TKE in a box"
+      - label: ":genie: Prognostic EDMFX Bomex with precribed TKE in a column"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/prognostic_edmfx_bomex_fixtke_box.yml
-        artifact_paths: "prognostic_edmfx_bomex_fixtke_box/*"
+          --config_file $CONFIG_PATH/prognostic_edmfx_bomex_fixtke_column.yml
+        artifact_paths: "prognostic_edmfx_bomex_fixtke_column/*"
         agents:
           slurm_mem: 20GB
 
-      - label: ":genie: Prognostic EDMFX Bomex in a box"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/prognostic_edmfx_bomex_box.yml
-        artifact_paths: "prognostic_edmfx_bomex_box/*"
-        agents:
-          slurm_mem: 20GB
-
-      - label: ":genie: Prognostic EDMFX Bomex stretched grid in a box"
+      - label: ":genie: Prognostic EDMFX Bomex stretched grid in a column"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/prognostic_edmfx_bomex_stretched_box.yml
-        artifact_paths: "prognostic_edmfx_bomex_stretched_box/*"
+          --config_file $CONFIG_PATH/prognostic_edmfx_bomex_stretched_column.yml
+        artifact_paths: "prognostic_edmfx_bomex_stretched_column/*"
         agents:
           slurm_mem: 20GB
 
@@ -588,11 +580,11 @@ steps:
         agents:
           slurm_mem: 20GB
 
-      - label: ":genie: Prognostic EDMFX Dycoms RF01 in a box"
+      - label: ":genie: Prognostic EDMFX Dycoms RF01 in a column"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/prognostic_edmfx_dycoms_rf01_box.yml
-        artifact_paths: "prognostic_edmfx_dycoms_rf01_box/*"
+          --config_file $CONFIG_PATH/prognostic_edmfx_dycoms_rf01_column.yml
+        artifact_paths: "prognostic_edmfx_dycoms_rf01_column/*"
         agents:
           slurm_mem: 20GB
 
@@ -612,6 +604,14 @@ steps:
         agents:
           slurm_mem: 20GB
 
+      - label: ":genie: Prognostic EDMFX Bomex in a box"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/prognostic_edmfx_bomex_box.yml
+        artifact_paths: "prognostic_edmfx_bomex_box/*"
+        agents:
+          slurm_mem: 20GB
+
       - label: ":genie: Prognostic EDMFX aquaplanet"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl

config/gpu_configs/gpu_prognostic_edmfx_aquaplanet.yml

@@ -15,7 +15,7 @@ precip_model: 0M
 dt: 10secs 
 t_end: 1hours 
 dt_save_to_disk: 600secs
-toml: [toml/prognostic_edmfx_box.toml]
+toml: [toml/prognostic_edmfx.toml]
 output_default_diagnostics: false
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hfes, hur, hus, cl, clw, cli, evspsbl, rsd, rsu, rld, rlu]

config/model_configs/prognostic_edmfx_adv_test_box.yml → config/model_configs/prognostic_edmfx_adv_test_column.yml

@@ -1,14 +1,11 @@
-job_id: "prognostic_edmfx_adv_test_box"
+job_id: "prognostic_edmfx_adv_test_column"
 initial_condition: "MoistAdiabaticProfileEDMFX"
 advection_test: true
 turbconv: "prognostic_edmfx"
 ode_algo: "SSP33ShuOsher"
 edmfx_upwinding: "first_order"
-config: "box"
+config: "column"
 moist: "equil"
-hyperdiff: "true"
-x_max: 1e8
-y_max: 1e8
 z_max: 5.5e4
 x_elem: 2
 y_elem: 2
@@ -19,9 +16,9 @@ dt: "10secs"
 t_end: "3600secs"
 dt_save_state_to_disk: "100secs"
 FLOAT_TYPE: "Float64"
-toml: [toml/prognostic_edmfx_box_advection.toml]
+toml: [toml/prognostic_edmfx_advection.toml]
 netcdf_output_at_levels: true
-netcdf_interpolation_num_points: [8, 8, 63]
+netcdf_interpolation_num_points: [2, 2, 63]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]
     period: 10mins

config/model_configs/prognostic_edmfx_aquaplanet.yml

@@ -15,7 +15,7 @@ precip_model: 0M
 dt: 10secs 
 t_end: 1hours 
 dt_save_state_to_disk: 600secs
-toml: [toml/prognostic_edmfx_box.toml]
+toml: [toml/prognostic_edmfx.toml]
 output_default_diagnostics: false
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hfes, hur, hus, cl, clw, cli, evspsbl, rsd, rsu, rld, rlu]

config/model_configs/prognostic_edmfx_bomex_box.yml

@@ -31,7 +31,7 @@ perturb_initstate: false
 dt: "50secs"
 t_end: "6hours"
 dt_save_state_to_disk: "30mins"
-toml: [toml/prognostic_edmfx_bomex_box.toml]
+toml: [toml/prognostic_edmfx_bomex.toml]
 netcdf_output_at_levels: true
 netcdf_interpolation_num_points: [8, 8, 60]
 diagnostics:

config/model_configs/prognostic_edmfx_bomex_column.yml

@@ -26,7 +26,7 @@ perturb_initstate: false
 dt: "50secs"
 t_end: "6hours"
 dt_save_to_disk: "10mins"
-toml: [toml/prognostic_edmfx_bomex_box.toml]
+toml: [toml/prognostic_edmfx_bomex.toml]
 netcdf_output_at_levels: true
 netcdf_interpolation_num_points: [2, 2, 60]
 diagnostics:

config/model_configs/prognostic_edmfx_bomex_fixtke_box.yml → config/model_configs/prognostic_edmfx_bomex_fixtke_column.yml

@@ -1,4 +1,4 @@
-job_id: "prognostic_edmfx_bomex_fixtke_box"
+job_id: "prognostic_edmfx_bomex_fixtke_column"
 initial_condition: "Bomex"
 subsidence: "Bomex"
 edmf_coriolis: "Bomex"
@@ -14,10 +14,7 @@ edmfx_nh_pressure: true
 edmfx_velocity_relaxation: true
 prognostic_tke: false
 moist: "equil"
-config: "box"
-hyperdiff: "true"
-x_max: 1e8
-y_max: 1e8
+config: "column"
 z_max: 3e3
 x_elem: 2
 y_elem: 2
@@ -27,9 +24,9 @@ perturb_initstate: false
 dt: "5secs"
 t_end: "6hours"
 dt_save_state_to_disk: "10mins"
-toml: [toml/prognostic_edmfx_bomex_box.toml]
+toml: [toml/prognostic_edmfx_bomex.toml]
 netcdf_output_at_levels: true
-netcdf_interpolation_num_points: [8, 8, 60]
+netcdf_interpolation_num_points: [2, 2, 60]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]
     period: 10mins

config/model_configs/prognostic_edmfx_bomex_stretched_box.yml → config/model_configs/prognostic_edmfx_bomex_stretched_column.yml

@@ -1,4 +1,4 @@
-job_id: "prognostic_edmfx_bomex_stretched_box"
+job_id: "prognostic_edmfx_bomex_stretched_column"
 initial_condition: "Bomex"
 subsidence: "Bomex"
 edmf_coriolis: "Bomex"
@@ -18,10 +18,8 @@ edmfx_nh_pressure: true
 edmfx_velocity_relaxation: true
 prognostic_tke: true
 moist: "equil"
-config: "box"
+config: "column"
 hyperdiff: "true"
-x_max: 1e8
-y_max: 1e8
 z_max: 3e3
 x_elem: 2
 y_elem: 2
@@ -32,9 +30,9 @@ perturb_initstate: false
 dt: "50secs"
 t_end: "6hours"
 dt_save_state_to_disk: "10mins"
-toml: [toml/prognostic_edmfx_bomex_box.toml]
+toml: [toml/prognostic_edmfx_bomex.toml]
 netcdf_output_at_levels: true
-netcdf_interpolation_num_points: [8, 8, 30]
+netcdf_interpolation_num_points: [2, 2, 30]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]
     period: 10mins

config/model_configs/prognostic_edmfx_dycoms_rf01_box.yml → config/model_configs/prognostic_edmfx_dycoms_rf01_column.yml

@@ -1,4 +1,4 @@
-job_id: prognostic_edmfx_dycoms_rf01_box
+job_id: prognostic_edmfx_dycoms_rf01_column
 initial_condition: DYCOMS_RF01
 subsidence: DYCOMS
 edmf_coriolis: DYCOMS_RF01
@@ -19,10 +19,8 @@ edmfx_nh_pressure: true
 edmfx_velocity_relaxation: true
 prognostic_tke: true
 moist: equil
-config: box
+config: column
 hyperdiff: "true"
-x_max: 1e8
-y_max: 1e8
 z_max: 1500
 x_elem: 2
 y_elem: 2
@@ -31,9 +29,9 @@ z_stretch: false
 dt: 40secs
 t_end: 4hours
 dt_save_state_to_disk: 10mins
-toml: [toml/prognostic_edmfx_dycoms_rf01_box.toml]
+toml: [toml/prognostic_edmfx_dycoms_rf01.toml]
 netcdf_output_at_levels: true
-netcdf_interpolation_num_points: [8, 8, 30]
+netcdf_interpolation_num_points: [2, 2, 30]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]
     period: 10mins

config/model_configs/prognostic_edmfx_gabls_box.yml → config/model_configs/prognostic_edmfx_gabls_column.yml

@@ -1,4 +1,4 @@
-job_id: "prognostic_edmfx_gabls_box"
+job_id: "prognostic_edmfx_gabls_column"
 initial_condition: GABLS
 edmf_coriolis: GABLS
 surface_setup: GABLS
@@ -16,10 +16,8 @@ edmfx_nh_pressure: true
 edmfx_velocity_relaxation: true
 prognostic_tke: true
 moist: "equil"
-config: "box"
+config: "column"
 hyperdiff: "true"
-x_max: 1e8
-y_max: 1e8
 z_max: 400
 x_elem: 2
 y_elem: 2
@@ -29,9 +27,9 @@ dt: "60secs"
 t_end: "9hours"
 dt_save_state_to_disk: "30mins"
 perturb_initstate: false
-toml: [toml/prognostic_edmfx_box.toml]
+toml: [toml/prognostic_edmfx.toml]
 netcdf_output_at_levels: true
-netcdf_interpolation_num_points: [8, 8, 8]
+netcdf_interpolation_num_points: [2, 2, 8]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]
     period: 10mins

config/model_configs/prognostic_edmfx_rico_column.yml

@@ -24,7 +24,7 @@ perturb_initstate: false
 dt: "5secs"
 t_end: "6hours"
 dt_save_state_to_disk: "10mins"
-toml: [toml/prognostic_edmfx_box.toml]
+toml: [toml/prognostic_edmfx.toml]
 netcdf_output_at_levels: true
 netcdf_interpolation_num_points: [8, 8, 100]
 diagnostics:

config/model_configs/prognostic_edmfx_trmm_column.yml

@@ -24,7 +24,7 @@ dt: 5secs
 t_end: 6hours
 dt_save_state_to_disk: 10mins
 FLOAT_TYPE: "Float64"
-toml: [toml/prognostic_edmfx_box.toml]
+toml: [toml/prognostic_edmfx.toml]
 netcdf_output_at_levels: true
 netcdf_interpolation_num_points: [8, 8, 82]
 diagnostics:

config/perf_configs/flame_perf_target_prognostic_edmfx_aquaplanet.yml

@@ -17,4 +17,4 @@ precip_model: 0M
 dt: 10secs 
 t_end: 1hours 
 dt_save_state_to_disk: 600secs
-toml: [toml/prognostic_edmfx_box.toml]
+toml: [toml/prognostic_edmfx.toml]

docs/src/config.md

@@ -40,7 +40,7 @@ perturb_initstate: false
 dt: "5secs"
 t_end: "6hours"
 dt_save_state_to_disk: "10mins"
-toml: [toml/prognostic_edmfx_box.toml]
+toml: [toml/prognostic_edmfx.toml]
 ```
 
 To add a new configuration argument/key, open `.buildkite/default_config.yml`.

post_processing/ci_plots.jl

@@ -829,6 +829,7 @@ AquaplanetPlots = Union{
     Val{:longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_diffonly_0M},
     Val{:longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M},
     Val{:longrun_aquaplanet_rhoe_equil_55km_nz63_allsky_diagedmf_0M},
+    Val{:longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_progedmf_diffonly_0M},
     Val{:longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M_earth},
     Val{:longrun_aquaplanet_rhoe_equil_highres_allsky_ft32},
     Val{:longrun_aquaplanet_dyamond},
@@ -939,16 +940,16 @@ EDMFBoxPlots = Union{
     Val{:diagnostic_edmfx_trmm_box},
     Val{:diagnostic_edmfx_trmm_stretched_box},
     Val{:diagnostic_edmfx_dycoms_rf01_explicit_box},
-    Val{:prognostic_edmfx_adv_test_box},
-    Val{:prognostic_edmfx_gabls_box},
-    Val{:prognostic_edmfx_bomex_fixtke_box},
-    Val{:prognostic_edmfx_bomex_box},
+    Val{:prognostic_edmfx_adv_test_column},
+    Val{:prognostic_edmfx_gabls_column},
+    Val{:prognostic_edmfx_bomex_fixtke_column},
     Val{:prognostic_edmfx_bomex_column},
-    Val{:prognostic_edmfx_bomex_stretched_box},
-    Val{:prognostic_edmfx_dycoms_rf01_box},
+    Val{:prognostic_edmfx_bomex_stretched_column},
+    Val{:prognostic_edmfx_dycoms_rf01_column},
     Val{:prognostic_edmfx_rico_column},
     Val{:prognostic_edmfx_trmm_column},
     Val{:prognostic_edmfx_simpleplume_column},
+    Val{:prognostic_edmfx_bomex_box},
 }
 
 """