Skip to content
Snippets Groups Projects
Commit 402a3193 authored by Marco Matthies's avatar Marco Matthies
Browse files

Some missing ALMaSS submodule prefixes

parent 7ccf4c6f
No related branches found
No related tags found
No related merge requests found
...@@ -92,7 +92,7 @@ Sow the specified crop on this farmplot. ...@@ -92,7 +92,7 @@ Sow the specified crop on this farmplot.
function sow!(cropname::String, farmplot::FarmPlot, model::SimulationModel) function sow!(cropname::String, farmplot::FarmPlot, model::SimulationModel)
createevent!(model, farmplot.pixels, sowing) createevent!(model, farmplot.pixels, sowing)
farmplot.croptype = model.crops[cropname] farmplot.croptype = model.crops[cropname]
farmplot.phase = sow farmplot.phase = ALMaSS.sow
#XXX test if the crop is sowable? #XXX test if the crop is sowable?
end end
...@@ -103,9 +103,9 @@ Harvest the crop on this farmplot. ...@@ -103,9 +103,9 @@ Harvest the crop on this farmplot.
""" """
function harvest!(farmplot::FarmPlot, model::SimulationModel) function harvest!(farmplot::FarmPlot, model::SimulationModel)
createevent!(model, farmplot.pixels, harvesting) createevent!(model, farmplot.pixels, harvesting)
farmplot.phase in [harvest1, harvest2] ? farmplot.phase in [ALMaSS.harvest1, ALMaSS.harvest2] ?
farmplot.phase = harvest2 : farmplot.phase = ALMaSS.harvest2 :
farmplot.phase = harvest1 farmplot.phase = ALMaSS.harvest1
# height & LAI will be automatically adjusted by the growth function # height & LAI will be automatically adjusted by the growth function
#TODO calculate and return yield #TODO calculate and return yield
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment