Re-implement previous behavior to display drilling/stimulation costs for redrilling when total capex is provided

Author: softwareengineerprogrammer

src/geophires_x/Outputs.py

@@ -475,6 +475,12 @@ def PrintOutputs(self, model: Model):
                         f.write(f'         District Heating System Cost:                  {model.economics.dhdistrictcost.value:10.2f} {model.economics.dhdistrictcost.CurrentUnits.value}\n')
                     f.write(f'         Total surface equipment costs:                 {(model.economics.Cplant.value+model.economics.Cgath.value):10.2f} ' + model.economics.Cplant.CurrentUnits.value + NL)
                     f.write(f'         {model.economics.Cexpl.display_name}:                             {model.economics.Cexpl.value:10.2f} {model.economics.Cexpl.CurrentUnits.value}\n')
+
+                if model.economics.totalcapcost.Valid and model.wellbores.redrill.value > 0:
+                    f.write(f'         Drilling and completion costs (for redrilling):{econ.Cwell.value:10.2f} {econ.Cwell.CurrentUnits.value}\n')
+                    f.write(f'      Drilling and completion costs per redrilled well: {(econ.Cwell.value/(model.wellbores.nprod.value+model.wellbores.ninj.value)):10.2f} {econ.Cwell.CurrentUnits.value}\n')
+                    f.write(f'         Stimulation costs (for redrilling):            {econ.Cstim.value:10.2f} {econ.Cstim.CurrentUnits.value}\n')
+
                 if model.economics.RITCValue.value:
                     f.write(f'         {model.economics.RITCValue.display_name}:                         {-1*model.economics.RITCValue.value:10.2f} {model.economics.RITCValue.CurrentUnits.value}\n')
 

tests/test_geophires_x.py

@@ -1249,19 +1249,15 @@ def test_redrilling_costs(self):
             self.assertAlmostEqual(result_opex['Total operating and maintenance costs']['value'], opex_sum, places=1)
 
             result_capex = result.result['CAPITAL COSTS (M$)']
-            if result_capex.get('Drilling and completion costs') is not None:
-                expected_annual_redrilling_cost = (
-                    (
-                        result_capex['Drilling and completion costs']['value']
-                        + result_capex['Stimulation costs']['value']
-                    )
-                    * result_redrills
-                ) / result.result['ECONOMIC PARAMETERS']['Project lifetime']['value']
-
-                self.assertAlmostEqual(
-                    expected_annual_redrilling_cost, result_opex['Redrilling costs']['value'], places=2
+            capex_field_suffix = (
+                '' if result_capex.get('Drilling and completion costs') is not None else ' (for redrilling)'
+            )
+            expected_annual_redrilling_cost = (
+                (
+                    result_capex[f'Drilling and completion costs{capex_field_suffix}']['value']
+                    + result_capex[f'Stimulation costs{capex_field_suffix}']['value']
                 )
-            else:
-                # Individual capex line items are not calculated when user provides Total Capital Cost.
-                # FIXME WIP output/check
-                pass
+                * result_redrills
+            ) / result.result['ECONOMIC PARAMETERS']['Project lifetime']['value']
+
+            self.assertAlmostEqual(expected_annual_redrilling_cost, result_opex['Redrilling costs']['value'], places=2)