Reduce N and C content with AD substrates, initialize silage yield

holos-aafc · Sep 12, 2024 · 8e9a85a · 8e9a85a
1 parent 7cfd305
commit 8e9a85a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/H.Core/Calculators/Infrastructure/ADCalculator.cs b/H.Core/Calculators/Infrastructure/ADCalculator.cs
@@ -727,15 +727,15 @@ public List<SubstrateFlowInformation> GetDailyFlowRatesForSubstrateTypes(
                     if (type == SubstrateType.ImportedManure)
                     {
                         // Equation 4.8.1-30
-                        substrateFlow.NitrogenFlowOfSubstrate = substrateViewItemBase.FlowRate * substrateViewItemBase.NitrogenContent;
+                        substrateFlow.NitrogenFlowOfSubstrate = substrateViewItemBase.FlowRate * (substrateViewItemBase.NitrogenContent / 100.0);
                     }
 
                     // Equation 4.8.1-14
                     substrateFlow.CarbonFlowOfSubstrate = substrateViewItemBase.TotalCarbon;
                     if (type == SubstrateType.ImportedManure)
                     {
                         // Equation 4.8.1-31
-                        substrateFlow.CarbonFlowOfSubstrate = substrateViewItemBase.FlowRate * substrateViewItemBase.CarbonContent;
+                        substrateFlow.CarbonFlowOfSubstrate = substrateViewItemBase.FlowRate * (substrateViewItemBase.CarbonContent / 100.0);
                     }
 
                     result.Add(substrateFlow);

diff --git a/H.Core/Calculators/Nitrogen/N2OEmissionFactorCalculator.cs b/H.Core/Calculators/Nitrogen/N2OEmissionFactorCalculator.cs
@@ -650,7 +650,5 @@ private double CalculateEmissionFactorUsingPotentialEvapotranspiration(double po
         }
 
         #endregion
-
-
     }
 }
diff --git a/H.Core/Models/Animals/AnimalGroup.cs b/H.Core/Models/Animals/AnimalGroup.cs
@@ -245,7 +245,6 @@ public int GetNumberOfAnimalsByDate(DateTime dateTime)
         /// <returns>The <see cref="ManagementPeriod"/> that contains the given <see cref="DateTime"/>, or null if the <see cref="ManagementPeriod"/> doesn't exist</returns>
         public ManagementPeriod GetManagementPeriodByDate(DateTime dateTime)
         {
-
             var result = this.ManagementPeriods.OrderBy(managementPeriod => managementPeriod.Start).FirstOrDefault(managementPeriod => managementPeriod.Start <= dateTime && managementPeriod.End >= dateTime);
             if (result != null)
             {

diff --git a/H.Core/Services/Animals/AnimalResultsServiceBase.cs b/H.Core/Services/Animals/AnimalResultsServiceBase.cs
@@ -28,13 +28,11 @@ public abstract partial class AnimalResultsServiceBase : IAnimalResultsService
 
         private static readonly DietProvider _dietProvider;
 
-        protected readonly Table_49_Electricity_Conversion_Defaults_Provider _energyConversionDefaultsProvider =
-            new Table_49_Electricity_Conversion_Defaults_Provider();
+        protected readonly Table_49_Electricity_Conversion_Defaults_Provider _energyConversionDefaultsProvider = new Table_49_Electricity_Conversion_Defaults_Provider();
 
         protected readonly Table_43_Beef_Dairy_Default_Emission_Factors_Provider _defaultEmissionFactorsProvider = new Table_43_Beef_Dairy_Default_Emission_Factors_Provider();
 
-        protected IAdditiveReductionFactorsProvider AdditiveReductionFactorsProvider =
-            new Table_19_Additive_Reduction_Factors_Provider();
+        protected IAdditiveReductionFactorsProvider AdditiveReductionFactorsProvider = new Table_19_Additive_Reduction_Factors_Provider();
 
         protected readonly Table_36_Livestock_Emission_Conversion_Factors_Provider
             _livestockEmissionConversionFactorsProvider = new Table_36_Livestock_Emission_Conversion_Factors_Provider();

diff --git a/H.Core/Services/Initialization/Crops/CropInitializationService.Yield.cs b/H.Core/Services/Initialization/Crops/CropInitializationService.Yield.cs
@@ -181,6 +181,7 @@ public void InitializeSilageCropYield(CropViewItem silageCropViewItem, Farm farm
 
             // We call AssignSystemDefaults with the CropViewItem representing the grain crop to get its default values.
             this.InitializePercentageReturns(farm, grainCropViewItem);
+            this.InitializeBiomassCoefficients(grainCropViewItem, farm);
 
             // We specifically find the PlantCarbonInAgriculturalProduct of the grain crop as that is needed in the yield calculation.
             grainCropViewItem.PlantCarbonInAgriculturalProduct = _icbmCarbonInputCalculator.CalculatePlantCarbonInAgriculturalProduct(previousYearViewItem: null, currentYearViewItem: grainCropViewItem, farm: farm);