SurfacePlantAbsorptionChiller fix

Author: softwareengineerprogrammer

src/geophires_x/SurfacePlantAbsorptionChiller.py

@@ -114,32 +114,22 @@ def Calculate(self, model: Model) -> None:
         self.HeatkWhExtracted.value = np.zeros(self.plant_lifetime.value)
         self.PumpingkWh.value = np.zeros(self.plant_lifetime.value)
 
+        def _integrate_slice(series, _i):
+            return SurfacePlant.integrate_time_series_slice(
+                series, _i, model.economics.timestepsperyear.value, self.utilization_factor.value
+            )
+
         for i in range(0, self.plant_lifetime.value):
-            # FIXME TODO WIP adjust dx for slice size
-            self.HeatkWhExtracted.value[i] = np.trapz(self.HeatExtracted.value[
-                                            (0 + i * model.economics.timestepsperyear.value):((
-                                            i + 1) * model.economics.timestepsperyear.value) + 1],
-                                            dx=1. / model.economics.timestepsperyear.value * 365. * 24.) * 1000. * self.utilization_factor.value
-            self.PumpingkWh.value[i] = np.trapz(model.wellbores.PumpingPower.value[
-                                                (0 + i * model.economics.timestepsperyear.value):((
-                                                i + 1) * model.economics.timestepsperyear.value) + 1],
-                                                dx=1. / model.economics.timestepsperyear.value * 365. * 24.) * 1000. * self.utilization_factor.value
+            self.HeatkWhExtracted.value[i] = _integrate_slice(self.HeatExtracted.value, i)
+            self.PumpingkWh.value[i] = _integrate_slice(model.wellbores.PumpingPower.value, i)
 
         self.HeatkWhProduced.value = np.zeros(self.plant_lifetime.value)
         for i in range(0, self.plant_lifetime.value):
-            # FIXME TODO WIP adjust dx for slice size
-            self.HeatkWhProduced.value[i] = np.trapz(self.HeatProduced.value[
-                                                     (0 + i * model.economics.timestepsperyear.value):((
-                                                    i + 1) * model.economics.timestepsperyear.value) + 1],
-                                                     dx=1. / model.economics.timestepsperyear.value * 365. * 24.) * 1000. * self.utilization_factor.value
+            self.HeatkWhProduced.value[i] = _integrate_slice(self.HeatProduced.value, i)
 
         self.cooling_kWh_Produced.value = np.zeros(self.plant_lifetime.value)
         for i in range(0, self.plant_lifetime.value):
-            # FIXME TODO WIP adjust dx for slice size
-            self.cooling_kWh_Produced.value[i] = np.trapz(self.cooling_produced.value[
-                                                        (0 + i * model.economics.timestepsperyear.value):((
-                                                        i + 1) * model.economics.timestepsperyear.value) + 1],
-                                                          dx=1. / model.economics.timestepsperyear.value * 365. * 24.) * 1000. * self.utilization_factor.value
+            self.cooling_kWh_Produced.value[i] = _integrate_slice(self.cooling_produced.value, i)
 
         # calculate reservoir heat content
         self.RemainingReservoirHeatContent.value = SurfacePlant.remaining_reservoir_heat_content(