separate hyperviscosity for velocity and tracer

CliMA · Dec 19, 2023 · b5a7327 · b5a7327
1 parent a223fbe
commit b5a7327
Show file tree

Hide file tree

Showing 49 changed files with 117 additions and 66 deletions.
diff --git a/.buildkite/comparison/pipeline.sh b/.buildkite/comparison/pipeline.sh
@@ -69,9 +69,9 @@ for nprocs in ${process_counts[@]}; do
     job_id="comparison_sphere_held_suarez_${res}_res_rhoe_$nprocs"
 
 if [[ "$res" == "low" ]]; then
-    command="julia --color=yes --project=examples examples/hybrid/driver.jl --job_id $job_id --forcing held_suarez --FLOAT_TYPE $FT --tracer_upwinding none --t_end 10days --dt 400secs --z_elem 10 --h_elem 4 --kappa_4 2e17"
+    command="julia --color=yes --project=examples examples/hybrid/driver.jl --job_id $job_id --forcing held_suarez --FLOAT_TYPE $FT --tracer_upwinding none --t_end 10days --dt 400secs --z_elem 10 --h_elem 4 --kappa_4_vorticity 2e17 --kappa_4_tracer 2e17"
 else
-    command="julia --color=yes --project=examples examples/hybrid/driver.jl --job_id $job_id --forcing held_suarez --FLOAT_TYPE $FT --tracer_upwinding none --t_end 1days --dt 50secs --z_elem 45 --h_elem 24 --kappa_4 5e14"
+    command="julia --color=yes --project=examples examples/hybrid/driver.jl --job_id $job_id --forcing held_suarez --FLOAT_TYPE $FT --tracer_upwinding none --t_end 1days --dt 50secs --z_elem 45 --h_elem 24 --kappa_4_vorticity 5e14 --kappa_4_tracer 5e14"
 fi
 
 if [[ "$profiling" == "enable" ]]; then

diff --git a/.buildkite/scaling/pipeline.sh b/.buildkite/scaling/pipeline.sh
@@ -17,22 +17,25 @@ low_resolution_lines=\
 dt: 400secs
 z_elem: 10
 h_elem: 6
-kappa_4: 2e17"
+kappa_4_vorticity: 2e17
+kappa_4_tracer: 2e17"
 
 medium_resolution_lines=\
 "t_end: 4days
 dt: 150secs
 z_elem: 45
 dz_bottom: 30
 h_elem: 16
-kappa_4: 1e16"
+kappa_4_vorticity: 1e16
+kappa_4_tracer: 1e16"
 
 high_resolution_lines=\
 "t_end: 1days
 dt: 50secs
 z_elem: 45
 h_elem: 30
-kappa_4: 5e14"
+kappa_4_vorticity: 5e14
+kappa_4_tracer: 5e14"
 
 # Create configuration files for each resolution
 for i in "${!resolutions[@]}"; do

diff --git a/config/default_configs/default_config.yml b/config/default_configs/default_config.yml
@@ -30,8 +30,11 @@ z_elem:
 z_max:
   help: "Model top height. Default: 30km"
   value: 30000.0
-kappa_4:
-  help: "Hyperdiffusion parameter"
+kappa_4_vorticity:
+  help: "Hyperdiffusion parameter for vorticity"
+  value: 2.0e17
+kappa_4_tracer:
+  help: "Hyperdiffusion parameter for tracer"
   value: 2.0e17
 # Topography
 topography:

diff --git a/config/gpu_configs/central_gpu_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml b/config/gpu_configs/central_gpu_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml
@@ -6,7 +6,8 @@ z_elem: 63
 dz_bottom: 30.0
 dz_top: 3000.0
 z_max: 55000.0
-kappa_4: 2.0e16
+kappa_4_vorticity: 2.0e16
+kappa_4_tracer: 2.0e16
 vert_diff: "true"
 moist: "equil"
 precip_model: "0M"

diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond.yml b/config/gpu_configs/gpu_aquaplanet_dyamond.yml
@@ -3,7 +3,8 @@ z_max: 55000.0
 z_elem: 63
 dz_bottom: 30.0
 dz_top: 3000.0
