9434 Accumulate Function Resetting at Harvest

Models/Functions/AccumulateByNumericPhase.cs

@@ -113,8 +113,8 @@ private void OnCut(object sender, EventArgs e)
         /// <summary>Called when [cut].</summary>
         /// <param name="sender">The sender.</param>
         /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
-        [EventSubscribe("Harvesting")]
-        private void OnHarvest(object sender, EventArgs e)
+        [EventSubscribe("PostHarvesting")]
+        private void OnPostHarvesting(object sender, EventArgs e)
         {
             AccumulatedValue -= FractionRemovedOnHarvest * AccumulatedValue;
         }

Models/Functions/AccumulateFunction.cs

@@ -127,8 +127,8 @@ private void OnCut(object sender, EventArgs e)
         /// <summary>Called when harvest.</summary>
         /// <param name="sender">The sender.</param>
         /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
-        [EventSubscribe("Harvesting")]
-        private void OnHarvest(object sender, EventArgs e)
+        [EventSubscribe("PostHarvesting")]
+        private void OnPostHarvesting(object sender, EventArgs e)
         {
             AccumulatedValue -= FractionRemovedOnHarvest * AccumulatedValue;
         }

Models/PMF/BiomassArbitration/Organ.cs

@@ -20,8 +20,6 @@ namespace Models.PMF
 
     public class Organ : Model, IOrgan, IHasDamageableBiomass
     {
-        ///0. Redundant satisification of IOrgan
-        ///--------------------------------------------------------------------------------------------------
         /// <summary>Harvest the organ.</summary>
         /// <returns>The amount of biomass (live+dead) removed from the plant (g/m2).</returns>
         public double Harvest()
@@ -388,6 +386,15 @@ protected void OnPlantSowing(object sender, SowingParameters data)
             }
         }
 
+        /// <summary>Called when crop is harvested</summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
+        [EventSubscribe("PostHarvesting")]
+        protected void OnPostHarvesting(object sender, EventArgs e)
+        {
+            Harvest();
+        }
+
         /// <summary>
         /// set initial biomass for organ
         /// </summary>

Models/PMF/Organs/GenericOrgan.cs

@@ -563,5 +563,14 @@ protected void OnPlantEnding(object sender, EventArgs e)
 
             Clear();
         }
+
+        /// <summary>Called when crop is harvested</summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
+        [EventSubscribe("PostHarvesting")]
+        protected void OnPostHarvesting(object sender, EventArgs e)
+        {
+            Harvest();
+        }
     }
 }

Models/PMF/Organs/HIReproductiveOrgan.cs

@@ -194,6 +194,15 @@ private void OnPlantEnding(object sender, EventArgs e)
             Clear();
         }
 
+        /// <summary>Called when crop is harvested</summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
+        [EventSubscribe("PostHarvesting")]
+        protected void OnPostHarvesting(object sender, EventArgs e)
+        {
+            Harvest();
+        }
+
         /// <summary>Gets the hi.</summary>
         /// <value>The hi.</value>
         public double HI

Models/PMF/Organs/Leaf.cs

@@ -1890,6 +1890,15 @@ private void OnHarvesting(object sender, EventArgs e)
             CohortsAtInitialisation = 0;
         }
 
+        /// <summary>Called when crop is harvested</summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
+        [EventSubscribe("PostHarvesting")]
+        protected void OnPostHarvesting(object sender, EventArgs e)
+        {
+            Harvest();
+        }
+
         /// <summary>Called when [do daily initialisation].</summary>
         /// <param name="sender">The sender.</param>
         /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>

Models/PMF/Organs/Nodule.cs

@@ -581,5 +581,14 @@ protected void OnPlantEnding(object sender, EventArgs e)
             Clear();
         }
 
+        /// <summary>Called when crop is harvested</summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
+        [EventSubscribe("PostHarvesting")]
+        protected void OnPostHarvesting(object sender, EventArgs e)
+        {
+            Harvest();
+        }
+
     }
 }

