Adjust dx for slice size for all integrations in SurfacePlant.annual_electricity_pumping_power. FIXME TODO WIP marked for remaining integrations to adjust.

Author: softwareengineerprogrammer

src/geophires_x/SurfacePlant.py

@@ -152,15 +152,15 @@ def electricity_heat_production(self, enduse_option: EndUseOptions, availability
 
         return ElectricityProduced, HeatExtracted, HeatProduced, HeatExtractedTowardsElectricity
 
-    def annual_electricity_pumping_power(self, plant_lifetime: int, enduse_option: EndUseOptions, HeatExtracted: np.ndarray,
-                                         timestepsperyear: np.ndarray, utilization_factor: float, PumpingPower: np.ndarray,
+    def annual_electricity_pumping_power(self, plant_lifetime: int,enduse_option: EndUseOptions, HeatExtracted: np.ndarray,
+                                         time_steps_per_year: int, utilization_factor: float, PumpingPower: np.ndarray,
                                          ElectricityProduced: np.ndarray, NetElectricityProduced: np.ndarray, HeatProduced: np.ndarray) -> tuple:
         """
         Calculate annual electricity/heat production
         :param plant_lifetime: plant lifetime
         :param enduse_option: end-use option
         :param HeatExtracted: heat extracted
-        :param timestepsperyear: timesteps per year
+        :param time_steps_per_year: time steps per year
         :param utilization_factor: utilization factor
         :param PumpingPower: pumping power
         :param ElectricityProduced: electricity produced
@@ -176,12 +176,20 @@ def annual_electricity_pumping_power(self, plant_lifetime: int, enduse_option: E
         NetkWhProduced = np.zeros(plant_lifetime)
         HeatkWhProduced = np.zeros(plant_lifetime)
 
+        def integrate_slice(series: np.ndarray, _i: int) -> np.float64:
+            _slice = series[(0 + _i * time_steps_per_year):((_i + 1) * time_steps_per_year) + 1]
+
+            # Note that len(_slice) - 1 may be less than time_steps_per_year for the last slice.
+
+            return np.trapz(
+                _slice,
+                dx=1. / (len(_slice) - 1) * 365. * 24.
+            ) * 1000. * utilization_factor
+
         for i in range(0, plant_lifetime):
-            heat_extracted_slice = HeatExtracted[(0 + i * timestepsperyear):((i + 1) * timestepsperyear) + 1]
-            HeatkWhExtracted[i] = np.trapz(heat_extracted_slice,
-                                                dx = 1. / (len(heat_extracted_slice)-1) * 365. * 24.) * 1000. * utilization_factor
-            PumpingkWh[i] = np.trapz(PumpingPower[(0 + i * timestepsperyear):((i + 1) * timestepsperyear) + 1],
-                                                dx = 1. / timestepsperyear * 365. * 24.) * 1000. * utilization_factor
+            HeatkWhExtracted[i] = integrate_slice(HeatExtracted, i)
+            PumpingkWh[i] = integrate_slice(PumpingPower, i)
+
 
         if enduse_option in [EndUseOptions.ELECTRICITY, EndUseOptions.COGENERATION_TOPPING_EXTRA_HEAT,
                                         EndUseOptions.COGENERATION_TOPPING_EXTRA_ELECTRICITY,
@@ -193,16 +201,14 @@ def annual_electricity_pumping_power(self, plant_lifetime: int, enduse_option: E
             TotalkWhProduced = np.zeros(plant_lifetime)
             NetkWhProduced = np.zeros(plant_lifetime)
             for i in range(0, plant_lifetime):
-                TotalkWhProduced[i] = np.trapz(ElectricityProduced[(0 + i * timestepsperyear):((i + 1) * timestepsperyear) + 1],
-                                                        dx=1. / timestepsperyear * 365. * 24.) * 1000. * utilization_factor
-                NetkWhProduced[i] = np.trapz(NetElectricityProduced[(0 + i * timestepsperyear):((i + 1) * timestepsperyear) + 1],
-                                                        dx=1. / timestepsperyear * 365. * 24.) * 1000. * utilization_factor
+                TotalkWhProduced[i] = integrate_slice(ElectricityProduced, i)
+                NetkWhProduced[i] = integrate_slice(NetElectricityProduced, i)
+
         if enduse_option is not EndUseOptions.ELECTRICITY:
             # all those end-use options have a direct-use component
             HeatkWhProduced = np.zeros(plant_lifetime)
             for i in range(0, plant_lifetime):
-                HeatkWhProduced[i] = np.trapz(HeatProduced[(0 + i * timestepsperyear):((i + 1) * timestepsperyear) + 1],
-                                                         dx=1. / timestepsperyear * 365. * 24.) * 1000. * utilization_factor
+                HeatkWhProduced[i] = integrate_slice(HeatProduced, i)
 
         return HeatkWhExtracted, PumpingkWh, TotalkWhProduced, NetkWhProduced, HeatkWhProduced
 

src/geophires_x/SurfacePlantAGS.py

@@ -739,6 +739,7 @@ def Calculate(self, model: Model) -> None:
         # useful direct-use heat provided to application [MWth]
         self.HeatProduced.value = self.HeatExtracted.value * self.enduseefficiencyfactor.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[
                                                       (i * model.economics.timestepsperyear.value):((
                                                         i + 1) * model.economics.timestepsperyear.value) + 1],
@@ -754,6 +755,7 @@ def Calculate(self, model: Model) -> None:
         if self.End_use is not EndUseOptions.ELECTRICITY:
             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],

src/geophires_x/SurfacePlantAbsorptionChiller.py

@@ -115,6 +115,7 @@ def Calculate(self, model: Model) -> None:
         self.PumpingkWh.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.HeatkWhExtracted.value[i] = np.trapz(self.HeatExtracted.value[
                                             (0 + i * model.economics.timestepsperyear.value):((
                                             i + 1) * model.economics.timestepsperyear.value) + 1],
@@ -126,13 +127,15 @@ def Calculate(self, model: Model) -> None:
 
         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.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],

src/geophires_x/SurfacePlantDistrictHeating.py

@@ -217,6 +217,7 @@ def Calculate(self, model: Model) -> None:
 
         for i in range(0, self.plant_lifetime.value):
             if self.plant_type.value == PlantType.DISTRICT_HEATING:  # for district heating, we have a util_factor_array
+                # 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],
@@ -228,6 +229,7 @@ def Calculate(self, model: Model) -> None:
                                                     dx=1. / model.economics.timestepsperyear.value * 365. * 24.) * 1000. * \
                                            self.util_factor_array.value[i]
             else:
+                # 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],

src/geophires_x/SurfacePlantHeatPump.py

@@ -116,15 +116,18 @@ def Calculate(self, model: Model) -> None:
         self.PumpingkWh.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.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.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.heat_pump_electricity_kwh_used.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.heat_pump_electricity_kwh_used.value[i] = np.trapz(self.heat_pump_electricity_used.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
 
         # calculate reservoir heat content

src/geophires_x/SurfacePlantIndustrialHeat.py

@@ -78,6 +78,7 @@ def Calculate(self, model: Model) -> None:
         self.PumpingkWh.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.HeatkWhExtracted.value[i] = np.trapz(self.HeatExtracted.value[
                                                       (0 + i * model.economics.timestepsperyear.value):((
                                                       i + 1) * model.economics.timestepsperyear.value) + 1],
@@ -89,6 +90,7 @@ def Calculate(self, model: Model) -> None:
 
         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],