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
402a3193
Commit
402a3193
authored
9 months ago
by
Marco Matthies
Browse files
Options
Downloads
Patches
Plain Diff
Some missing ALMaSS submodule prefixes
parent
7ccf4c6f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/crop/farmplot.jl
+4
-4
4 additions, 4 deletions
src/crop/farmplot.jl
with
4 additions
and
4 deletions
src/crop/farmplot.jl
+
4
−
4
View file @
402a3193
...
...
@@ -92,7 +92,7 @@ Sow the specified crop on this farmplot.
function
sow!
(
cropname
::
String
,
farmplot
::
FarmPlot
,
model
::
SimulationModel
)
createevent!
(
model
,
farmplot
.
pixels
,
sowing
)
farmplot
.
croptype
=
model
.
crops
[
cropname
]
farmplot
.
phase
=
sow
farmplot
.
phase
=
ALMaSS
.
sow
#XXX test if the crop is sowable?
end
...
...
@@ -103,9 +103,9 @@ Harvest the crop on this farmplot.
"""
function
harvest!
(
farmplot
::
FarmPlot
,
model
::
SimulationModel
)
createevent!
(
model
,
farmplot
.
pixels
,
harvesting
)
farmplot
.
phase
in
[
harvest1
,
harvest2
]
?
farmplot
.
phase
=
harvest2
:
farmplot
.
phase
=
harvest1
farmplot
.
phase
in
[
ALMaSS
.
harvest1
,
ALMaSS
.
harvest2
]
?
farmplot
.
phase
=
ALMaSS
.
harvest2
:
farmplot
.
phase
=
ALMaSS
.
harvest1
# height & LAI will be automatically adjusted by the growth function
#TODO calculate and return yield
end
...
...
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