CliMA · Espeer5 · Feb 3, 2025 · Feb 5, 2025 · Feb 5, 2025 · Feb 5, 2025
diff --git a/docs/tutorials/integrated/soil_canopy_tutorial.jl b/docs/tutorials/integrated/soil_canopy_tutorial.jl
@@ -125,6 +125,9 @@ include(
 # [tutorial](https://clima.github.io/ClimaLand.jl/dev/generated/Soil/soil_energy_hydrology/)
 # on the model for a more detailed explanation of the soil model.
 
+# Define the discretization of the radiation spectrum used in the model:
+spectral_discretization = TwoBandSpectralDiscretization{FT}()
+
 # Define the parameters for the soil model and provide them to the model
 # parameters struct:
 
@@ -143,8 +146,7 @@ soil_vg_α = FT(0.04) # inverse meters
 z_0m_soil = FT(0.1)
 z_0b_soil = FT(0.1)
 soil_ϵ = FT(0.98)
-soil_α_PAR = FT(0.2)
-soil_α_NIR = FT(0.4)
+soil_α = FT.((0.2, 0.4))
 
 soil_domain = land_domain
 soil_ps = Soil.EnergyHydrologyParameters(
@@ -161,8 +163,7 @@ soil_ps = Soil.EnergyHydrologyParameters(
     z_0m = z_0m_soil,
     z_0b = z_0b_soil,
     emissivity = soil_ϵ,
-    PAR_albedo = soil_α_PAR,
-    NIR_albedo = soil_α_NIR,
+    albedo = soil_α,
 );
 
 soil_args = (domain = soil_domain, parameters = soil_ps)
@@ -220,12 +221,11 @@ autotrophic_respiration_args =
 radiative_transfer_args = (;
     parameters = TwoStreamParameters(
         FT;
+        spectral_discretization = spectral_discretization,
         G_Function = ConstantGFunction(FT(0.5)),
-        α_PAR_leaf = 0.1,
-        α_NIR_leaf = 0.45,
-        τ_PAR_leaf = 0.05,
-        τ_NIR_leaf = 0.25,
-        Ω = 0.69,
+        ρ_leaf = FT.((0.1, 0.45)),
+        τ_leaf = FT.((0.05, 0.25)),
+        Ω = FT(0.69),
     )
 )
 

diff --git a/docs/tutorials/standalone/Canopy/canopy_tutorial.jl b/docs/tutorials/standalone/Canopy/canopy_tutorial.jl
@@ -145,8 +145,8 @@ soil_driver = PrescribedGroundConditions(
     FT;
     root_depths = SVector{10, FT}(-(10:-1:1.0) ./ 10.0 * 2.0 .+ 0.2 / 2.0),
     ψ = t -> ψ_soil0,
-    α_PAR = FT(0.2),
-    α_NIR = FT(0.4),
+    spectral_discretization = TwoBandSpectralDiscretization{FT}(),
+    α_ground = FT.((0.2, 0.4)),
     T = t -> 298.0,
     ϵ = FT(0.99),
 );
@@ -156,11 +156,10 @@ soil_driver = PrescribedGroundConditions(
 
 rt_params = TwoStreamParameters(
     FT;
+    spectral_discretization = TwoBandSpectralDiscretization{FT}(),
     G_Function = ConstantGFunction(FT(0.5)),
-    α_PAR_leaf = FT(0.1),
-    α_NIR_leaf = FT(0.45),
-    τ_PAR_leaf = FT(0.05),
-    τ_NIR_leaf = FT(0.25),
+    ρ_leaf = FT.((0.1, 0.45)),
+    τ_leaf = FT.((0.05, 0.25)),
     Ω = FT(0.69),
     λ_γ_PAR = FT(5e-7),
 )

diff --git a/docs/tutorials/standalone/Soil/evaporation.jl b/docs/tutorials/standalone/Soil/evaporation.jl
@@ -102,8 +102,7 @@ S_s = FT(1e-3)
 ν_ss_quartz = FT(1.0)
 ν_ss_gravel = FT(0.0)
 emissivity = FT(1.0)
-PAR_albedo = FT(0.2)
-NIR_albedo = FT(0.4)
+albedo = FT.((0.2, 0.4))
 z_0m = FT(1e-3)
 z_0b = FT(1e-4)
 d_ds = FT(0.01)
@@ -117,8 +116,7 @@ params = ClimaLand.Soil.EnergyHydrologyParameters(
     K_sat,
     S_s,
     θ_r,
-    PAR_albedo,
-    NIR_albedo,
+    albedo,
     emissivity,
     z_0m,
     z_0b,

diff --git a/docs/tutorials/standalone/Soil/evaporation_gilat_loess.jl b/docs/tutorials/standalone/Soil/evaporation_gilat_loess.jl
@@ -47,8 +47,7 @@ S_s = FT(1e-3)
 ν_ss_quartz = FT(0.3)
 ν_ss_gravel = FT(0.0)
 emissivity = FT(1.0)
-PAR_albedo = FT(0.2)
-NIR_albedo = FT(0.4)
+albedo = FT.((0.2, 0.4))
 z_0m = FT(1e-3)
 z_0b = FT(1e-4)
 d_ds = FT(0.01)# 10mm
@@ -62,8 +61,7 @@ params = ClimaLand.Soil.EnergyHydrologyParameters(
     K_sat,
     S_s,
     θ_r,
-    PAR_albedo,
-    NIR_albedo,
+    albedo,
     emissivity,
     z_0m,
     z_0b,

diff --git a/docs/tutorials/standalone/Soil/sublimation.jl b/docs/tutorials/standalone/Soil/sublimation.jl
@@ -88,8 +88,7 @@ S_s = FT(1e-3)
 ν_ss_quartz = FT(1.0)
 ν_ss_gravel = FT(0.0)
 emissivity = FT(1.0)
-PAR_albedo = FT(0.2)
-NIR_albedo = FT(0.4)
+albedo = FT.((0.2, 0.4))
 z_0m = FT(1e-3)
 z_0b = FT(1e-4)
 d_ds = FT(0.01)
@@ -103,8 +102,7 @@ params = ClimaLand.Soil.EnergyHydrologyParameters(
     K_sat,
     S_s,
     θ_r,
-    PAR_albedo,
-    NIR_albedo,
+    albedo,
     emissivity,
     z_0m,
     z_0b,

diff --git a/experiments/benchmarks/land.jl b/experiments/benchmarks/land.jl
@@ -72,6 +72,8 @@ function setup_prob(t0, tf, Δt; nelements = (101, 15))
 
     start_date = DateTime(2008)
 
+    spectral_discretization = Canopy.TwoBandSpectralDiscretization{FT}()
+
     # Forcing data
     era5_artifact_path =
         ClimaLand.Artifacts.era5_land_forcing_data2008_folder_path(; context)
@@ -99,10 +101,8 @@ function setup_prob(t0, tf, Δt; nelements = (101, 15))
         K_sat,
         S_s,
         θ_r,
-        PAR_albedo_dry,
-        NIR_albedo_dry,
-        PAR_albedo_wet,
-        NIR_albedo_wet,
+        albedo_dry,
+        albedo_wet,
         f_max,
     ) = spatially_varying_soil_params
     soil_params = Soil.EnergyHydrologyParameters(
@@ -115,10 +115,9 @@ function setup_prob(t0, tf, Δt; nelements = (101, 15))
         K_sat,
         S_s,
         θ_r,
-        PAR_albedo_dry = PAR_albedo_dry,
-        NIR_albedo_dry = NIR_albedo_dry,
-        PAR_albedo_wet = PAR_albedo_wet,
-        NIR_albedo_wet = NIR_albedo_wet,
+        spectral_discretization,
+        albedo_dry,
+        albedo_wet,
     )
 
     f_over = FT(3.28) # 1/m
@@ -130,18 +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,
-        α_PAR_leaf,
-        τ_PAR_leaf,
-        α_NIR_leaf,
-        τ_NIR_leaf,
-    ) = clm_parameters
+    (; Ω, rooting_depth, is_c3, Vcmax25, g1, G_Function, ρ_leaf, τ_leaf) =
+        clm_parameters
 
     # Energy Balance model
     ac_canopy = FT(2.5e3)
@@ -218,11 +207,10 @@ function setup_prob(t0, tf, Δt; nelements = (101, 15))
     radiative_transfer_args = (;
         parameters = Canopy.TwoStreamParameters(
             FT;
+            spectral_discretization,
             Ω,
-            α_PAR_leaf,
-            τ_PAR_leaf,
-            α_NIR_leaf,
-            τ_NIR_leaf,
+            ρ_leaf,
+            τ_leaf,
             G_Function,
         )
     )

diff --git a/experiments/benchmarks/snowy_land.jl b/experiments/benchmarks/snowy_land.jl
@@ -66,6 +66,8 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (101, 15))
     surface_space = domain.space.surface
     subsurface_space = domain.space.subsurface
 
+    spectral_discretization = Canopy.TwoBandSpectralDiscretization{FT}()
+
     start_date = DateTime(2008)
     # Forcing data
     era5_artifact_path =
@@ -99,10 +101,8 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (101, 15))
         K_sat,
         S_s,
         θ_r,
-        PAR_albedo_dry,
-        NIR_albedo_dry,
-        PAR_albedo_wet,
-        NIR_albedo_wet,
+        albedo_dry,
+        albedo_wet,
         f_max,
     ) = spatially_varying_soil_params
     soil_params = Soil.EnergyHydrologyParameters(
@@ -115,10 +115,9 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (101, 15))
         K_sat,
         S_s,
         θ_r,
-        PAR_albedo_dry = PAR_albedo_dry,
-        NIR_albedo_dry = NIR_albedo_dry,
-        PAR_albedo_wet = PAR_albedo_wet,
-        NIR_albedo_wet = NIR_albedo_wet,
+        spectral_discretization,
+        albedo_dry,
+        albedo_wet,
     )
     f_over = FT(3.28) # 1/m
     R_sb = FT(1.484e-4 / 1000) # m/s
@@ -137,9 +136,8 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (101, 15))
         Vcmax25,
         g1,
         G_Function,
-        α_PAR_leaf,
-        τ_PAR_leaf,
-        α_NIR_leaf,
+        ρ_leaf,
+        ρ_leaf,
         τ_NIR_leaf,
     ) = clm_parameters
 
@@ -216,11 +214,10 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (101, 15))
     radiative_transfer_args = (;
         parameters = Canopy.TwoStreamParameters(
             FT;
+            spectral_discretization,
             Ω,
-            α_PAR_leaf,
-            τ_PAR_leaf,
-            α_NIR_leaf,
-            τ_NIR_leaf,
+            ρ_leaf,
+            τ_leaf,
             G_Function,
         )
     )

diff --git a/experiments/integrated/fluxnet/US-Ha1/US-Ha1_parameters.jl b/experiments/integrated/fluxnet/US-Ha1/US-Ha1_parameters.jl
@@ -37,10 +37,10 @@ soil_α_NIR = FT(0.2)
 Ω = FT(0.69)
 ld = FT(0.5)
 G_Function = ConstantGFunction(ld)
-α_PAR_leaf = FT(0.1)
+ρ_PAR_leaf = FT(0.1)
 λ_γ_PAR = FT(5e-7)
 τ_PAR_leaf = FT(0.05)
