WIP stash - adjust econ capex/opex with add-ons

Author: softwareengineerprogrammer

src/geophires_x/EconomicsAddOns.py

@@ -307,7 +307,7 @@ def Calculate(self, model: Model) -> None:
 
         if is_sam_em:
             model.economics.CCap.value = self.AdjustedProjectCAPEX.value
-            model.economics.Coam.value = self.AdjustedProjectOPEX.value
+            model.economics.Coam.value = self.AdjustedProjectOPEX.value - np.sum(self.AddOnProfitGainedPerYear.value)
             # FIXME WIP
 
         AddOnCapCostPerYear = self.AddOnCAPEXTotal.value / model.surfaceplant.construction_years.value

tests/geophires_x_tests/egs-sam-em-add-ons.txt

@@ -62,8 +62,6 @@ Production Flow Rate per Well, 80
 # AddOns
 Do AddOn Calculations, True
 AddOn Nickname 1, Desalinization
-AddOn CAPEX 1, 10
-AddOn OPEX 1, 10
-AddOn Electricity Gained 1, -100
-AddOn Heat Gained 1, 0.0
-AddOn Profit Gained 1, 0.05
+AddOn CAPEX 1, 562
+AddOn OPEX 1, 0.1
+AddOn Profit Gained 1, 107

tests/geophires_x_tests/test_economics_sam.py

@@ -574,10 +574,26 @@ def _accrued_financing(_r: GeophiresXResult) -> float:
 
     def test_add_ons(self):
         add_ons_result = self._get_result({}, file_path=self._get_test_file_path('egs-sam-em-add-ons.txt'))
+        no_add_ons_result = self._get_result(
+            {'Do AddOn Calculations': False}, file_path=self._get_test_file_path('egs-sam-em-add-ons.txt')
+        )
         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'],
+            add_ons_result.result['SUMMARY OF RESULTS']['Total CAPEX']['value'],
+        )
 
     @staticmethod
     def _new_model(input_file: Path, additional_params: dict[str, Any] | None = None, read_and_calculate=True) -> Model: