Skip to content

Commit 9a08e8d

Browse files
committed
add theta_res for Campbell
1 parent 14e9de1 commit 9a08e8d

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ docs/backup
44
*.sh
55
backup
66
.worktree
7+
.vscode

src/Model_SoilDiffEqs.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ end
2525

2626
@bounds @units @with_kw mutable struct Campbell{T<:Real} <: AbstractRetention{T}
2727
θ_sat::T = 0.287 | (0.25, 0.50) | "m3 m-3"
28+
θ_res::T = 0.075 | nothing | "m3 m-3" # [m3 m-3] # not used in Campbell, but for BEPS
2829
ψ_sat::T = -10.0 | (-100.0, -5.0) | "cm"
29-
Ksat::T = 34.0 | nothing | "cm h-1" # [cm h-1]; overridden by kv_profile when set
30+
Ksat::T = 34.0 | nothing | "cm h-1" # [cm h-1]; overridden by kv_profile when set
3031
b::T = 4.0 | (2.0, 15.0) | "-"
3132
θ_fc::T = 0.2 | nothing | "m3 m-3" # field capacity, optional
3233
end

test/test-Kv_profile.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ end
8585
par = Campbell(θ_sat=0.4, ψ_sat=-10.0, Ksat=10.0, b=4.0)
8686
kv2 = KvExp(kv=10.0, f=0.01)
8787
dz = [20.0, 20.0, 20.0] # [cm]
88-
# ps = SoilModel(par, 3; kv_profile=kv2, dz_cm=dz)
88+
# ps = SoilColumn(par, 3; kv_profile=kv2, dz_cm=dz)
8989
# for i in 1:3
9090
# z1_cm = (i - 1) * 20.0
9191
# z2_cm = i * 20.0
@@ -165,7 +165,7 @@ end
165165
# @test params.path == [[:kv, 1], [:kv, 2], [:kv, 3], [:f, 1], [:f, 2], [:f, 3]]
166166

167167
# par = Campbell(θ_sat=0.4, ψ_sat=-10.0, Ksat=10.0, b=4.0)
168-
# ps = SoilModel(par, 3; kv_profile=kv, nlayers_kv=2, dz_cm=[20.0, 20.0, 20.0])
168+
# ps = SoilColumn(par, 3; kv_profile=kv, nlayers_kv=2, dz_cm=[20.0, 20.0, 20.0])
169169
# @test ps.kv_profile isa AbstractKvLayers
170170
# @test get_params(ps, :kv_profile).value == params.value
171171
# end

0 commit comments

Comments
 (0)