-kappa_4: 1e14
+kappa_4_vorticity: 1e14
+kappa_4_tracer: 1e14
 moist: "equil" 
 precip_model: "0M" 
 rad: "allskywithclear" 

diff --git a/config/gpu_configs/gpu_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml b/config/gpu_configs/gpu_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml
@@ -6,7 +6,8 @@ z_elem: 63
 dz_bottom: 30.0
 dz_top: 3000.0
 z_max: 55000.0
-kappa_4: 1.0e15
+kappa_4_vorticity: 1.0e15
+kappa_4_tracer: 1.0e15
 vert_diff: "true"
 moist: "equil"
 precip_model: "0M"

diff --git a/config/gpu_configs/gpu_hs_rhoe_equilmoist_nz63_0M_55km_rs35km_4process.yml b/config/gpu_configs/gpu_hs_rhoe_equilmoist_nz63_0M_55km_rs35km_4process.yml
@@ -6,7 +6,8 @@ z_elem: 63
 dz_bottom: 30.0
 dz_top: 3000.0
 z_max: 55000.0
-kappa_4: 1.0e15
+kappa_4_vorticity: 1.0e15
+kappa_4_tracer: 1.0e15
 vert_diff: "true"
 moist: "equil"
 precip_model: "0M"

diff --git a/config/longrun_configs/longrun_aquaplanet_amip.yml b/config/longrun_configs/longrun_aquaplanet_amip.yml
@@ -3,7 +3,8 @@ z_max: 55000.0
 z_elem: 63
 dz_bottom: 30.0
 dz_top: 3000.0
-kappa_4: 1e16
+kappa_4_vorticity: 1e16
+kappa_4_tracer: 1e16
 moist: "equil" 
 precip_model: "0M" 
 override_τ_precip: false

diff --git a/config/longrun_configs/longrun_aquaplanet_dyamond.yml b/config/longrun_configs/longrun_aquaplanet_dyamond.yml
@@ -3,7 +3,8 @@ z_max: 55000.0
 z_elem: 63
 dz_bottom: 30.0
 dz_top: 3000.0
-kappa_4: 1e14
+kappa_4_vorticity: 1e14
+kappa_4_tracer: 1e14
 moist: "equil" 
 precip_model: "0M" 
 rad: "allskywithclear" 

diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_gray_55km_nz63_0M.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_gray_55km_nz63_0M.yml
@@ -8,7 +8,8 @@ z_elem: 63
 dz_bottom: 30.0
 dz_top: 3000.0
 vert_diff: "true" 
-kappa_4: 2e16
+kappa_4_vorticity: 2e16
+kappa_4_tracer: 2e16
 surface_setup: "DefaultExchangeCoefficients" 
 moist: "equil" 
 rad: "gray" 

diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_clearsky_ft32_earth.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_clearsky_ft32_earth.yml
@@ -11,7 +11,8 @@ dz_bottom: 30.0
 vert_diff: "true"
 h_elem: 16
 use_reference_state: false
-kappa_4: 3.0e16
+kappa_4_vorticity: 3.0e16
+kappa_4_tracer: 3.0e16
 FLOAT_TYPE: "Float32"
 precip_model: "0M"
 topography: "Earth"

diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky.yml
@@ -8,7 +8,8 @@ dz_bottom: 30.0
 dz_top: 3000.0
 z_max: 55000.0
 rayleigh_sponge: true
-kappa_4: 1.0e16
+kappa_4_vorticity: 1.0e16
+kappa_4_tracer: 1.0e16
 moist: "equil"
 precip_model: "0M"
 surface_setup: "DefaultMoninObukhov"

diff --git a/...longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_earth.yml b/...longrun_configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_earth.yml
@@ -10,7 +10,8 @@ z_max: 55000.0
 rayleigh_sponge: true
 topography: "Earth"
 topo_smoothing: true
-kappa_4: 4.0e16
+kappa_4_vorticity: 4.0e16
+kappa_4_tracer: 4.0e16
 moist: "equil"
 precip_model: "0M"
 surface_setup: "DefaultMoninObukhov"

