Plant-Food-Research-Open · HamishBrownPFR · May 23, 2024 · May 22, 2024 · May 22, 2024 · May 23, 2024
diff --git a/Prototype_V3.4.xlsm b/Prototype_V3.4.xlsm
diff --git a/SVSModel/Data/CropCoefficientTableFull.csv b/SVSModel/Data/CropCoefficientTableFull.csv
@@ -12,6 +12,7 @@ Annual ryegrass Fodder General,8,Fodder,Grass,Annual ryegrass,General,Poaceae ,L
 Rape Fodder General,3,Fodder,Leafy brassica,Rape,General,Brassicaceae,Brassica,napus,napus,Brassica napus napus,napus napus,Seed,Oct,EarlyReproductive,Jan,6,t/ha,Standing DM,1,Dry,0,0,0.778,-0.122,0,0.1,1.2,1,2,0.8,1,2.5
 Kale Fodder General,4,Fodder,Leafy brassica,Kale,General,Brassicaceae,Brassica,oleracea,acephala,Brassica oleracea acephala,oleracea acephala,Seed,Oct,LateReproductive,Jul,16,t/ha,Standing DM,1,Dry,0,0,0.58,-0.22,0,0.1,1.2,1,2,0.8,1,2.5
 Turnip Fodder Leafy,6,Fodder,Leafy brassica,Turnip,Leafy,Brassicaceae,Brassica,rapa x napus,,Brassica rapa x napus ,rapa x napus ,Seed,Oct,Vegetative,Mar,6,t/ha,Standing DM,1,Dry,0,0,0.49,-0.21,0,0.1,1.2,1,2,0.8,1.5,3.5
+Pasture Regrowth,,Fodder,Grass,Pasture,General,,,,,,,Seedling,Apr,EarlyReproductive,Dec,3,t/ha,Standing DM,1,Dry,0,0,0.7,0,0,0.1,0.9,1,1.5,0.9,1.9,2.5
 Oat Grain General,13,Grain,Cereal,Oat,General,Poaceae ,Avena,sativa,,Avena sativa ,sativa ,Seed,May,Maturity,Feb,8,t/ha,Saleable grain ,1,Total,0,0,0.4,0.1,13,0.1,1.5,1,1,0.9,0.5,1.3
 Sunflower Grain General,17,Grain,Cereal,Sunflower,General,Asteraceae ,Helianthus,annus,,Helianthus annus ,annus ,Seed,Oct,Maturity,Mar,3,t/ha,Saleable grain ,1,Total,0,0,0.3,0.1,8,0.1,1.5,1,1,0.9,1.3,2.4
 Barley Grain General,18,Grain,Cereal,Barley,General,Poaceae ,Hordeum,vulgure,,Hordeum vulgure ,vulgure ,Seed,Sep,Maturity,Feb,10,t/ha,Saleable grain ,1,Total,0,0,0.463,0.1,13,0.1,1.2,1,1,0.9,0.5,1.2

diff --git a/SVSModel/ModelInterface.cs b/SVSModel/ModelInterface.cs
@@ -27,7 +27,7 @@ public interface IModelInterface
         /// <param name="nApplied">A dictionary of nitrogen applications</param>
         /// <param name="config">Model config object, all parameters are required</param>
         /// <returns>A list of <see cref="DailyNBalance"/> objects</returns>
-        List<DailyNBalance> GetDailyNBalance(string weatherStation, Dictionary<DateTime, double> testResults, Dictionary<DateTime, double> nApplied, Config config, double initialN);
+        List<DailyNBalance> GetDailyNBalance(string weatherStation, Dictionary<DateTime, double> testResults, Dictionary<DateTime, double> nApplied, Config config);
 
         /// <summary>
         /// Gets the crop data from the data file
