Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Persefone.jl
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Persefone
Persefone.jl
Commits
1ca5347a
Commit
1ca5347a
authored
6 months ago
by
Marco Matthies
Browse files
Options
Downloads
Patches
Plain Diff
ALMaSS crop model: rename recalculate_bugs_n_stuff! to recalculate_vegetation!
parent
7d2c01e3
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/crop/almass.jl
+3
-2
3 additions, 2 deletions
src/crop/almass.jl
with
3 additions
and
2 deletions
src/crop/almass.jl
+
3
−
2
View file @
1ca5347a
...
@@ -701,7 +701,8 @@ function stepagent!(cs::CropState, model::SimulationModel)
...
@@ -701,7 +701,8 @@ function stepagent!(cs::CropState, model::SimulationModel)
cs
.
LAtotal
=
1.1
*
cs
.
LAgreen
cs
.
LAtotal
=
1.1
*
cs
.
LAgreen
end
end
recalculate_bugs_n_stuff!
(
cs
,
model
)
# Note: calls `VegElement::RecalculateBugsNStuff()` in the original ALMaSS code
recalculate_vegetation!
(
cs
,
model
)
# TODO ignored: ResetGeese()
# TODO ignored: ResetGeese()
# TODO ignored: Deal with any possible unsprayed margin, transferring info as necessary
# TODO ignored: Deal with any possible unsprayed margin, transferring info as necessary
...
@@ -729,7 +730,7 @@ end
...
@@ -729,7 +730,7 @@ end
# Function in original ALMaSS code:
# Function in original ALMaSS code:
# `void VegElement::RecalculateBugsNStuff(void)` from `Landscape/Elements.cpp`, line 1704
# `void VegElement::RecalculateBugsNStuff(void)` from `Landscape/Elements.cpp`, line 1704
function
recalculate_
bugs_n_stuff
!
(
cs
::
CropState
,
model
::
SimulationModel
)
function
recalculate_
vegetation
!
(
cs
::
CropState
,
model
::
SimulationModel
)
# This is the heart of the dynamics of vegetation elements. It
# This is the heart of the dynamics of vegetation elements. It
# calculates vegetation cover and uses this to determine
# calculates vegetation cover and uses this to determine
# vegetation biomass. It also calculates spilled grain and goose
# vegetation biomass. It also calculates spilled grain and goose
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment