CliMA · Sbozzolo · Aug 13, 2024 · Aug 13, 2024
diff --git a/config/longrun_configs/amip_target_diagedmf.yml b/config/longrun_configs/amip_target_diagedmf.yml
@@ -17,7 +17,6 @@ aerosol_radiation: true
 prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT01"]
 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_allsky_diagedmf_0M.yml b/config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml
@@ -6,7 +6,6 @@ dz_top: 3000.0
 rayleigh_sponge: true
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
-ode_algo: ARS343
 dt: "120secs"
 t_end: "240days"
 dt_save_state_to_disk: "30days"

diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_progedmf_diffonly_0M.yml b/config/longrun_configs/longrun_aquaplanet_allsky_progedmf_diffonly_0M.yml
@@ -7,7 +7,6 @@ rayleigh_sponge: true
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 max_newton_iters_ode: 3
-ode_algo: ARS343
 dt: "120secs"
 t_end: "240days"
 dt_save_state_to_disk: "30days"

diff --git a/config/model_configs/aquaplanet_diagedmf.yml b/config/model_configs/aquaplanet_diagedmf.yml
@@ -24,7 +24,6 @@ edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 cloud_model: diagnostic_edmfx
 precip_model: 0M
-dt: 90secs
-t_end: 1days
+dt: 50secs
+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
@@ -3,7 +3,7 @@ rad: clearsky
 turbconv: diagnostic_edmfx
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
-prognostic_tke: true
+prognostic_tke: false
 edmfx_upwinding: first_order
 edmfx_entr_model: "Generalized"
 edmfx_detr_model: "Generalized"
@@ -14,9 +14,14 @@ moist: equil
 cloud_model: diagnostic_edmfx
 precip_model: 0M
 override_τ_precip: false
-dt: 100secs
+dt: 50secs
 t_end: 12hours
 dt_save_state_to_disk: 12hours
 regression_test: true
 toml: [toml/diagnostic_edmfx_0M.toml]
-ode_algo: ARS343
+restart_file: "output/diagnostic_edmfx_aquaplanet/output_0001/day0.24600.hdf5"
+diagnostics:
+  - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl, pr]
+    period: 100secs
+  - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
+    period: 100secs
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
@@ -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_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
@@ -25,7 +25,7 @@ y_elem: 2
 z_elem: 30
 z_max: 1500
 z_stretch: false
-dt: 100secs
+dt: 50secs
 t_end: 6hours
 dt_save_state_to_disk: 10mins
 toml: [toml/diagnostic_edmfx.toml]
@@ -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
@@ -24,7 +24,7 @@ y_elem: 2
 z_elem: 100
 z_max: 4e3
 z_stretch: false
-dt: 100secs
+dt: 60secs
 t_end: 8hours
 dt_save_state_to_disk: 10mins
 toml: [toml/diagnostic_edmfx.toml]
@@ -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
@@ -24,7 +24,7 @@ y_elem: 2
 z_elem: 82
 z_max: 16400
 z_stretch: false
-dt: 200secs
+dt: 60secs
 t_end: 6hours
 dt_save_state_to_disk: 10mins
 FLOAT_TYPE: "Float64"
@@ -37,4 +37,3 @@ diagnostics:
     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
@@ -24,7 +24,7 @@ y_elem: 2
 z_elem: 82
 z_max: 16400
 z_stretch: false
-dt: 200secs
+dt: 60secs
 t_end: 6hours
 dt_save_state_to_disk: 10mins
 FLOAT_TYPE: "Float64"
@@ -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
@@ -1,4 +1,3 @@
-
 initial_condition: TRMM_LBA
 rad: TRMM_LBA
 surface_setup: TRMM_LBA
@@ -26,7 +25,7 @@ z_elem: 30
 z_max: 16400
 dz_bottom: 50
 dz_top: 2000
-dt: 300secs
+dt: 60secs
 t_end: 6hours
 dt_save_state_to_disk: 10mins
 FLOAT_TYPE: "Float64"
@@ -39,4 +38,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
@@ -46,4 +46,3 @@ diagnostics:
   - reduction_time: max
     short_name: tke
     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
@@ -20,4 +20,3 @@ dt: 100secs
 t_end: 12hours
 dt_save_state_to_disk: 12hours
 toml: [toml/rcemipii_diagnostic_edmfx_0M.toml]
-ode_algo: ARS343