diff --git a/config/default_configs/default_config.yml b/config/default_configs/default_config.yml index 720b5a0d32..d41abfafe3 100644 --- a/config/default_configs/default_config.yml +++ b/config/default_configs/default_config.yml @@ -199,7 +199,7 @@ job_id: help: "Uniquely identifying string for a particular job" value: ~ density_upwinding: - help: "Denisity upwinding mode [`none` (default), `first_order` , `third_order`, `boris_book`, `zalesak`]" + help: "Density upwinding mode [`none` (default), `first_order` , `third_order`, `boris_book`, `zalesak`]" value: none tracer_upwinding: help: "Tracer upwinding mode [`none` (default), `first_order` , `third_order`, `boris_book`, `zalesak`]" @@ -252,7 +252,7 @@ alpha_rayleigh_w: value: 1.0 alpha_rayleigh_uh: help: "Rayleigh sponge coefficient for horizontal velocity" - value: 0.0001 + value: 0.0 zd_viscous: help: "Viscous sponge height" value: 15000.0 @@ -261,4 +261,4 @@ zd_rayleigh: value: 15000.0 kappa_2_sponge: help: "Viscous sponge coefficient" - value: 1.0e6 \ No newline at end of file + value: 1.0e6 diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_clearsky_highres_hightop_rayleigh35e3_float64.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_clearsky_highres_hightop_rayleigh35e3_float64.yml index 07ded2feea..5d22c99568 100644 --- a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_clearsky_highres_hightop_rayleigh35e3_float64.yml +++ b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_clearsky_highres_hightop_rayleigh35e3_float64.yml @@ -15,6 +15,5 @@ alpha_rayleigh_w: 10.0 FLOAT_TYPE: "Float64" z_max: 45000.0 precip_model: "0M" -alpha_rayleigh_uh: 0.0 job_id: "longrun_aquaplanet_rhoe_equil_clearsky_highres_hightop_rayleigh35e3_float64" moist: "equil" diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_allsky_ft64.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_allsky_ft64.yml index 6b572dd637..547b9d0281 100644 --- a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_allsky_ft64.yml +++ b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_allsky_ft64.yml @@ -13,6 +13,5 @@ kappa_4: 1.0e16 idealized_insolation: false FLOAT_TYPE: "Float64" precip_model: "0M" -alpha_rayleigh_uh: 0.0 job_id: "longrun_aquaplanet_rhoe_equil_highres_allsky_ft64" moist: "equil" diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_clearsky_ft64.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_clearsky_ft64.yml index eaa2dc758b..4a496cdbed 100644 --- a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_clearsky_ft64.yml +++ b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_clearsky_ft64.yml @@ -12,7 +12,6 @@ h_elem: 16 kappa_4: 1.0e16 FLOAT_TYPE: "Float64" precip_model: "0M" -alpha_rayleigh_uh: 0.0 dt_save_to_sol: "10days" job_id: "longrun_aquaplanet_rhoe_equil_highres_clearsky_ft64" moist: "equil" diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_clearsky_ft64_earth.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_clearsky_ft64_earth.yml index 13814fb8c2..f10a8d2674 100644 --- a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_clearsky_ft64_earth.yml +++ b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_clearsky_ft64_earth.yml @@ -15,7 +15,6 @@ kappa_4: 3.0e16 FLOAT_TYPE: "Float64" precip_model: "0M" topography: "Earth" -alpha_rayleigh_uh: 0.0 dt_save_to_sol: "10days" job_id: "longrun_aquaplanet_rhoe_equil_highres_clearsky_ft64_earth" 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 index 0504048cd6..0737f5ba7a 100644 --- a/config/longrun_configs/longrun_bw_rhoe_equil_highres_topography_earth.yml +++ b/config/longrun_configs/longrun_bw_rhoe_equil_highres_topography_earth.yml @@ -11,6 +11,5 @@ use_reference_state: false kappa_4: 2.0e16 precip_model: "0M" topography: "Earth" -alpha_rayleigh_uh: 0.0 job_id: "longrun_bw_rhoe_equil_highres_topography_earth" moist: "equil" 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 index ddecb58e5d..9573099460 100644 --- a/config/longrun_configs/longrun_hs_rhoe_equil_highres_topography_earth.yml +++ b/config/longrun_configs/longrun_hs_rhoe_equil_highres_topography_earth.yml @@ -12,6 +12,5 @@ kappa_4: 3.0e16 forcing: "held_suarez" precip_model: "0M" topography: "Earth" -alpha_rayleigh_uh: 0.0 job_id: "longrun_hs_rhoe_equil_highres_topography_earth" moist: "equil" diff --git a/config/longrun_configs/longrun_hs_rhoe_equilmoist_highres_hightop_rayleigh30e3.yml b/config/longrun_configs/longrun_hs_rhoe_equilmoist_highres_hightop_rayleigh30e3.yml index f6cd846737..0b6c1c8437 100644 --- a/config/longrun_configs/longrun_hs_rhoe_equilmoist_highres_hightop_rayleigh30e3.yml +++ b/config/longrun_configs/longrun_hs_rhoe_equilmoist_highres_hightop_rayleigh30e3.yml @@ -13,6 +13,5 @@ forcing: "held_suarez" alpha_rayleigh_w: 10.0 z_max: 45000.0 precip_model: "0M" -alpha_rayleigh_uh: 0.0 job_id: "longrun_hs_rhoe_equilmoist_highres_hightop_rayleigh30e3" moist: "equil" diff --git a/config/longrun_configs/longrun_zalesak_tracer_energy_aquaplanet_rhoe_equil_highres_clearsky_ft64.yml b/config/longrun_configs/longrun_zalesak_tracer_energy_aquaplanet_rhoe_equil_highres_clearsky_ft64.yml index 56e457aa77..d239deab67 100644 --- a/config/longrun_configs/longrun_zalesak_tracer_energy_aquaplanet_rhoe_equil_highres_clearsky_ft64.yml +++ b/config/longrun_configs/longrun_zalesak_tracer_energy_aquaplanet_rhoe_equil_highres_clearsky_ft64.yml @@ -14,7 +14,6 @@ kappa_4: 1.0e16 energy_upwinding: zalesak FLOAT_TYPE: "Float64" precip_model: "0M" -alpha_rayleigh_uh: 0.0 dt_save_to_sol: "10days" job_id: "longrun_zalesak_tracer_energy_aquaplanet_rhoe_equil_highres_clearsky_ft64" moist: "equil" diff --git a/config/model_configs/edmf_trmm.yml b/config/model_configs/edmf_trmm.yml index 8bd5837947..ac278104c4 100644 --- a/config/model_configs/edmf_trmm.yml +++ b/config/model_configs/edmf_trmm.yml @@ -15,6 +15,7 @@ FLOAT_TYPE: "Float64" z_max: 16400.0 precip_model: "1M" regression_test: true +alpha_rayleigh_uh: 0.0001 dt_save_to_sol: "5mins" job_id: "edmf_trmm" rad: "TRMM_LBA" diff --git a/config/model_configs/plane_agnesi_mountain_test_stretched.yml b/config/model_configs/plane_agnesi_mountain_test_stretched.yml index 4b0e291a65..6f908628c4 100644 --- a/config/model_configs/plane_agnesi_mountain_test_stretched.yml +++ b/config/model_configs/plane_agnesi_mountain_test_stretched.yml @@ -14,5 +14,4 @@ kappa_4: 1.0e6 alpha_rayleigh_w: 0.1 z_max: 25000.0 topography: "Agnesi" -alpha_rayleigh_uh: 0.0 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 index d1aade1b55..bb6e0ff504 100644 --- a/config/model_configs/plane_agnesi_mountain_test_uniform.yml +++ b/config/model_configs/plane_agnesi_mountain_test_uniform.yml @@ -13,5 +13,4 @@ kappa_4: 1.0e6 alpha_rayleigh_w: 0.1 z_max: 25000.0 topography: "Agnesi" -alpha_rayleigh_uh: 0.0 job_id: "plane_agnesi_mountain_test_uniform" diff --git a/config/model_configs/plane_schar_mountain_test_stretched.yml b/config/model_configs/plane_schar_mountain_test_stretched.yml index c5c5a29850..1e6890b6f4 100644 --- a/config/model_configs/plane_schar_mountain_test_stretched.yml +++ b/config/model_configs/plane_schar_mountain_test_stretched.yml @@ -15,5 +15,4 @@ kappa_4: 5.0e7 alpha_rayleigh_w: 0.1 z_max: 25000.0 topography: "Schar" -alpha_rayleigh_uh: 0.0 job_id: "plane_schar_mountain_test_stretched" diff --git a/config/model_configs/plane_schar_mountain_test_uniform.yml b/config/model_configs/plane_schar_mountain_test_uniform.yml index 12fd066c88..f627e30234 100644 --- a/config/model_configs/plane_schar_mountain_test_uniform.yml +++ b/config/model_configs/plane_schar_mountain_test_uniform.yml @@ -14,5 +14,4 @@ kappa_4: 5.0e7 alpha_rayleigh_w: 0.1 z_max: 25000.0 topography: "Schar" -alpha_rayleigh_uh: 0.0 job_id: "plane_schar_mountain_test_uniform" 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 171ca17f01..2ac2bb11bf 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 @@ -14,7 +14,6 @@ idealized_insolation: false z_max: 45000.0 precip_model: "0M" regression_test: true -alpha_rayleigh_uh: 0.0 surface_temperature: "ZonallyAsymmetric" job_id: "sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric" moist: "equil" 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 e56fb5189b..d1a07a1db0 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 @@ -14,6 +14,5 @@ idealized_insolation: false z_max: 45000.0 precip_model: "0M" regression_test: true -alpha_rayleigh_uh: 0.0 job_id: "sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res" moist: "equil" 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 88f8008326..5c8defe792 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 @@ -11,7 +11,6 @@ forcing: "held_suarez" z_max: 45000.0 precip_model: "0M" regression_test: true -alpha_rayleigh_uh: 0.0 viscous_sponge: true job_id: "sphere_held_suarez_rhoe_equilmoist_hightop_sponge" moist: "equil" diff --git a/config/model_configs/sphere_ssp_first_tracer_energy_upwind_held_suarez_rhoe_equilmoist_hightop_sponge.yml b/config/model_configs/sphere_ssp_first_tracer_energy_upwind_held_suarez_rhoe_equilmoist_hightop_sponge.yml index b4da6fd655..15e9ca8206 100644 --- a/config/model_configs/sphere_ssp_first_tracer_energy_upwind_held_suarez_rhoe_equilmoist_hightop_sponge.yml +++ b/config/model_configs/sphere_ssp_first_tracer_energy_upwind_held_suarez_rhoe_equilmoist_hightop_sponge.yml @@ -13,7 +13,6 @@ forcing: "held_suarez" energy_upwinding: first_order z_max: 45000.0 precip_model: "0M" -alpha_rayleigh_uh: 0.0 viscous_sponge: true job_id: "sphere_ssp_first_tracer_energy_upwind_held_suarez_rhoe_equilmoist_hightop_sponge" moist: "equil" diff --git a/config/perf_configs/flame/perf_gw.yml b/config/perf_configs/flame/perf_gw.yml index b9d30b7b36..ccfe571f29 100644 --- a/config/perf_configs/flame/perf_gw.yml +++ b/config/perf_configs/flame/perf_gw.yml @@ -12,6 +12,5 @@ vert_diff: "true" idealized_insolation: false z_max: 45000.0 precip_model: "0M" -alpha_rayleigh_uh: 0.0 job_id: "flame_perf_gw" moist: "equil"