From 2a953fe7562a9c927d0fab4480c75701143a7a1d Mon Sep 17 00:00:00 2001 From: kmdeck Date: Sun, 7 Jul 2024 13:14:31 -0700 Subject: [PATCH] fix params [skip ci] --- docs/tutorials/integrated/soil_canopy_tutorial.jl | 2 +- experiments/integrated/fluxnet/ozark_pft.jl | 5 +---- experiments/integrated/fluxnet/run_fluxnet.jl | 5 +---- experiments/integrated/global/global_parameters.jl | 6 +----- .../performance/conservation/ozark_conservation_setup.jl | 2 +- experiments/integrated/performance/profile_allocations.jl | 2 +- .../src/Fluxnet/fluxnet_utilities/make_parameters.jl | 4 +--- lib/ClimaLandSimulations/src/Fluxnet/run_fluxnet.jl | 3 --- 8 files changed, 7 insertions(+), 22 deletions(-) diff --git a/docs/tutorials/integrated/soil_canopy_tutorial.jl b/docs/tutorials/integrated/soil_canopy_tutorial.jl index ec462b8b25..ed52d28940 100644 --- 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 index 91245bed5c..3ccde05c20 100644 --- 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 index 916bf1a051..d802db5b5f 100644 --- 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 index 79e3c5c485..56fe6fb824 100644 --- 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 index ba3006a2da..b40f34c80c 100644 --- 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 index 61a0c58680..e9b898383c 100644 --- 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 index 965495a5be..9f8913180f 100644 --- 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 index 0285b5a475..e5920a746c 100644 --- 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,