From fce41921831dd0381ffbacc241d6b1b7dff196c0 Mon Sep 17 00:00:00 2001 From: Hamish Brown Date: Thu, 13 Jun 2024 13:45:14 +1200 Subject: [PATCH 1/2] Delete redundant text --- SVSModel/Simulation.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/SVSModel/Simulation.cs b/SVSModel/Simulation.cs index a199c00..a3a8b56 100644 --- a/SVSModel/Simulation.cs +++ b/SVSModel/Simulation.cs @@ -83,11 +83,6 @@ public class Simulation //Do initial nitorgen balance with no fertiliser or resets SoilNitrogen.UpdateBalance(config.StartDate, initialN, 0, 0, ref thisSim, false, nAapplied, ScheduleFert); - //Add fertiliser that has already been applied to the N balance - //DateTime StartApplicationDate = config.StartDate; - //DateTime StartSchedullingDate = Fertiliser.startSchedullingDate(nAapplied, testResults, config); - //Fertiliser.ApplyExistingFertiliser(StartApplicationDate, StartSchedullingDate, nAapplied, ref thisSim); - //Reset soil N with test valaues SoilNitrogen.TestCorrection(testResults, ref thisSim); From 1c36fafeec008e9fa495a653f83ad4f0258ca5a3 Mon Sep 17 00:00:00 2001 From: Hamish Brown Date: Thu, 13 Jun 2024 13:45:52 +1200 Subject: [PATCH 2/2] Fix fert requirement calculation --- SVSModel/Models/Fertiliser.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SVSModel/Models/Fertiliser.cs b/SVSModel/Models/Fertiliser.cs index 82833a0..cb88e23 100644 --- a/SVSModel/Models/Fertiliser.cs +++ b/SVSModel/Models/Fertiliser.cs @@ -75,7 +75,7 @@ public static void RemainingFertiliserSchedule(DateTime startSchedulleDate,DateT for (int passes = 0; passes < 50; passes++) { double lastPassLossEst = losses; - double remainingReqN = remainingRequirement(d, endScheduleDate, thisSim, trigger) + losses; + double remainingReqN = remainingRequirement(d, endScheduleDate, thisSim, initialN) + losses; NAppn = remainingReqN / remainingSplits; SoilNitrogen.UpdateBalance(d, NAppn, initialN, initialLossEst, ref thisSim, true, new Dictionary(),true); losses = anticipatedLosses(d, endScheduleDate, thisSim.NLost); @@ -90,12 +90,12 @@ public static void RemainingFertiliserSchedule(DateTime startSchedulleDate,DateT } } - private static double remainingRequirement(DateTime startDate, DateTime endDate, SimulationType thisSim, double trigger) + private static double remainingRequirement(DateTime startDate, DateTime endDate, SimulationType thisSim, double initialN) { double remainingCropN = thisSim.CropN[endDate] - thisSim.CropN[startDate]; DateTime[] remainingDates = Functions.DateSeries(startDate, endDate); double remainingOrgN = remainingMineralisation(remainingDates, thisSim.NResidues, thisSim.NSoilOM); - double surplussMineralN = Math.Max(0, trigger - Constants.Trigger); + double surplussMineralN = Math.Max(0, initialN - Constants.Trigger); return Math.Max(0, remainingCropN - remainingOrgN - surplussMineralN); }