-α_NIR_leaf = FT(0.45)
+ρ_NIR_leaf = FT(0.45)
 τ_NIR_leaf = FT(0.25)
 ϵ_canopy = FT(0.97)
 

diff --git a/experiments/integrated/fluxnet/US-MOz/US-MOz_parameters.jl b/experiments/integrated/fluxnet/US-MOz/US-MOz_parameters.jl
@@ -36,10 +36,10 @@ soil_α_NIR = FT(0.2)
 Ω = FT(0.69)
 χl = FT(0.1)
 G_Function = CLMGFunction(χl)
-α_PAR_leaf = FT(0.1)
+ρ_PAR_leaf = FT(0.1)
 λ_γ_PAR = FT(5e-7)
 τ_PAR_leaf = FT(0.05)
-α_NIR_leaf = FT(0.45)
+ρ_NIR_leaf = FT(0.45)
 τ_NIR_leaf = FT(0.25)
 ϵ_canopy = FT(0.97)
 

diff --git a/experiments/integrated/fluxnet/US-NR1/US-NR1_parameters.jl b/experiments/integrated/fluxnet/US-NR1/US-NR1_parameters.jl
@@ -40,10 +40,10 @@ soil_α_NIR = FT(0.2)
 Ω = FT(0.71)
 ld = FT(0.5)
 G_Function = ConstantGFunction(ld)
