From e265a13b1bf0b402b9120b7abaec23f8691ab161 Mon Sep 17 00:00:00 2001 From: Zhaoyi Shen <11598433+szy21@users.noreply.github.com> Date: Mon, 16 Sep 2024 14:57:15 -0700 Subject: [PATCH 1/2] use a higher model top --- .../gpu_aquaplanet_dyamond_diag_1process.yml | 5 +++-- config/gpu_configs/gpu_aquaplanet_dyamond_ss.yml | 5 +++-- .../gpu_aquaplanet_dyamond_ws_1process.yml | 4 +++- .../gpu_aquaplanet_dyamond_ws_2process.yml | 4 +++- .../gpu_aquaplanet_dyamond_ws_4process.yml | 5 +++-- .../gpu_configs/gpu_hs_rhoe_equil_55km_nz63_0M.yml | 2 +- config/longrun_configs/amip_target_diagedmf.yml | 9 +++++---- .../longrun_aquaplanet_allsky_0M.yml | 3 ++- .../longrun_aquaplanet_allsky_0M_earth.yml | 3 ++- .../longrun_aquaplanet_allsky_1M.yml | 3 ++- .../longrun_aquaplanet_allsky_diagedmf_0M.yml | 3 ++- ...grun_aquaplanet_allsky_progedmf_diffonly_0M.yml | 3 ++- ...grun_aquaplanet_allsky_tvinsol_0M_slabocean.yml | 3 ++- .../longrun_configs/longrun_aquaplanet_dyamond.yml | 3 ++- config/longrun_configs/longrun_dry_held_suarez.yml | 4 ++-- .../longrun_configs/longrun_moist_held_suarez.yml | 4 ++-- .../longrun_moist_held_suarez_deepatmos.yml | 4 ++-- .../longrun_sphere_hydrostatic_balance_rhoe.yml | 9 ++++----- config/model_configs/aquaplanet_diagedmf.yml | 4 +++- config/model_configs/aquaplanet_progedmf.yml | 4 +++- .../model_configs/diagnostic_edmfx_aquaplanet.yml | 9 ++++++--- .../diagnostic_edmfx_aquaplanet_gpu.yml | 6 ++++-- .../model_configs/prognostic_edmfx_aquaplanet.yml | 5 +++++ .../single_column_hydrostatic_balance_ft64.yml | 3 ++- ...diative_equilibrium_allsky_idealized_clouds.yml | 6 +++--- ...ingle_column_radiative_equilibrium_clearsky.yml | 6 +++--- ...quilibrium_clearsky_prognostic_surface_temp.yml | 7 +++---- .../single_column_radiative_equilibrium_gray.yml | 5 ++--- ..._equilmoist_allsky_gw_raw_zonallyasymmetric.yml | 8 ++++---- ...re_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml | 10 +++++----- ...sphere_aquaplanet_rhoe_nonequilmoist_allsky.yml | 8 ++++---- ..._held_suarez_rhoe_equilmoist_hightop_sponge.yml | 14 +++++++------- .../sphere_held_suarez_rhoe_hightop.yml | 8 +++++--- src/cache/tracer_cache.jl | 4 ++++ toml/diagnostic_edmfx.toml | 6 ++++++ toml/longrun_aquaplanet.toml | 5 ++++- toml/longrun_aquaplanet_diagedmf.toml | 5 ++++- toml/longrun_aquaplanet_progedmf.toml | 5 ++++- toml/longrun_held_suarez.toml | 5 +++++ toml/prognostic_edmfx.toml | 6 ++++++ toml/sphere_aquaplanet.toml | 6 ++++++ ...equilmoist_allsky_gw_raw_zonallyasymmetric.toml | 3 --- ...e_aquaplanet_rhoe_equilmoist_allsky_gw_res.toml | 3 --- toml/sphere_held_suarez.toml | 6 ++++++ ...held_suarez_rhoe_equilmoist_hightop_sponge.toml | 6 ------ 45 files changed, 149 insertions(+), 90 deletions(-) create mode 100644 toml/longrun_held_suarez.toml create mode 100644 toml/sphere_aquaplanet.toml delete mode 100644 toml/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric.toml delete mode 100644 toml/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.toml create mode 100644 toml/sphere_held_suarez.toml delete mode 100644 toml/sphere_held_suarez_rhoe_equilmoist_hightop_sponge.toml diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_diag_1process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_diag_1process.yml index 9eea1032c2..719c23a24e 100644 --- a/config/gpu_configs/gpu_aquaplanet_dyamond_diag_1process.yml +++ b/config/gpu_configs/gpu_aquaplanet_dyamond_diag_1process.yml @@ -1,9 +1,11 @@ dt_save_state_to_disk: 12hours dt_save_to_sol: 12hours h_elem: 30 -z_max: 55000.0 +z_max: 65000.0 z_elem: 63 dz_bottom: 30.0 +rayleigh_sponge: true +viscous_sponge: true moist: equil precip_model: 1M rad: allskywithclear @@ -14,7 +16,6 @@ implicit_diffusion: true approximate_linear_solve_iters: 2 dt_cloud_fraction: 1hours surface_setup: DefaultMoninObukhov -rayleigh_sponge: true dt: 90secs t_end: 1days toml: [toml/longrun_aquaplanet.toml] diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ss.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ss.yml index 59964a2949..6b3a24cac6 100644 --- a/config/gpu_configs/gpu_aquaplanet_dyamond_ss.yml +++ b/config/gpu_configs/gpu_aquaplanet_dyamond_ss.yml @@ -2,9 +2,11 @@ dt_save_state_to_disk: "Inf" dt_save_to_sol: "Inf" output_default_diagnostics: false h_elem: 30 -z_max: 55000.0 +z_max: 65000.0 z_elem: 63 dz_bottom: 30.0 +rayleigh_sponge: true +viscous_sponge: true moist: "equil" precip_model: "1M" rad: "allskywithclear" @@ -15,7 +17,6 @@ vert_diff: "FriersonDiffusion" implicit_diffusion: true approximate_linear_solve_iters: 2 surface_setup: "DefaultMoninObukhov" -rayleigh_sponge: true dt: "90secs" t_end: "1days" toml: [toml/longrun_aquaplanet.toml] diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ws_1process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ws_1process.yml index 59964a2949..abde5081cb 100644 --- a/config/gpu_configs/gpu_aquaplanet_dyamond_ws_1process.yml +++ b/config/gpu_configs/gpu_aquaplanet_dyamond_ws_1process.yml @@ -2,9 +2,11 @@ dt_save_state_to_disk: "Inf" dt_save_to_sol: "Inf" output_default_diagnostics: false h_elem: 30 -z_max: 55000.0 +z_max: 65000.0 z_elem: 63 dz_bottom: 30.0 +rayleigh_sponge: true +viscous_sponge: true moist: "equil" precip_model: "1M" rad: "allskywithclear" diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ws_2process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ws_2process.yml index 48f01bf80e..a0edbc9b9b 100644 --- a/config/gpu_configs/gpu_aquaplanet_dyamond_ws_2process.yml +++ b/config/gpu_configs/gpu_aquaplanet_dyamond_ws_2process.yml @@ -2,9 +2,11 @@ dt_save_state_to_disk: "Inf" dt_save_to_sol: "Inf" output_default_diagnostics: false h_elem: 42 -z_max: 55000.0 +z_max: 65000.0 z_elem: 63 dz_bottom: 30.0 +rayleigh_sponge: true +viscous_sponge: true moist: "equil" precip_model: "1M" rad: "allskywithclear" diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ws_4process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ws_4process.yml index 7c98ddcdc5..eff50a5260 100644 --- a/config/gpu_configs/gpu_aquaplanet_dyamond_ws_4process.yml +++ b/config/gpu_configs/gpu_aquaplanet_dyamond_ws_4process.yml @@ -2,9 +2,11 @@ dt_save_state_to_disk: "Inf" dt_save_to_sol: "Inf" output_default_diagnostics: false h_elem: 60 -z_max: 55000.0 +z_max: 65000.0 z_elem: 63 dz_bottom: 30.0 +rayleigh_sponge: true +viscous_sponge: true moist: "equil" precip_model: "1M" rad: "allskywithclear" @@ -15,7 +17,6 @@ vert_diff: "FriersonDiffusion" implicit_diffusion: true approximate_linear_solve_iters: 2 surface_setup: "DefaultMoninObukhov" -rayleigh_sponge: true dt: "90secs" t_end: "1days" toml: [toml/longrun_aquaplanet.toml] diff --git a/config/gpu_configs/gpu_hs_rhoe_equil_55km_nz63_0M.yml b/config/gpu_configs/gpu_hs_rhoe_equil_55km_nz63_0M.yml index 8514cde35b..3178fe9804 100644 --- a/config/gpu_configs/gpu_hs_rhoe_equil_55km_nz63_0M.yml +++ b/config/gpu_configs/gpu_hs_rhoe_equil_55km_nz63_0M.yml @@ -12,4 +12,4 @@ moist: "equil" precip_model: "0M" rayleigh_sponge: true forcing: "held_suarez" -toml: [toml/longrun_aquaplanet.toml] +toml: [toml/longrun_held_suarez.toml] diff --git a/config/longrun_configs/amip_target_diagedmf.yml b/config/longrun_configs/amip_target_diagedmf.yml index 550e95d0df..8a5e2a4f6c 100644 --- a/config/longrun_configs/amip_target_diagedmf.yml +++ b/config/longrun_configs/amip_target_diagedmf.yml @@ -1,9 +1,11 @@ -dt_save_to_sol: "10days" -dt_save_state_to_disk: "20days" h_elem: 16 -z_max: 55000.0 +z_max: 65000.0 z_elem: 63 dz_bottom: 30.0 +rayleigh_sponge: true +viscous_sponge: true +dt_save_to_sol: "10days" +dt_save_state_to_disk: "20days" moist: "equil" cloud_model: "quadrature_sgs" precip_model: "0M" @@ -27,7 +29,6 @@ edmfx_detr_model: "Generalized" edmfx_nh_pressure: true edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true -rayleigh_sponge: true dt: "120secs" t_end: "120days" toml: [toml/longrun_aquaplanet_diagedmf.toml] diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_0M.yml b/config/longrun_configs/longrun_aquaplanet_allsky_0M.yml index 05fa7b6874..0991708125 100644 --- a/config/longrun_configs/longrun_aquaplanet_allsky_0M.yml +++ b/config/longrun_configs/longrun_aquaplanet_allsky_0M.yml @@ -1,8 +1,9 @@ h_elem: 16 -z_max: 55000.0 +z_max: 65000.0 z_elem: 63 dz_bottom: 30.0 rayleigh_sponge: true +viscous_sponge: true implicit_diffusion: true approximate_linear_solve_iters: 2 dt: "120secs" diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_0M_earth.yml b/config/longrun_configs/longrun_aquaplanet_allsky_0M_earth.yml index 7f01ea2654..36c281078b 100644 --- a/config/longrun_configs/longrun_aquaplanet_allsky_0M_earth.yml +++ b/config/longrun_configs/longrun_aquaplanet_allsky_0M_earth.yml @@ -1,8 +1,9 @@ h_elem: 16 -z_max: 55000.0 +z_max: 65000.0 z_elem: 63 dz_bottom: 30.0 rayleigh_sponge: true +viscous_sponge: true topography: "Earth" topo_smoothing: true implicit_diffusion: true diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_1M.yml b/config/longrun_configs/longrun_aquaplanet_allsky_1M.yml index 4b9a29e7d3..7d446e32bd 100644 --- a/config/longrun_configs/longrun_aquaplanet_allsky_1M.yml +++ b/config/longrun_configs/longrun_aquaplanet_allsky_1M.yml @@ -1,8 +1,9 @@ h_elem: 16 -z_max: 55000.0 +z_max: 65000.0 z_elem: 63 dz_bottom: 30.0 rayleigh_sponge: true +viscous_sponge: true implicit_diffusion: true approximate_linear_solve_iters: 2 dt: "120secs" diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml b/config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml index 1c0db6dab4..6b73d89a6b 100644 --- a/config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml +++ b/config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml @@ -1,8 +1,9 @@ h_elem: 16 -z_max: 55000.0 +z_max: 65000.0 z_elem: 63 dz_bottom: 30.0 rayleigh_sponge: true +viscous_sponge: true implicit_diffusion: true approximate_linear_solve_iters: 2 ode_algo: ARS343 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 3f52e72d0e..38c91e78d7 100644 --- a/config/longrun_configs/longrun_aquaplanet_allsky_progedmf_diffonly_0M.yml +++ b/config/longrun_configs/longrun_aquaplanet_allsky_progedmf_diffonly_0M.yml @@ -1,8 +1,9 @@ h_elem: 16 -z_max: 55000.0 +z_max: 65000.0 z_elem: 63 dz_bottom: 30.0 rayleigh_sponge: true +viscous_sponge: true implicit_diffusion: true approximate_linear_solve_iters: 2 max_newton_iters_ode: 3 diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_tvinsol_0M_slabocean.yml b/config/longrun_configs/longrun_aquaplanet_allsky_tvinsol_0M_slabocean.yml index 55b19eeb09..7e94323f09 100644 --- a/config/longrun_configs/longrun_aquaplanet_allsky_tvinsol_0M_slabocean.yml +++ b/config/longrun_configs/longrun_aquaplanet_allsky_tvinsol_0M_slabocean.yml @@ -1,8 +1,9 @@ h_elem: 16 -z_max: 55000.0 +z_max: 65000.0 z_elem: 63 dz_bottom: 30.0 rayleigh_sponge: true +viscous_sponge: true implicit_diffusion: true approximate_linear_solve_iters: 2 dt: "120secs" diff --git a/config/longrun_configs/longrun_aquaplanet_dyamond.yml b/config/longrun_configs/longrun_aquaplanet_dyamond.yml index 70cf2fed44..bae902f3d3 100644 --- a/config/longrun_configs/longrun_aquaplanet_dyamond.yml +++ b/config/longrun_configs/longrun_aquaplanet_dyamond.yml @@ -1,8 +1,9 @@ h_elem: 60 -z_max: 55000.0 +z_max: 65000.0 z_elem: 63 dz_bottom: 30.0 rayleigh_sponge: true +viscous_sponge: true moist: "equil" cloud_model: "grid_scale" dt: "30secs" diff --git a/config/longrun_configs/longrun_dry_held_suarez.yml b/config/longrun_configs/longrun_dry_held_suarez.yml index 9b6ece9b78..197e153161 100644 --- a/config/longrun_configs/longrun_dry_held_suarez.yml +++ b/config/longrun_configs/longrun_dry_held_suarez.yml @@ -1,10 +1,10 @@ h_elem: 30 -z_elem: 63 z_max: 55000.0 +z_elem: 63 dz_bottom: 30.0 dt: "90secs" t_end: "360days" forcing: "held_suarez" rayleigh_sponge: true dt_save_state_to_disk: "10days" -toml: [toml/longrun_aquaplanet.toml] +toml: [toml/longrun_held_suarez.toml] diff --git a/config/longrun_configs/longrun_moist_held_suarez.yml b/config/longrun_configs/longrun_moist_held_suarez.yml index c08f35aaea..691da32328 100644 --- a/config/longrun_configs/longrun_moist_held_suarez.yml +++ b/config/longrun_configs/longrun_moist_held_suarez.yml @@ -1,6 +1,6 @@ h_elem: 30 -z_elem: 63 z_max: 55000.0 +z_elem: 63 dz_bottom: 30.0 dt: "90secs" t_end: "360days" @@ -10,4 +10,4 @@ vert_diff: true rayleigh_sponge: true forcing: "held_suarez" dt_save_state_to_disk: "10days" -toml: [toml/longrun_aquaplanet.toml] +toml: [toml/longrun_held_suarez.toml] diff --git a/config/longrun_configs/longrun_moist_held_suarez_deepatmos.yml b/config/longrun_configs/longrun_moist_held_suarez_deepatmos.yml index df52d68030..cce934ce8f 100644 --- a/config/longrun_configs/longrun_moist_held_suarez_deepatmos.yml +++ b/config/longrun_configs/longrun_moist_held_suarez_deepatmos.yml @@ -1,6 +1,6 @@ h_elem: 30 -z_elem: 63 z_max: 55000.0 +z_elem: 63 dz_bottom: 30.0 dt: "90secs" t_end: "360days" @@ -11,4 +11,4 @@ vert_diff: true rayleigh_sponge: true forcing: "held_suarez" dt_save_state_to_disk: "10days" -toml: [toml/longrun_aquaplanet.toml] +toml: [toml/longrun_held_suarez.toml] diff --git a/config/longrun_configs/longrun_sphere_hydrostatic_balance_rhoe.yml b/config/longrun_configs/longrun_sphere_hydrostatic_balance_rhoe.yml index d8650da3f9..a5e09e3310 100644 --- a/config/longrun_configs/longrun_sphere_hydrostatic_balance_rhoe.yml +++ b/config/longrun_configs/longrun_sphere_hydrostatic_balance_rhoe.yml @@ -1,10 +1,9 @@ -dt_save_state_to_disk: "10days" -dt: "90secs" -t_end: "360days" h_elem: 30 +z_max: 55000.0 z_elem: 63 dz_bottom: 30.0 -z_max: 55000.0 +dt_save_state_to_disk: "10days" +dt: "90secs" +t_end: "360days" perturb_initstate: false discrete_hydrostatic_balance: true -toml: [toml/longrun_aquaplanet.toml] diff --git a/config/model_configs/aquaplanet_diagedmf.yml b/config/model_configs/aquaplanet_diagedmf.yml index 4f0c6e53e8..358593a950 100644 --- a/config/model_configs/aquaplanet_diagedmf.yml +++ b/config/model_configs/aquaplanet_diagedmf.yml @@ -2,9 +2,11 @@ dt_save_state_to_disk: "Inf" dt_save_to_sol: "Inf" output_default_diagnostics: false h_elem: 30 -z_max: 55000.0 +z_max: 65000.0 z_elem: 63 dz_bottom: 30.0 +rayleigh_sponge: true +viscous_sponge: true moist: equil surface_setup: DefaultMoninObukhov rad: allskywithclear diff --git a/config/model_configs/aquaplanet_progedmf.yml b/config/model_configs/aquaplanet_progedmf.yml index cc6a960576..0320b0c13d 100644 --- a/config/model_configs/aquaplanet_progedmf.yml +++ b/config/model_configs/aquaplanet_progedmf.yml @@ -2,9 +2,11 @@ dt_save_state_to_disk: "Inf" dt_save_to_sol: "Inf" output_default_diagnostics: false h_elem: 30 -z_max: 55000.0 +z_max: 65000.0 z_elem: 63 dz_bottom: 30.0 +rayleigh_sponge: true +viscous_sponge: true moist: equil surface_setup: DefaultMoninObukhov rad: allskywithclear diff --git a/config/model_configs/diagnostic_edmfx_aquaplanet.yml b/config/model_configs/diagnostic_edmfx_aquaplanet.yml index 4d170fec26..cdcc207fba 100644 --- a/config/model_configs/diagnostic_edmfx_aquaplanet.yml +++ b/config/model_configs/diagnostic_edmfx_aquaplanet.yml @@ -1,3 +1,7 @@ +z_max: 65000.0 +z_elem: 31 +dz_bottom: 50.0 +rayleigh_sponge: true surface_setup: DefaultMoninObukhov rad: clearsky turbconv: diagnostic_edmfx @@ -13,9 +17,8 @@ edmfx_sgs_diffusive_flux: true moist: equil cloud_model: "quadrature_sgs" precip_model: 1M -dt: 100secs -t_end: 12hours -dt_save_state_to_disk: 12hours +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 index f311520ea3..8924d38334 100644 --- a/config/model_configs/diagnostic_edmfx_aquaplanet_gpu.yml +++ b/config/model_configs/diagnostic_edmfx_aquaplanet_gpu.yml @@ -1,3 +1,6 @@ +z_max: 65000.0 +z_elem: 31 +dz_bottom: 50.0 surface_setup: DefaultMoninObukhov rad: clearsky turbconv: diagnostic_edmfx @@ -13,8 +16,7 @@ edmfx_sgs_diffusive_flux: true moist: equil cloud_model: "quadrature_sgs" precip_model: 1M -dt: 100secs +dt: 120secs t_end: 12hours -dt_save_state_to_disk: 12hours toml: [toml/diagnostic_edmfx.toml] ode_algo: ARS343 diff --git a/config/model_configs/prognostic_edmfx_aquaplanet.yml b/config/model_configs/prognostic_edmfx_aquaplanet.yml index 5526883302..ec31e2a154 100644 --- a/config/model_configs/prognostic_edmfx_aquaplanet.yml +++ b/config/model_configs/prognostic_edmfx_aquaplanet.yml @@ -1,3 +1,8 @@ +# This jobs takes too long so we use a lower top and coarser vertical resolution +# z_max: 65000.0 +# z_elem: 31 +# dz_bottom: 50.0 +# rayleigh_sponge: true surface_setup: DefaultMoninObukhov rad: clearsky turbconv: prognostic_edmfx diff --git a/config/model_configs/single_column_hydrostatic_balance_ft64.yml b/config/model_configs/single_column_hydrostatic_balance_ft64.yml index 225a48d060..597049f41e 100644 --- a/config/model_configs/single_column_hydrostatic_balance_ft64.yml +++ b/config/model_configs/single_column_hydrostatic_balance_ft64.yml @@ -1,9 +1,10 @@ +z_max: 65000.0 +z_elem: 63 dz_bottom: 30.0 dt_save_state_to_disk: "5days" initial_condition: "IsothermalProfile" config: "column" hyperdiff: false -z_elem: 45 dt: "3hours" FLOAT_TYPE: "Float64" dt_save_to_sol: "3hours" diff --git a/config/model_configs/single_column_radiative_equilibrium_allsky_idealized_clouds.yml b/config/model_configs/single_column_radiative_equilibrium_allsky_idealized_clouds.yml index 10d5bc77b1..21ae93d7f3 100644 --- a/config/model_configs/single_column_radiative_equilibrium_allsky_idealized_clouds.yml +++ b/config/model_configs/single_column_radiative_equilibrium_allsky_idealized_clouds.yml @@ -1,16 +1,16 @@ +z_max: 65000.0 +z_elem: 63 +dz_bottom: 30.0 dt_save_state_to_disk: "100days" initial_condition: "IsothermalProfile" hyperdiff: false -z_elem: 63 dt: "3hours" dt_rad: "3hours" idealized_h2o: true t_end: "654days" idealized_clouds: true -dz_bottom: 30.0 config: "column" insolation: "timevarying" -z_max: 70000.0 dt_save_to_sol: "30hours" rad: "allskywithclear" diagnostics: diff --git a/config/model_configs/single_column_radiative_equilibrium_clearsky.yml b/config/model_configs/single_column_radiative_equilibrium_clearsky.yml index f8b197d806..f359f4fbc8 100644 --- a/config/model_configs/single_column_radiative_equilibrium_clearsky.yml +++ b/config/model_configs/single_column_radiative_equilibrium_clearsky.yml @@ -1,13 +1,13 @@ +z_max: 65000.0 +z_elem: 63 +dz_bottom: 30.0 dt_save_state_to_disk: "100days" initial_condition: "IsothermalProfile" hyperdiff: false -z_elem: 63 dt: "3hours" dt_rad: "3hours" idealized_h2o: true t_end: "654days" -dz_bottom: 30.0 config: "column" -z_max: 70000.0 dt_save_to_sol: "30hours" rad: "clearsky" diff --git a/config/model_configs/single_column_radiative_equilibrium_clearsky_prognostic_surface_temp.yml b/config/model_configs/single_column_radiative_equilibrium_clearsky_prognostic_surface_temp.yml index e49d6ec462..a311af9be0 100644 --- a/config/model_configs/single_column_radiative_equilibrium_clearsky_prognostic_surface_temp.yml +++ b/config/model_configs/single_column_radiative_equilibrium_clearsky_prognostic_surface_temp.yml @@ -1,12 +1,11 @@ - +z_max: 65000.0 +z_elem: 63 +dz_bottom: 30.0 rad: "clearsky" idealized_h2o: true hyperdiff: false config: "column" initial_condition: "IsothermalProfile" -z_max: 70000 -z_elem: 63 -dz_bottom: 30 t_end: "654days" dt: "3hours" dt_rad: "3hours" diff --git a/config/model_configs/single_column_radiative_equilibrium_gray.yml b/config/model_configs/single_column_radiative_equilibrium_gray.yml index 02b096b8fa..0923cd6658 100644 --- a/config/model_configs/single_column_radiative_equilibrium_gray.yml +++ b/config/model_configs/single_column_radiative_equilibrium_gray.yml @@ -1,15 +1,14 @@ dt_save_state_to_disk: "3months" initial_condition: "IsothermalProfile" hyperdiff: false -# It seems radiative equilibrium needs a larger dz near the top -# to be stable, so we use a smaller z_elem +# It seems radiative equilibrium needs a larger dz near the top (smaller z_elem) to be stable +z_max: 65000.0 z_elem: 50 dt: "3hours" dt_rad: "3hours" t_end: "654days" dz_bottom: 30.0 config: "column" -z_max: 70000.0 dt_save_to_sol: "30hours" rad: "gray" # [2, 2, 80] instead of [1, 1, 80] because Julia ranges are inclusive of the 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 index 5d30bc3f40..5a810a84c7 100644 --- 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 @@ -1,16 +1,16 @@ +z_max: 65000.0 +z_elem: 31 +dz_bottom: 50.0 rad: "allskywithclear" dt_save_state_to_disk: "1days" rayleigh_sponge: true orographic_gravity_wave: "raw_topo" -z_elem: 25 dt: "400secs" surface_setup: "DefaultMoninObukhov" t_end: "15hours" non_orographic_gravity_wave: true -dz_bottom: 300.0 vert_diff: true insolation: "timevarying" -z_max: 55000.0 precip_model: "0M" cloud_model: "grid_scale" surface_temperature: "ZonallyAsymmetric" @@ -19,4 +19,4 @@ albedo_model: "RegressionFunctionAlbedo" reproducibility_test: true aerosol_radiation: true prescribed_aerosols: ["CB1", "CB2", "DST01", "DST02", "DST03", "DST04", "OC1", "OC2", "SO4"] -toml: [toml/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric.toml] +toml: [toml/sphere_aquaplanet.toml] diff --git a/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml b/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml index 3ced2aaf4f..0c1938aa5b 100644 --- a/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml +++ b/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml @@ -1,6 +1,7 @@ -z_elem: 25 -z_max: 55000.0 -dz_bottom: 300.0 +z_max: 65000.0 +z_elem: 31 +dz_bottom: 50.0 +rayleigh_sponge: true dt: "400secs" t_end: "1days" dt_save_state_to_disk: "24hours" @@ -12,13 +13,12 @@ precip_model: "1M" rad: "allskywithclear" aerosol_radiation: true insolation: "timevarying" -rayleigh_sponge: true non_orographic_gravity_wave: true orographic_gravity_wave: "gfdl_restart" surface_setup: "DefaultMoninObukhov" prescribe_ozone: true prescribed_aerosols: ["CB1", "CB2", "SO4"] -toml: [toml/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.toml] +toml: [toml/sphere_aquaplanet.toml] diagnostics: - short_name: [edt, evu, mmrso4, mmrbcpo, mmrbcpi, o3] reduction_time: average diff --git a/config/model_configs/sphere_aquaplanet_rhoe_nonequilmoist_allsky.yml b/config/model_configs/sphere_aquaplanet_rhoe_nonequilmoist_allsky.yml index 1fed54c9c3..606612ee13 100644 --- a/config/model_configs/sphere_aquaplanet_rhoe_nonequilmoist_allsky.yml +++ b/config/model_configs/sphere_aquaplanet_rhoe_nonequilmoist_allsky.yml @@ -1,6 +1,6 @@ -z_elem: 25 -z_max: 55000.0 -dz_bottom: 300.0 +z_max: 65000.0 +z_elem: 31 +dz_bottom: 50.0 dt: "400secs" t_end: "18hours" dt_save_state_to_disk: "18hours" @@ -14,4 +14,4 @@ rad: "allskywithclear" insolation: "timevarying" rayleigh_sponge: true surface_setup: "DefaultMoninObukhov" -toml: [toml/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.toml] +toml: [toml/sphere_aquaplanet.toml] diff --git a/config/model_configs/sphere_held_suarez_rhoe_equilmoist_hightop_sponge.yml b/config/model_configs/sphere_held_suarez_rhoe_equilmoist_hightop_sponge.yml index da7221e58c..5fba8640ee 100644 --- a/config/model_configs/sphere_held_suarez_rhoe_equilmoist_hightop_sponge.yml +++ b/config/model_configs/sphere_held_suarez_rhoe_equilmoist_hightop_sponge.yml @@ -1,14 +1,14 @@ -dt_save_state_to_disk: "4days" +z_max: 55000.0 +z_elem: 31 +dz_bottom: 50.0 rayleigh_sponge: true -dt: "450secs" -z_elem: 25 +viscous_sponge: true +dt_save_state_to_disk: "4days" +dt: "400secs" t_end: "4days" -dz_bottom: 300.0 vert_diff: true forcing: "held_suarez" -z_max: 55000.0 precip_model: "0M" reproducibility_test: true -viscous_sponge: true moist: "equil" -toml: [toml/sphere_held_suarez_rhoe_equilmoist_hightop_sponge.toml] +toml: [toml/sphere_held_suarez.toml] diff --git a/config/model_configs/sphere_held_suarez_rhoe_hightop.yml b/config/model_configs/sphere_held_suarez_rhoe_hightop.yml index 6e9f232f5b..18d75660c9 100644 --- a/config/model_configs/sphere_held_suarez_rhoe_hightop.yml +++ b/config/model_configs/sphere_held_suarez_rhoe_hightop.yml @@ -1,8 +1,10 @@ -dz_bottom: 300.0 +z_max: 55000.0 +z_elem: 31 +dz_bottom: 50.0 dt_save_state_to_disk: "4days" t_end: "8days" forcing: "held_suarez" dt: "400secs" -z_elem: 25 deep_atmosphere: true -z_max: 55000.0 +rayleigh_sponge: true +toml: [toml/sphere_held_suarez.toml] diff --git a/src/cache/tracer_cache.jl b/src/cache/tracer_cache.jl index 4b57ab7589..f3f1203998 100644 --- a/src/cache/tracer_cache.jl +++ b/src/cache/tracer_cache.jl @@ -2,6 +2,7 @@ using ClimaUtilities.ClimaArtifacts import Dates: Year import ClimaUtilities.TimeVaryingInputs: TimeVaryingInput, LinearPeriodFillingInterpolation +import Interpolations as Intp function tracer_cache( Y, @@ -15,6 +16,7 @@ function tracer_cache( end target_space = axes(Y.c) + extrapolation_bc = (Intp.Periodic(), Intp.Flat(), Intp.Flat()) if prescribe_ozone o3 = similar(Y.c.ρ) prescribed_o3_timevaryinginput = TimeVaryingInput( @@ -29,6 +31,7 @@ function tracer_cache( target_space; reference_date = start_date, regridder_type = :InterpolationsRegridder, + regridder_kwargs = (; extrapolation_bc), method = LinearPeriodFillingInterpolation(Year(1)), ) o3_cache = (; o3, prescribed_o3_timevaryinginput) @@ -60,6 +63,7 @@ function tracer_cache( target_space; reference_date = start_date, regridder_type = :InterpolationsRegridder, + regridder_kwargs = (; extrapolation_bc), method = LinearPeriodFillingInterpolation(Year(1)), ) for name in prescribed_aerosol_names ] diff --git a/toml/diagnostic_edmfx.toml b/toml/diagnostic_edmfx.toml index 41c7c57094..38c3bc8430 100644 --- a/toml/diagnostic_edmfx.toml +++ b/toml/diagnostic_edmfx.toml @@ -1,3 +1,9 @@ +[zd_rayleigh] +value = 45000.0 + +[zd_viscous] +value = 45000.0 + [entr_inv_tau] value = 0.002 diff --git a/toml/longrun_aquaplanet.toml b/toml/longrun_aquaplanet.toml index 50ba37624e..702d724b8d 100644 --- a/toml/longrun_aquaplanet.toml +++ b/toml/longrun_aquaplanet.toml @@ -1,2 +1,5 @@ [zd_rayleigh] -value = 35000.0 +value = 45000.0 + +[zd_viscous] +value = 45000.0 diff --git a/toml/longrun_aquaplanet_diagedmf.toml b/toml/longrun_aquaplanet_diagedmf.toml index f7e9a8be19..be62fb81e8 100644 --- a/toml/longrun_aquaplanet_diagedmf.toml +++ b/toml/longrun_aquaplanet_diagedmf.toml @@ -1,5 +1,8 @@ [zd_rayleigh] -value = 35000.0 +value = 45000.0 + +[zd_viscous] +value = 45000.0 [precipitation_timescale] value = 600 diff --git a/toml/longrun_aquaplanet_progedmf.toml b/toml/longrun_aquaplanet_progedmf.toml index 057d09ed39..ba2cadf48d 100644 --- a/toml/longrun_aquaplanet_progedmf.toml +++ b/toml/longrun_aquaplanet_progedmf.toml @@ -1,5 +1,8 @@ [zd_rayleigh] -value = 35000.0 +value = 45000.0 + +[zd_viscous] +value = 45000.0 [precipitation_timescale] value = 600 diff --git a/toml/longrun_held_suarez.toml b/toml/longrun_held_suarez.toml new file mode 100644 index 0000000000..1ff5b77289 --- /dev/null +++ b/toml/longrun_held_suarez.toml @@ -0,0 +1,5 @@ +[zd_rayleigh] +value = 35000.0 + +[zd_viscous] +value = 35000.0 diff --git a/toml/prognostic_edmfx.toml b/toml/prognostic_edmfx.toml index 654a543e81..a66aaa27a4 100644 --- a/toml/prognostic_edmfx.toml +++ b/toml/prognostic_edmfx.toml @@ -1,3 +1,9 @@ +[zd_rayleigh] +value = 45000.0 + +[zd_viscous] +value = 45000.0 + [EDMF_surface_area] value = 0.1 diff --git a/toml/sphere_aquaplanet.toml b/toml/sphere_aquaplanet.toml new file mode 100644 index 0000000000..60cb0a2bf5 --- /dev/null +++ b/toml/sphere_aquaplanet.toml @@ -0,0 +1,6 @@ +[zd_viscous] +value = 45000.0 + +[zd_rayleigh] +value = 45000.0 + diff --git a/toml/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric.toml b/toml/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric.toml deleted file mode 100644 index cadefc8ff9..0000000000 --- a/toml/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric.toml +++ /dev/null @@ -1,3 +0,0 @@ -[zd_rayleigh] -value = 30000.0 - diff --git a/toml/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.toml b/toml/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.toml deleted file mode 100644 index cadefc8ff9..0000000000 --- a/toml/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.toml +++ /dev/null @@ -1,3 +0,0 @@ -[zd_rayleigh] -value = 30000.0 - diff --git a/toml/sphere_held_suarez.toml b/toml/sphere_held_suarez.toml new file mode 100644 index 0000000000..554d4ca307 --- /dev/null +++ b/toml/sphere_held_suarez.toml @@ -0,0 +1,6 @@ +[zd_viscous] +value = 35000.0 + +[zd_rayleigh] +value = 35000.0 + diff --git a/toml/sphere_held_suarez_rhoe_equilmoist_hightop_sponge.toml b/toml/sphere_held_suarez_rhoe_equilmoist_hightop_sponge.toml deleted file mode 100644 index cda298c679..0000000000 --- a/toml/sphere_held_suarez_rhoe_equilmoist_hightop_sponge.toml +++ /dev/null @@ -1,6 +0,0 @@ -[zd_viscous] -value = 30000.0 - -[zd_rayleigh] -value = 30000.0 - From da6e6c2914b69e0cbbaba69ed097f4782f9b9425 Mon Sep 17 00:00:00 2001 From: Zhaoyi Shen <11598433+szy21@users.noreply.github.com> Date: Fri, 27 Sep 2024 13:40:24 -0700 Subject: [PATCH 2/2] bump ref counter --- reproducibility_tests/ref_counter.jl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/reproducibility_tests/ref_counter.jl b/reproducibility_tests/ref_counter.jl index 3befb779f1..0f5c7eda9d 100644 --- a/reproducibility_tests/ref_counter.jl +++ b/reproducibility_tests/ref_counter.jl @@ -1,4 +1,4 @@ -182 +183 # **README** # @@ -20,6 +20,9 @@ #= +183 +- Change model top and vertical resolution + 182 - We don't know why, but sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric seemed to not produce the same result between the merge-queue branch and the main branch,