Merge pull request #3017 from CliMA/zs/explicit_progedmf

Make updraft explicit in prognostic edmf single column cases
CliMA · May 17, 2024 · fb7114a · fb7114a
2 parents 0ee96c0 + 3ff6551
commit fb7114a
Show file tree

Hide file tree

Showing 31 changed files with 94 additions and 124 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -629,12 +629,12 @@ steps:
         agents:
           slurm_mem: 20GB
 
-      - label: ":genie: Prognostic EDMFX Bomex in a column (explicit)"
+      - label: ":genie: Prognostic EDMFX Bomex in a column (pi group)"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/prognostic_edmfx_bomex_explicit_column.yml
-          --job_id prognostic_edmfx_bomex_explicit_column
-        artifact_paths: "prognostic_edmfx_bomex_explicit_column/output_active/*"
+          --config_file $CONFIG_PATH/prognostic_edmfx_bomex_pigroup_column.yml
+          --job_id prognostic_edmfx_bomex_pigroup_column
+        artifact_paths: "prognostic_edmfx_bomex_pigroup_column/output_active/*"
         agents:
           slurm_mem: 20GB
 
@@ -664,6 +664,15 @@ steps:
         artifact_paths: "prognostic_edmfx_bomex_column/output_active/*"
         agents:
           slurm_mem: 20GB
+
+      - label: ":genie: Prognostic EDMFX Bomex in a column (implicit)"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/prognostic_edmfx_bomex_implicit_column.yml
+          --job_id prognostic_edmfx_bomex_column_implicit
+        artifact_paths: "prognostic_edmfx_bomex_column_implicit/output_active/*"
+        agents:
+          slurm_mem: 20GB
 
       - label: ":genie: Prognostic EDMFX Dycoms RF01 in a column"
         command: >

diff --git a/config/model_configs/aquaplanet_diagedmf.yml b/config/model_configs/aquaplanet_diagedmf.yml
@@ -25,4 +25,4 @@ edmfx_sgs_diffusive_flux: true
 precip_model: 0M
 dt: 100secs 
 t_end: 12hours 
-toml: [toml/diagnostic_edmfx_box.toml]
+toml: [toml/diagnostic_edmfx.toml]
diff --git a/config/model_configs/diagnostic_edmfx_aquaplanet.yml b/config/model_configs/diagnostic_edmfx_aquaplanet.yml
@@ -17,4 +17,4 @@ dt: 100secs
 t_end: 12hours
 dt_save_state_to_disk: 12hours
 regression_test: true
-toml: [toml/diagnostic_edmfx_trmm_box.toml]
+toml: [toml/diagnostic_edmfx_0M.toml]
diff --git a/config/model_configs/diagnostic_edmfx_bomex_box.yml b/config/model_configs/diagnostic_edmfx_bomex_box.yml
@@ -26,7 +26,7 @@ z_stretch: false
 dt: "100secs" 
 t_end: "6hours" 
 dt_save_state_to_disk: "10mins"
-toml: [toml/diagnostic_edmfx_box.toml]
+toml: [toml/diagnostic_edmfx.toml]
 netcdf_interpolation_num_points: [8, 8, 60]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]

diff --git a/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml b/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml
@@ -27,7 +27,7 @@ dz_top: 200.0
 dt: "200secs" 
 t_end: "6hours" 
 dt_save_state_to_disk: "10mins"
-toml: [toml/diagnostic_edmfx_box.toml]
+toml: [toml/diagnostic_edmfx.toml]
 netcdf_interpolation_num_points: [8, 8, 30]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]

diff --git a/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml b/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml
@@ -26,7 +26,7 @@ z_stretch: false
 dt: 100secs
 t_end: 4hours 
 dt_save_state_to_disk: 10mins
-toml: [toml/diagnostic_edmfx_box.toml]
+toml: [toml/diagnostic_edmfx.toml]
 netcdf_interpolation_num_points: [8, 8, 30]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]

diff --git a/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml b/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml
@@ -24,7 +24,7 @@ z_stretch: false
 dt: 20secs 
 t_end: 4hours 
 dt_save_state_to_disk: 10mins
-toml: [toml/diagnostic_edmfx_box.toml]
+toml: [toml/diagnostic_edmfx.toml]
 netcdf_interpolation_num_points: [8, 8, 30]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]

