Assembly name fix

holos-aafc · Apr 18, 2024 · c40952e · c40952e
1 parent 5555288
commit c40952e
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 4 deletions.
diff --git a/H.Content/H.Content.csproj b/H.Content/H.Content.csproj
@@ -14,7 +14,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>H.Content</RootNamespace>
-    <AssemblyName>AAFC.Holos.Content</AssemblyName>
+    <AssemblyName>H.Content</AssemblyName>
     <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>

diff --git a/H.Core/Calculators/Carbon/ICBMSoilCarbonCalculator.cs b/H.Core/Calculators/Carbon/ICBMSoilCarbonCalculator.cs
@@ -64,6 +64,12 @@ public CropViewItem SetCarbonInputs(
             CropViewItem nextYearViewItem,
             Farm farm)
         {
+            var isNonSwathingGrazingScenario = currentYearViewItem.TotalCarbonLossesByGrazingAnimals > 0 &&
+                                    farm.CropHasGrazingAnimals(currentYearViewItem) &&
+                                    farm.YieldAssignmentMethod != YieldAssignmentMethod.Custom &&
+                                    currentYearViewItem.HarvestMethod != HarvestMethods.StubbleGrazing &&
+                                    currentYearViewItem.HarvestMethod != HarvestMethods.Swathing;
+
             currentYearViewItem.PlantCarbonInAgriculturalProduct = this.CalculatePlantCarbonInAgriculturalProduct(
                 previousYearViewItem: previousYearViewItem,
                 currentYearViewItem: currentYearViewItem,
@@ -75,7 +81,7 @@ public CropViewItem SetCarbonInputs(
                 nextYearViewItem: nextYearViewItem,
                 farm: farm);
 
-            if (currentYearViewItem.TotalCarbonLossesByGrazingAnimals > 0 && farm.CropHasGrazingAnimals(currentYearViewItem) && farm.YieldAssignmentMethod != YieldAssignmentMethod.Custom && currentYearViewItem.HarvestMethod != HarvestMethods.StubbleGrazing)
+            if (isNonSwathingGrazingScenario)
             {
                 // Total C losses from grazing animals is calculated in Equation 11.3.2-4
 

diff --git a/H.Core/Calculators/Carbon/IPCCTier2SoilCarbonCalculator.cs b/H.Core/Calculators/Carbon/IPCCTier2SoilCarbonCalculator.cs
@@ -196,6 +196,12 @@ public void CalculateInputs(CropViewItem viewItem, Farm farm)
                 intercept: intercept,
                 moistureContentAsPercentage: viewItem.MoistureContentOfCropPercentage);
 
+
+            if (viewItem.HarvestMethod == HarvestMethods.Swathing && farm.CropHasGrazingAnimals(viewItem))
+            {
+                viewItem.PercentageOfProductYieldReturnedToSoil = (100 - viewItem.GetAverageUtilizationFromGrazingAnimals());
+            }
+
             viewItem.AboveGroundResidueDryMatter = this.CalculateAboveGroundResidueDryMatter(harvestIndex: harvestIndex, viewItem: viewItem);
 
             viewItem.AboveGroundResidueDryMatterExported = this.CalculateAboveGroundResidueDryMatterExported(

diff --git a/H.Core/H.Core.csproj b/H.Core/H.Core.csproj
@@ -14,7 +14,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>H.Core</RootNamespace>
-    <AssemblyName>AAFC.Holos.Core</AssemblyName>
+    <AssemblyName>H.Core</AssemblyName>
     <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>

diff --git a/H.Core/Models/LandManagement/Fields/CropViewItem.Grazing.cs b/H.Core/Models/LandManagement/Fields/CropViewItem.Grazing.cs
@@ -1,4 +1,5 @@
 using System.Collections.ObjectModel;
+using System.Linq;
 
 namespace H.Core.Models.LandManagement.Fields
 {
@@ -42,5 +43,21 @@ public double TotalCarbonLossesByGrazingAnimals
         public double TotalCarbonUptakeByAnimals { get; set; }
 
         #endregion
+
+        #region Public Methods
+
+        public double GetAverageUtilizationFromGrazingAnimals()
+        {
+            if (this.HasGrazingViewItems)
+            {
+                return this.GrazingViewItems.Average(x => x.Utilization);
+            }
+            else
+            {
+                return 0;
+            }
+        }
+
+        #endregion
     }
 }
diff --git a/H.Infrastructure/H.Infrastructure.csproj b/H.Infrastructure/H.Infrastructure.csproj
@@ -14,7 +14,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>H.Infrastructure</RootNamespace>
-    <AssemblyName>AAFC.Holos.Infrastructure</AssemblyName>
+    <AssemblyName>H.Infrastructure</AssemblyName>
     <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>