Merge pull request #34 from HamishBrownPFR/SmallerFixes

Smaller fixes
Plant-Food-Research-Open · May 21, 2024 · c5ab7c9 · c5ab7c9
2 parents 78be371 + 8c55315
commit c5ab7c9
Show file tree

Hide file tree

Showing 251 changed files with 101,674 additions and 98,916 deletions.
diff --git a/LincolnUniWheat_V3.4.xlsm b/LincolnUniWheat_V3.4.xlsm
diff --git a/Prototype_V3.4.xlsm b/Prototype_V3.4.xlsm
diff --git a/SVSModel.Excel/ExcelInterface.cs b/SVSModel.Excel/ExcelInterface.cs
@@ -54,7 +54,7 @@ public static class MyFunctions //: IMyFunctions
                 Dictionary<DateTime, double> _nApplied = Functions.dictMaker(nApplied, "Amount");
                 var _config = new Config(Functions.dictMaker(config));
 
-                return Simulation.Simulation.SimulateField(_tt, _rain, _pet, _testResults, _nApplied, _config);
+                return Simulation.Simulation.SimulateField(_tt, _rain, _pet, _testResults, _nApplied, _config, Constants.InitialN);
             }
             else
             {

diff --git a/SVSModel/Configuration/CropConfig.cs b/SVSModel/Configuration/CropConfig.cs
@@ -51,6 +51,9 @@ public double FieldYield
     public double ResStover { get; set; }
     public double ResFieldLoss { get; set; }
     public double NUptake { get; set; }
+    public double NDemand { get; set; }
+    public double ResStoverReturn { get { return ResStover * ResidueFactRetained; } }
+    public double ResFieldLossReturn { get { return ResFieldLoss * ResidueFactRetained; }}
     public CropType SimResults { get; set; }
 
     /// <summary>

diff --git a/SVSModel/Data/CropCoefficientTableFull.csv b/SVSModel/Data/CropCoefficientTableFull.csv
diff --git a/SVSModel/Data/CropCoefficients.ipynb b/SVSModel/Data/CropCoefficients.ipynb