Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

10/10/2024 #20

Merged
merged 1 commit into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/phenology/budburst.jl
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
=========#

# Budburst only when forcing requirement met. No budburst when coppiced i.e. WS == 0.
budburst(F, Rf, bud_max, WF, coppiced) => begin
(F >= Rf) && (bud_max >= WF) && !coppiced
budburst(F, Rf, bud_max, WF) => begin
(F >= Rf) && (bud_max >= WF)
end ~ flag

# Degree units for budburst. Actual
Expand Down
1 change: 1 addition & 0 deletions src/phenology/dormancy.jl
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

DD(T_air, T_dorm): dormant_degrees => (T_air - T_dorm) ~ track(when=dormant, u"K")

# incorporate effect of day length for chilling requirement
dC(DD) ~ track(max = 0, u"K")
C(dC): chilling_accumulated ~ accumulate(when=!chilled, reset=senescent, u"K*hr")

Expand Down
1 change: 0 additions & 1 deletion src/phenology/shooting.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
shoot_max => 1e4 ~ preserve(parameter, u"kg/ha")

shooting(F, Rf, shoot_max, shoot, WS) => begin
# false
(F >= Rf) && (shoot_max >= shoot) && (WS <= shoot_max)
end ~ flag

Expand Down
4 changes: 2 additions & 2 deletions src/physiology/mortality.jl
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ This system calculate age and stress related mortality.
# Follows the "self-thinning" rule.
"Self-thinning rate"
selfThinning(accuracy, mS, stemNo, WS, wSx1000, thinPower) => begin
n = stemNo / 1000u"ha^-1"
n = stemNo / 1000u"ha^-1" # Trees density ?
x1 = mS * WS / stemNo
i = 0
while true
Expand All @@ -92,5 +92,5 @@ This system calculate age and stress related mortality.
Mortality
========#
"Tree mortality rate"
mortality(asMortality, selfThinning) => asMortality + selfThinning ~ track(u"ha^-1/hr", when=flagMortal)
mortality(asMortality, selfThinning) => asMortality + selfThinning ~ track(u"ha^-1/hr")
end
Loading