diff --git a/config/model_configs/diagnostic_edmfx_gabls_box.yml b/config/model_configs/diagnostic_edmfx_gabls_box.yml
@@ -24,7 +24,7 @@ z_stretch: false
 dt: 200secs
 t_end: 9hours
 dt_save_state_to_disk: 10mins
-toml: [toml/diagnostic_edmfx_box.toml]
+toml: [toml/diagnostic_edmfx.toml]
 netcdf_interpolation_num_points: [8, 8, 8]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]

diff --git a/config/model_configs/diagnostic_edmfx_rico_box.yml b/config/model_configs/diagnostic_edmfx_rico_box.yml
@@ -27,7 +27,7 @@ z_stretch: false
 dt: 100secs
 t_end: 8hours
 dt_save_state_to_disk: 10mins
-toml: [toml/diagnostic_edmfx_trmm_box.toml]
+toml: [toml/diagnostic_edmfx.toml]
 netcdf_interpolation_num_points: [8, 8, 100]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]

diff --git a/config/model_configs/diagnostic_edmfx_test_box.yml b/config/model_configs/diagnostic_edmfx_test_box.yml
@@ -11,7 +11,7 @@ x_elem: 2
 dz_bottom: 30.0
 config: "box"
 moist: "equil"
-toml: [toml/diagnostic_edmfx_box.toml]
+toml: [toml/diagnostic_edmfx.toml]
 netcdf_interpolation_num_points: [8, 8, 45]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]

diff --git a/config/model_configs/diagnostic_edmfx_trmm_box.yml b/config/model_configs/diagnostic_edmfx_trmm_box.yml
@@ -27,7 +27,7 @@ dt: 200secs
 t_end: 6hours
 dt_save_state_to_disk: 10mins
 FLOAT_TYPE: "Float64"
-toml: [toml/diagnostic_edmfx_trmm_box.toml]
+toml: [toml/diagnostic_edmfx.toml]
 netcdf_interpolation_num_points: [8, 8, 82]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]

diff --git a/config/model_configs/diagnostic_edmfx_trmm_box_0M.yml b/config/model_configs/diagnostic_edmfx_trmm_box_0M.yml
@@ -28,7 +28,7 @@ dt: 200secs
 t_end: 6hours
 dt_save_state_to_disk: 10mins
 FLOAT_TYPE: "Float64"
-toml: [toml/diagnostic_edmfx_trmm_box_0M.toml]
+toml: [toml/diagnostic_edmfx_0M.toml]
 netcdf_output_at_levels: true
 netcdf_interpolation_num_points: [8, 8, 82]
 diagnostics:

diff --git a/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml b/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml
@@ -30,7 +30,7 @@ dt: 300secs
 t_end: 6hours
 dt_save_state_to_disk: 10mins
 FLOAT_TYPE: "Float64"
-toml: [toml/diagnostic_edmfx_trmm_box.toml]
+toml: [toml/diagnostic_edmfx.toml]
 netcdf_interpolation_num_points: [8, 8, 30]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]

diff --git a/config/model_configs/gpu_diagnostic_edmfx_aquaplanet.yml b/config/model_configs/gpu_diagnostic_edmfx_aquaplanet.yml
@@ -16,4 +16,4 @@ moist: equil
 precip_model: 0M
 dt: 100secs
 t_end: 6hours
-toml: [toml/diagnostic_edmfx_box.toml]
+toml: [toml/diagnostic_edmfx_0M.toml]
diff --git a/config/model_configs/prognostic_edmfx_bomex_column.yml b/config/model_configs/prognostic_edmfx_bomex_column.yml
@@ -5,9 +5,8 @@ ls_adv: "Bomex"
 surface_setup: "Bomex"
 turbconv: "prognostic_edmfx"
 implicit_diffusion: true
-implicit_sgs_advection: true
+implicit_sgs_advection: false
 approximate_linear_solve_iters: 2
-max_newton_iters_ode: 3
 edmfx_upwinding: first_order
 edmfx_entr_model: "Generalized"
 edmfx_detr_model: "Generalized"
@@ -22,7 +21,7 @@ z_max: 3e3
 z_elem: 60
 z_stretch: false
 perturb_initstate: false
-dt: "50secs"
+dt: "10secs"
 t_end: "6hours"
 dt_save_to_disk: "10mins"
 toml: [toml/prognostic_edmfx_bomex.toml]

