reformat

experiments/integrated/fluxnet/ozark_pft.jl

@@ -209,11 +209,8 @@ plant_hydraulics_ps = PlantHydraulics.PlantHydraulicsParameters(;
     conductivity_model = conductivity_model,
     retention_model = retention_model,
 )
-plant_hydraulics_args = (
-    parameters = plant_hydraulics_ps,
-    h_stem = h_stem,
-    h_leaf = h_leaf,
-)
+plant_hydraulics_args =
+    (parameters = plant_hydraulics_ps, h_stem = h_stem, h_leaf = h_leaf)
 
 energy_args = (parameters = Canopy.BigLeafEnergyParameters{FT}(ac_canopy),)
 

experiments/integrated/fluxnet/run_fluxnet.jl

@@ -169,11 +169,8 @@ plant_hydraulics_ps = PlantHydraulics.PlantHydraulicsParameters(;
     conductivity_model = conductivity_model,
     retention_model = retention_model,
 )
-plant_hydraulics_args = (
-    parameters = plant_hydraulics_ps,
-    h_stem = h_stem,
-    h_leaf = h_leaf,
-)
+plant_hydraulics_args =
+    (parameters = plant_hydraulics_ps, h_stem = h_stem, h_leaf = h_leaf)
 
 energy_args = (parameters = Canopy.BigLeafEnergyParameters{FT}(ac_canopy),)
 

experiments/integrated/performance/conservation/ozark_conservation_setup.jl

@@ -151,11 +151,8 @@ plant_hydraulics_ps = PlantHydraulics.PlantHydraulicsParameters(;
     conductivity_model = conductivity_model,
     retention_model = retention_model,
 )
-plant_hydraulics_args = (
-    parameters = plant_hydraulics_ps,
-    h_stem = h_stem,
-    h_leaf = h_leaf,
-)
+plant_hydraulics_args =
+    (parameters = plant_hydraulics_ps, h_stem = h_stem, h_leaf = h_leaf)
 
 # Canopy component args
 canopy_component_args = (;

experiments/integrated/performance/profile_allocations.jl

@@ -283,11 +283,8 @@ plant_hydraulics_ps = PlantHydraulics.PlantHydraulicsParameters(;
     conductivity_model = conductivity_model,
     retention_model = retention_model,
 )
-plant_hydraulics_args = (
-    parameters = plant_hydraulics_ps,
-    h_stem = h_stem,
-    h_leaf = h_leaf,
-)
+plant_hydraulics_args =
+    (parameters = plant_hydraulics_ps, h_stem = h_stem, h_leaf = h_leaf)
 
 # Canopy component args
 canopy_component_args = (;

lib/ClimaLandSimulations/src/Fluxnet/fluxnet_utilities/make_setup.jl

@@ -12,15 +12,7 @@ setup site specific domain and time stepping:
 - dt, the time step (s)
 - n, the number of time step between saving outputs
 """
-function make_setup(;
-    dz_bottom,
-    dz_top,
-    h_stem,
-    h_leaf,
-    t0,
-    dt,
-    n,
-)
+function make_setup(; dz_bottom, dz_top, h_stem, h_leaf, t0, dt, n)
     return (
         dz_bottom = dz_bottom,
         dz_top = dz_top,

lib/ClimaLandSimulations/src/Fluxnet/run_fluxnet.jl

@@ -180,11 +180,7 @@ function run_fluxnet(
         conductivity_model = params.plant_hydraulics.conductivity_model,
         retention_model = params.plant_hydraulics.retention_model,
     )
-    plant_hydraulics_args = (
-        parameters = plant_hydraulics_ps,
-        h_stem,
-        h_leaf,
-    )
+    plant_hydraulics_args = (parameters = plant_hydraulics_ps, h_stem, h_leaf)
 
     energy_args = (
         parameters = Canopy.BigLeafEnergyParameters{FT}(

src/integrated/soil_canopy_model.jl

@@ -242,7 +242,7 @@ function make_update_boundary_fluxes(
     FT,
     MM <: Soil.Biogeochemistry.SoilCO2Model{FT},
     SM <: Soil.EnergyHydrology{FT},
-    RM <: Canopy.CanopyModel{FT, PlantHydraulics.BigLeadHydraulicsModel{FT}},
+    RM <: Canopy.CanopyModel{FT, PlantHydraulics.BigLeafHydraulicsModel{FT}},
 }
     update_soil_bf! = make_update_boundary_fluxes(land.soil)
     update_soilco2_bf! = make_update_boundary_fluxes(land.soilco2)
@@ -257,18 +257,16 @@ function make_update_boundary_fluxes(
 
         area_index = p.canopy.hydraulics.area_index
 
-        labels = land.canopy.hydraulics.parameters.h_stem > 0 ? [:stem, :leaf] : [:leaf]
+        labels =
+            land.canopy.hydraulics.parameters.h_stem > 0 ? [:stem, :leaf] :
+            [:leaf]
 
-        above_ground_area_index = getproperty(
-            area_index,
-            labels[1],
-        )
+        above_ground_area_index = getproperty(area_index, labels[1])
 
         h_stem = land.canopy.hydraulics.parameters.h_stem
         h_leaf = land.canopy.hydraulics.parameters.h_leaf
 
-        midpoint =
-            labels[1] == :stem ? h_stem / 2 : model.h_leaf / 2
+        midpoint = labels[1] == :stem ? h_stem / 2 : model.h_leaf / 2
 
         @. p.root_extraction =
             (area_index.root + above_ground_area_index) / 2 *

src/standalone/Vegetation/Canopy.jl

@@ -515,8 +515,7 @@ function ClimaLand.make_update_aux(
             )
 
             areai = getproperty(area_index, labels[i])
-            areaip1 =
-                getproperty(area_index, labels[ip1])
+            areaip1 = getproperty(area_index, labels[ip1])
 
             midpoint = hydraulics.h_stem / 2
             midpointip1 = hydraulics.h_stem + (model.h_leaf / 2)

src/standalone/Vegetation/PlantHydraulics.jl

@@ -622,7 +622,7 @@ function lai_consistency_check(
     model::BigLeafHydraulicsModel{FT},
     area_index::NamedTuple{(:root, :stem, :leaf), Tuple{FT, FT, FT}},
 ) where {FT}
-    if area_index.leaf > esp(FT) || area_index.stem > eso(FT)
+    if area_index.leaf > eps(FT) || area_index.stem > eps(FT)
         @assert area_index.root > eps(FT)
     end
     # If the SAI is 0, then the stem compartment should be height 0

test/standalone/Vegetation/canopy_model.jl

@@ -382,7 +382,7 @@ for FT in (Float32, Float64)
         )
         h_stem = FT(0.0)
         h_leaf = FT(1.0)
-        
+
         plant_hydraulics = PlantHydraulics.BigLeafHydraulicsModel{FT}(;
             parameters = param_set,
             h_stem = h_stem,