CliMA · szy21 · Jan 30, 2025 · Jan 30, 2025
diff --git a/calibration/experiments/gcm_driven_scm/model_config_diagnostic.yml b/calibration/experiments/gcm_driven_scm/model_config_diagnostic.yml
@@ -36,4 +36,3 @@ netcdf_output_at_levels: true
 diagnostics:
   - short_name: [hus, thetaa, clw, arup, tke, entr, detr, waup]
     period: 10mins
-ode_algo: ARS343
diff --git a/calibration/experiments/gcm_driven_scm/model_config_prognostic.yml b/calibration/experiments/gcm_driven_scm/model_config_prognostic.yml
@@ -34,7 +34,6 @@ t_end: "72hours"
 dt_save_to_disk: "10mins"
 cloud_model: "quadrature_sgs"
 call_cloud_diagnostics_per_stage : true
-ode_algo: "ARS343"
 toml: [scm_tomls/prognostic_edmfx.toml]
 netcdf_output_at_levels: true
 netcdf_interpolation_num_points: [2, 2, 60]

diff --git a/calibration/experiments/sphere_held_suarez_rhoe_equilmoist/model_config.yml b/calibration/experiments/sphere_held_suarez_rhoe_equilmoist/model_config.yml
@@ -1,6 +1,5 @@
 dt: 500secs
 t_end: 560days
-ode_algo: ARS343
 moist: equil 
 forcing: held_suarez
 precip_model: 0M

diff --git a/config/default_configs/default_config.yml b/config/default_configs/default_config.yml
@@ -76,7 +76,7 @@ max_newton_iters_ode:
   value: 1
 ode_algo:
   help: "ODE algorithm [`ARS343` (default), `SSP333`, `IMKG343a`, etc.]"
-  value: "SSPKnoth"
+  value: "ARS343"
 krylov_rtol:
   help: "Relative tolerance of the Krylov method (only for ClimaTimeSteppers.jl; only used if `use_krylov_method` is `true`)"
   value: 0.1

diff --git a/config/longrun_configs/amip_target_diagedmf.yml b/config/longrun_configs/amip_target_diagedmf.yml
@@ -19,7 +19,6 @@ aerosol_radiation: true
 prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT03", "SSLT04"]
 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 @@ rayleigh_sponge: true
 viscous_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 @@ viscous_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/longrun_configs/longrun_dry_baroclinic_wave.yml b/config/longrun_configs/longrun_dry_baroclinic_wave.yml
@@ -3,7 +3,6 @@ z_elem: 43
 dz_bottom: 30.0
 dt: "90secs"
 t_end: "120days"
-ode_algo: ARS343
 initial_condition: "DryBaroclinicWave"
 dt_save_state_to_disk: "10days"
 diagnostics:

diff --git a/config/longrun_configs/longrun_dry_baroclinic_wave_he60.yml b/config/longrun_configs/longrun_dry_baroclinic_wave_he60.yml
@@ -3,7 +3,6 @@ z_elem: 43
 dz_bottom: 30.0
 dt: "30secs"
 t_end: "30days"
-ode_algo: ARS343
 initial_condition: "DryBaroclinicWave"
 dt_save_state_to_disk: "10days"
 netcdf_interpolation_num_points: [360, 180, 2]

diff --git a/config/longrun_configs/longrun_moist_baroclinic_wave.yml b/config/longrun_configs/longrun_moist_baroclinic_wave.yml
@@ -3,7 +3,6 @@ z_elem: 43
 dz_bottom: 30.0
 dt: "90secs"
 t_end: "120days"
-ode_algo: ARS343
 initial_condition: "MoistBaroclinicWave"
 moist: "equil"
 precip_model: "0M"

diff --git a/config/longrun_configs/longrun_moist_baroclinic_wave_he60.yml b/config/longrun_configs/longrun_moist_baroclinic_wave_he60.yml
@@ -3,7 +3,6 @@ z_elem: 43
 dz_bottom: 30.0
 dt: "30secs"
 t_end: "30days"
-ode_algo: ARS343
 initial_condition: "MoistBaroclinicWave"
 moist: "equil"
 precip_model: "0M"

diff --git a/config/model_configs/aquaplanet_diagedmf.yml b/config/model_configs/aquaplanet_diagedmf.yml
@@ -29,4 +29,3 @@ precip_model: 0M
 dt: 90secs
 t_end: 61mins
 toml: [toml/diagnostic_edmfx.toml]
-ode_algo: ARS343
diff --git a/config/model_configs/aquaplanet_progedmf.yml b/config/model_configs/aquaplanet_progedmf.yml
@@ -31,4 +31,3 @@ precip_model: 0M
 dt: 10secs
 t_end: 61mins
 toml: [toml/prognostic_edmfx.toml]
-ode_algo: ARS343
diff --git a/config/model_configs/aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean.yml b/config/model_configs/aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean.yml
@@ -11,4 +11,4 @@ rad: "clearsky"
 insolation: "timevarying"
 dt_rad: "1hours"
 prognostic_surface: "PrognosticSurfaceTemperature"
-check_conservation: true
+#check_conservation: true
diff --git a/config/model_configs/aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean_ft64.yml b/config/model_configs/aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean_ft64.yml
@@ -11,4 +11,4 @@ rad: "clearsky"
 insolation: "timevarying"
 dt_rad: "1hours"
 prognostic_surface: "PrognosticSurfaceTemperature"
-check_conservation: true
+#check_conservation: true
diff --git a/config/model_configs/diagnostic_edmfx_aquaplanet.yml b/config/model_configs/diagnostic_edmfx_aquaplanet.yml
@@ -22,4 +22,3 @@ dt: 120secs
 t_end: 3hours
 reproducibility_test: true
 toml: [toml/diagnostic_edmfx.toml]
-ode_algo: ARS343
diff --git a/config/model_configs/diagnostic_edmfx_aquaplanet_gpu.yml b/config/model_configs/diagnostic_edmfx_aquaplanet_gpu.yml
@@ -20,4 +20,3 @@ precip_model: 1M
 dt: 120secs
 t_end: 12hours
 toml: [toml/diagnostic_edmfx.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
@@ -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_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
@@ -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
@@ -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
@@ -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_trmm_stretched_box.yml b/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml
@@ -37,4 +37,3 @@ diagnostics:
     period: 10mins
   - short_name: [husra, hussn]
     period: 10mins
-ode_algo: ARS343
diff --git a/config/model_configs/gpu_aquaplanet_dyamond.yml b/config/model_configs/gpu_aquaplanet_dyamond.yml
@@ -1,6 +1,6 @@
 dt_save_state_to_disk: "Inf"
 dt_save_to_sol: "Inf"
-h_elem: 30
+h_elem: 16
 z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0

diff --git a/config/model_configs/les_isdac_box.yml b/config/model_configs/les_isdac_box.yml
@@ -25,7 +25,6 @@ z_max: 2.5e3
 z_stretch: false
 rayleigh_sponge: true
 toml: [toml/les_isdac.toml]  # sponge height
-ode_algo: "SSPKnoth"
 dt: "0.05secs" 
 t_end: "2mins" 
 dt_cloud_fraction: "10mins"

diff --git a/config/model_configs/prognostic_edmfx_adv_test_column.yml b/config/model_configs/prognostic_edmfx_adv_test_column.yml
@@ -1,7 +1,6 @@
 initial_condition: "MoistAdiabaticProfileEDMFX"
 advection_test: true
 turbconv: "prognostic_edmfx"
-ode_algo: "SSP33ShuOsher"
 edmfx_upwinding: "first_order"
 config: "column"
 moist: "equil"
@@ -21,4 +20,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
@@ -30,4 +30,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
@@ -40,4 +40,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
@@ -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_fixtke_column.yml b/config/model_configs/prognostic_edmfx_bomex_fixtke_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_bomex_implicit_column.yml b/config/model_configs/prognostic_edmfx_bomex_implicit_column.yml
@@ -36,4 +36,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
@@ -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_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
@@ -48,4 +48,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
@@ -39,4 +39,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_soares_column.yml b/config/model_configs/prognostic_edmfx_soares_column.yml
@@ -31,4 +31,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
@@ -39,4 +39,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
@@ -35,4 +35,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_box_diagnostic_edmfx.yml b/config/model_configs/rcemipii_box_diagnostic_edmfx.yml
@@ -28,4 +28,3 @@ diagnostics:
     period: 5mins
   - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
     period: 5mins
-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
diff --git a/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric.yml b/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric.yml
@@ -3,6 +3,7 @@ z_elem: 31
 dz_bottom: 50.0
 rad: "allskywithclear"
 dt_save_state_to_disk: "1days"
+ode_algo: "SSPKnoth"
 rayleigh_sponge: true
 orographic_gravity_wave: "raw_topo"
 dt: "400secs"

diff --git a/config/model_configs/sphere_hydrostatic_balance_rhoe_ft64.yml b/config/model_configs/sphere_hydrostatic_balance_rhoe_ft64.yml
@@ -1,7 +1,7 @@
+dt: "300secs"
 dt_save_state_to_disk: "8days"
 t_end: "8days"
 discrete_hydrostatic_balance: true
 hyperdiff: false
 perturb_initstate: false
 FLOAT_TYPE: "Float64"
-dt_save_to_sol: "600secs"
diff --git a/perf/flame.jl b/perf/flame.jl
@@ -38,14 +38,14 @@ ProfileCanvas.html_file(joinpath(output_dir, "flame.html"), results)
 #####
 
 allocs_limit = Dict()
-allocs_limit["flame_perf_target"] = 33_096
-allocs_limit["flame_perf_target_tracers"] = 49_264
+allocs_limit["flame_perf_target"] = 99_928
+allocs_limit["flame_perf_target_tracers"] = 27_6368
 allocs_limit["flame_perf_diagnostics"] = 10_677_144
-allocs_limit["flame_perf_target_diagnostic_edmfx"] = 47_744
-allocs_limit["flame_perf_target_frierson"] = 559_148
-allocs_limit["flame_perf_target_threaded"] = 883_784
-allocs_limit["flame_perf_target_callbacks"] = 316_872
-allocs_limit["flame_perf_gw"] = 410_768_488
+allocs_limit["flame_perf_target_diagnostic_edmfx"] = 122_624
+allocs_limit["flame_perf_target_frierson"] = 4_015_767_024
+allocs_limit["flame_perf_target_threaded"] = 2047_736
+allocs_limit["flame_perf_target_callbacks"] = 391_864
+allocs_limit["flame_perf_gw"] = 581_381_976
 allocs_limit["flame_perf_target_prognostic_edmfx_aquaplanet"] = 538_819
 allocs_limit["flame_gpu_implicit_barowave_moist"] = 1_243_048
 # Ideally, we would like to track all the allocations, but this becomes too

diff --git a/post_processing/ci_plots.jl b/post_processing/ci_plots.jl
@@ -1169,6 +1169,7 @@ end
 
 
 EDMFBoxPlots = Union{
+    Val{:diagnostic_edmfx_test_box},
     Val{:diagnostic_edmfx_gabls_box},
     Val{:diagnostic_edmfx_bomex_box},
     Val{:diagnostic_edmfx_bomex_stretched_box},

diff --git a/reproducibility_tests/ref_counter.jl b/reproducibility_tests/ref_counter.jl
@@ -1,4 +1,4 @@
-205
+206
 
 # **README**
 #
@@ -20,6 +20,8 @@
 
 
 #=
+206
+- Change default timestepper to ARS343
 
 205
 - A ClimaTimeSteppers update