@@ -49,11 +49,11 @@ function set_soil_initial_conditions!(
4949 regridder_kwargs = (; extrapolation_bc, interpolation_method),
5050 )
5151
52- Y. soil. ϑ_l .= enforce_residual_constraint .(Y. soil. ϑ_l, θ_r)
53- Y. soil. ϑ_l .= enforce_porosity_constraint .(Y. soil. ϑ_l, ν)
54- Y. soil. θ_i .=
55- enforce_residual_constraint .(Y. soil. θ_i, eltype (Y. soil. θ_i)(0 ))
56- Y. soil. θ_i .= enforce_porosity_constraint .(Y. soil. ϑ_l, Y. soil. θ_i, ν)
52+ # Y.soil.ϑ_l .= enforce_residual_constraint.(Y.soil.ϑ_l, θ_r)
53+ # Y.soil.ϑ_l .= enforce_porosity_constraint.(Y.soil.ϑ_l, ν)
54+ # Y.soil.θ_i .=
55+ # enforce_residual_constraint.(Y.soil.θ_i, eltype(Y.soil.θ_i)(0))
56+ # Y.soil.θ_i .= enforce_porosity_constraint.(Y.soil.ϑ_l, Y.soil.θ_i, ν)
5757 ρc_s =
5858 ClimaLand. Soil. volumetric_heat_capacity .(
5959 Y. soil. ϑ_l,
@@ -68,21 +68,21 @@ function set_soil_initial_conditions!(
6868 regridder_type,
6969 regridder_kwargs = (; extrapolation_bc, interpolation_method),
7070 )
71- T =
72- ClimaLand. Soil. temperature_from_ρe_int .(
73- Y. soil. ρe_int,
74- Y. soil. θ_i,
75- ρc_s,
76- soil. parameters. earth_param_set,
77- )
78- T .= clip_to_bounds .(T, T_bounds[1 ], T_bounds[2 ])
79- Y. soil. ρe_int .=
80- ClimaLand. Soil. volumetric_internal_energy .(
81- Y. soil. θ_i,
82- ρc_s,
83- T,
84- soil. parameters. earth_param_set,
85- )
71+ # T =
72+ # ClimaLand.Soil.temperature_from_ρe_int.(
73+ # Y.soil.ρe_int,
74+ # Y.soil.θ_i,
75+ # ρc_s,
76+ # soil.parameters.earth_param_set,
77+ # )
78+ # T .= clip_to_bounds.(T, T_bounds[1], T_bounds[2])
79+ # Y.soil.ρe_int .=
80+ # ClimaLand.Soil.volumetric_internal_energy.(
81+ # Y.soil.θ_i,
82+ # ρc_s,
83+ # T,
84+ # soil.parameters.earth_param_set,
85+ # )
8686 return nothing
8787end
8888
@@ -247,20 +247,12 @@ function make_set_initial_state_from_file(
247247 # to soil potential (soil moisture), averaged over the soil layers,
248248 # which would correspond to approximate steady state
249249 if land. canopy. hydraulics isa ClimaLand. Canopy. PlantHydraulicsModel
250- @. p. soil. ψ = ClimaLand. Soil. pressure_head (
251- land. soil. parameters. hydrology_cm,
252- land. soil. parameters. θ_r,
253- Y. soil. ϑ_l,
254- land. soil. parameters. ν - Y. soil. θ_i,
255- land. soil. parameters. S_s,
256- )
257- ψ_roots = ClimaCore. Fields. zeros (axes (Y. canopy. hydraulics. ϑ_l.:1 ))
258- z = land. soil. domain. fields. z
259- tmp = @. ClimaLand. Canopy. root_distribution (
260- z,
261- land. canopy. biomass. rooting_depth,
262- ) * p. soil. ψ / land. soil. domain. fields. depth
263- ClimaCore. Operators. column_integral_definite! (ψ_roots, tmp)
250+ ψ_roots = SpaceVaryingInput (
251+ ic_path,
252+ " lwp" ,
253+ land. snow. domain. space. surface;
254+ regridder_type,
255+ regridder_kwargs = (; extrapolation_bc, interpolation_method))
264256 Y. canopy. hydraulics. ϑ_l.:1 .=
265257 ClimaLand. Canopy. PlantHydraulics. inverse_water_retention_curve .(
266258 land. canopy. hydraulics. parameters. retention_model,
0 commit comments