diff --git a/config/longrun_configs/amip_target_diagedmf.yml b/config/longrun_configs/amip_target_diagedmf.yml index eb1654840d..6f20751507 100644 --- 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 index f2ca18279b..7d8a12b6f8 100644 --- 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 index f4b97bd820..0c3421d4c8 100644 --- 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 index 9a0d8aaf63..765e45c1e5 100644 --- 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 index 906a0c7550..d2a7680abf 100644 --- 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 index 0aed9c1926..1e9f581123 100644 --- 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 index 3e9a044a15..f338c32ea7 100644 --- 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 index 973cc295cc..ce40a8727d 100644 --- 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 index 7dc5586097..6f424ba4cc 100644 --- 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 index 8832bb34da..24736d73df 100644 --- 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 index bca0d6f340..4adc3e4c97 100644 --- 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 index 9145947e80..0181b40881 100644 --- 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 index b9860663d9..e061608cf6 100644 --- 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 index 070ef81c5e..f7732c62a7 100644 --- 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 index c655f65640..dee0b6d614 100644 --- 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 index a8aa2c1c61..b3b2c225b8 100644 --- 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 index a9ab3a4dc9..834940fd18 100644 --- 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 index 889020b0c3..84708999bf 100644 --- 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 index c7358f657f..641ba6845b 100644 --- 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 index a0f4838b08..9fb8af18ee 100644 --- 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 index f8ee5a9212..0c5d0975fe 100644 --- 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 index a03f37229e..27a0f779cd 100644 --- 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 index c504efe747..13008813e6 100644 --- 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 index db6634b0d3..d6dabd43b2 100644 --- 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 index b06aa32de5..1f0d57f27f 100644 --- 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 index 0f8702b990..16f234383e 100644 --- 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 index 4771aeb1fc..11b846f086 100644 --- 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 index 8fcb0cce4b..264b4c46ca 100644 --- 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 index 34dc2ace1b..d95e04c343 100644 --- 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 index 5a0115fc21..e392209e83 100644 --- 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 index 4e7cf68864..1def83196f 100644 --- 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 index 897eb5ed97..61e82f166a 100644 --- 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 index a07fd23592..b5457dbec0 100644 --- 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 index de3b416c04..1c42435fe1 100644 --- 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 index 7f244913e0..0645eb7f76 100644 --- 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