soil moisture stress

Author: ychnli

Artifacts.toml

@@ -184,4 +184,4 @@ git-tree-sha1 = "c35ba0e899040cb8153226ab751f69100f475d39"
 
     [[mizoguchi_soil_freezing_data.download]]
     sha256 = "0027cc080ba45ba33dc790b176ec2854353ce7dce4eae4bef72963b0dd944e0b"
-    url = "https://caltech.box.com/shared/static/tn1bnqjmegyetw5kzd2ixq5pbnb05s3u.gz"
+    url = "https://caltech.box.com/shared/static/tn1bnqjmegyetw5kzd2ixq5pbnb05s3u.gz"

docs/src/standalone/pages/vegetation/photosynthesis/pmodel.md

@@ -6,7 +6,7 @@ The P-model differs from other canopy component models in two main ways:
 
 ```julia
 # make the callback 
-pmodel_cb = ClimaLand.make_PModel_callback(FT, start_date, t0, dt, canopy)
+pmodel_cb = ClimaLand.make_PModel_callback(FT, start_date, dt, canopy)
 
 # add this callback to the CallbackSet with driver, diag
 cb = SciMLBase.CallbackSet(driver_cb, diag_cb, pmodel_cb);

docs/src/tutorials/standalone/Canopy/canopy_tutorial.jl

@@ -123,13 +123,14 @@ domain = Point(; z_sfc = FT(0.0), longlat = (long, lat));
 
 # For this canopy, we are running in standalone mode, which means we need to
 # use a prescribed soil driver, defined as follows:
-ψ_soil = FT(0.0)
+
+θ_soil = FT(0.0)
 T_soil = FT(298.0)
 ground = PrescribedGroundConditions{FT}(;
     α_PAR = FT(0.2),
     α_NIR = FT(0.4),
     T = TimeVaryingInput(t -> T_soil),
-    ψ = TimeVaryingInput(t -> ψ_soil),
+    θ = TimeVaryingInput(t -> θ_soil),
     ϵ = FT(0.99),
 );
 forcing = (; atmos, radiation, ground);

experiments/integrated/fluxnet/ozark_pmodel.jl

@@ -109,7 +109,8 @@ dt = Float64(450) # 7.5 minutes
     atmos_h,
     start_date,
     earth_param_set,
-    FT,
+    FT;
+    construct_prescribed_soil = false
 )
 
 
@@ -176,6 +177,17 @@ conductance = PModelConductance{FT}()
 # Set up photosynthesis
 photosynthesis = PModel{FT}()
 
+# Set up soil moisture stress
+soil_moisture_stress_params = PiecewiseMoistureStressParameters(
+    FT;
+    θ_c = FT(0.60),
+    θ_w = FT(0.10),
+    c = FT(1.0),
+    β0 = FT(1.0),
+)
+soil_moisture_stress =
+    PiecewiseMoistureStressModel{FT}(soil_moisture_stress_params)
+
 # Set up plant hydraulics
 # Read in LAI from MODIS data
 surface_space = land_domain.space.surface;
@@ -217,6 +229,7 @@ canopy = Canopy.CanopyModel{FT}(
     radiative_transfer,
     photosynthesis,
     conductance,
+    soil_moisture_stress,
     hydraulics,
     energy,
 )
@@ -251,19 +264,18 @@ diags = ClimaLand.default_diagnostics(
 
 ## How often we want to update the drivers.
 data_dt = Second(FluxnetSimulations.get_data_dt(site_ID))
-updateat = Array(start_date:data_dt:stop_date)
-pmodel_cb = ClimaLand.make_PModel_callback(FT, start_date, dt, land.canopy)
+updateat = Array(start_date:data_dt:end_date)
+
 simulation = LandSimulation(
     start_date,
-    stop_date,
+    end_date,
     dt,
     land;
-    user_callbacks = (pmodel_cb,),
     set_ic!,
     updateat,
     diagnostics = diags,
-);
-@time solve!(simulation)
+)
+@time sol = solve!(simulation)
 
 comparison_data = FluxnetSimulations.get_comparison_data(site_ID, time_offset)
 savedir = joinpath(