unit test add-ons/extended economics npv with/without discount initial year

Author: softwareengineerprogrammer

src/geophires_x/Outputs.py

@@ -1643,7 +1643,12 @@ def PrintOutputs(self, model: Model):
                 f.write(f'      Accrued financing during construction:            {model.economics.inflrateconstruction.value*100:10.2f} ' + model.economics.inflrateconstruction.CurrentUnits.value + NL)
                 f.write(f'      Project lifetime:                              {model.surfaceplant.plant_lifetime.value:10.0f} ' + model.surfaceplant.plant_lifetime.CurrentUnits.value + NL)
                 f.write(f'      Capacity factor:                                 {model.surfaceplant.utilization_factor.value * 100:10.1f} %' + NL)
-                f.write(f'      Project NPV:                                     {model.economics.ProjectNPV.value:10.2f} ' + model.economics.ProjectNPV.PreferredUnits.value + NL)
+
+                e_npv = model.economics.ProjectNPV
+                npv_field_label = Outputs._field_label('Project NPV', 49)
+                # TODO should use CurrentUnits instead of PreferredUnits
+                f.write(f'      {npv_field_label}{e_npv.value:10.2f} {e_npv.PreferredUnits.value}\n')
+
                 f.write(f'      Project IRR:                                     {model.economics.ProjectIRR.value:10.2f} ' + model.economics.ProjectIRR.PreferredUnits.value + NL)
                 f.write(f'      Project VIR=PI=PIR:                              {model.economics.ProjectVIR.value:10.2f}' + NL)
                 f.write(f'      {model.economics.ProjectMOIC.Name}:                                    {model.economics.ProjectMOIC.value:10.2f}' + NL)

src/geophires_x/WellBores.py

@@ -537,7 +537,7 @@ def ProdPressureDropAndPumpingPowerUsingIndexes(
         pumpdepthfinal_m = np.max(pumpdepth_m)
         if pumpdepthfinal_m < 0.0:
             pumpdepthfinal_m = 0.0
-            msg = (f'GEOPHIRES calculates negative production well pumping depth. ({pumpdepthfinal_m:.2f}m)'
+            msg = (f'GEOPHIRES calculates negative production well pumping depth. ({pumpdepthfinal_m:.2f}m). '
                    f'No production well pumps will be assumed')
             print(f'Warning: {msg}')
             model.logger.warning(msg)

tests/test_geophires_x.py

@@ -591,12 +591,12 @@ def assertHasLogRecordWithMessage(logs_, message):
             )
 
     def test_discount_initial_year_cashflow(self):
-        def _get_result(do_discount: bool) -> GeophiresXResult:
+        def _get_result(base_example: str, do_discount: bool) -> GeophiresXResult:
             return GeophiresXClient().get_geophires_result(
                 GeophiresInputParameters(
                     # TODO switch over to generic EGS case to avoid thrash from example updates
                     # from_file_path=self._get_test_file_path('geophires_x_tests/generic-egs-case.txt'),
-                    from_file_path=self._get_test_file_path('examples/Fervo_Project_Cape-3.txt'),
+                    from_file_path=self._get_test_file_path(f'examples/{base_example}.txt'),
                     params={
                         'Discount Initial Year Cashflow': do_discount,
                     },
@@ -606,8 +606,28 @@ def _get_result(do_discount: bool) -> GeophiresXResult:
         def _npv(r: GeophiresXResult) -> dict:
             return r.result['ECONOMIC PARAMETERS']['Project NPV']['value']
 
-        self.assertEqual(4580.36, _npv(_get_result(False)))
-        self.assertEqual(4280.71, _npv(_get_result(True)))
+        self.assertEqual(4580.36, _npv(_get_result('Fervo_Project_Cape-3', False)))
+        self.assertEqual(4280.71, _npv(_get_result('Fervo_Project_Cape-3', True)))
+
+        def _extended_economics_npv(r: GeophiresXResult) -> dict:
+            return r.result['EXTENDED ECONOMICS']['Project NPV   (including AddOns)']['value']
+
+        add_ons_result_without_discount = _get_result('example1_addons', False)
+        add_ons_result_with_discount = _get_result('example1_addons', True)
+
+        self.assertGreater(_npv(add_ons_result_without_discount), _npv(add_ons_result_with_discount))
+
+        ee_npv_without_discount = _extended_economics_npv(add_ons_result_without_discount)
+        assert ee_npv_without_discount < 0, (
+            'Test is expecting example1_addons extended economics NPV to be negative '
+            'as a precondition - if this error is encountered, '
+            'create a test-only copy of the previous version of example1_addons and '
+            'use it in this test (like geophires_x_tests/generic-egs-case.txt).'
+        )
+
+        # Discounting first year causes negative NPVs to be less negative (according to Google Sheets,
+        # which was used to manually validate the expected NPVs here).
+        self.assertLess(ee_npv_without_discount, _extended_economics_npv(add_ons_result_with_discount))
 
     def test_transmission_pipeline_cost(self):
         result = GeophiresXClient().get_geophires_result(