Fix #203

holos-aafc · Nov 15, 2024 · dbe7667 · dbe7667
1 parent 775842a
commit dbe7667
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/H.Core/Enumerations/HousingTypeExtensions.cs b/H.Core/Enumerations/HousingTypeExtensions.cs
@@ -71,6 +71,9 @@ public static bool IsIndoorHousing(this HousingType housingType)
                 case HousingType.FreeStallBarnSolidLitter:
                 case HousingType.FreeStallBarnSlurryScraping:
                 case HousingType.FreeStallBarnMilkParlourSlurryFlushing:
+                case HousingType.TieStall:
+                case HousingType.TieStallSlurry:
+                case HousingType.TieStallSolidLitter:
                     return true;
 
                 default:

diff --git a/H.Core/Services/Animals/AnimalResultsServiceBase.cs b/H.Core/Services/Animals/AnimalResultsServiceBase.cs
@@ -1388,12 +1388,22 @@ public double CalculateAmbientTemperatureAdjustmentNoBarn(double averageMonthlyT
 
         /// <summary>
         /// Equation 4.3.1-12
+        ///
+        /// Indoor dairy housing systems do not get an additional +2 degrees - just beef housing systems
         /// </summary>
         /// <param name="dailyTemperature">Temperature (°C)</param>
+        /// <param name="isDairyIndoorHousing"></param>
         /// <returns>Temperature-based adjustments used to correct default NH3 emission factors for indoor housing</returns>
-        public double CalculateAmbientTemperatureAdjustmentForIndoorHousing(double dailyTemperature)
+        public double CalculateAmbientTemperatureAdjustmentForIndoorHousing(double dailyTemperature,
+            bool isDairyIndoorHousing = false)
         {
-            return Math.Pow(1.041, dailyTemperature + 2) / Math.Pow(1.041, 15);
+            var temperatureAdjustment = dailyTemperature;
+            if (isDairyIndoorHousing == false)
+            {
+                temperatureAdjustment += 2;
+            }
+
+            return Math.Pow(1.041, temperatureAdjustment) / Math.Pow(1.041, 15);
         }
 
         /// <summary>

diff --git a/H.Core/Services/Animals/BeefAndDairyResultsServiceBase.cs b/H.Core/Services/Animals/BeefAndDairyResultsServiceBase.cs
@@ -68,8 +68,10 @@ protected void CalculateIndirectManureNitrousOxide(GroupEmissionsByDay dailyEmis
                     }
                 }
 
+                var isIndoorDairyHousing = managementPeriod.HousingDetails.HousingType.IsIndoorHousing() && managementPeriod.AnimalType.IsDairyCattleType();
                 dailyEmissions.AmbientAirTemperatureAdjustmentForHousing = CalculateAmbientTemperatureAdjustmentForIndoorHousing(
-                    dailyTemperature: temperature);
+                    dailyTemperature: temperature,
+                    isDairyIndoorHousing: isIndoorDairyHousing);
             }
             else
             {