Merge pull request #6698 from jbrider/sorghum/refactor

reorganizing code to current standards
APSIMInitiative · Aug 10, 2021 · f8156ae · f8156ae
2 parents 832dac4 + 07ab592
commit f8156ae
Show file tree

Hide file tree

Showing 4 changed files with 1,020 additions and 1,156 deletions.
diff --git a/Models/PMF/Arbitrator/Methods/C4NitrogenUptakeMethod.cs b/Models/PMF/Arbitrator/Methods/C4NitrogenUptakeMethod.cs
@@ -97,7 +97,7 @@ public List<ZoneWaterAndN> GetUptakeEstimates(SoilState soilstate, IArbitration[
             var grainDemand = N.StructuralDemand[grainIndex] + N.MetabolicDemand[grainIndex];
             //have to correct the leaf demand calculation
             var leaf = Organs[leafIndex] as SorghumLeaf;
-            var leafAdjustment = leaf.calculateClassicDemandDelta();
+            var leafAdjustment = leaf.CalculateClassicDemandDelta();
 
             //double NDemand = (N.TotalPlantDemand - N.TotalReallocation) / kgha2gsm * Plant.Zone.Area; //NOTE: This is in kg, not kg/ha, to arbitrate N demands for spatial simulations.
             //old sorghum uses g/m^2 - need to convert after it is used to calculate actual diffusion

diff --git a/Models/PMF/Arbitrator/SorghumArbitratorN.cs b/Models/PMF/Arbitrator/SorghumArbitratorN.cs
@@ -57,7 +57,7 @@ public void DoAllocation(IArbitration[] Organs, double TotalSupply, ref double T
 
             //calc leaf demand separately - old sorghum doesn't quite fit
             var leaf = Organs[leafIndex] as SorghumLeaf;
-            var leafAdjustment = leaf.calculateClassicDemandDelta();
+            var leafAdjustment = leaf.CalculateClassicDemandDelta();
 
             //var totalPlantNDemand = BAT.TotalPlantDemand + leafAdjustment - grainDemand; // to replicate calcNDemand in old sorghum 
 
@@ -284,7 +284,7 @@ public double AllocateStructuralFromLeaf(SorghumLeaf leaf, int iSupply, int iSin
             if (MathUtilities.IsPositive(StructuralRequirement))
             {
                 bool forLeaf = iSupply == iSink;
-                double providedN = leaf.provideNRetranslocation(BAT, StructuralRequirement, forLeaf);
+                double providedN = leaf.ProvideNRetranslocation(BAT, StructuralRequirement, forLeaf);
                 BAT.StructuralAllocation[iSink] += providedN;
 
                 // Leaf's dltRetranslocatedN is negative (as in old apsim).