diff --git a/src/crop/almass.jl b/src/crop/almass.jl index 92033230333a7cf194851cf5a50c03ec1769720a..5ac4c53ed22c13ab66fe9125577659fd3879b838 100644 --- a/src/crop/almass.jl +++ b/src/crop/almass.jl @@ -195,10 +195,9 @@ end Change the cropstate to sow the specified crop. """ function sow!(cs::CropState, model::SimulationModel, cropname::String) - createevent!(model, farmplot.pixels, sowing) + #XXX test if the crop is sowable? cs.croptype = model.crops[cropname] cs.phase = ALMaSS.sow - #XXX test if the crop is sowable? end """ @@ -207,7 +206,6 @@ end Harvest the crop of this cropstate. """ function harvest!(cs::CropState, model::SimulationModel) - createevent!(model, farmplot.pixels, harvesting) cs.phase in [ALMaSS.harvest1, ALMaSS.harvest2] ? cs.phase = ALMaSS.harvest2 : cs.phase = ALMaSS.harvest1 diff --git a/src/crop/farmplot.jl b/src/crop/farmplot.jl index b1c479ac16212d8c0741976f6d6dfeaeed186248..39755b5dc2c5afed7d8e9dfd5c83d7d34e14e7ed 100644 --- a/src/crop/farmplot.jl +++ b/src/crop/farmplot.jl @@ -30,9 +30,9 @@ end Sow the specified crop on the farmplot. """ function sow!(farmplot::FarmPlot, model::SimulationModel, cropname::String) + #XXX test if the crop is sowable? createevent!(model, farmplot.pixels, sowing) sow!(farmplot.crop_state, model, cropname) - #XXX test if the crop is sowable? end """