Merge pull request #3431 from CliMA/zs/hs_top

Change model top to 60km
CliMA · Nov 12, 2024 · 3c2e640 · 3c2e640
2 parents ae3de63 + 775a371
commit 3c2e640
Show file tree

Hide file tree

Showing 43 changed files with 61 additions and 52 deletions.
diff --git a/.buildkite/gpu_pipeline/pipeline.yml b/.buildkite/gpu_pipeline/pipeline.yml
@@ -70,7 +70,7 @@ steps:
           - >
             nsys profile --delay 100 --trace=nvtx,mpi,cuda,osrt --output=gpu_hs_rhoe_equil_55km_nz63_0M/output_active/report
             julia --threads=3 --color=yes --project=examples examples/hybrid/driver.jl
-            --config_file ${GPU_CONFIG_PATH}gpu_hs_rhoe_equil_55km_nz63_0M.yml
+            --config_file ${GPU_CONFIG_PATH}gpu_hs_rhoe_equil_0M.yml
             --job_id gpu_hs_rhoe_equil_55km_nz63_0M
         artifact_paths: "gpu_hs_rhoe_equil_55km_nz63_0M/output_active/*"
         env:
@@ -88,7 +88,7 @@ steps:
             srun --cpu-bind=threads --cpus-per-task=4
             nsys profile --delay 100 --trace=nvtx,mpi,cuda,osrt --output=gpu_hs_rhoe_equil_55km_nz63_0M_4process/output_active/report-%q{PMI_RANK}
             julia --threads=3 --color=yes --project=examples examples/hybrid/driver.jl
-            --config_file ${GPU_CONFIG_PATH}gpu_hs_rhoe_equil_55km_nz63_0M.yml
+            --config_file ${GPU_CONFIG_PATH}gpu_hs_rhoe_equil_0M.yml
             --job_id gpu_hs_rhoe_equil_55km_nz63_0M_4process
         artifact_paths: "gpu_hs_rhoe_equil_55km_nz63_0M_4process/output_active/*"
         env:

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -916,7 +916,7 @@ steps:
           - >
             nsys profile --delay 100 --trace=nvtx,cuda --output=central_gpu_hs_rhoe_equil_55km_nz63_0M/output_active/report
             julia --color=yes --project=examples examples/hybrid/driver.jl
-            --config_file $CONFIG_PATH/central_gpu_hs_rhoe_equil_55km_nz63_0M.yml
+            --config_file $CONFIG_PATH/central_gpu_hs_rhoe_equil_0M.yml
             --job_id central_gpu_hs_rhoe_equil_55km_nz63_0M
         artifact_paths: "central_gpu_hs_rhoe_equil_55km_nz63_0M/output_active/*"
         env:
@@ -930,7 +930,7 @@ steps:
           - >
             nsys profile --delay 100 --trace=nvtx,cuda --output=central_cloud_diag_gpu_hs_rhoe_equil_55km_nz63_0M/output_active/report
             julia --color=yes --project=examples examples/hybrid/driver.jl
-            --config_file $CONFIG_PATH/central_cloud_diag_gpu_hs_rhoe_equil_55km_nz63_0M.yml
+            --config_file $CONFIG_PATH/central_cloud_diag_gpu_hs_rhoe_equil_0M.yml
             --job_id central_cloud_diag_gpu_hs_rhoe_equil_55km_nz63_0M
         artifact_paths: "central_cloud_diag_gpu_hs_rhoe_equil_55km_nz63_0M/output_active/*"
         env:

diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_diag_1process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_diag_1process.yml
@@ -1,7 +1,7 @@
 dt_save_state_to_disk: 12hours
 dt_save_to_sol: 12hours
 h_elem: 30
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 rayleigh_sponge: true

diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ss.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ss.yml
@@ -2,7 +2,7 @@ dt_save_state_to_disk: "Inf"
 dt_save_to_sol: "Inf"
 output_default_diagnostics: false
 h_elem: 30
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 rayleigh_sponge: true

diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ws_1process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ws_1process.yml
@@ -2,7 +2,7 @@ dt_save_state_to_disk: "Inf"
 dt_save_to_sol: "Inf"
 output_default_diagnostics: false
 h_elem: 30
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 rayleigh_sponge: true

diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ws_2process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ws_2process.yml
@@ -2,7 +2,7 @@ dt_save_state_to_disk: "Inf"
 dt_save_to_sol: "Inf"
 output_default_diagnostics: false
 h_elem: 42
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 rayleigh_sponge: true

diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_ws_4process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_ws_4process.yml
@@ -2,7 +2,7 @@ dt_save_state_to_disk: "Inf"
 dt_save_to_sol: "Inf"
 output_default_diagnostics: false
 h_elem: 60
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 rayleigh_sponge: true

diff --git a/...onfigs/gpu_hs_rhoe_equil_55km_nz63_0M.yml → config/gpu_configs/gpu_hs_rhoe_equil_0M.yml b/...onfigs/gpu_hs_rhoe_equil_55km_nz63_0M.yml → config/gpu_configs/gpu_hs_rhoe_equil_0M.yml
@@ -6,10 +6,11 @@ t_end: "1days"
 h_elem: 30
 z_elem: 63
 dz_bottom: 30.0
-z_max: 55000.0
+z_max: 60000.0
 vert_diff: true
 moist: "equil"
 precip_model: "0M"
 rayleigh_sponge: true
+viscous_sponge: true
 forcing: "held_suarez"
 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,5 +1,5 @@
 h_elem: 16
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 rayleigh_sponge: true

diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_0M.yml b/config/longrun_configs/longrun_aquaplanet_allsky_0M.yml
@@ -1,5 +1,5 @@
 h_elem: 16
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 rayleigh_sponge: true

diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_0M_earth.yml b/config/longrun_configs/longrun_aquaplanet_allsky_0M_earth.yml
@@ -1,5 +1,5 @@
 h_elem: 16
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 rayleigh_sponge: true

diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_1M.yml b/config/longrun_configs/longrun_aquaplanet_allsky_1M.yml
@@ -1,5 +1,5 @@
 h_elem: 16
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 rayleigh_sponge: true

diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml b/config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml
@@ -1,5 +1,5 @@
 h_elem: 16
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 rayleigh_sponge: true

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,5 +1,5 @@
 h_elem: 16
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 rayleigh_sponge: true

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,5 +1,5 @@
 h_elem: 16
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 rayleigh_sponge: true

diff --git a/config/longrun_configs/longrun_aquaplanet_dyamond.yml b/config/longrun_configs/longrun_aquaplanet_dyamond.yml
@@ -1,5 +1,5 @@
 h_elem: 60
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 rayleigh_sponge: true

diff --git a/config/longrun_configs/longrun_dry_held_suarez.yml b/config/longrun_configs/longrun_dry_held_suarez.yml
@@ -1,10 +1,11 @@
 h_elem: 30
-z_max: 55000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 dt: "90secs"
 t_end: "360days"
 forcing: "held_suarez"
 rayleigh_sponge: true
+viscous_sponge: true
 dt_save_state_to_disk: "10days"
 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,5 +1,5 @@
 h_elem: 30
-z_max: 55000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 dt: "90secs"
@@ -8,6 +8,7 @@ moist: "equil"
 precip_model: "0M"
 vert_diff: true
 rayleigh_sponge: true
+viscous_sponge: true
 forcing: "held_suarez"
 dt_save_state_to_disk: "10days"
 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,5 +1,5 @@
 h_elem: 30
-z_max: 55000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 dt: "90secs"
@@ -9,6 +9,7 @@ moist: "equil"
 precip_model: "0M"
 vert_diff: true
 rayleigh_sponge: true
+viscous_sponge: true
 forcing: "held_suarez"
 dt_save_state_to_disk: "10days"
 toml: [toml/longrun_held_suarez.toml]
