Skip to content

Commit

Permalink
Merge pull request #3019 from CliMA/gb/rosenbrock
Browse files Browse the repository at this point in the history
Add SSPKnoth and make it default
  • Loading branch information
Sbozzolo authored Jun 17, 2024
2 parents 3de6d58 + 97f2f69 commit 70dcaae
Show file tree
Hide file tree
Showing 45 changed files with 939 additions and 169 deletions.
20 changes: 20 additions & 0 deletions .buildkite/longruns_gpu/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions config/default_configs/default_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
14 changes: 14 additions & 0 deletions config/longrun_configs/longrun_bw_rhoe_equil_veryhighres.yml
Original file line number Diff line number Diff line change
@@ -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
12 changes: 12 additions & 0 deletions config/longrun_configs/longrun_bw_rhoe_veryhighres.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions config/model_configs/aquaplanet_diagedmf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ precip_model: 0M
dt: 100secs
t_end: 12hours
toml: [toml/diagnostic_edmfx.toml]
ode_algo: ARS343
1 change: 1 addition & 0 deletions config/model_configs/aquaplanet_progedmf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ precip_model: 0M
dt: 10secs
t_end: 3hours
toml: [toml/prognostic_edmfx.toml]
ode_algo: ARS343
1 change: 1 addition & 0 deletions config/model_configs/diagnostic_edmfx_aquaplanet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions config/model_configs/diagnostic_edmfx_bomex_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions config/model_configs/diagnostic_edmfx_gabls_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions config/model_configs/diagnostic_edmfx_rico_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ diagnostics:
period: 10mins
- short_name: [husra, hussn]
period: 10mins
ode_algo: ARS343
1 change: 1 addition & 0 deletions config/model_configs/diagnostic_edmfx_test_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions config/model_configs/diagnostic_edmfx_trmm_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ diagnostics:
period: 10mins
- short_name: [husra, hussn]
period: 10mins
ode_algo: ARS343
1 change: 1 addition & 0 deletions config/model_configs/diagnostic_edmfx_trmm_box_0M.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,4 @@ diagnostics:
period: 10mins
- short_name: [husra, hussn]
period: 10mins
ode_algo: ARS343
1 change: 1 addition & 0 deletions config/model_configs/gpu_diagnostic_edmfx_aquaplanet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ precip_model: 1M
dt: 100secs
t_end: 6hours
toml: [toml/diagnostic_edmfx.toml]
ode_algo: ARS343
1 change: 1 addition & 0 deletions config/model_configs/gpu_prognostic_edmfx_aquaplanet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions config/model_configs/prognostic_edmfx_adv_test_column.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions config/model_configs/prognostic_edmfx_aquaplanet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions config/model_configs/prognostic_edmfx_bomex_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,4 @@ diagnostics:
period: 10mins
- short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
period: 10mins
ode_algo: ARS343
1 change: 1 addition & 0 deletions config/model_configs/prognostic_edmfx_bomex_column.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ diagnostics:
period: 10mins
- short_name: [entr, detr, lmix, lmixw, lmixtke, lmixb, bgrad, strain, edt, evu]
period: 10mins
ode_algo: ARS343
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ diagnostics:
period: 10mins
- short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
period: 10mins
ode_algo: ARS343
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ diagnostics:
period: 10mins
- short_name: [entr, detr, lmix, lmixw, lmixtke, lmixb, bgrad, strain, edt, evu]
period: 10mins
ode_algo: ARS343
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ diagnostics:
period: 10mins
- short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
period: 10mins
ode_algo: ARS343
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ diagnostics:
period: 10mins
- short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
period: 10mins
ode_algo: ARS343
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ diagnostics:
period: 10mins
- short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
period: 10mins
ode_algo: ARS343
1 change: 1 addition & 0 deletions config/model_configs/prognostic_edmfx_gabls_column.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ diagnostics:
period: 10mins
- short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
period: 10mins
ode_algo: ARS343
1 change: 1 addition & 0 deletions config/model_configs/prognostic_edmfx_gcmdriven_column.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ diagnostics:
period: 10mins
- short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
period: 10mins
ode_algo: ARS343
1 change: 1 addition & 0 deletions config/model_configs/prognostic_edmfx_rico_column.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ diagnostics:
period: 10mins
- short_name: [husra, hussn]
period: 10mins
ode_algo: ARS343
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ diagnostics:
period: 10mins
- short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
period: 10mins
ode_algo: ARS343
1 change: 1 addition & 0 deletions config/model_configs/prognostic_edmfx_trmm_column.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ diagnostics:
period: 10mins
- short_name: [husra, hussn]
period: 10mins
ode_algo: ARS343
1 change: 1 addition & 0 deletions config/model_configs/prognostic_edmfx_trmm_column_0M.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Loading

0 comments on commit 70dcaae

Please sign in to comment.