Models/PMF/Organs/PerennialLeaf.cs

@@ -672,6 +672,15 @@ protected void OnPlantEnding(object sender, EventArgs e)
             Clear();
         }
 
+        /// <summary>Called when crop is harvested</summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
+        [EventSubscribe("PostHarvesting")]
+        protected void OnPostHarvesting(object sender, EventArgs e)
+        {
+            Harvest();
+        }
+
         /// <summary>Called when [phase changed].</summary>
         /// <param name="phaseChange">The phase change.</param>
         /// <param name="sender">Sender plant.</param>

Models/PMF/Organs/ReproductiveOrgan.cs

@@ -321,6 +321,16 @@ private void OnDoActualPlantGrowth(object sender, EventArgs e)
             if (Phenology.OnStartDayOf(RipeStage))
                 _ReadyForHarvest = true;
         }
+
+        /// <summary>Called when crop is harvested</summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
+        [EventSubscribe("PostHarvesting")]
+        protected void OnPostHarvesting(object sender, EventArgs e)
+        {
+            Harvest();
+        }
+
         /// <summary>Sets the dry matter potential allocation.</summary>
         public void SetDryMatterPotentialAllocation(BiomassPoolType dryMatter)
         {

Models/PMF/Organs/Root.cs

@@ -1122,6 +1122,13 @@ private void OnPlantEnding(object sender, EventArgs e)
             Clear();
         }
 
-
+        /// <summary>Called when crop is harvested</summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
+        [EventSubscribe("PostHarvesting")]
+        protected void OnPostHarvesting(object sender, EventArgs e)
+        {
+            Harvest();
+        }
     }
 }

Models/PMF/Organs/SimpleLeaf.cs

@@ -987,6 +987,15 @@ protected void OnPlantEnding(object sender, EventArgs e)
             Clear();
         }
 
+        /// <summary>Called when crop is harvested</summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
+        [EventSubscribe("PostHarvesting")]
+        protected void OnPostHarvesting(object sender, EventArgs e)
+        {
+            Harvest();
+        }
+
         /// <summary>Remove biomass from organ.</summary>
         /// <param name="liveToRemove">Fraction of live biomass to remove from simulation (0-1).</param>
         /// <param name="deadToRemove">Fraction of dead biomass to remove from simulation (0-1).</param>

Models/PMF/Organs/SorghumLeaf.cs

@@ -1351,5 +1351,14 @@ private void DoPlantEnding(object sender, EventArgs e)
             Clear();
         }
 
+        /// <summary>Called when crop is harvested</summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
+        [EventSubscribe("PostHarvesting")]
+        protected void OnPostHarvesting(object sender, EventArgs e)
+        {
+            Harvest();
+        }
+
         }
     }

Models/PMF/Plant.cs

@@ -224,8 +224,10 @@ public double LAI
         public event EventHandler Sowing;
         /// <summary>Occurs when a plant is sown.</summary>
         public event EventHandler<SowingParameters> PlantSowing;
-        /// <summary>Occurs when a plant is about to be harvested.</summary>
+        /// <summary>Occurs when a plant is about to be harvested so that values can be reported.</summary>
         public event EventHandler Harvesting;
+        /// <summary>Occurs when a plant is harvested, this event should trigger functions that remove biomass from organs and reset values</summary>
+        public event EventHandler PostHarvesting;
         /// <summary>Occurs when a plant is ended via EndCrop.</summary>
         public event EventHandler PlantEnding;
         /// <summary>Occurs when a plant is about to flower</summary>
@@ -368,8 +370,7 @@ public void Harvest(bool removeBiomassFromOrgans = true)
             Phenology.SetToEndStage();
             Harvesting?.Invoke(this, EventArgs.Empty);
             if (removeBiomassFromOrgans)
-                foreach (var organ in Organs)
-                    organ.Harvest();
+                PostHarvesting?.Invoke(this, EventArgs.Empty);
         }
 
         /// <summary>End the crop.</summary>