result fields & unit test/code cleanup

Author: softwareengineerprogrammer

src/geophires_x/EconomicsAddOns.py

@@ -317,9 +317,9 @@ def Calculate(self, model: Model) -> None:
         self.AdjustedProjectOPEX.value = model.economics.Coam.value + self.AddOnOPEXTotalPerYear.value
 
         if is_sam_em:
+            # SAM econ models incorporate add-ons into main economics, not as separate extended economics
             model.economics.CCap.value = self.AdjustedProjectCAPEX.value
             model.economics.Coam.value = self.AdjustedProjectOPEX.value
-            # FIXME WIP
 
         AddOnCapCostPerYear = self.AddOnCAPEXTotal.value / model.surfaceplant.construction_years.value
         ProjectCapCostPerYear = self.AdjustedProjectCAPEX.value / model.surfaceplant.construction_years.value

src/geophires_x_client/geophires_x_result.py

@@ -261,6 +261,7 @@ class GeophiresXResult:
                 'Exploration costs',
                 'Investment Tax Credit',
                 'Inflation costs during construction',
+                'Total Add-on CAPEX',
                 'Total capital costs',
                 'Annualized capital costs',
                 # AGS/CLGS
@@ -289,6 +290,7 @@ class GeophiresXResult:
                 'Average annual auxiliary fuel cost',
                 'Average annual pumping cost',
                 'Redrilling costs',
+                'Total Add-on OPEX',
                 'Total average annual O&M costs',
                 'Total operating and maintenance costs',
                 # AGS/CLGS

tests/geophires_x_tests/test_economics_sam.py

@@ -581,20 +581,24 @@ def test_add_ons(self):
         )
         self.assertIsNotNone(add_ons_result)
 
-        with open(add_ons_result.output_file_path, encoding='utf-8') as f:
-            print('With Add-Ons:\n')
-            print(f.read())
-            print('\n------------\n')
-
-        with open(no_add_ons_result.output_file_path, encoding='utf-8') as f:
-            print('Without Add-Ons:\n')
-            print(f.read())
-            print('\n------------\n')
-
-        # FIXME WIP
-        self.assertLess(
-            no_add_ons_result.result['SUMMARY OF RESULTS']['Total CAPEX']['value'],
+        self.assertGreater(
             add_ons_result.result['SUMMARY OF RESULTS']['Total CAPEX']['value'],
+            no_add_ons_result.result['SUMMARY OF RESULTS']['Total CAPEX']['value'],
+        )
+
+        self.assertGreater(add_ons_result.result['CAPITAL COSTS (M$)']['Total Add-on CAPEX']['value'], 0)
+
+        self.assertGreater(
+            add_ons_result.result['OPERATING AND MAINTENANCE COSTS (M$/yr)']['Total operating and maintenance costs'][
+                'value'
+            ],
+            no_add_ons_result.result['OPERATING AND MAINTENANCE COSTS (M$/yr)'][
+                'Total operating and maintenance costs'
+            ]['value'],
+        )
+
+        self.assertGreater(
+            add_ons_result.result['OPERATING AND MAINTENANCE COSTS (M$/yr)']['Total Add-on OPEX']['value'], 0
         )
 
     @staticmethod