diff --git a/src/crop/farmplot.jl b/src/crop/farmplot.jl index 5d95d2f7912c310ee86b1539d1b7b6a23177b4a9..46a563dc2d3fdd9617be37e1c9e164923e057691 100644 --- a/src/crop/farmplot.jl +++ b/src/crop/farmplot.jl @@ -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