CliMA · Sbozzolo · Jun 17, 2024 · May 15, 2024 · Jun 5, 2024 · May 15, 2024
diff --git a/.buildkite/longruns_gpu/pipeline.yml b/.buildkite/longruns_gpu/pipeline.yml
@@ -64,6 +64,16 @@ steps:
           CLIMACOMMS_DEVICE: "CUDA"
           JOB_NAME: "longrun_bw_rhoe_highres"
 
+      - label: ":computer: dry baroclinic wave high res"
+        command:
+          - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
+        artifact_paths: "$$JOB_NAME/output_active/*"
+        agents:
+          slurm_gpus: 1
+          slurm_time: 12:00:00
+        env:
+          JOB_NAME: "longrun_bw_rhoe_veryhighres"
+
       - label: ":computer: baroclinic wave equilmoist"
         command:
           - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
@@ -75,6 +85,16 @@ steps:
           CLIMACOMMS_DEVICE: "CUDA"
           JOB_NAME: "longrun_bw_rhoe_equil_highres"
 
+      - label: ":computer: baroclinic wave equilmoist high res"
+        command:
+          - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
+        artifact_paths: "$$JOB_NAME/output_active/*"
+        agents:
+          slurm_gpus: 1
+          slurm_time: 12:00:00
+        env:
+          JOB_NAME: "longrun_bw_rhoe_equil_veryhighres"
+
       - label: ":computer: dry held-suarez"
         command:
           - srun julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME

diff --git a/Project.toml b/Project.toml
@@ -53,7 +53,7 @@ ClimaComms = "0.6.2"
 ClimaCore = "0.14.6"
 ClimaDiagnostics = "0.2"
 ClimaParams = "0.10.4"
-ClimaTimeSteppers = "0.7.31"
+ClimaTimeSteppers = "0.7.32"
 ClimaUtilities = "0.1.3"
 CloudMicrophysics = "0.18, 0.19, 0.20"
 Colors = "0.12"

diff --git a/config/default_configs/default_config.yml b/config/default_configs/default_config.yml
@@ -79,7 +79,7 @@ max_newton_iters_ode:
   value: 1
 ode_algo:
   help: "ODE algorithm [`ARS343` (default), `SSP333`, `IMKG343a`, etc.]"
-  value: "ARS343"
+  value: "SSPKnoth"
 krylov_rtol:
   help: "Relative tolerance of the Krylov method (only for ClimaTimeSteppers.jl; only used if `use_krylov_method` is `true`)"
   value: 0.1
@@ -141,7 +141,7 @@ vert_diff:
   value: "false"
 hyperdiff:
   help: "Hyperdiffusion [`ClimaHyperdiffusion` (or `true`; default), `none` (or `false`)]"
-  value: "ClimaHyperdiffusion"
+  value: "CAM_SE"
 bubble:
   help: "Enable bubble correction for more accurate surface areas"
   value: true

diff --git a/config/longrun_configs/longrun_bw_rhoe_equil_veryhighres.yml b/config/longrun_configs/longrun_bw_rhoe_equil_veryhighres.yml
@@ -0,0 +1,14 @@
+h_elem: 60
+z_elem: 63
+dz_bottom: 30.0
+dz_top: 3000.0
+dt: "100secs"
+t_end: "30days"
+initial_condition: "MoistBaroclinicWave"
+moist: "equil"
+precip_model: "0M"
+dt_save_state_to_disk: "10days"
+netcdf_interpolation_num_points: [360, 180, 2]
+diagnostics:
+  - short_name: [pfull, wa, va, rv, hus, ke]
+    period: 1days
diff --git a/config/longrun_configs/longrun_bw_rhoe_veryhighres.yml b/config/longrun_configs/longrun_bw_rhoe_veryhighres.yml
@@ -0,0 +1,12 @@
+h_elem: 60
+z_elem: 63
+dz_bottom: 30.0
+dz_top: 3000.0
+dt: "100secs"
+t_end: "10days"
+initial_condition: "DryBaroclinicWave"
+dt_save_state_to_disk: "10days"
+netcdf_interpolation_num_points: [360, 180, 2]
+diagnostics:
+  - short_name: [pfull, wa, va, rv, ke]
+    period: 1days
diff --git a/config/model_configs/aquaplanet_diagedmf.yml b/config/model_configs/aquaplanet_diagedmf.yml
@@ -26,3 +26,4 @@ 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,3 +29,4 @@ 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
@@ -18,3 +18,4 @@ 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
@@ -33,3 +33,4 @@ 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,3 +34,4 @@ 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
@@ -33,3 +33,4 @@ 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
@@ -31,3 +31,4 @@ 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_gabls_box.yml b/config/model_configs/diagnostic_edmfx_gabls_box.yml
@@ -31,3 +31,4 @@ 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,3 +36,4 @@ 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
@@ -18,3 +18,4 @@ 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
@@ -36,3 +36,4 @@ 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
@@ -36,3 +36,4 @@ 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,3 +39,4 @@ 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,3 +17,4 @@ 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,3 +27,4 @@ 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,3 +22,4 @@ 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,3 +23,4 @@ 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,3 +39,4 @@ 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
@@ -33,3 +33,4 @@ 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
@@ -32,3 +32,4 @@ 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
@@ -34,3 +34,4 @@ 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
@@ -31,3 +31,4 @@ 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
@@ -37,3 +37,4 @@ 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
@@ -36,3 +36,4 @@ 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,3 +34,4 @@ 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
@@ -33,3 +33,4 @@ 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
@@ -37,3 +37,4 @@ 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
@@ -32,3 +32,4 @@ 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
@@ -37,3 +37,4 @@ 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
@@ -33,3 +33,4 @@ 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/sphere_baroclinic_wave_rhoe_topography_dcmip_rs.yml b/config/model_configs/sphere_baroclinic_wave_rhoe_topography_dcmip_rs.yml
@@ -5,6 +5,7 @@ topo_smoothing: true
 initial_condition: "DryBaroclinicWave"
 t_end: "6days"
 dt: "200secs"
+hyperdiff: "ClimaHyperdiffusion"
 netcdf_output_at_levels: false
 diagnostics:
   - short_name: [pfull, wa, va, rv]