diff --git a/config/ci_configs/gpu_amip_albedo_function.yml b/config/ci_configs/gpu_amip_albedo_function.yml index 5f0fe3305..99384ab85 100644 --- a/config/ci_configs/gpu_amip_albedo_function.yml +++ b/config/ci_configs/gpu_amip_albedo_function.yml @@ -1,5 +1,3 @@ -alpha_rayleigh_uh: 0 -alpha_rayleigh_w: 10 apply_limiter: false dt: "150secs" dt_cpl: 150 diff --git a/config/ci_configs/gpu_amip_albedo_static_map.yml b/config/ci_configs/gpu_amip_albedo_static_map.yml index f401e573f..c99814382 100644 --- a/config/ci_configs/gpu_amip_albedo_static_map.yml +++ b/config/ci_configs/gpu_amip_albedo_static_map.yml @@ -1,5 +1,3 @@ -alpha_rayleigh_uh: 0 -alpha_rayleigh_w: 10 apply_limiter: false dt: "150secs" dt_cpl: 150 diff --git a/config/ci_configs/gpu_amip_albedo_temporal_map.yml b/config/ci_configs/gpu_amip_albedo_temporal_map.yml index af5edfeb2..928acb193 100644 --- a/config/ci_configs/gpu_amip_albedo_temporal_map.yml +++ b/config/ci_configs/gpu_amip_albedo_temporal_map.yml @@ -1,5 +1,3 @@ -alpha_rayleigh_uh: 0 -alpha_rayleigh_w: 10 apply_limiter: false dt: "150secs" dt_cpl: 150 diff --git a/config/ci_configs/gpu_amip_albedo_temporal_map_1M.yml b/config/ci_configs/gpu_amip_albedo_temporal_map_1M.yml index 065326f9e..5353a753b 100644 --- a/config/ci_configs/gpu_amip_albedo_temporal_map_1M.yml +++ b/config/ci_configs/gpu_amip_albedo_temporal_map_1M.yml @@ -1,5 +1,3 @@ -alpha_rayleigh_uh: 0 -alpha_rayleigh_w: 10 apply_limiter: false dt: "150secs" dt_cpl: 150 diff --git a/config/ci_configs/target_amip_albedo_function.yml b/config/ci_configs/target_amip_albedo_function.yml index 1884de0ca..8fb7219f7 100644 --- a/config/ci_configs/target_amip_albedo_function.yml +++ b/config/ci_configs/target_amip_albedo_function.yml @@ -1,5 +1,3 @@ -alpha_rayleigh_uh: 0 -alpha_rayleigh_w: 10 apply_limiter: false dt: "150secs" dt_cpl: 150 diff --git a/config/ci_configs/target_amip_n1_shortrun.yml b/config/ci_configs/target_amip_n1_shortrun.yml index 69c3291d4..6595005e0 100644 --- a/config/ci_configs/target_amip_n1_shortrun.yml +++ b/config/ci_configs/target_amip_n1_shortrun.yml @@ -1,5 +1,3 @@ -alpha_rayleigh_uh: 0 -alpha_rayleigh_w: 10 apply_limiter: false dt: "150secs" dt_cpl: 150 diff --git a/config/ci_configs/target_params_in_slab_test2.yml b/config/ci_configs/target_params_in_slab_test2.yml index 0d00da967..836dca429 100644 --- a/config/ci_configs/target_params_in_slab_test2.yml +++ b/config/ci_configs/target_params_in_slab_test2.yml @@ -1,5 +1,3 @@ -alpha_rayleigh_uh: 0 -alpha_rayleigh_w: 10 apply_limiter: false conservation_softfail: true dt: "200secs" diff --git a/config/ci_configs/target_params_in_slab_test3.yml b/config/ci_configs/target_params_in_slab_test3.yml index 0d00da967..836dca429 100644 --- a/config/ci_configs/target_params_in_slab_test3.yml +++ b/config/ci_configs/target_params_in_slab_test3.yml @@ -1,5 +1,3 @@ -alpha_rayleigh_uh: 0 -alpha_rayleigh_w: 10 apply_limiter: false conservation_softfail: true dt: "200secs" diff --git a/config/longrun_configs/amip_n1_shortrun.yml b/config/longrun_configs/amip_n1_shortrun.yml index fd7029660..404847bf6 100644 --- a/config/longrun_configs/amip_n1_shortrun.yml +++ b/config/longrun_configs/amip_n1_shortrun.yml @@ -1,5 +1,3 @@ -alpha_rayleigh_uh: 0 -alpha_rayleigh_w: 10 apply_limiter: false dt: "150secs" dt_cpl: 150 diff --git a/config/longrun_configs/amip_n1_shortrun_nocouple.yml b/config/longrun_configs/amip_n1_shortrun_nocouple.yml index 321241689..fcdb4f0aa 100644 --- a/config/longrun_configs/amip_n1_shortrun_nocouple.yml +++ b/config/longrun_configs/amip_n1_shortrun_nocouple.yml @@ -1,5 +1,3 @@ -alpha_rayleigh_uh: 0 -alpha_rayleigh_w: 10 apply_limiter: false dt: "150secs" dt_cpl: 86200 diff --git a/config/longrun_configs/amip_n2_shortrun.yml b/config/longrun_configs/amip_n2_shortrun.yml index a242f0513..112f94d8e 100644 --- a/config/longrun_configs/amip_n2_shortrun.yml +++ b/config/longrun_configs/amip_n2_shortrun.yml @@ -1,5 +1,3 @@ -alpha_rayleigh_uh: 0 -alpha_rayleigh_w: 10 apply_limiter: false dt: 150secs dt_cpl: 150 diff --git a/config/longrun_configs/amip_n32_shortrun.yml b/config/longrun_configs/amip_n32_shortrun.yml index 7646c3345..3efc860b0 100644 --- a/config/longrun_configs/amip_n32_shortrun.yml +++ b/config/longrun_configs/amip_n32_shortrun.yml @@ -1,5 +1,3 @@ -alpha_rayleigh_uh: 0 -alpha_rayleigh_w: 10 apply_limiter: false dt: "150secs" dt_cpl: 150 diff --git a/config/longrun_configs/amip_n64_shortrun.yml b/config/longrun_configs/amip_n64_shortrun.yml index 7646c3345..3efc860b0 100644 --- a/config/longrun_configs/amip_n64_shortrun.yml +++ b/config/longrun_configs/amip_n64_shortrun.yml @@ -1,5 +1,3 @@ -alpha_rayleigh_uh: 0 -alpha_rayleigh_w: 10 apply_limiter: false dt: "150secs" dt_cpl: 150 diff --git a/config/longrun_configs/amip_n8_shortrun.yml b/config/longrun_configs/amip_n8_shortrun.yml index 7646c3345..3efc860b0 100644 --- a/config/longrun_configs/amip_n8_shortrun.yml +++ b/config/longrun_configs/amip_n8_shortrun.yml @@ -1,5 +1,3 @@ -alpha_rayleigh_uh: 0 -alpha_rayleigh_w: 10 apply_limiter: false dt: "150secs" dt_cpl: 150 diff --git a/config/perf_configs/perf_diff_target_amip_n1_shortrun.yml b/config/perf_configs/perf_diff_target_amip_n1_shortrun.yml index 57f56954a..8a46587e5 100644 --- a/config/perf_configs/perf_diff_target_amip_n1_shortrun.yml +++ b/config/perf_configs/perf_diff_target_amip_n1_shortrun.yml @@ -1,6 +1,4 @@ FLOAT_TYPE: "Float64" -alpha_rayleigh_uh: 0 -alpha_rayleigh_w: 10 apply_limiter: true dt: "150secs" dt_cpl: 150 diff --git a/test/component_model_tests/climaatmos_standalone/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.toml b/test/component_model_tests/climaatmos_standalone/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.toml index 95ed8a095..1166e2614 100644 --- a/test/component_model_tests/climaatmos_standalone/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.toml +++ b/test/component_model_tests/climaatmos_standalone/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.toml @@ -1,7 +1,3 @@ [zd_rayleigh] value = 35000.0 type = "float" - -[alpha_rayleigh_uh] -value = 0.0 -type = "float" diff --git a/toml/amip_target_topo_diagedmf.toml b/toml/amip_target_topo_diagedmf.toml index 663063b16..44f02f035 100644 --- a/toml/amip_target_topo_diagedmf.toml +++ b/toml/amip_target_topo_diagedmf.toml @@ -1,6 +1,3 @@ -[alpha_rayleigh_w] -value = 3.0 - [zd_rayleigh] value = 35000.0