Clip tke_press

CliMA · Jun 27, 2024 · b62b4e2 · b62b4e2
1 parent 0738db9
commit b62b4e2
Show file tree

Hide file tree

Showing 37 changed files with 6 additions and 39 deletions.
diff --git a/config/longrun_configs/amip_target_diagedmf.yml b/config/longrun_configs/amip_target_diagedmf.yml
@@ -15,7 +15,6 @@ dt_cloud_fraction: "1hours"
 idealized_insolation: false
 surface_setup: "DefaultMoninObukhov"
 turbconv: "diagnostic_edmfx"
-ode_algo: ARS343
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 prognostic_tke: true

diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_allsky_diagedmf_0M.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_allsky_diagedmf_0M.yml
@@ -11,7 +11,6 @@ rad: "allskywithclear"
 dt_rad: "6hours"
 surface_setup: "DefaultMoninObukhov"
 turbconv: "diagnostic_edmfx"
-ode_algo: ARS343
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 prognostic_tke: true

diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.yml
@@ -11,7 +11,6 @@ rad: "clearsky"
 dt_rad: "6hours"
 surface_setup: "DefaultMoninObukhov"
 turbconv: "diagnostic_edmfx"
-ode_algo: ARS343
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 prognostic_tke: true

diff --git a/...longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_progedmf_diffonly_0M.yml b/...longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_progedmf_diffonly_0M.yml
@@ -10,7 +10,6 @@ rad: "clearsky"
 dt_rad: "6hours"
 surface_setup: "DefaultMoninObukhov"
 turbconv: "prognostic_edmfx"
-ode_algo: ARS343
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 max_newton_iters_ode: 3

diff --git a/config/model_configs/aquaplanet_diagedmf.yml b/config/model_configs/aquaplanet_diagedmf.yml
@@ -27,4 +27,3 @@ precip_model: 0M
 dt: 100secs 
 t_end: 12hours 
 toml: [toml/diagnostic_edmfx.toml]
-ode_algo: ARS343
diff --git a/config/model_configs/aquaplanet_progedmf.yml b/config/model_configs/aquaplanet_progedmf.yml
@@ -29,4 +29,3 @@ precip_model: 0M
 dt: 10secs
 t_end: 3hours
 toml: [toml/prognostic_edmfx.toml]
-ode_algo: ARS343
diff --git a/config/model_configs/diagnostic_edmfx_aquaplanet.yml b/config/model_configs/diagnostic_edmfx_aquaplanet.yml
@@ -19,4 +19,3 @@ t_end: 12hours
 dt_save_state_to_disk: 12hours
 regression_test: true
 toml: [toml/diagnostic_edmfx_0M.toml]
-ode_algo: ARS343
diff --git a/config/model_configs/diagnostic_edmfx_bomex_box.yml b/config/model_configs/diagnostic_edmfx_bomex_box.yml
@@ -34,4 +34,3 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml b/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml
@@ -35,4 +35,3 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml b/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml
@@ -26,12 +26,13 @@ z_max: 1500
 z_stretch: false
 dt: 100secs
 t_end: 4hours
-dt_save_state_to_disk: 10mins
+# dt_save_state_to_disk: 10mins
 toml: [toml/diagnostic_edmfx.toml]
 netcdf_interpolation_num_points: [8, 8, 30]
+# output_default_diagnostics: false
+# FLOAT_TYPE: "Float64"
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl, pr]
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml b/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml
@@ -32,4 +32,3 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/diagnostic_edmfx_dycoms_rf02_box.yml b/config/model_configs/diagnostic_edmfx_dycoms_rf02_box.yml
@@ -37,4 +37,3 @@ diagnostics:
     period: 10mins
   - short_name: [husra, hussn]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/diagnostic_edmfx_gabls_box.yml b/config/model_configs/diagnostic_edmfx_gabls_box.yml
@@ -32,4 +32,3 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/diagnostic_edmfx_rico_box.yml b/config/model_configs/diagnostic_edmfx_rico_box.yml
@@ -36,4 +36,3 @@ diagnostics:
     period: 10mins
   - short_name: [husra, hussn]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/diagnostic_edmfx_test_box.yml b/config/model_configs/diagnostic_edmfx_test_box.yml
@@ -17,4 +17,3 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/diagnostic_edmfx_trmm_box.yml b/config/model_configs/diagnostic_edmfx_trmm_box.yml
@@ -26,15 +26,15 @@ z_max: 16400
 z_stretch: false
 dt: 200secs
 t_end: 6hours
-dt_save_state_to_disk: 10mins
+# dt_save_state_to_disk: 10mins
 FLOAT_TYPE: "Float64"
 toml: [toml/diagnostic_edmfx.toml]
 netcdf_interpolation_num_points: [8, 8, 82]
+output_default_diagnostics: false
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl, pr]
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
   - short_name: [husra, hussn]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/diagnostic_edmfx_trmm_box_0M.yml b/config/model_configs/diagnostic_edmfx_trmm_box_0M.yml
@@ -36,4 +36,3 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml b/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml
@@ -39,4 +39,3 @@ diagnostics:
     period: 10mins
   - short_name: [husra, hussn]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/gpu_diagnostic_edmfx_aquaplanet.yml b/config/model_configs/gpu_diagnostic_edmfx_aquaplanet.yml
