fixingbugs

CliMA · Jul 24, 2024 · 9525d2f · 9525d2f
1 parent 602f06f
commit 9525d2f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 3 deletions.
diff --git a/docs/tutorials/integrated/soil_canopy_tutorial.jl b/docs/tutorials/integrated/soil_canopy_tutorial.jl
@@ -178,6 +178,7 @@ soilco2_ps = SoilCO2ModelParameters(FT);
 
 # Specify the spatially varying soil organic carbon as a ClimaCore field.
 # One can also specify SOC using a TimeVaryingInput, or SpaceVaryingInput (reading data from files)
+subsurface_space = soil_domain.space.subsurface
 Csom = ClimaLand.PrescribedSoilOrganicCarbon{FT}(
     ClimaCore.Fields.zeros(subsurface_space) .+ 5,
 )

diff --git a/experiments/benchmarks/land.jl b/experiments/benchmarks/land.jl
@@ -30,6 +30,7 @@ import Interpolations
 using Insolation
 
 import ClimaUtilities.TimeVaryingInputs: TimeVaryingInput
+import ClimaUtilities.SpaceVaryingInputs: SpaceVaryingInput
 import ClimaUtilities.Regridders: InterpolationsRegridder
 import ClimaUtilities.ClimaArtifacts: @clima_artifact
 import ClimaParams as CP

diff --git a/experiments/integrated/fluxnet/ozark_pft.jl b/experiments/integrated/fluxnet/ozark_pft.jl
@@ -136,7 +136,7 @@ soil_model_type = Soil.EnergyHydrology{FT}
 soilco2_type = Soil.Biogeochemistry.SoilCO2Model{FT}
 
 soilco2_ps = SoilCO2ModelParameters(FT)
-
+subsurface_space = soil_domain.space.subsurface
 Csom = ClimaLand.PrescribedSoilOrganicCarbon{FT}(
     ClimaCore.Fields.zeros(subsurface_space) .+ 5,
 )

diff --git a/experiments/integrated/fluxnet/run_fluxnet.jl b/experiments/integrated/fluxnet/run_fluxnet.jl
@@ -95,7 +95,7 @@ soil_model_type = Soil.EnergyHydrology{FT}
 soilco2_type = Soil.Biogeochemistry.SoilCO2Model{FT}
 
 soilco2_ps = SoilCO2ModelParameters(FT)
-
+subsurface_space = soil_domain.space.subsurface
 Csom = ClimaLand.PrescribedSoilOrganicCarbon{FT}(
     ClimaCore.Fields.zeros(subsurface_space) .+ 5,
 )

diff --git a/experiments/integrated/performance/conservation/ozark_conservation_setup.jl b/experiments/integrated/performance/conservation/ozark_conservation_setup.jl
@@ -82,6 +82,7 @@ soilco2_type = Soil.Biogeochemistry.SoilCO2Model{FT}
 soilco2_ps = SoilCO2ModelParameters(FT)
 
 # soil microbes args
+subsurface_space = soil_domain.space.subsurface
 Csom = ClimaLand.PrescribedSoilOrganicCarbon{FT}(
     ClimaCore.Fields.zeros(subsurface_space) .+ 5,
 )

diff --git a/experiments/integrated/performance/profile_allocations.jl b/experiments/integrated/performance/profile_allocations.jl
@@ -229,6 +229,7 @@ soilco2_type = Soil.Biogeochemistry.SoilCO2Model{FT}
 soilco2_ps = SoilCO2ModelParameters(FT)
 
 # soil microbes args
+subsurface_space = soil_domain.space.subsurface
 Csom = ClimaLand.PrescribedSoilOrganicCarbon{FT}(
     ClimaCore.Fields.zeros(subsurface_space) .+ 5,
 )

diff --git a/src/shared_utilities/drivers.jl b/src/shared_utilities/drivers.jl
@@ -911,7 +911,7 @@ Creates and returns a function which updates the driver variables
 in the case of a PrescribedSoilOrganicCarbon.
 """
 function make_update_drivers(
-    d::PrescribedSoilOrganicCarbon{FT, AbstractTimeVaryingInput},
+    d::PrescribedSoilOrganicCarbon{FT, <:AbstractTimeVaryingInput},
 ) where {FT}
     function update_drivers!(p, t)
         evaluate!(p.drivers.soc, d.soc, t)