add missing capex fields to client result

Author: softwareengineerprogrammer

src/geophires_x/Outputs.py

@@ -1822,7 +1822,7 @@ def PrintOutputs(self, model: Model):
                         f.write(f'            of which Peaking Boiler Cost:               {model.economics.peakingboilercost.value:10.2f} ' + model.economics.peakingboilercost.CurrentUnits.value + NL)
                     f.write(f'         Field gathering system costs:                  {model.economics.Cgath.value:10.2f} ' + model.economics.Cgath.CurrentUnits.value + NL)
                     if model.surfaceplant.piping_length.value > 0:
-                        f.write(f'         Transmission pipeline cost                     {model.economics.Cpiping.value:10.2f} ' + model.economics.Cpiping.CurrentUnits.value + NL)
+                        f.write(f'         Transmission pipeline cost:                    {model.economics.Cpiping.value:10.2f} ' + model.economics.Cpiping.CurrentUnits.value + NL)
                     if model.surfaceplant.plant_type.value == PlantType.DISTRICT_HEATING:
                         f.write(f'         District Heating System Cost:                  {model.economics.dhdistrictcost.value:10.2f} ' + model.economics.dhdistrictcost.CurrentUnits.value + NL)
                     f.write(f'         Total surface equipment costs:                 {(model.economics.Cplant.value+model.economics.Cgath.value):10.2f} ' + model.economics.Cplant.CurrentUnits.value + NL)

src/geophires_x_client/geophires_x_result.py

@@ -196,17 +196,22 @@ class GeophiresXResult:
                 'Drilling and completion costs per vertical production well',
                 'Drilling and completion costs per vertical injection well',
                 'Drilling and completion costs per non-vertical section',
+                'Drilling and completion costs (for redrilling)',
+                'Drilling and completion costs per redrilled well',
                 'Stimulation costs',
+                'Stimulation costs (for redrilling)',
                 'Surface power plant costs',
                 'of which Absorption Chiller Cost',
                 'of which Heat Pump Cost',
                 'of which Peaking Boiler Cost',
+                'Transmission pipeline cost',
                 'District Heating System Cost',
                 'Field gathering system costs',
                 'Total surface equipment costs',
                 'Exploration costs',
                 'Investment Tax Credit',
                 'Total capital costs',
+                'Annualized capital costs',
                 # AGS/CLGS
                 'Total CAPEX',
                 'Drilling Cost',

tests/example1_addons.csv

@@ -80,6 +80,7 @@ CAPITAL COSTS (M$),Field gathering system costs,,2.3,MUSD
 CAPITAL COSTS (M$),Total surface equipment costs,,23.1,MUSD
 CAPITAL COSTS (M$),Exploration costs,,5.33,MUSD
 CAPITAL COSTS (M$),Total capital costs,,31.07,MUSD
+CAPITAL COSTS (M$),Annualized capital costs,,1.55,MUSD
 OPERATING AND MAINTENANCE COSTS (M$/yr),Wellfield maintenance costs,,0.44,MUSD/yr
 OPERATING AND MAINTENANCE COSTS (M$/yr),Power plant maintenance costs,,0.9,MUSD/yr
 OPERATING AND MAINTENANCE COSTS (M$/yr),Water costs,,0.06,MUSD/yr

tests/test_geophires_x.py

@@ -583,3 +583,15 @@ def assertHasLogRecordWithMessage(logs_, message):
             assertHasLogRecordWithMessage(
                 logs2, 'Set Discount Rate to 0.042 because Fixed Internal Rate was provided (4.2 percent)'
             )
+
+    def test_transmission_pipeline_cost(self):
+        result = GeophiresXClient().get_geophires_result(
+            GeophiresInputParameters(
+                from_file_path=self._get_test_file_path(Path('examples/Fervo_Norbeck_Latimer_2023.txt')),
+                params={'Surface Piping Length': 5},
+            )
+        )
+
+        self.assertAlmostEqual(
+            result.result['CAPITAL COSTS (M$)']['Transmission pipeline cost']['value'], 3.75, delta=0.5
+        )

tests/test_geophires_x_client.py

@@ -518,3 +518,7 @@ def test_parse_chp_percent_cost_allocation(self):
         self.assertEqual(
             result.result['ECONOMIC PARAMETERS']['CHP: Percent cost allocation for electrical plant']['value'], 93.48
         )
+
+    def test_parse_annualized_capital_costs(self):
+        result = GeophiresXResult(self._get_test_file_path('examples/example1_addons.out'))
+        self.assertIsNotNone(result.result['CAPITAL COSTS (M$)']['Annualized capital costs']['value'])