diff --git a/config/model_configs/coarse_single_ft64_hourly_checkpoints_co2.yml b/config/model_configs/coarse_single_ft64_hourly_checkpoints_co2.yml index 46b0d4ad3f..62a0e19fdc 100644 --- a/config/model_configs/coarse_single_ft64_hourly_checkpoints_co2.yml +++ b/config/model_configs/coarse_single_ft64_hourly_checkpoints_co2.yml @@ -15,4 +15,4 @@ precip_model: "0M" rad: "gray" run_name: "coarse_single_ft64_hourly_checkpoints_co2" t_end: "32days" -vert_diff: "true" +vert_diff: "true" \ No newline at end of file diff --git a/config/model_configs/gpu_slabplanet_albedo_function.yml b/config/model_configs/gpu_slabplanet_albedo_function.yml index 61dd17468e..e9ee5ede71 100644 --- a/config/model_configs/gpu_slabplanet_albedo_function.yml +++ b/config/model_configs/gpu_slabplanet_albedo_function.yml @@ -1,4 +1,5 @@ apply_limiter: false +conservation_softfail: true dt: "200secs" dt_cpl: 200 dt_save_to_sol: "3600secs" diff --git a/experiments/AMIP/components/land/bucket_init.jl b/experiments/AMIP/components/land/bucket_init.jl index f657310f6e..05130d55a3 100644 --- a/experiments/AMIP/components/land/bucket_init.jl +++ b/experiments/AMIP/components/land/bucket_init.jl @@ -128,8 +128,8 @@ function bucket_init( σS_c = FT(0.2) W_f = FT(10) d_soil = FT(3.5) # soil depth - z_0m = FT(1e-2) - z_0b = FT(1e-3) + z_0m = FT(1e-3) # roughness length for momentum over smooth bare soil + z_0b = FT(1e-3) # roughness length for tracers over smooth bare soil κ_soil = FT(0.7) ρc_soil = FT(2e8) t_crit = FT(dt) # This is the timescale on which snow exponentially damps to zero, in the case where all @@ -156,7 +156,7 @@ function bucket_init( T_sfc_0 = FT(271.0) @. Y.bucket.T = T_sfc_0 + temp_anomaly(coords.subsurface) - Y.bucket.W .= 10.0 + Y.bucket.W .= 6.5 Y.bucket.Ws .= 0.0 Y.bucket.σS .= 0.0 diff --git a/experiments/AMIP/components/ocean/slab_ocean_init.jl b/experiments/AMIP/components/ocean/slab_ocean_init.jl index de55c69b3c..e9261c8341 100644 --- a/experiments/AMIP/components/ocean/slab_ocean_init.jl +++ b/experiments/AMIP/components/ocean/slab_ocean_init.jl @@ -96,7 +96,7 @@ function ocean_init( evolving_switch = evolving ? FT(1) : FT(0) params = - OceanSlabParameters(FT(20), FT(1500.0), FT(800.0), FT(271.0), FT(1e-5), FT(1e-5), FT(0.38), evolving_switch) + OceanSlabParameters(FT(20), FT(1500.0), FT(800.0), FT(271.0), FT(5e-4), FT(5e-4), FT(0.38), evolving_switch) Y, space = slab_ocean_space_init(space, params) cache = (