fix single-time-step-per-year integration logic, with additional full unit test

Author: softwareengineerprogrammer

src/geophires_x/SurfacePlant.py

@@ -16,19 +16,25 @@ def integrate_time_series_slice(
         time_steps_per_year: int,
         utilization_factor: float
     ) -> np.float64:
-        _slice = series[(0 + _i * time_steps_per_year):((_i + 1) * time_steps_per_year) + 1]
+        slice_start_index = _i * time_steps_per_year
+        slice_end_index = ((_i + 1) * time_steps_per_year) + 1
+        _slice = list(series[slice_start_index:slice_end_index])
 
         # Note that len(_slice) - 1 may be less than time_steps_per_year for the last slice.
 
         if len(_slice) == 1:
-            integral = _slice[0]
-        else:
-            dx_steps = len(_slice) - 1
+            extrapolated_future_datapoint = _slice[0]
+            if slice_start_index - 1 > 0:
+                delta = series[slice_start_index] - series[slice_start_index - 1]
+                extrapolated_future_datapoint = _slice[0] + delta
+            _slice.append(extrapolated_future_datapoint)
+
+        dx_steps = len(_slice) - 1
 
-            integral = np.trapz(
-                _slice,
-                dx=1. / dx_steps * 365. * 24.
-            )
+        integral = np.trapz(
+            _slice,
+            dx=1. / dx_steps * 365. * 24.
+        )
 
         return integral * 1000. * utilization_factor
 

src/geophires_x/WellBores.py

@@ -196,7 +196,7 @@ def RameyCalc(krock: float, rhorock: float, cprock: float, welldiam: float, tv,
     framey = np.zeros(alen)
     framey[1:] = -np.log(
         1.1 * (welldiam / 2.0) / np.sqrt(4. * alpharock * tv[1:] * 365.0 * 24.0 * 3600.0 * utilfactor)) - 0.29
-    framey[0] = framey[1]  # fource the first value to be the same as the second to get away from near surface effects
+    framey[0] = framey[1]  # force the first value to be the same as the second to get away from near surface effects
     rameyA = flowrate * cpwater * framey / 2 / math.pi / krock
     TempDrop = -((Trock - Tresoutput) - averagegradient * (depth - rameyA) + (
         Tresoutput - averagegradient * rameyA - Trock) * np.exp(-depth / rameyA))

tests/geophires_x_tests/test_surface_plant.py

@@ -73,7 +73,8 @@ def _integrate_slice(series: np.ndarray, _i: int) -> np.float64:
             TotalkWhProduced[i] = _integrate_slice(ElectricityProduced, i)
             NetkWhProduced[i] = _integrate_slice(NetElectricityProduced, i)
 
-        self.assertEqual(TotalkWhProduced[-1], ElectricityProduced[-1])
+        self.assertAlmostEqual(3194711457.45603, NetkWhProduced[-1], places=3)
+        self.assertAlmostEqual(TotalkWhProduced[-2], TotalkWhProduced[-1], delta=308_000)
 
     def _workaround_module_initialization_order_dependency(self) -> Model:
         stash_cwd = Path.cwd()

tests/test_geophires_x.py

@@ -676,3 +676,37 @@ def _c_non_vert(r: GeophiresXResult) -> dict:
         self.assertIsNotNone(_c_non_vert(r_1)['value'])
 
         self.assertEqual(_c_non_vert(r_1)['value'], _c_non_vert(_get_result(2))['value'])
+
+    def test_single_time_step_per_year(self):
+        result_1 = GeophiresXClient().get_geophires_result(
+            GeophiresInputParameters(
+                from_file_path=self._get_test_file_path('geophires_x_tests/generic-egs-case.txt'),
+                params={'Time steps per year': 1},
+            )
+        )
+
+        result_1_final_val = result_1.heat_electricity_extraction_generation_profile[-1][1]
+        self.assertGreater(result_1_final_val, 0)
+
+        result_2 = GeophiresXClient().get_geophires_result(
+            GeophiresInputParameters(
+                from_file_path=self._get_test_file_path('geophires_x_tests/generic-egs-case.txt'),
+                params={'Time steps per year': 2},
+            )
+        )
+
+        result_2_final_val = result_2.heat_electricity_extraction_generation_profile[-1][1]
+        self.assertAlmostEqual(result_2_final_val, result_1_final_val, delta=1.5)
+
+        # TODO enable once https://github.com/NREL/GEOPHIRES-X/issues/352 is resolved
+        # result_1_1 = GeophiresXClient().get_geophires_result(
+        #     GeophiresInputParameters(
+        #         from_file_path=self._get_test_file_path('geophires_x_tests/generic-egs-case.txt'),
+        #         params={
+        #             'Time steps per year': 1,
+        #             'Plant Lifetime': 1
+        #         },
+        #     )
+        # )
+        #
+        # self.assertIsNotNone(result_1_1)