@@ -17,4 +17,3 @@ precip_model: 1M
 dt: 100secs
 t_end: 6hours
 toml: [toml/diagnostic_edmfx.toml]
-ode_algo: ARS343
diff --git a/config/model_configs/gpu_prognostic_edmfx_aquaplanet.yml b/config/model_configs/gpu_prognostic_edmfx_aquaplanet.yml
@@ -27,4 +27,3 @@ diagnostics:
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     reduction_time: average
     period: 1hours
-ode_algo: ARS343
diff --git a/config/model_configs/prognostic_edmfx_adv_test_column.yml b/config/model_configs/prognostic_edmfx_adv_test_column.yml
@@ -22,4 +22,3 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, taen, thetaaen, haen, husen, huren, clwen, clien, tke, lmix]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/prognostic_edmfx_aquaplanet.yml b/config/model_configs/prognostic_edmfx_aquaplanet.yml
@@ -23,4 +23,3 @@ diagnostics:
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     reduction_time: average
     period: 1hours
-ode_algo: ARS343
diff --git a/config/model_configs/prognostic_edmfx_bomex_box.yml b/config/model_configs/prognostic_edmfx_bomex_box.yml
@@ -39,4 +39,3 @@ diagnostics:
     period: 10mins
   - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/prognostic_edmfx_bomex_column.yml b/config/model_configs/prognostic_edmfx_bomex_column.yml
@@ -34,4 +34,3 @@ diagnostics:
     period: 10mins
   - short_name: [entr, detr, lmix, lmixw, lmixtke, lmixb, bgrad, strain, edt, evu]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/prognostic_edmfx_bomex_fixtke_column.yml b/config/model_configs/prognostic_edmfx_bomex_fixtke_column.yml
@@ -33,4 +33,3 @@ diagnostics:
     period: 10mins
   - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/prognostic_edmfx_bomex_implicit_column.yml b/config/model_configs/prognostic_edmfx_bomex_implicit_column.yml
@@ -35,4 +35,3 @@ diagnostics:
     period: 10mins
   - short_name: [entr, detr, lmix, lmixw, lmixtke, lmixb, bgrad, strain, edt, evu]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/prognostic_edmfx_bomex_pigroup_column.yml b/config/model_configs/prognostic_edmfx_bomex_pigroup_column.yml
@@ -32,4 +32,3 @@ diagnostics:
     period: 10mins
   - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/prognostic_edmfx_bomex_stretched_column.yml b/config/model_configs/prognostic_edmfx_bomex_stretched_column.yml
@@ -38,4 +38,3 @@ diagnostics:
     period: 10mins
   - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/prognostic_edmfx_dycoms_rf01_column.yml b/config/model_configs/prognostic_edmfx_dycoms_rf01_column.yml
@@ -37,4 +37,3 @@ diagnostics:
     period: 10mins
   - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/prognostic_edmfx_gabls_column.yml b/config/model_configs/prognostic_edmfx_gabls_column.yml
@@ -34,4 +34,3 @@ diagnostics:
     period: 10mins
   - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/prognostic_edmfx_gcmdriven_column.yml b/config/model_configs/prognostic_edmfx_gcmdriven_column.yml
@@ -34,4 +34,3 @@ diagnostics:
     period: 10mins
   - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/prognostic_edmfx_rico_column.yml b/config/model_configs/prognostic_edmfx_rico_column.yml
@@ -38,4 +38,3 @@ diagnostics:
     period: 10mins
   - short_name: [husra, hussn]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/prognostic_edmfx_simpleplume_column.yml b/config/model_configs/prognostic_edmfx_simpleplume_column.yml
@@ -33,4 +33,3 @@ diagnostics:
     period: 10mins
   - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/prognostic_edmfx_trmm_column.yml b/config/model_configs/prognostic_edmfx_trmm_column.yml
@@ -38,4 +38,3 @@ diagnostics:
     period: 10mins
   - short_name: [husra, hussn]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/prognostic_edmfx_trmm_column_0M.yml b/config/model_configs/prognostic_edmfx_trmm_column_0M.yml
@@ -34,4 +34,3 @@ diagnostics:
     period: 10mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, taen, thetaaen, haen, husen, huren, clwen, clien, tke, lmix]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/rcemipii_sphere_diagnostic_edmfx.yml b/config/model_configs/rcemipii_sphere_diagnostic_edmfx.yml
@@ -18,4 +18,3 @@ dt: 100secs
 t_end: 12hours
 dt_save_state_to_disk: 12hours
 toml: [toml/diagnostic_edmfx_0M.toml]
-ode_algo: ARS343
diff --git a/src/prognostic_equations/edmfx_tke.jl b/src/prognostic_equations/edmfx_tke.jl
@@ -52,7 +52,7 @@ function edmfx_tke_tendency!(
                 )
         end
         # pressure work
-        @. Yₜ.c.sgs⁰.ρatke += ᶜtke_press
+        @. Yₜ.c.sgs⁰.ρatke += ifelse(ᶜtke_press >= 0, ᶜtke_press, 0)
     end
 
     return nothing