try long run [skip ci]

Author: kmdeck

src/standalone/Vegetation/Canopy.jl

@@ -5,9 +5,10 @@ using Thermodynamics
 using ClimaLand
 using LazyBroadcast: lazy
 using ClimaCore
+using NCDatasets
 using ClimaCore.MatrixFields
 import ClimaCore.MatrixFields: @name, ⋅
-import ClimaUtilities.TimeVaryingInputs: AbstractTimeVaryingInput
+using ClimaUtilities.TimeVaryingInputs: AbstractTimeVaryingInput
 import ClimaUtilities.TimeManager: ITime, date
 import LinearAlgebra: I, dot
 using ClimaLand: AbstractRadiativeDrivers, AbstractAtmosphericDrivers
@@ -383,13 +384,13 @@ end
     PrescribedBiomassModel{FT}(
         domain,
         LAI::AbstractTimeVaryingInput,
-        maxLAI::Union{FT,AbstractSpaceVaryingInput},
+        maxLAI,
         toml_dict::CP.ParamDict;
-        SAI::FS = toml_dict["SAI_coeff"] .* maxLAI,
-        RAI::FS = toml_dict["RAI_coeff"] .* maxLAI,
+        SAI = toml_dict["SAI_coeff"] .* maxLAI,
+        RAI = toml_dict["RAI_coeff"] .* maxLAI,
         rooting_depth = clm_rooting_depth(domain.space.surface),
         height = toml_dict["canopy_height"]
-    ) where {FS, FT <: AbstractFloat}
+    ) where {FT <: AbstractFloat}
 
 Creates a PrescribedBiomassModel on the provided domain, using parameters from `toml_dict`,
 assuming that the SAI and RAI are computed as a linear multiple of the maximum LAI.
@@ -403,13 +404,13 @@ The following default parameters are used:
 function PrescribedBiomassModel{FT}(
     domain,
     LAI::AbstractTimeVaryingInput,
-    maxLAI::Union{FT, AbstractSpaceVaryingInput},
+    maxLAI,
     toml_dict::CP.ParamDict;
-    SAI::FS = toml_dict["SAI_coeff"] .* maxLAI,
-    RAI::FS = toml_dict["RAI_coeff"] .* maxLAI,
+    SAI = toml_dict["SAI_coeff"] .* maxLAI,
+    RAI = toml_dict["RAI_coeff"] .* maxLAI,
     rooting_depth = clm_rooting_depth(domain.space.surface),
     height = toml_dict["canopy_height"],
-) where {FS, FT <: AbstractFloat}
+) where {FT <: AbstractFloat}
     plant_area_index = PrescribedAreaIndices(LAI, SAI, RAI)
     return PrescribedBiomassModel{
         FT,

src/standalone/Vegetation/plant_hydraulics.jl

@@ -1,18 +1,6 @@
 using ClimaLand
 using ClimaLand.Soil
-using ClimaUtilities.TimeVaryingInputs
-import ClimaUtilities.TimeVaryingInputs:
-    TimeVaryingInput, AbstractTimeVaryingInput
-import ClimaUtilities.TimeManager: ITime
-import NCDatasets, ClimaCore, Interpolations # Needed to load TimeVaryingInputs
-using ..ClimaLand.Canopy: AbstractCanopyComponent
 using ClimaLand: PrescribedGroundConditions
-using ClimaCore
-import ClimaLand.Parameters as LP
-import ClimaParams as CP
-using DocStringExtensions
-using LazyBroadcast: lazy
-
 export PlantHydraulicsModel,
     AbstractPlantHydraulicsModel,
     water_flux,

toml/default_parameters.toml

@@ -87,7 +87,7 @@ description = "The linear factor multiplying the maximum LAI in a pixel to get t
 tag = "PrescribedAreaIndices"
 
 ["RAI_coeff"]
-value = 0.16
+value = 5.0
 type = "float"
 description = "The linear factor multiplying the maximum LAI in a pixel to get the root area index (RAI; m2/m2)"
 tag = "PrescribedAreaIndices"

toml/uncalibrated_parameters.toml

@@ -87,7 +87,7 @@ description = "The linear factor multiplying the maximum LAI in a pixel to get t
 tag = "PrescribedAreaIndices"
 
 ["RAI_coeff"]
-value = 0.16
+value = 5.0
 type = "float"
 description = "The linear factor multiplying the maximum LAI in a pixel to get the root area index (RAI; m2/m2)"
 tag = "PrescribedAreaIndices"