Merge pull request #25 from HamishBrownPFR/SmallerFixes

Smaller fixes @Nibble-Byte please not I have added the weather station name into the interface. This is because the loss model has coefficients fitted for each weather station so it needs to know which weather station is being used.
Plant-Food-Research-Open · Apr 1, 2024 · d741b2c · d741b2c
2 parents a522b3c + 181c3f4
commit d741b2c
Show file tree

Hide file tree

Showing 34 changed files with 10,364 additions and 6 deletions.
diff --git a/Prototype_V3.4.xlsm b/Prototype_V3.4.xlsm
diff --git a/SVSModel.Tests/Configuration/FieldConfigTests.cs b/SVSModel.Tests/Configuration/FieldConfigTests.cs
@@ -11,6 +11,7 @@ namespace SVSModel.Tests.Configuration;
 
 public class FieldConfigTests
 {
+    private static readonly string WeatherStation = Defaults.WeatherStation;
     private static readonly string SoilCategory = Defaults.SoilCategory;
     private static readonly string Texture = Defaults.SoilTexture;
     private static readonly double PMN = Defaults.PMN;
@@ -23,6 +24,7 @@ public class FieldConfigTests
 
     private readonly Dictionary<string, object> ExcelInputDict = new()
     {
+        { "WeatherStation", WeatherStation },
         { "SoilCategory", SoilCategory },
         { "Texture", Texture },
         { "PMN", PMN },

diff --git a/SVSModel/Configuration/FieldConfig.cs b/SVSModel/Configuration/FieldConfig.cs
@@ -13,6 +13,7 @@ namespace SVSModel.Configuration
     public class FieldConfig
     {
         // Inputs
+        public string WeatherStation { get; init; }
         public string SoilCategory { get; init; }
         public string SoilTexture { get; init; }
         public double PMN { get; init; }
@@ -44,7 +45,7 @@ public FieldConfig() { }
         public FieldConfig(Dictionary<string, object> c)
         {
             // Only raw input values should be set in here
-
+            WeatherStation = c["WeatherStation"].ToString();
             SoilCategory = c["SoilCategory"].ToString();
             SoilTexture = c["Texture"].ToString();
             PMN = Functions.Num(c["PMN"]);

diff --git a/SVSModel/Data/CropCoefficientTableFull.csv b/SVSModel/Data/CropCoefficientTableFull.csv
@@ -23,7 +23,7 @@ Lentil Grain General,19,Grain,Pulse,Lentil,General,Fabaceae ,Lens,culinaris,,Len
 Linseed Grain General,20,Grain,Oilseed,Linseed,General,Linaceae ,Linum,usitatissimum,,Linum usitatissimum ,usitatissimum ,Seed,Sep,LateReproductive,Mar,2.5,t/ha,Saleable grain ,1,Total,0,0,0.208333333,0,9,0.1,1,1,1,1,1,4.3
 Bean Grain General,21,Grain,Pulse,Bean,General,Fabaceae ,Phaseolus,vulgaris,,Phaseolus vulgaris ,vulgaris ,Seed,Oct,Maturity,Mar,3.5,t/ha,Saleable grain ,1,Total,0,0,0.5,0,14,0.1,1,1,1,1.5,1.6,3.5
 Pea Grain General,22,Grain,Pulse,Pea,General,Fabaceae ,Pisum,sativum,,Pisum sativum ,sativum ,Seed,Oct,Maturity,Mar,3.5,t/ha,Saleable grain ,1,Total,0,0,0.3,0,14,0.1,0.7,1,1,1.5,1.6,4.7
-Wheat Grain Breed,23,Grain,Cereal,Wheat,Breed,Poaceae ,Triticum,astevium,,Triticum astevium ,astevium ,Seed,Apr,Maturity,Feb,10,t/ha,Saleable grain ,1,Total,0,0,0.4117,0.1,13,0.1,1.5,1,1,0.9,0.5,1.5
+Wheat Grain Breed,23,Grain,Cereal,Wheat,Bread,Poaceae ,Triticum,astevium,,Triticum astevium ,astevium ,Seed,Apr,Maturity,Feb,10,t/ha,Saleable grain ,1,Total,0,0,0.4117,0.1,13,0.1,1.5,1,1,0.9,0.5,1.5
 Wheat Grain Feed,24,Grain,Cereal,Wheat,Feed,Poaceae ,Triticum,astevium,,Triticum astevium ,astevium ,Seed,Apr,Maturity,Feb,12,t/ha,Saleable grain ,1,Total,0,0,0.4117,0.1,13,0.1,1.5,1,1,0.9,0.5,1.2
 Wheat Grain General,24,Grain,Cereal,Wheat,General,Poaceae ,Triticum,astevium,,Triticum astevium ,astevium ,Seed,Apr,Maturity,Feb,12,t/ha,Saleable grain ,1,Total,0,0,0.4117,0.1,13,0.1,1.5,1,1,0.9,0.5,1.2
 Maize Grain General,25,Grain,Cereal,Maize,General,Poaceae ,Zea,mays,,Zea mays ,mays ,Seed,Oct,Maturity,Apr,13.3,t/ha,Saleable grain ,1,Total,0,0,0.5,0,13,0.1,1.5,0.85,1,0.9,0.7,1.4