diff --git a/config/model_configs/prognostic_edmfx_bomex_implicit_column.yml b/config/model_configs/prognostic_edmfx_bomex_implicit_column.yml
@@ -0,0 +1,36 @@
+initial_condition: "Bomex"
+subsidence: "Bomex"
+edmf_coriolis: "Bomex"
+ls_adv: "Bomex"
+surface_setup: "Bomex"
+turbconv: "prognostic_edmfx"
+implicit_diffusion: true
+implicit_sgs_advection: true
+approximate_linear_solve_iters: 2
+max_newton_iters_ode: 3
+edmfx_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
+edmfx_filter: true
+prognostic_tke: true
+moist: "equil"
+config: "column"
+z_max: 3e3
+z_elem: 60
+z_stretch: false
+perturb_initstate: false
+dt: "50secs"
+t_end: "6hours"
+dt_save_to_disk: "10mins"
+toml: [toml/prognostic_edmfx_bomex.toml]
+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
+  - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, taen, thetaaen, haen, husen, huren, clwen, clien, tke]
+    period: 10mins
+  - short_name: [entr, detr, lmix, lmixw, lmixtke, lmixb, bgrad, strain, edt, evu]
+    period: 10mins
diff --git a/...rognostic_edmfx_bomex_explicit_column.yml → ...prognostic_edmfx_bomex_pigroup_column.yml b/...rognostic_edmfx_bomex_explicit_column.yml → ...prognostic_edmfx_bomex_pigroup_column.yml
@@ -4,10 +4,6 @@ edmf_coriolis: "Bomex"
 ls_adv: "Bomex"
 surface_setup: "Bomex"
 turbconv: "prognostic_edmfx"
-implicit_diffusion: false
-implicit_sgs_advection: false
-approximate_linear_solve_iters: 2
-max_newton_iters_ode: 3
 edmfx_upwinding: first_order
 edmfx_entr_model: "PiGroups"
 edmfx_detr_model: "PiGroups"
@@ -23,10 +19,10 @@ z_max: 3e3
 z_elem: 60
 z_stretch: false
 perturb_initstate: false
-dt: "1secs"
+dt: "5secs"
 t_end: "6hours"
 dt_save_to_disk: "10mins"
-toml: [toml/prognostic_edmfx_bomex_explicit.toml]
+toml: [toml/prognostic_edmfx_bomex_pigroup.toml]
 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]

diff --git a/config/model_configs/prognostic_edmfx_bomex_stretched_column.yml b/config/model_configs/prognostic_edmfx_bomex_stretched_column.yml
@@ -5,9 +5,8 @@ ls_adv: "Bomex"
 surface_setup: "Bomex"
 turbconv: "prognostic_edmfx"
 implicit_diffusion: true
-implicit_sgs_advection: true
+implicit_sgs_advection: false
 approximate_linear_solve_iters: 2
-max_newton_iters_ode: 3
 edmfx_upwinding: first_order
 edmfx_entr_model: "Generalized"
 edmfx_detr_model: "Generalized"
@@ -26,7 +25,7 @@ z_elem: 30
 dz_bottom: 50.0
 dz_top: 200.0
 perturb_initstate: false
-dt: "50secs"
+dt: "10secs"
 t_end: "6hours"
 dt_save_state_to_disk: "10mins"
 toml: [toml/prognostic_edmfx_bomex.toml]

diff --git a/config/model_configs/prognostic_edmfx_dycoms_rf01_column.yml b/config/model_configs/prognostic_edmfx_dycoms_rf01_column.yml
@@ -5,9 +5,8 @@ rad: DYCOMS_RF01
 surface_setup: DYCOMS_RF01
 turbconv: prognostic_edmfx
 implicit_diffusion: true
-implicit_sgs_advection: true
+implicit_sgs_advection: false
 approximate_linear_solve_iters: 2
-max_newton_iters_ode: 3
 edmfx_upwinding: first_order
 edmfx_sgsflux_upwinding: first_order
 edmfx_entr_model: "Generalized"
@@ -25,10 +24,10 @@ x_elem: 2
 y_elem: 2
 z_elem: 30
 z_stretch: false
-dt: 40secs
+dt: 10secs
 t_end: 4hours
 dt_save_state_to_disk: 10mins
-toml: [toml/prognostic_edmfx_dycoms_rf01.toml]
+toml: [toml/prognostic_edmfx.toml]
 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]

diff --git a/config/model_configs/prognostic_edmfx_gabls_column.yml b/config/model_configs/prognostic_edmfx_gabls_column.yml
@@ -3,9 +3,8 @@ edmf_coriolis: GABLS
 surface_setup: GABLS
 turbconv: "prognostic_edmfx"
 implicit_diffusion: true