diff --git a/..._configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_tvinsolation.yml b/..._configs/longrun_aquaplanet_rhoe_equilmoist_nz63_0M_55km_rs35km_clearsky_tvinsolation.yml
@@ -8,7 +8,8 @@ dz_bottom: 30.0
 dz_top: 3000.0
 z_max: 55000.0
 rayleigh_sponge: true
-kappa_4: 2.0e16
+kappa_4_vorticity: 2.0e16
+kappa_4_tracer: 2.0e16
 moist: "equil"
 precip_model: "0M"
 surface_setup: "DefaultMoninObukhov"

diff --git a/config/longrun_configs/longrun_bw_rhoe_equil_highres.yml b/config/longrun_configs/longrun_bw_rhoe_equil_highres.yml
@@ -5,7 +5,8 @@ dt: "300secs"
 t_end: "100days"
 dz_bottom: 30.0
 h_elem: 16
-kappa_4: 1.0e16
+kappa_4_vorticity: 1.0e16
+kappa_4_tracer: 1.0e16
 precip_model: "0M"
 job_id: "longrun_bw_rhoe_equil_highres"
 moist: "equil"
diff --git a/config/longrun_configs/longrun_bw_rhoe_equil_highres_topography_earth.yml b/config/longrun_configs/longrun_bw_rhoe_equil_highres_topography_earth.yml
@@ -8,7 +8,8 @@ t_end: "100days"
 dz_bottom: 30.0
 h_elem: 16
 use_reference_state: false
-kappa_4: 2.0e16
+kappa_4_vorticity: 2.0e16
+kappa_4_tracer: 2.0e16
 precip_model: "0M"
 topography: "Earth"
 job_id: "longrun_bw_rhoe_equil_highres_topography_earth"

diff --git a/config/longrun_configs/longrun_bw_rhoe_highres.yml b/config/longrun_configs/longrun_bw_rhoe_highres.yml
@@ -3,7 +3,8 @@ dt_save_to_disk: "10days"
 h_elem: 16
 initial_condition: "DryBaroclinicWave"
 t_end: "100days"
-kappa_4: 1.0e16
+kappa_4_vorticity: 1.0e16
+kappa_4_tracer: 1.0e16
 z_elem: 45
 dt: "400secs"
 job_id: "longrun_bw_rhoe_highres"
diff --git a/config/longrun_configs/longrun_hs_rhoe_dry_nz63_55km_rs35km.yml b/config/longrun_configs/longrun_hs_rhoe_dry_nz63_55km_rs35km.yml
@@ -5,7 +5,8 @@ t_end: "300days"
 h_elem: 16
 z_elem: 63
 z_max: 55000.0
-kappa_4: 1.0e16
+kappa_4_vorticity: 1.0e16
+kappa_4_tracer: 1.0e16
 forcing: "held_suarez"
 dt: "300secs"
 rayleigh_sponge: true

diff --git a/config/longrun_configs/longrun_hs_rhoe_equil_highres_topography_earth.yml b/config/longrun_configs/longrun_hs_rhoe_equil_highres_topography_earth.yml
@@ -8,7 +8,8 @@ dz_bottom: 30.0
 vert_diff: "true"
 h_elem: 16
 use_reference_state: false
-kappa_4: 3.0e16
+kappa_4_vorticity: 3.0e16
+kappa_4_tracer: 3.0e16
 forcing: "held_suarez"
 precip_model: "0M"
 topography: "Earth"

diff --git a/config/longrun_configs/longrun_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml b/config/longrun_configs/longrun_hs_rhoe_equilmoist_nz63_0M_55km_rs35km.yml
@@ -6,7 +6,8 @@ z_elem: 63
 dz_bottom: 30.0
 dz_top: 3000.0
 z_max: 55000.0
-kappa_4: 1.0e16
+kappa_4_vorticity: 1.0e16
+kappa_4_tracer: 1.0e16
 vert_diff: "true"
 moist: "equil"
 precip_model: "0M"

diff --git a/config/longrun_configs/longrun_sphere_hydrostatic_balance_rhoe.yml b/config/longrun_configs/longrun_sphere_hydrostatic_balance_rhoe.yml
@@ -2,7 +2,8 @@ h_elem: 16
 z_elem: 45
 dz_bottom: 30.0
 dt: "400secs"