diff --git a/config/model_configs/aquaplanet_diagedmf.yml b/config/model_configs/aquaplanet_diagedmf.yml
@@ -2,7 +2,7 @@ dt_save_state_to_disk: "Inf"
 dt_save_to_sol: "Inf"
 output_default_diagnostics: false
 h_elem: 30
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 rayleigh_sponge: true

diff --git a/config/model_configs/aquaplanet_progedmf.yml b/config/model_configs/aquaplanet_progedmf.yml
@@ -2,7 +2,7 @@ dt_save_state_to_disk: "Inf"
 dt_save_to_sol: "Inf"
 output_default_diagnostics: false
 h_elem: 30
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 rayleigh_sponge: true

diff --git a/...d_diag_gpu_hs_rhoe_equil_55km_nz63_0M.yml → ...ntral_cloud_diag_gpu_hs_rhoe_equil_0M.yml b/...d_diag_gpu_hs_rhoe_equil_55km_nz63_0M.yml → ...ntral_cloud_diag_gpu_hs_rhoe_equil_0M.yml
@@ -6,11 +6,12 @@ t_end: "2days"
 h_elem: 16
 z_elem: 63
 dz_bottom: 30.0
-z_max: 55000.0
+z_max: 60000.0
 vert_diff: true
 moist: "equil"
 precip_model: "0M"
 rayleigh_sponge: true
+viscous_sponge: true
 forcing: "held_suarez"
 call_cloud_diagnostics_per_stage: true
-toml: [toml/longrun_aquaplanet.toml]
+toml: [toml/longrun_held_suarez.toml]
diff --git a/...entral_gpu_hs_rhoe_equil_55km_nz63_0M.yml → ..._configs/central_gpu_hs_rhoe_equil_0M.yml b/...entral_gpu_hs_rhoe_equil_55km_nz63_0M.yml → ..._configs/central_gpu_hs_rhoe_equil_0M.yml
diff --git a/config/model_configs/diagnostic_edmfx_aquaplanet.yml b/config/model_configs/diagnostic_edmfx_aquaplanet.yml
@@ -1,4 +1,4 @@
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 31
 dz_bottom: 50.0
 rayleigh_sponge: true

diff --git a/config/model_configs/diagnostic_edmfx_aquaplanet_gpu.yml b/config/model_configs/diagnostic_edmfx_aquaplanet_gpu.yml
@@ -1,4 +1,4 @@
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 31
 dz_bottom: 50.0
 surface_setup: DefaultMoninObukhov

diff --git a/config/model_configs/gpu_aquaplanet_dyamond.yml b/config/model_configs/gpu_aquaplanet_dyamond.yml
@@ -1,7 +1,7 @@
 dt_save_state_to_disk: "Inf"
 dt_save_to_sol: "Inf"
 h_elem: 30
-z_max: 55000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 moist: "equil"
@@ -15,6 +15,7 @@ implicit_diffusion: true
 approximate_linear_solve_iters: 2
 surface_setup: "DefaultMoninObukhov"
 rayleigh_sponge: true
+viscous_sponge: true
 dt: "90secs"
 t_end: "8hours"
 prescribe_ozone: true

diff --git a/config/model_configs/prognostic_edmfx_aquaplanet.yml b/config/model_configs/prognostic_edmfx_aquaplanet.yml
@@ -1,5 +1,5 @@
 # This jobs takes too long so we use a lower top and coarser vertical resolution
-# z_max: 65000.0
+# z_max: 60000.0
 # z_elem: 31
 # dz_bottom: 50.0
 # rayleigh_sponge: true

diff --git a/config/model_configs/single_column_hydrostatic_balance_ft64.yml b/config/model_configs/single_column_hydrostatic_balance_ft64.yml
@@ -1,4 +1,4 @@
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 dt_save_state_to_disk: "5days"

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,4 +1,4 @@
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 dt_save_state_to_disk: "100days"

diff --git a/config/model_configs/single_column_radiative_equilibrium_clearsky.yml b/config/model_configs/single_column_radiative_equilibrium_clearsky.yml
@@ -1,4 +1,4 @@
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 dt_save_state_to_disk: "100days"

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,4 +1,4 @@
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 63
 dz_bottom: 30.0
 rad: "clearsky"