-α_PAR_leaf = FT(0.1)
+ρ_PAR_leaf = FT(0.1)
 λ_γ_PAR = FT(5e-7)
 τ_PAR_leaf = FT(0.05)
-α_NIR_leaf = FT(0.35)
+ρ_NIR_leaf = FT(0.35)
 τ_NIR_leaf = FT(0.25)
 ϵ_canopy = FT(0.97)
 

diff --git a/experiments/integrated/fluxnet/US-Var/US-Var_parameters.jl b/experiments/integrated/fluxnet/US-Var/US-Var_parameters.jl
@@ -44,10 +44,10 @@ soil_α_NIR = FT(0.2)
 Ω = FT(1.0)
 ld = FT(0.5)
 G_Function = ConstantGFunction(ld)
-α_PAR_leaf = FT(0.11)
+ρ_PAR_leaf = FT(0.11)
 λ_γ_PAR = FT(5e-7)
 τ_PAR_leaf = FT(0.05)
-α_NIR_leaf = FT(0.35)
+ρ_NIR_leaf = FT(0.35)
 τ_NIR_leaf = FT(0.34)
 ϵ_canopy = FT(0.97)
 

diff --git a/experiments/integrated/fluxnet/ozark_pft.jl b/experiments/integrated/fluxnet/ozark_pft.jl
@@ -77,8 +77,8 @@ pft_pcts = [
 # Load the PFT parameters into the namespace
 (
     Ω,
-    α_PAR_leaf,
-    α_NIR_leaf,
+    ρ_PAR_leaf,
+    ρ_NIR_leaf,
     τ_PAR_leaf,
     τ_NIR_leaf,
     ϵ_canopy,
@@ -111,6 +111,10 @@ include(
         "experiments/integrated/fluxnet/met_drivers_FLUXNET.jl",
     ),
 )
+
+# Discretization of radiation
+spectral_discretization = ClimaLand.TwoBandSpectralDiscretization{FT}()
+
 # Now we set up the model. For the soil model, we pick
 # a model type and model args:
 soil_domain = land_domain
@@ -128,8 +132,8 @@ soil_ps = Soil.EnergyHydrologyParameters(
     z_0m = z_0m_soil,
     z_0b = z_0b_soil,
     emissivity = soil_ϵ,
-    PAR_albedo = soil_α_PAR,
-    NIR_albedo = soil_α_NIR,
+    spectral_discretization = spectral_discretization,
+    albedo = (soil_α_PAR, soil_α_NIR),
 );
 
 soil_args = (domain = soil_domain, parameters = soil_ps)
@@ -172,15 +176,16 @@ autotrophic_respiration_args =
     (; parameters = AutotrophicRespirationParameters(FT))
 # Set up radiative transfer
 G_Function = CLMGFunction(χl)
+ρ_leaf = (ρ_PAR_leaf, ρ_NIR_leaf)
+τ_leaf = (τ_PAR_leaf, τ_NIR_leaf)
 radiative_transfer_args = (;
     parameters = TwoStreamParameters(
         FT;
+        spectral_discretization,
         Ω,
         G_Function,
-        α_PAR_leaf,
-        τ_PAR_leaf,
-        α_NIR_leaf,
-        τ_NIR_leaf,
+        ρ_leaf,
+        τ_leaf,
     )
 )
 # Set up conductance