-kappa_4: 1.0e16
+kappa_4_vorticity: 1.0e16
+kappa_4_tracer: 1.0e16
 perturb_initstate: false 
 discrete_hydrostatic_balance: true 
 t_end: "800days" 

diff --git a/config/longrun_configs/longrun_ssp_bw_rhoe_equil_highres.yml b/config/longrun_configs/longrun_ssp_bw_rhoe_equil_highres.yml
@@ -7,7 +7,8 @@ t_end: "100days"
 dz_bottom: 30.0
 h_elem: 16
 ode_algo: "SSP333"
-kappa_4: 1.0e16
+kappa_4_vorticity: 1.0e16
+kappa_4_tracer: 1.0e16
 precip_model: "0M"
 job_id: "longrun_ssp_bw_rhoe_equil_highres"
 moist: "equil"

diff --git a/config/longrun_configs/longrun_zalesak_tracer_energy_bw_rhoe_equil_highres.yml b/config/longrun_configs/longrun_zalesak_tracer_energy_bw_rhoe_equil_highres.yml
@@ -6,7 +6,8 @@ tracer_upwinding: zalesak
 t_end: "100days"
 dz_bottom: 30.0
 h_elem: 16
-kappa_4: 1.0e16
+kappa_4_vorticity: 1.0e16
+kappa_4_tracer: 1.0e16
 energy_upwinding: zalesak
 precip_model: "0M"
 job_id: "longrun_zalesak_tracer_energy_bw_rhoe_equil_highres"

diff --git a/config/model_configs/box_density_current_test.yml b/config/model_configs/box_density_current_test.yml
@@ -11,7 +11,8 @@ z_stretch: false
 x_elem: 45
 ode_algo: "SSP33ShuOsher"
 config: "box"
-kappa_4: 1.0e7
+kappa_4_vorticity: 1.0e7
+kappa_4_tracer: 1.0e7
 z_max: 6400.0
 job_id: "box_density_current_test"
 diagnostics:

diff --git a/config/model_configs/diagnostic_edmfx_bomex_box.yml b/config/model_configs/diagnostic_edmfx_bomex_box.yml
@@ -17,7 +17,8 @@ edmfx_sgs_diffusive_flux: true
 moist: "equil"
 config: "box" 
 hyperdiff: "true" 
-kappa_4: 1e21
+kappa_4_vorticity: 1e21
+kappa_4_tracer: 1e21
 x_max: 1e8 
 y_max: 1e8 
 x_elem: 2 

diff --git a/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml b/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml
@@ -17,7 +17,8 @@ edmfx_sgs_diffusive_flux: true
 moist: "equil"
 config: "box" 
 hyperdiff: "true" 
-kappa_4: 1e21
+kappa_4_vorticity: 1e21
+kappa_4_tracer: 1e21
 x_max: 1e8 
 y_max: 1e8 
 x_elem: 2 

diff --git a/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml b/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml
@@ -17,7 +17,8 @@ edmfx_sgs_diffusive_flux: true
 moist: equil
 config: box 
 hyperdiff: "true" 
-kappa_4: 1e21
+kappa_4_vorticity: 1e21
+kappa_4_tracer: 1e21
 x_max: 1e8 
 y_max: 1e8 
 x_elem: 2 

diff --git a/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml b/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml
@@ -15,7 +15,8 @@ edmfx_sgs_diffusive_flux: true
 moist: equil
 config: box 
 hyperdiff: "true" 
-kappa_4: 1e21
+kappa_4_vorticity: 1e21
+kappa_4_tracer: 1e21
 x_max: 1e8 
 y_max: 1e8 
 x_elem: 2 

diff --git a/config/model_configs/diagnostic_edmfx_gabls_box.yml b/config/model_configs/diagnostic_edmfx_gabls_box.yml
@@ -15,7 +15,8 @@ edmfx_sgs_diffusive_flux: true
 moist: equil
 config: box
 hyperdiff: "true"