diff --git a/config/model_configs/single_column_radiative_equilibrium_gray.yml b/config/model_configs/single_column_radiative_equilibrium_gray.yml
@@ -2,7 +2,7 @@ dt_save_state_to_disk: "3months"
 initial_condition: "IsothermalProfile"
 hyperdiff: false
 # It seems radiative equilibrium needs a larger dz near the top (smaller z_elem) to be stable
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 50
 dt: "3hours"
 dt_rad: "3hours"

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
@@ -1,4 +1,4 @@
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 31
 dz_bottom: 50.0
 rad: "allskywithclear"

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
@@ -1,4 +1,4 @@
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 31
 dz_bottom: 50.0
 rayleigh_sponge: true

diff --git a/config/model_configs/sphere_aquaplanet_rhoe_nonequilmoist_allsky.yml b/config/model_configs/sphere_aquaplanet_rhoe_nonequilmoist_allsky.yml
@@ -1,4 +1,4 @@
-z_max: 65000.0
+z_max: 60000.0
 z_elem: 31
 dz_bottom: 50.0
 dt: "400secs"

diff --git a/reproducibility_tests/ref_counter.jl b/reproducibility_tests/ref_counter.jl
@@ -1,4 +1,4 @@
-186
+187
 
 # **README**
 #
@@ -21,6 +21,9 @@
 
 #=
 
+187
+- Change the model top for a few ci cases
+
 186
 - Topography dataset has been modified to the 60 arc-second ETOPO2022 dataset. 
   This is behaviour changing for the gravity-wave (raw-topo) parameterization

diff --git a/toml/diagnostic_edmfx.toml b/toml/diagnostic_edmfx.toml
@@ -1,8 +1,8 @@
 [zd_rayleigh]
-value = 45000.0
+value = 40000.0
 
 [zd_viscous]
-value = 45000.0
+value = 40000.0
 
 [entr_inv_tau]
 value = 0.002

diff --git a/toml/longrun_aquaplanet.toml b/toml/longrun_aquaplanet.toml
@@ -1,5 +1,5 @@
 [zd_rayleigh]
-value = 45000.0
+value = 40000.0
 
 [zd_viscous]
-value = 45000.0
+value = 40000.0
diff --git a/toml/longrun_aquaplanet_diagedmf.toml b/toml/longrun_aquaplanet_diagedmf.toml
@@ -1,8 +1,8 @@
 [zd_rayleigh]
-value = 45000.0
+value = 40000.0
 
 [zd_viscous]
-value = 45000.0
+value = 40000.0
 
 [precipitation_timescale]
 value = 600

diff --git a/toml/longrun_aquaplanet_progedmf.toml b/toml/longrun_aquaplanet_progedmf.toml
@@ -1,8 +1,8 @@
 [zd_rayleigh]
-value = 45000.0
+value = 40000.0
 
 [zd_viscous]
-value = 45000.0
+value = 40000.0
 
 [precipitation_timescale]
 value = 600

diff --git a/toml/longrun_held_suarez.toml b/toml/longrun_held_suarez.toml
@@ -1,5 +1,5 @@
 [zd_rayleigh]
-value = 35000.0
+value = 40000.0
 
 [zd_viscous]
-value = 35000.0
+value = 40000.0
diff --git a/toml/prognostic_edmfx.toml b/toml/prognostic_edmfx.toml
@@ -1,8 +1,8 @@
 [zd_rayleigh]
-value = 45000.0
+value = 40000.0
 
 [zd_viscous]
-value = 45000.0
+value = 40000.0
 
 [EDMF_surface_area]
 value = 0.1

diff --git a/toml/sphere_aquaplanet.toml b/toml/sphere_aquaplanet.toml
@@ -1,6 +1,6 @@
 [zd_viscous]
-value = 45000.0
+value = 40000.0
 
 [zd_rayleigh]
-value = 45000.0
+value = 40000.0