-implicit_sgs_advection: true
+implicit_sgs_advection: false
 approximate_linear_solve_iters: 2
-max_newton_iters_ode: 3
 edmfx_upwinding: "first_order"
 edmfx_entr_model: "Generalized"
 edmfx_detr_model: "Generalized"
@@ -22,7 +21,7 @@ x_elem: 2
 y_elem: 2
 z_elem: 8
 z_stretch: false
-dt: "60secs"
+dt: "10secs"
 t_end: "9hours"
 dt_save_state_to_disk: "30mins"
 perturb_initstate: false

diff --git a/config/model_configs/prognostic_edmfx_gcmdriven_column.yml b/config/model_configs/prognostic_edmfx_gcmdriven_column.yml
@@ -4,9 +4,8 @@ external_forcing_file: "/groups/esm/zhaoyi/GCMForcedLES/cfsite/07/HadGEM2-A/amip
 surface_setup: "GCM"
 turbconv: "prognostic_edmfx"
 implicit_diffusion: true
-implicit_sgs_advection: true
+implicit_sgs_advection: false
 approximate_linear_solve_iters: 2
-max_newton_iters_ode: 3
 edmfx_upwinding: first_order
 edmfx_entr_model: "Generalized"
 edmfx_detr_model: "Generalized"
@@ -21,7 +20,7 @@ z_max: 3e3
 z_elem: 60
 z_stretch: false
 perturb_initstate: false
-dt: "50secs"
+dt: "10secs"
 t_end: "6hours"
 dt_save_to_disk: "10mins"
 toml: [toml/prognostic_edmfx_bomex.toml]

diff --git a/config/model_configs/prognostic_edmfx_rico_column.yml b/config/model_configs/prognostic_edmfx_rico_column.yml
@@ -4,9 +4,8 @@ ls_adv: "Rico"
 surface_setup: "Rico"
 turbconv: "prognostic_edmfx"
 implicit_diffusion: true
-implicit_sgs_advection: true
+implicit_sgs_advection: false
 approximate_linear_solve_iters: 2
-max_newton_iters_ode: 3
 edmfx_upwinding: first_order
 edmfx_entr_model: "Generalized"
 edmfx_detr_model: "Generalized"
@@ -24,7 +23,7 @@ y_elem: 2
 z_elem: 100
 z_stretch: false
 perturb_initstate: false
-dt: "50secs"
+dt: "10secs"
 t_end: "6hours"
 dt_save_state_to_disk: "10mins"
 toml: [toml/prognostic_edmfx.toml]

diff --git a/config/model_configs/prognostic_edmfx_trmm_column.yml b/config/model_configs/prognostic_edmfx_trmm_column.yml
@@ -3,9 +3,8 @@ rad: TRMM_LBA
 surface_setup: TRMM_LBA
 turbconv: prognostic_edmfx
 implicit_diffusion: true
-implicit_sgs_advection: true
+implicit_sgs_advection: false
 approximate_linear_solve_iters: 2
-max_newton_iters_ode: 3
 edmfx_upwinding: first_order
 edmfx_entr_model: "Generalized"
 edmfx_detr_model: "Generalized"
@@ -23,7 +22,7 @@ x_elem: 2
 y_elem: 2
 z_elem: 82
 z_stretch: false
-dt: 50secs
+dt: 10secs
 t_end: 6hours
 dt_save_state_to_disk: 10mins
 FLOAT_TYPE: "Float64"

diff --git a/config/model_configs/prognostic_edmfx_trmm_column_0M.yml b/config/model_configs/prognostic_edmfx_trmm_column_0M.yml
@@ -3,9 +3,8 @@ rad: TRMM_LBA
 surface_setup: TRMM_LBA
 turbconv: prognostic_edmfx
 implicit_diffusion: true
-implicit_sgs_advection: true
+implicit_sgs_advection: false
 approximate_linear_solve_iters: 2
-max_newton_iters_ode: 3
 edmfx_upwinding: first_order
 edmfx_entr_model: "Generalized"
 edmfx_detr_model: "Generalized"
@@ -23,7 +22,7 @@ x_elem: 2
 y_elem: 2
 z_elem: 82
 z_stretch: false
-dt: 50secs
+dt: 10secs
 t_end: 6hours
 dt_save_state_to_disk: 10mins
 FLOAT_TYPE: "Float64"