Merge pull request #3305 from CliMA/zs/model_top

use a higher model top
CliMA · Sep 27, 2024 · db918c7 · db918c7
2 parents 1fecdfa + da6e6c2
commit db918c7
Show file tree

Hide file tree

Showing 46 changed files with 153 additions and 91 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...ig/model_configs/single_column_radiative_equilibrium_clearsky_prognostic_surface_temp.yml b/...ig/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"