Repair a ton of issues

Author: Espeer5

docs/tutorials/standalone/Canopy/canopy_tutorial.jl

@@ -146,7 +146,7 @@ soil_driver = PrescribedGroundConditions(
     root_depths = SVector{10, FT}(-(10:-1:1.0) ./ 10.0 * 2.0 .+ 0.2 / 2.0),
     ψ = t -> ψ_soil0,
     spectral_discretization = TwoBandSpectralDiscretization{FT}(),
-    α_ground = FT.(0.2, 0.4),
+    α_ground = FT.((0.2, 0.4)),
     T = t -> 298.0,
     ϵ = FT(0.99),
 );

experiments/standalone/Vegetation/no_vegetation.jl

@@ -62,7 +62,7 @@ soil_driver = PrescribedGroundConditions(
     root_depths = SVector{10, FT}(-(10:-1:1.0) ./ 10.0 * 2.0 .+ 0.2 / 2.0),
     ψ = t -> ψ_soil0,
     spectral_discretization = spectral_discretization,
-    α_ground = FT.(0.2, 0.4),
+    α_ground = FT.((0.2, 0.4)),
     T = t -> 298.0,
     ϵ = FT(0.99),
 );

experiments/standalone/Vegetation/timestep_test.jl

@@ -101,7 +101,7 @@ soil_driver = PrescribedGroundConditions(
     root_depths = SVector{10, FT}(-(10:-1:1.0) ./ 10.0 * 2.0 .+ 0.2 / 2.0),
     ψ = t -> ψ_soil0,
     spectral_discretization = spectral_discretization,
-    α_ground = FT.(0.2, 0.4),
+    α_ground = FT.((0.2, 0.4)),
     T = t -> 298.0,
     ϵ = FT(0.99),
 );

experiments/standalone/Vegetation/varying_lai.jl

@@ -60,7 +60,7 @@ soil_driver = PrescribedGroundConditions(
     root_depths = SVector{10, FT}(-(10:-1:1.0) ./ 10.0 * 2.0 .+ 0.2 / 2.0),
     ψ = t -> ψ_soil0,
     spectral_discretization = TwoBandSpectralDiscretization{FT}(),
-    α_ground = FT.(0.2, 0.4),
+    α_ground = FT.((0.2, 0.4)),
     T = t -> 298.0,
     ϵ = FT(0.99),
 );

experiments/standalone/Vegetation/varying_lai_with_stem.jl

@@ -62,7 +62,7 @@ soil_driver = PrescribedGroundConditions(
     root_depths = SVector{10, FT}(-(10:-1:1.0) ./ 10.0 * 2.0 .+ 0.2 / 2.0),
     ψ = t -> ψ_soil0,
     spectral_discretization = spectral_discretization,
-    α_ground = FT.(0.2, 0.4),
+    α_ground = FT.((0.2, 0.4)),
     T = t -> 298.0,
     ϵ = FT(0.99),
 );

ext/CreateParametersExt.jl

@@ -624,12 +624,21 @@ function TwoStreamParameters(
     FT = CP.float_type(toml_dict)
     # default value for keyword args must be converted manually
     # automatic conversion not possible to Union types
-    ρ_leaf = FT.(ρ_leaf)
-    τ_leaf = FT.(τ_leaf)
+    if typeof(ρ_leaf) <: Tuple
+        ρ_leaf = FT.(ρ_leaf)
+        τ_leaf = FT.(τ_leaf)
+    end
+    
     if (isnothing(spectral_discretization))
         spectral_discretization = TwoBandSpectralDiscretization{FT}()
     end
-    return TwoStreamParameters{FT, typeof(spectral_discretization), typeof(G_Function), typeof(Ω), typeof(ρ_leaf)}(;
+    return TwoStreamParameters{
+        FT,
+        typeof(spectral_discretization),
+        typeof(G_Function),
+        typeof(Ω),
+        typeof(ρ_leaf),
+    }(;
         G_Function,
         spectral_discretization,
         ρ_leaf,
@@ -678,12 +687,20 @@ function BeerLambertParameters(
     FT = CP.float_type(toml_dict)
     # default value for keyword args must be converted manually
     # automatic conversion not possible to Union types
-    ρ_leaf = FT.(ρ_leaf)
+    if typeof(ρ_leaf) <: Tuple
+        ρ_leaf = FT.(ρ_leaf)
+    end
     if (isnothing(spectral_discretization))
         spectral_discretization = TwoBandSpectralDiscretization{FT}()
     end
-    return BeerLambertParameters{FT, typeof(spectral_discretization), typeof(G_Function), typeof(ρ_leaf)}(;
+    return BeerLambertParameters{
+        FT,
+        typeof(spectral_discretization),
+        typeof(G_Function),
+        typeof(ρ_leaf),
+    }(;
         G_Function,
+        spectral_discretization,
         ρ_leaf,
         Ω,
         parameters...,

src/standalone/Vegetation/Canopy.jl

@@ -442,7 +442,6 @@ function ClimaLand.make_update_aux(
         thermo_params = earth_param_set.thermo_params
         (; spectral_discretization, G_Function, Ω, λ_γ_PAR) =
             canopy.radiative_transfer.parameters
-        nbands = length(spectral_discretization.λ) - 1
         energy_per_mole_photon_par = planck_h * c / λ_γ_PAR * N_a
         (; g1, g0, Drel) = canopy.conductance.parameters
         area_index = p.canopy.hydraulics.area_index
@@ -457,8 +456,8 @@ function ClimaLand.make_update_aux(
             (1 - exp(-(LAI + SAI))) #from CLM 5.0, Tech note 4.20
         p.canopy.radiative_transfer.G .= compute_G(G_Function, θs)
         RT = canopy.radiative_transfer
-        compute_PAR!(par_d, RT, bc.radiation, p, t)
-        compute_NIR!(nir_d, RT, bc.radiation, p, t)
+        banded_sw_d = (sw_d) -> sw_d .* RT.parameters.spectral_discretization.I
+        @. SW_d.= banded_sw_d(p.drivers.SW_d)
         K = p.canopy.radiative_transfer.K
         @. K = extinction_coeff(p.canopy.radiative_transfer.G, θs)
         DOY =
@@ -490,10 +489,9 @@ function ClimaLand.make_update_aux(
         )
 
         # Extract PAR radiation from radiative transfer output
-        faPAR = sum(
-            spectral_discretization.PAR_proportions .*
-            ntuple((i) -> p.canopy.radiative_transfer.rt[i].abs, nbands),
-        )
+        get_PAR = (rt) -> sum(map(x -> x.abs, rt) .* spectral_discretization.PAR_proportions)
+        faPAR = get_PAR.(p.canopy.radiative_transfer.rt)
+
 
         # update plant hydraulics aux
         hydraulics = canopy.hydraulics
@@ -560,6 +558,8 @@ function ClimaLand.make_update_aux(
 
         # Update Rd, An, Vcmax25 (if applicable to model) in place
         Vcmax25 = p.canopy.photosynthesis.Vcmax25
+        get_par_d = (sw_d) -> sum(sw_d .* spectral_discretization.PAR_proportions)
+        par_d = get_par_d.(SW_d)
         update_photosynthesis!(
             Rd,
             An,