Skip to content

Commit

Permalink
edits post rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
kmdeck committed Jul 11, 2024
1 parent 92d81df commit add21e5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 13 deletions.
19 changes: 7 additions & 12 deletions experiments/long_runs/land.jl
Original file line number Diff line number Diff line change
Expand Up @@ -399,10 +399,7 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (101, 15))
z0_b = FT(0.1) * z0_m


soilco2_ps = Soil.Biogeochemistry.SoilCO2ModelParameters(
FT;
ν = 1.0,# INCORRECT!
)
soilco2_ps = Soil.Biogeochemistry.SoilCO2ModelParameters(FT)

soil_args = (domain = domain, parameters = soil_params)
soil_model_type = Soil.EnergyHydrology{FT}
Expand All @@ -421,18 +418,11 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (101, 15))
soilco2_boundary_conditions =
(; top = soilco2_top_bc, bottom = soilco2_bot_bc)

soilco2_drivers = Soil.Biogeochemistry.SoilDrivers(
Soil.Biogeochemistry.PrognosticMet{FT}(),
Soil.Biogeochemistry.PrescribedSOC{FT}(Csom),
atmos,
)

soilco2_args = (;
boundary_conditions = soilco2_boundary_conditions,
sources = soilco2_sources,
domain = domain,
parameters = soilco2_ps,
drivers = soilco2_drivers,
)

# Now we set up the canopy model, which we set up by component:
Expand Down Expand Up @@ -537,7 +527,12 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (101, 15))
)

# Integrated plant hydraulics and soil model
land_input = (atmos = atmos, radiation = radiation, runoff = runoff_model)
land_input = (
atmos = atmos,
radiation = radiation,
runoff = runoff_model,
soil_organic_carbon = Csom,
)
land = SoilCanopyModel{FT}(;
soilco2_type = soilco2_type,
soilco2_args = soilco2_args,
Expand Down
2 changes: 1 addition & 1 deletion src/diagnostics/define_diagnostics.jl
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ function define_diagnostics!(land_model)
long_name = "Soil Ice",
standard_name = "soil_ice",
units = "m^3 m^-3",
comments = "soil ice.",
comments = "soil ice.",
compute! = (out, Y, p, t) ->
compute_soil_ice!(out, Y, p, t, land_model),
)
Expand Down

0 comments on commit add21e5

Please sign in to comment.