clm parameters to tuples

Author: Espeer5

experiments/benchmarks/land.jl

@@ -129,16 +129,8 @@ function setup_prob(t0, tf, Δt; nelements = (101, 15))
     )
     # Spatially varying canopy parameters from CLM
     clm_parameters = ClimaLand.clm_canopy_parameters(surface_space)
-    (;
-        Ω,
-        rooting_depth,
-        is_c3,
-        Vcmax25,
-        g1,
-        G_Function,
-        ρ_leaf,
-        τ_leaf,
-    ) = clm_parameters
+    (; Ω, rooting_depth, is_c3, Vcmax25, g1, G_Function, ρ_leaf, τ_leaf) =
+        clm_parameters
 
     # Energy Balance model
     ac_canopy = FT(2.5e3)

experiments/integrated/global/global_parameters.jl

@@ -41,16 +41,8 @@ runoff_model = ClimaLand.Soil.Runoff.TOPMODELRunoff{FT}(;
 
 # Spatially varying canopy parameters from CLM
 clm_parameters = ClimaLand.clm_canopy_parameters(surface_space)
-(;
-    Ω,
-    rooting_depth,
-    is_c3,
-    Vcmax25,
-    g1,
-    G_Function,
-    ρ_leaf,
-    τ_leaf,
-) = clm_parameters
+(; Ω, rooting_depth, is_c3, Vcmax25, g1, G_Function, ρ_leaf, τ_leaf) =
+    clm_parameters
 # Energy Balance model
 ac_canopy = FT(2.5e3)
 # Plant Hydraulics and general plant parameters

experiments/integrated/global/global_soil_canopy.jl

@@ -64,7 +64,7 @@ atmos, radiation = ClimaLand.prescribed_forcing_era5(
     time_interpolation_method = time_interpolation_method,
 )
 
-# Discretization of radiationi
+# Discretization of radiation
 spectral_discretization = ClimaLand.TwoBandSpectralDiscretization{FT}()
 
 include(
@@ -111,8 +111,6 @@ canopy_component_types = (;
 autotrophic_respiration_args =
     (; parameters = Canopy.AutotrophicRespirationParameters(FT))
 # Set up radiative transfer
-ρ_leaf = @. (ρ_PAR_leaf, ρ_NIR_leaf)
-τ_leaf = @. (τ_PAR_leaf, τ_NIR_leaf)
 radiative_transfer_args = (;
     parameters = Canopy.TwoStreamParameters(
         FT;

experiments/long_runs/land.jl

@@ -129,16 +129,8 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (101, 15))
 
     # Spatially varying canopy parameters from CLM
     clm_parameters = ClimaLand.clm_canopy_parameters(surface_space)
-    (;
-        Ω,
-        rooting_depth,
-        is_c3,
-        Vcmax25,
-        g1,
-        G_Function,
-        ρ_leaf,
-        τ_leaf,
-    ) = clm_parameters
+    (; Ω, rooting_depth, is_c3, Vcmax25, g1, G_Function, ρ_leaf, τ_leaf) =
+        clm_parameters
 
     # Energy Balance model
     ac_canopy = FT(2.5e3)

experiments/long_runs/land_region.jl

@@ -134,16 +134,8 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (10, 10, 15))
 
     # Spatially varying canopy parameters from CLM
     clm_parameters = ClimaLand.clm_canopy_parameters(surface_space)
-    (;
-        Ω,
-        rooting_depth,
-        is_c3,
-        Vcmax25,
-        g1,
-        G_Function,
-        ρ_leaf,
-        τ_leaf,
-    ) = clm_parameters
+    (; Ω, rooting_depth, is_c3, Vcmax25, g1, G_Function, ρ_leaf, τ_leaf) =
+        clm_parameters
     # Energy Balance model
     ac_canopy = FT(2.5e3)
     # Plant Hydraulics and general plant parameters

experiments/long_runs/snowy_land.jl

@@ -134,16 +134,8 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (101, 15))
 
     # Spatially varying canopy parameters from CLM
     clm_parameters = ClimaLand.clm_canopy_parameters(surface_space)
-    (;
-        Ω,
-        rooting_depth,
-        is_c3,
-        Vcmax25,
-        g1,
-        G_Function,
-        ρ_leaf,
-        τ_leaf,
-    ) = clm_parameters
+    (; Ω, rooting_depth, is_c3, Vcmax25, g1, G_Function, ρ_leaf, τ_leaf) =
+        clm_parameters
 
     # Energy Balance model
     ac_canopy = FT(2.5e3)

src/simulations/spatial_parameters.jl

@@ -73,23 +73,37 @@ function clm_canopy_parameters(
         regridder_kwargs = (; extrapolation_bc,),
     )
     G_Function = CLMGFunction(χl)
-    compose_function = (PAR, NIR) -> (PAR, NIR)
-    ρ_leaf = SpaceVaryingInput(
+    ρ_PAR_leaf = SpaceVaryingInput(
         joinpath(clm_artifact_path, "vegetation_properties_map.nc"),
-        ["rholvis", "rholnir"],
+        "rholvis",
         surface_space;
         regridder_type,
         regridder_kwargs = (; extrapolation_bc,),
-        compose_function,
     )
-    τ_leaf = SpaceVaryingInput(
+    ρ_NIR_leaf = SpaceVaryingInput(
         joinpath(clm_artifact_path, "vegetation_properties_map.nc"),
-        ["taulvis", "taulnir"],
+        "rholnir",
         surface_space;
         regridder_type,
         regridder_kwargs = (; extrapolation_bc,),
-        compose_function,
     )
+    τ_PAR_leaf = SpaceVaryingInput(
+        joinpath(clm_artifact_path, "vegetation_properties_map.nc"),
+        "taulvis",
+        surface_space;
+        regridder_type,
+        regridder_kwargs = (; extrapolation_bc,),
+    )
+    τ_NIR_leaf = SpaceVaryingInput(
+        joinpath(clm_artifact_path, "vegetation_properties_map.nc"),
+        "taulnir",
+        surface_space;
+        regridder_type,
+        regridder_kwargs = (; extrapolation_bc,),
+    )
+    to_tuple_valued_field = (PAR, NIR) -> (PAR, NIR)
+    ρ_leaf = to_tuple_valued_field.(ρ_PAR_leaf, ρ_NIR_leaf)
+    τ_leaf = to_tuple_valued_field.(τ_PAR_leaf, τ_NIR_leaf)
     # Conductance Model
     # g1 is read in units of sqrt(kPa) and then converted to sqrt(Pa)
     g1 = SpaceVaryingInput(
@@ -352,6 +366,9 @@ function default_spatially_varying_soil_parameters(
             "NIR_albedo_wet",
         ),
     )
+    to_tuple_valued_field = (PAR, NIR) -> (PAR, NIR)
+    albedo_dry = to_tuple_valued_field.(PAR_albedo_dry, NIR_albedo_dry)
+    albedo_wet = to_tuple_valued_field.(PAR_albedo_wet, NIR_albedo_wet)
 
     return (;
         ν = ν,
@@ -362,8 +379,8 @@ function default_spatially_varying_soil_parameters(
         K_sat = K_sat,
         S_s = S_s,
         θ_r = θ_r,
-        albedo_wet = (PAR_albedo_wet, NIR_albedo_wet),
-        albedo_dry = (PAR_albedo_dry, NIR_albedo_dry),
+        albedo_wet = albedo_wet,
+        albedo_dry = albedo_dry,
         f_max = f_max,
         mask = mask,
     )

test/simulations/spatial_parameters.jl

@@ -73,24 +73,13 @@ clm_parameters = ClimaLand.clm_canopy_parameters(
     regridder_type = regridder_type,
     extrapolation_bc = extrapolation_bc,
 )
-param_names = (
-    :Ω,
-    :rooting_depth,
-    :is_c3,
-    :Vcmax25,
-    :g1,
-    :ρ_leaf,
-    :τ_leaf,
-)
-param_names_banded = (
-    :ρ_leaf,
-    :τ_leaf,
-)
+param_names = (:Ω, :rooting_depth, :is_c3, :Vcmax25, :g1, :ρ_leaf, :τ_leaf)
+param_names_banded = (:ρ_leaf, :τ_leaf)
 for p in param_names
     @test p ∈ propertynames(clm_parameters)
     @test axes(getproperty(clm_parameters, p)) == surface_space
 end
-for p in param_nams_banded
+for p in param_names_banded
     @test p ∈ propertynames(clm_parameters)
     nbands = length(getproperty(clm_parameters, p))
     for i in 1:nbands