[GeothermalResearchInstitute] Fix calculation for heat exchange metrics.

hcoona · Oct 13, 2019 · 262fe83 · 262fe83
1 parent 771d79e
commit 262fe83
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...esearchInstitute/GeothermalResearchInstitute.Wpf/ViewModels/DeviceMetricBoardViewModel.cs b/...esearchInstitute/GeothermalResearchInstitute.Wpf/ViewModels/DeviceMetricBoardViewModel.cs
@@ -68,15 +68,19 @@ public Metric Metric
 
         public float WaterPumpFlowRateCubicMeterPerHour => this.Metric?.WaterPumpFlowRateCubicMeterPerHour ?? 0;
 
-        public float GroundHeatExchangeKilowatt => MathF.Abs(this.InputWaterCelsiusDegree - this.OutputWaterCelsiusDegree);
+        public float GroundHeatExchangeKilowatt =>
+            1.167F * this.WaterPumpFlowRateCubicMeterPerHour * MathF.Abs(
+                this.InputWaterCelsiusDegree - this.OutputWaterCelsiusDegree);
 
         public float InputWaterPressureMeter => this.Metric?.InputWaterPressureMeter ?? 0;
 
         public float InputWaterCelsiusDegree => this.Metric?.InputWaterCelsiusDegree ?? 0;
 
         public float EnvironmentCelsiusDegree => this.Metric?.EnvironmentCelsiusDegree ?? 0;
 
-        public float CompressorHeatExchangeKilowatt => MathF.Abs(this.EnvironmentCelsiusDegree - this.HeaterOutputWaterCelsiusDegree);
+        public float CompressorHeatExchangeKilowatt =>
+            1.167F * this.WaterPumpFlowRateCubicMeterPerHour * MathF.Abs(
+                this.OutputWaterCelsiusDegree - this.HeaterOutputWaterCelsiusDegree);
 
         public float DeltaWaterPressureMeter => MathF.Abs(this.InputWaterPressureMeter - this.OutputWaterPressureMeter);