-kappa_4: 1e21
+kappa_4_vorticity: 1e21
+kappa_4_tracer: 1e21
 x_max: 1e8
 y_max: 1e8
 x_elem: 2

diff --git a/config/model_configs/diagnostic_edmfx_rico_box.yml b/config/model_configs/diagnostic_edmfx_rico_box.yml
@@ -17,7 +17,8 @@ moist: equil
 precip_model: "0M"
 config: box
 hyperdiff: "true"
-kappa_4: 1e21
+kappa_4_vorticity: 1e21
+kappa_4_tracer: 1e21
 x_max: 1e8
 y_max: 1e8
 x_elem: 2

diff --git a/config/model_configs/diagnostic_edmfx_test_box.yml b/config/model_configs/diagnostic_edmfx_test_box.yml
@@ -10,7 +10,8 @@ turbconv: "diagnostic_edmfx"
 x_elem: 2
 dz_bottom: 30.0
 config: "box"
-kappa_4: 1.0e8
+kappa_4_vorticity: 1.0e8
+kappa_4_tracer: 1.0e8
 job_id: "diagnostic_edmfx_test_box"
 moist: "equil"
 toml: [toml/diagnostic_edmfx_box.toml]
diff --git a/config/model_configs/diagnostic_edmfx_trmm_box.yml b/config/model_configs/diagnostic_edmfx_trmm_box.yml
@@ -18,7 +18,8 @@ precip_model: "0M"
 override_τ_precip: false
 config: box
 hyperdiff: "true"
-kappa_4: 1e21
+kappa_4_vorticity: 1e21
+kappa_4_tracer: 1e21
 x_max: 1e8
 y_max: 1e8
 x_elem: 2

diff --git a/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml b/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml
@@ -20,7 +20,8 @@ precip_model: "0M"
 override_τ_precip: false
 config: box
 hyperdiff: "true"
-kappa_4: 1e21
+kappa_4_vorticity: 1e21
+kappa_4_tracer: 1e21
 x_max: 1e8
 y_max: 1e8
 x_elem: 2

diff --git a/config/model_configs/plane_agnesi_mountain_test_stretched.yml b/config/model_configs/plane_agnesi_mountain_test_stretched.yml
@@ -10,7 +10,8 @@ x_elem: 80
 dz_bottom: 200.0
 use_reference_state: false
 config: "plane"
-kappa_4: 1.0e6
+kappa_4_vorticity: 1.0e6
+kappa_4_tracer: 1.0e6
 z_max: 25000.0
 topography: "Agnesi"
 job_id: "plane_agnesi_mountain_test_stretched"

diff --git a/config/model_configs/plane_agnesi_mountain_test_uniform.yml b/config/model_configs/plane_agnesi_mountain_test_uniform.yml
@@ -9,7 +9,8 @@ z_stretch: false
 x_elem: 80
 use_reference_state: false
 config: "plane"
-kappa_4: 1.0e6
+kappa_4_vorticity: 1.0e6
+kappa_4_tracer: 1.0e6
 z_max: 25000.0
 topography: "Agnesi"
 job_id: "plane_agnesi_mountain_test_uniform"

diff --git a/config/model_configs/plane_density_current_test.yml b/config/model_configs/plane_density_current_test.yml
@@ -8,7 +8,8 @@ discrete_hydrostatic_balance: true
 z_stretch: false
 x_elem: 80
 config: "plane"
-kappa_4: 1.0e7
+kappa_4_vorticity: 1.0e7
+kappa_4_tracer: 1.0e7
 z_max: 6400.0
 job_id: "plane_density_current_test"
 diagnostics:

diff --git a/config/model_configs/plane_schar_mountain_test_stretched.yml b/config/model_configs/plane_schar_mountain_test_stretched.yml
@@ -11,7 +11,8 @@ dz_bottom: 200.0
 use_reference_state: false
 ode_algo: "SSP33ShuOsher"
 config: "plane"
-kappa_4: 5.0e7
+kappa_4_vorticity: 5.0e7
+kappa_4_tracer: 5.0e7
 z_max: 25000.0
 topography: "Schar"
 job_id: "plane_schar_mountain_test_stretched"