first commit, wip [skip ci]

CliMA · Apr 25, 2024 · 7ce2a1e · 7ce2a1e
1 parent dc67a50
commit 7ce2a1e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/experiments/integrated/global/global_parameters.jl b/experiments/integrated/global/global_parameters.jl
@@ -133,8 +133,8 @@ S_s = ClimaCore.Fields.zeros(subsurface_space) .+ FT(1e-3)
 ν_ss_om = ClimaCore.Fields.zeros(subsurface_space) .+ FT(0.1)
 ν_ss_quartz = ClimaCore.Fields.zeros(subsurface_space) .+ FT(0.1)
 ν_ss_gravel = ClimaCore.Fields.zeros(subsurface_space) .+ FT(0.1)
-PAR_albedo = ClimaCore.Fields.zeros(subsurface_space) .+ FT(0.2)
-NIR_albedo = ClimaCore.Fields.zeros(subsurface_space) .+ FT(0.2)
+PAR_albedo = ClimaCore.Fields.zeros(surface_space) .+ FT(0.2)
+NIR_albedo = ClimaCore.Fields.zeros(surface_space) .+ FT(0.2)
 soil_params = Soil.EnergyHydrologyParameters(
     FT;
     ν,

diff --git a/experiments/integrated/global/global_soil_canopy.jl b/experiments/integrated/global/global_soil_canopy.jl
@@ -184,7 +184,6 @@ radiative_transfer_args = (;
     parameters = Canopy.TwoStreamParameters(
         FT;
         Ω,
-        ld,
         α_PAR_leaf,
         τ_PAR_leaf,
         α_NIR_leaf,
@@ -317,17 +316,17 @@ Y.soil.ϑ_l .= hydrostatic_profile.(lat, z, ν, θ_r, vg_α, vg_n, S_s, f_max)
 Y.soil.θ_i .= FT(0.0)
 T = FT(276.85)
 # Next line does not run on GPU
-#=
-ρc_s = Soil.volumetric_heat_capacity.(Y.soil.ϑ_l, Y.soil.θ_i, soil_params)
+
+ρc_s = Soil.volumetric_heat_capacity.(Y.soil.ϑ_l, Y.soil.θ_i, soil_params.ρc_ds, soil_params.earth_param_set)
 Y.soil.ρe_int .=
-        Soil.volumetric_internal_energy.(Y.soil.θ_i, ρc_s, T, soil_params)
+        Soil.volumetric_internal_energy.(Y.soil.θ_i, ρc_s, T, soil_params.earth_param_set)
 @. Y.soil.ϑ_l = oceans_to_zero(Y.soil.ϑ_l, mask)
 @. Y.soil.ρe_int = oceans_to_zero(Y.soil.ρe_int, mask)
 @. Y.soil.θ_i = oceans_to_zero(Y.soil.θ_i, mask)
 
 
 set_initial_cache! = make_set_initial_cache(land)
-exp_tendency! = make_exp_tendency(land;
+exp_tendency! = make_exp_tendency(land)
 set_initial_cache!(p, Y, t0)
 timestepper = CTS.RK4()
 ode_algo = CTS.ExplicitAlgorithm(timestepper)
@@ -357,7 +356,7 @@ cb = SciMLBase.CallbackSet(driver_cb, saving_cb)
     adaptive = false,
     saveat = saveat,
 )
-
+#=
 longpts = range(-180.0, 180.0, 101)
 latpts = range(-90.0, 90.0, 101)
 hcoords = [