From d871ef90a78c55985db8f6944655244b021f27ce Mon Sep 17 00:00:00 2001
From: Marco Matthies <71844+marcom@users.noreply.github.com>
Date: Thu, 7 Nov 2024 00:31:00 +0100
Subject: [PATCH] Revert "ALMaSS: allow choosing highnutrientcurve when calling
sow!"
This reverts commit b077630dcd8687430acf11b6659bb3a6830967fd.
---
src/crop/almass.jl | 8 ++------
src/crop/farmplot.jl | 4 ++--
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/crop/almass.jl b/src/crop/almass.jl
index c41353b..894c9e4 100644
--- a/src/crop/almass.jl
+++ b/src/crop/almass.jl
@@ -804,17 +804,13 @@ supply_global_radiation(model::SimulationModel) =
Change the cropstate to sow the specified crop.
"""
-function sow!(cs::CropState, model::SimulationModel, cropname::String;
- highnutrients::Bool=false)
+function sow!(cs::CropState, model::SimulationModel, cropname::String)
!ismissing(cs.croptype.minsowdate) && model.date < cs.croptype.minsowdate &&
@warn "$(model.date) is earlier than the minimum sowing date for $(cropname)."
- empty!(cs.events)
- if highnutrients
- push!(cs.events, fertiliser)
- end
cs.croptype = model.crops[cropname]
setphase!(cs, sow, model)
cs.mature = false
+ empty!(cs.events)
# cs.vegddegs = 0.0
# cs.ddegs = 0.0
diff --git a/src/crop/farmplot.jl b/src/crop/farmplot.jl
index d11b2ff..c44d6ad 100644
--- a/src/crop/farmplot.jl
+++ b/src/crop/farmplot.jl
@@ -36,9 +36,9 @@ end
Sow the specified crop on the farmplot.
"""
-function sow!(farmplot::FarmPlot, model::SimulationModel, cropname::String; kwargs...)
+function sow!(farmplot::FarmPlot, model::SimulationModel, cropname::String)
createevent!(model, farmplot.pixels, sowing)
- sow!(farmplot.cropstate, model, cropname; kwargs...)
+ sow!(farmplot.cropstate, model, cropname)
@debug "Farmer $(farmplot.farmer) sowed $(cropname) on farmplot $(farmplot.id)."
end
--
GitLab