fix params [skip ci]

CliMA · Jul 7, 2024 · 2a953fe · 2a953fe
1 parent 5982a80
commit 2a953fe
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 22 deletions.
diff --git a/docs/tutorials/integrated/soil_canopy_tutorial.jl b/docs/tutorials/integrated/soil_canopy_tutorial.jl
@@ -174,7 +174,7 @@ soil_model_type = Soil.EnergyHydrology{FT}
 # The domain is defined similarly to the soil domain described above.
 soilco2_type = Soil.Biogeochemistry.SoilCO2Model{FT}
 
-soilco2_ps = SoilCO2ModelParameters(FT; ν = soil_ν);
+soilco2_ps = SoilCO2ModelParameters(FT);
 
 # soil microbes args
 Csom = (z, t) -> eltype(z)(5); # kg C m⁻³, this is a guess, not measured at the site

diff --git a/experiments/integrated/fluxnet/ozark_pft.jl b/experiments/integrated/fluxnet/ozark_pft.jl
@@ -135,10 +135,7 @@ soil_model_type = Soil.EnergyHydrology{FT}
 # Soil microbes model
 soilco2_type = Soil.Biogeochemistry.SoilCO2Model{FT}
 
-soilco2_ps = SoilCO2ModelParameters(
-    FT;
-    ν = soil_ν, # same as soil
-)
+soilco2_ps = SoilCO2ModelParameters(FT)
 
 # soil microbes args
 Csom = (z, t) -> eltype(z)(5.0)

diff --git a/experiments/integrated/fluxnet/run_fluxnet.jl b/experiments/integrated/fluxnet/run_fluxnet.jl
@@ -94,10 +94,7 @@ soil_model_type = Soil.EnergyHydrology{FT}
 # Soil microbes model
 soilco2_type = Soil.Biogeochemistry.SoilCO2Model{FT}
 
-soilco2_ps = SoilCO2ModelParameters(
-    FT;
-    ν = soil_ν, # same as soil
-)
+soilco2_ps = SoilCO2ModelParameters(FT)
 
 # soil microbes args
 Csom = (z, t) -> eltype(z)(5.0)

diff --git a/experiments/integrated/global/global_parameters.jl b/experiments/integrated/global/global_parameters.jl
@@ -188,8 +188,4 @@ z0_m = FT(0.13) * h_canopy
 z0_b = FT(0.1) * z0_m
 
 
-soilco2_ps = Soil.Biogeochemistry.SoilCO2ModelParameters(
-    FT;
-    ν = 1.0,# INCORRECT! This should be the same as the soil porosity, but
-    # currently, SoilCO2 does not support spatially varying parameters
-)
+soilco2_ps = Soil.Biogeochemistry.SoilCO2ModelParameters(FT)
diff --git a/experiments/integrated/performance/conservation/ozark_conservation_setup.jl b/experiments/integrated/performance/conservation/ozark_conservation_setup.jl
@@ -79,7 +79,7 @@ soil_model_type = Soil.EnergyHydrology{FT}
 # Soil microbes model
 soilco2_type = Soil.Biogeochemistry.SoilCO2Model{FT}
 
-soilco2_ps = SoilCO2ModelParameters(FT; ν = soil_ν)
+soilco2_ps = SoilCO2ModelParameters(FT)
 
 # soil microbes args
 Csom = (z, t) -> eltype(z)(5.0)

diff --git a/experiments/integrated/performance/profile_allocations.jl b/experiments/integrated/performance/profile_allocations.jl
@@ -226,7 +226,7 @@ soil_model_type = Soil.EnergyHydrology{FT}
 # Soil microbes model
 soilco2_type = Soil.Biogeochemistry.SoilCO2Model{FT}
 
-soilco2_ps = SoilCO2ModelParameters(FT; ν = soil_ν)
+soilco2_ps = SoilCO2ModelParameters(FT)
 
 # soil microbes args
 Csom = (z, t) -> eltype(z)(5.0)

diff --git a/lib/ClimaLandSimulations/src/Fluxnet/fluxnet_utilities/make_parameters.jl b/lib/ClimaLandSimulations/src/Fluxnet/fluxnet_utilities/make_parameters.jl
@@ -27,10 +27,8 @@ end
 # or, another example, parameters calculated from other parameters (e.g., κ_solid)
 # the structs below only contain unique params, that are given as number (not computed FTwhere)
 
-struct HeteroRespP # differs from SoilCO2ModelParameters because of porosity
-    θ_a100::FT
+struct HeteroRespP
     D_ref::FT
-    b::FT
     D_liq::FT
     α_sx::FT
     Ea_sx::FT

diff --git a/lib/ClimaLandSimulations/src/Fluxnet/run_fluxnet.jl b/lib/ClimaLandSimulations/src/Fluxnet/run_fluxnet.jl
@@ -46,10 +46,7 @@ function run_fluxnet(
 
     soilco2_ps = SoilCO2ModelParameters(
         FT;
-        ν = params.soil.ν,
-        θ_a100 = params.hetero_resp.θ_a100,
         D_ref = params.hetero_resp.D_ref,
-        b = params.hetero_resp.b,
         D_liq = params.hetero_resp.D_liq,
         # DAMM
         α_sx = params.hetero_resp.α_sx,