@@ -39,7 +39,7 @@ public interface IModelInterface
 
     public class ModelInterface : IModelInterface
     {
-        public List<DailyNBalance> GetDailyNBalance(string weatherStation, Dictionary<DateTime, double> testResults, Dictionary<DateTime, double> nApplied, Config config, double initialN = Constants.InitialN)
+        public List<DailyNBalance> GetDailyNBalance(string weatherStation, Dictionary<DateTime, double> testResults, Dictionary<DateTime, double> nApplied, Config config)
         {
             var startDate = config.Prior.EstablishDate.AddDays(-1);
             var endDate = config.Following.HarvestDate.AddDays(2);

diff --git a/TestComponents/TestSets/Location/Outputs/ashburton_Aut.csv b/TestComponents/TestSets/Location/Outputs/ashburton_Aut.csv
diff --git a/TestComponents/TestSets/Location/Outputs/ashburton_Spr.csv b/TestComponents/TestSets/Location/Outputs/ashburton_Spr.csv
diff --git a/TestComponents/TestSets/Location/Outputs/blenheim_Aut.csv b/TestComponents/TestSets/Location/Outputs/blenheim_Aut.csv
diff --git a/TestComponents/TestSets/Location/Outputs/blenheim_Spr.csv b/TestComponents/TestSets/Location/Outputs/blenheim_Spr.csv
diff --git a/TestComponents/TestSets/Location/Outputs/hastings_Aut.csv b/TestComponents/TestSets/Location/Outputs/hastings_Aut.csv
diff --git a/TestComponents/TestSets/Location/Outputs/hastings_Spr.csv b/TestComponents/TestSets/Location/Outputs/hastings_Spr.csv
diff --git a/TestComponents/TestSets/Location/Outputs/invercargill_Aut.csv b/TestComponents/TestSets/Location/Outputs/invercargill_Aut.csv
diff --git a/TestComponents/TestSets/Location/Outputs/invercargill_Spr.csv b/TestComponents/TestSets/Location/Outputs/invercargill_Spr.csv
diff --git a/TestComponents/TestSets/Location/Outputs/kerikeri_Aut.csv b/TestComponents/TestSets/Location/Outputs/kerikeri_Aut.csv
diff --git a/TestComponents/TestSets/Location/Outputs/kerikeri_Spr.csv b/TestComponents/TestSets/Location/Outputs/kerikeri_Spr.csv
diff --git a/TestComponents/TestSets/Location/Outputs/levin_Aut.csv b/TestComponents/TestSets/Location/Outputs/levin_Aut.csv
diff --git a/TestComponents/TestSets/Location/Outputs/levin_Spr.csv b/TestComponents/TestSets/Location/Outputs/levin_Spr.csv
diff --git a/TestComponents/TestSets/Losses/Outputs/Lauder_Base.csv b/TestComponents/TestSets/Losses/Outputs/Lauder_Base.csv
diff --git a/TestComponents/TestSets/Losses/Outputs/Lauder_LowYield.csv b/TestComponents/TestSets/Losses/Outputs/Lauder_LowYield.csv
diff --git a/TestComponents/TestSets/Losses/Outputs/Lauder_Rocks.csv b/TestComponents/TestSets/Losses/Outputs/Lauder_Rocks.csv
diff --git a/TestComponents/TestSets/Losses/Outputs/Lauder_VeryDry.csv b/TestComponents/TestSets/Losses/Outputs/Lauder_VeryDry.csv
diff --git a/TestComponents/TestSets/Losses/Outputs/Lauder_VeryWet.csv b/TestComponents/TestSets/Losses/Outputs/Lauder_VeryWet.csv
diff --git a/TestComponents/TestSets/Losses/Outputs/Levin_Base.csv b/TestComponents/TestSets/Losses/Outputs/Levin_Base.csv
diff --git a/TestComponents/TestSets/Losses/Outputs/Levin_LowYield.csv b/TestComponents/TestSets/Losses/Outputs/Levin_LowYield.csv
diff --git a/TestComponents/TestSets/Losses/Outputs/Levin_Rocks.csv b/TestComponents/TestSets/Losses/Outputs/Levin_Rocks.csv
diff --git a/TestComponents/TestSets/Losses/Outputs/Levin_VeryDry.csv b/TestComponents/TestSets/Losses/Outputs/Levin_VeryDry.csv
diff --git a/TestComponents/TestSets/Losses/Outputs/Levin_VeryWet.csv b/TestComponents/TestSets/Losses/Outputs/Levin_VeryWet.csv
diff --git a/TestComponents/TestSets/Losses/Outputs/Lincoln_Base.csv b/TestComponents/TestSets/Losses/Outputs/Lincoln_Base.csv
diff --git a/TestComponents/TestSets/Losses/Outputs/Lincoln_LowYield.csv b/TestComponents/TestSets/Losses/Outputs/Lincoln_LowYield.csv
diff --git a/TestComponents/TestSets/Losses/Outputs/Lincoln_Rocks.csv b/TestComponents/TestSets/Losses/Outputs/Lincoln_Rocks.csv
diff --git a/TestComponents/TestSets/Losses/Outputs/Lincoln_VeryDry.csv b/TestComponents/TestSets/Losses/Outputs/Lincoln_VeryDry.csv
diff --git a/TestComponents/TestSets/Losses/Outputs/Lincoln_VeryWet.csv b/TestComponents/TestSets/Losses/Outputs/Lincoln_VeryWet.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/Dry_Full.csv b/TestComponents/TestSets/Moisture/Outputs/Dry_Full.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/Dry_None.csv b/TestComponents/TestSets/Moisture/Outputs/Dry_None.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/Dry_Some.csv b/TestComponents/TestSets/Moisture/Outputs/Dry_Some.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/Typical_Full.csv b/TestComponents/TestSets/Moisture/Outputs/Typical_Full.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/Typical_None.csv b/TestComponents/TestSets/Moisture/Outputs/Typical_None.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/Typical_Some.csv b/TestComponents/TestSets/Moisture/Outputs/Typical_Some.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/VeryDry_Full.csv b/TestComponents/TestSets/Moisture/Outputs/VeryDry_Full.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/VeryDry_None.csv b/TestComponents/TestSets/Moisture/Outputs/VeryDry_None.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/VeryDry_Some.csv b/TestComponents/TestSets/Moisture/Outputs/VeryDry_Some.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/VeryWet_Full.csv b/TestComponents/TestSets/Moisture/Outputs/VeryWet_Full.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/VeryWet_None.csv b/TestComponents/TestSets/Moisture/Outputs/VeryWet_None.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/VeryWet_Some.csv b/TestComponents/TestSets/Moisture/Outputs/VeryWet_Some.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/Wet_Full.csv b/TestComponents/TestSets/Moisture/Outputs/Wet_Full.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/Wet_None.csv b/TestComponents/TestSets/Moisture/Outputs/Wet_None.csv
diff --git a/TestComponents/TestSets/Moisture/Outputs/Wet_Some.csv b/TestComponents/TestSets/Moisture/Outputs/Wet_Some.csv
diff --git a/TestComponents/TestSets/Residues/Outputs/StovN0.5High.csv b/TestComponents/TestSets/Residues/Outputs/StovN0.5High.csv
diff --git a/TestComponents/TestSets/Residues/Outputs/StovN0.5Low.csv b/TestComponents/TestSets/Residues/Outputs/StovN0.5Low.csv
diff --git a/TestComponents/TestSets/Residues/Outputs/StovN1.0High.csv b/TestComponents/TestSets/Residues/Outputs/StovN1.0High.csv
diff --git a/TestComponents/TestSets/Residues/Outputs/StovN1.0Low.csv b/TestComponents/TestSets/Residues/Outputs/StovN1.0Low.csv
diff --git a/TestComponents/TestSets/Residues/Outputs/StovN1.5High.csv b/TestComponents/TestSets/Residues/Outputs/StovN1.5High.csv
diff --git a/TestComponents/TestSets/Residues/Outputs/StovN1.5Low.csv b/TestComponents/TestSets/Residues/Outputs/StovN1.5Low.csv
diff --git a/TestComponents/TestSets/Residues/Outputs/StovN3.0High.csv b/TestComponents/TestSets/Residues/Outputs/StovN3.0High.csv
diff --git a/TestComponents/TestSets/Residues/Outputs/StovN3.0Low.csv b/TestComponents/TestSets/Residues/Outputs/StovN3.0Low.csv
diff --git a/TestComponents/TestSets/Residues/Outputs/StovN4.5High.csv b/TestComponents/TestSets/Residues/Outputs/StovN4.5High.csv
diff --git a/TestComponents/TestSets/Residues/Outputs/StovN4.5Low.csv b/TestComponents/TestSets/Residues/Outputs/StovN4.5Low.csv
diff --git a/TestComponents/TestSets/WS1/FieldConfigs.csv b/TestComponents/TestSets/WS1/FieldConfigs.csv
diff --git a/TestComponents/TestSets/WS1/FieldConfigs.pkl b/TestComponents/TestSets/WS1/FieldConfigs.pkl
diff --git a/TestComponents/TestSets/WS1/FieldConfigs.xlsx b/TestComponents/TestSets/WS1/FieldConfigs.xlsx
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N1_Irr1_RyegrassRegrowth1.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N1_Irr1_RyegrassRegrowth1.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N1_Irr1_RyegrassRegrowth2.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N1_Irr1_RyegrassRegrowth2.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N1_Irr2_RyegrassRegrowth1.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N1_Irr2_RyegrassRegrowth1.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N1_Irr2_RyegrassRegrowth2.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N1_Irr2_RyegrassRegrowth2.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N1_irr1_Onion.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N1_irr1_Onion.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N1_irr1_Ryegrass.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N1_irr1_Ryegrass.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N1_irr2_Onion.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N1_irr2_Onion.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N1_irr2_Ryegrass.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N1_irr2_Ryegrass.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N2_Irr1_RyegrassRegrowth1.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N2_Irr1_RyegrassRegrowth1.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N2_Irr1_RyegrassRegrowth2.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N2_Irr1_RyegrassRegrowth2.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N2_Irr2_RyegrassRegrowth1.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N2_Irr2_RyegrassRegrowth1.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N2_Irr2_RyegrassRegrowth2.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N2_Irr2_RyegrassRegrowth2.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N2_irr1_Onion.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N2_irr1_Onion.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N2_irr1_Ryegrass.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N2_irr1_Ryegrass.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N2_irr2_Onion.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N2_irr2_Onion.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N2_irr2_Ryegrass.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N2_irr2_Ryegrass.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N3_Irr1_RyegrassRegrowth1.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N3_Irr1_RyegrassRegrowth1.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N3_Irr1_RyegrassRegrowth2.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N3_Irr1_RyegrassRegrowth2.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N3_Irr2_RyegrassRegrowth1.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N3_Irr2_RyegrassRegrowth1.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N3_Irr2_RyegrassRegrowth2.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N3_Irr2_RyegrassRegrowth2.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N3_irr1_Onion.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N3_irr1_Onion.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N3_irr1_Ryegrass.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N3_irr1_Ryegrass.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N3_irr2_Onion.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N3_irr2_Onion.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N3_irr2_Ryegrass.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N3_irr2_Ryegrass.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N4_Irr1_RyegrassRegrowth1.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N4_Irr1_RyegrassRegrowth1.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N4_Irr1_RyegrassRegrowth2.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N4_Irr1_RyegrassRegrowth2.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N4_Irr2_RyegrassRegrowth1.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N4_Irr2_RyegrassRegrowth1.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N4_Irr2_RyegrassRegrowth2.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N4_Irr2_RyegrassRegrowth2.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N4_irr1_Onion.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N4_irr1_Onion.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N4_irr1_Ryegrass.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N4_irr1_Ryegrass.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N4_irr2_Onion.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N4_irr2_Onion.csv
diff --git a/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N4_irr2_Ryegrass.csv b/TestComponents/TestSets/WS1/Outputs/HawkesBayRot3_N4_irr2_Ryegrass.csv
diff --git a/TestComponents/TestSets/WS2/FieldConfigs.csv b/TestComponents/TestSets/WS2/FieldConfigs.csv
diff --git a/TestComponents/TestSets/WS2/FieldConfigs.pkl b/TestComponents/TestSets/WS2/FieldConfigs.pkl
diff --git a/TestComponents/TestSets/WS2/FieldConfigs.xlsx b/TestComponents/TestSets/WS2/FieldConfigs.xlsx
diff --git a/TestComponents/TestSets/WS2/Outputs/1-3Oni-A.csv b/TestComponents/TestSets/WS2/Outputs/1-3Oni-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/1-4Gra-A.csv b/TestComponents/TestSets/WS2/Outputs/1-4Gra-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/1-5Gra-A.csv b/TestComponents/TestSets/WS2/Outputs/1-5Gra-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/2-1Bar-A.csv b/TestComponents/TestSets/WS2/Outputs/2-1Bar-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/2-2Oni-A.csv b/TestComponents/TestSets/WS2/Outputs/2-2Oni-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/2-3Cauli-A.csv b/TestComponents/TestSets/WS2/Outputs/2-3Cauli-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/2-4Pot-B.csv b/TestComponents/TestSets/WS2/Outputs/2-4Pot-B.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/3-1Must-A.csv b/TestComponents/TestSets/WS2/Outputs/3-1Must-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/3-2Car-A.csv b/TestComponents/TestSets/WS2/Outputs/3-2Car-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/3-3Oni-A.csv b/TestComponents/TestSets/WS2/Outputs/3-3Oni-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/3-4Oni-B.csv b/TestComponents/TestSets/WS2/Outputs/3-4Oni-B.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/4-1Pot-A.csv b/TestComponents/TestSets/WS2/Outputs/4-1Pot-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/4-2Caul-A.csv b/TestComponents/TestSets/WS2/Outputs/4-2Caul-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/4-3Maize-A.csv b/TestComponents/TestSets/WS2/Outputs/4-3Maize-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/4-4Oni-A.csv b/TestComponents/TestSets/WS2/Outputs/4-4Oni-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/4-5Lup-A.csv b/TestComponents/TestSets/WS2/Outputs/4-5Lup-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/5-1Pot-A.csv b/TestComponents/TestSets/WS2/Outputs/5-1Pot-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/5-2Oni-A.csv b/TestComponents/TestSets/WS2/Outputs/5-2Oni-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/5-3Gra-A.csv b/TestComponents/TestSets/WS2/Outputs/5-3Gra-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/5-4Pot-B.csv b/TestComponents/TestSets/WS2/Outputs/5-4Pot-B.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/6-1Maize-A.csv b/TestComponents/TestSets/WS2/Outputs/6-1Maize-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/6-2Gra-A.csv b/TestComponents/TestSets/WS2/Outputs/6-2Gra-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/6-3Cab-A.csv b/TestComponents/TestSets/WS2/Outputs/6-3Cab-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/6-4Gra-B.csv b/TestComponents/TestSets/WS2/Outputs/6-4Gra-B.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/7-1BS-A.csv b/TestComponents/TestSets/WS2/Outputs/7-1BS-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/7-2Gra-A.csv b/TestComponents/TestSets/WS2/Outputs/7-2Gra-A.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/7-3BS-B.csv b/TestComponents/TestSets/WS2/Outputs/7-3BS-B.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/7-4Gra-B.csv b/TestComponents/TestSets/WS2/Outputs/7-4Gra-B.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/7-5BS-C.csv b/TestComponents/TestSets/WS2/Outputs/7-5BS-C.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/7-6Gra-C.csv b/TestComponents/TestSets/WS2/Outputs/7-6Gra-C.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/8-0Potato.csv b/TestComponents/TestSets/WS2/Outputs/8-0Potato.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/8-1Wheat.csv b/TestComponents/TestSets/WS2/Outputs/8-1Wheat.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/8-2Peas.csv b/TestComponents/TestSets/WS2/Outputs/8-2Peas.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/8-3Oat.csv b/TestComponents/TestSets/WS2/Outputs/8-3Oat.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/9-1Pumpkin.csv b/TestComponents/TestSets/WS2/Outputs/9-1Pumpkin.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/9-2TurfGrass.csv b/TestComponents/TestSets/WS2/Outputs/9-2TurfGrass.csv
diff --git a/TestComponents/TestSets/WS2/Outputs/9-3Broccoli.csv b/TestComponents/TestSets/WS2/Outputs/9-3Broccoli.csv
diff --git a/TestComponents/TestSets/WS2/SoilData.csv b/TestComponents/TestSets/WS2/SoilData.csv
@@ -60,7 +60,6 @@ Site,Date,SoilN0_15,SoilN15_30,SoilN30_60,SoilN60_90
 2,12/10/2022,12,20,41,NA
 2,16/11/2022,9,11,41,32
 2,13/12/2022,3,12,27,23
-2,11/01/2023,301,166,70,33
 2,15/02/2023,37,38,39,63
 2,15/03/2023,29,30,80,21
 2,4/04/2023,15,12,30,66

diff --git a/TestGraphs/MakeConfigs/WS1.ipynb b/TestGraphs/MakeConfigs/WS1.ipynb
@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 19,
    "id": "5d0cd442-4d73-4aaa-90f0-63dd7945be5f",
    "metadata": {
     "tags": []
@@ -15,7 +15,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 20,
    "id": "9f1dfee6-ad9f-4a0e-8324-31498e929c91",
    "metadata": {
     "tags": []
@@ -32,7 +32,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 21,
    "id": "83ad032a-d4db-4bb3-b289-c9c5679888dc",
    "metadata": {
     "tags": []
@@ -56,7 +56,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 22,
    "id": "cb5c353f",
    "metadata": {},
    "outputs": [],
@@ -78,7 +78,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 23,
    "id": "f1eb965a-7faa-4228-8052-754213d42587",
    "metadata": {
     "tags": []
@@ -91,7 +91,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 24,
    "id": "acea3a05-e847-42d0-afa6-82245a56da6a",
    "metadata": {
     "tags": []

diff --git a/TestGraphs/MakeConfigs/WS2.ipynb b/TestGraphs/MakeConfigs/WS2.ipynb
@@ -12,7 +12,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 13,
    "id": "5d0cd442-4d73-4aaa-90f0-63dd7945be5f",
    "metadata": {
     "tags": []
@@ -25,7 +25,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 14,
    "id": "9f1dfee6-ad9f-4a0e-8324-31498e929c91",
    "metadata": {
     "tags": []
@@ -47,7 +47,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 15,
    "id": "83ad032a-d4db-4bb3-b289-c9c5679888dc",
    "metadata": {
     "tags": []
@@ -71,7 +71,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 16,
    "id": "cb5c353f",
    "metadata": {},
    "outputs": [],
@@ -86,7 +86,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 17,
    "id": "f1eb965a-7faa-4228-8052-754213d42587",
    "metadata": {
     "tags": []
@@ -99,7 +99,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 18,
    "id": "acea3a05-e847-42d0-afa6-82245a56da6a",
    "metadata": {
     "tags": []

diff --git a/TestGraphs/MakeGraphs/Moisture.ipynb b/TestGraphs/MakeGraphs/Moisture.ipynb
diff --git a/TestGraphs/MakeGraphs/Residues.ipynb b/TestGraphs/MakeGraphs/Residues.ipynb
diff --git a/TestGraphs/MakeGraphs/Residues.py b/TestGraphs/MakeGraphs/Residues.py
@@ -82,3 +82,6 @@
 ax.xaxis.set_major_formatter(mdates.DateFormatter('%#d-%b'))
 Graph.tight_layout(pad=1.5)
 plt.savefig(os.path.join(outPath, 'Residues.png'))
+# -
+
+AllData
diff --git a/TestGraphs/MakeGraphs/WS1.ipynb b/TestGraphs/MakeGraphs/WS1.ipynb
diff --git a/TestGraphs/MakeGraphs/WS2.ipynb b/TestGraphs/MakeGraphs/WS2.ipynb