AddOn CAPEX/OPEX total OutputParameters

Author: softwareengineerprogrammer

src/geophires_x/EconomicsAddOns.py

@@ -108,12 +108,14 @@ def multi_addon_tooltip_text(param_name: str) -> str:
         # results
         self.AddOnCAPEXTotal = self.OutputParameterDict[self.AddOnCAPEXTotal.Name] = OutputParameter(
             "AddOn CAPEX Total",
+            display_name='Total Add-on CAPEX',
             UnitType=Units.CURRENCY,
             PreferredUnits=CurrencyUnit.MDOLLARS,
             CurrentUnits=CurrencyUnit.MDOLLARS,
         )
         self.AddOnOPEXTotalPerYear = self.OutputParameterDict[self.AddOnOPEXTotalPerYear.Name] = OutputParameter(
             "AddOn OPEX Total Per Year",
+            display_name='Total Add-on OPEX',
             UnitType=Units.CURRENCYFREQUENCY,
             PreferredUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR,
             CurrentUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR

src/geophires_x/Outputs.py

@@ -504,10 +504,8 @@ def PrintOutputs(self, model: Model):
 
                     if econ.DoAddOnCalculations.value:
                         # Non-SAM econ models print this in Extended Economics profile
-                        # TODO define dedicated OutputParameter
-                        aoc_label = Outputs._field_label('Total Add-on CAPEX', 47)
-                        f.write(
-                            f'         {aoc_label}{model.addeconomics.AddOnCAPEXTotal.value:10.2f} {model.addeconomics.AddOnCAPEXTotal.CurrentUnits.value}\n')
+                        aoc_label = Outputs._field_label(model.addeconomics.AddOnCAPEXTotal.display_name, 47)
+                        f.write(f'         {aoc_label}{model.addeconomics.AddOnCAPEXTotal.value:10.2f} {model.addeconomics.AddOnCAPEXTotal.CurrentUnits.value}\n')
 
                 capex_param = econ.CCap if not is_sam_econ_model else econ.capex_total
                 capex_label = Outputs._field_label(capex_param.display_name, 50)
@@ -540,10 +538,8 @@ def PrintOutputs(self, model: Model):
 
                     if econ.DoAddOnCalculations.value and is_sam_econ_model:
                         # Non-SAM econ models print this in Extended Economics profile
-                        # TODO define dedicated OutputParameter
-                        aoc_label = Outputs._field_label('Total Add-on OPEX', 47)
-                        f.write(
-                            f'         {aoc_label}{model.addeconomics.AddOnOPEXTotalPerYear.value:10.2f} {model.addeconomics.AddOnOPEXTotalPerYear.CurrentUnits.value}\n')
+                        aoc_label = Outputs._field_label(model.addeconomics.AddOnOPEXTotalPerYear.display_name, 47)
+                        f.write(f'         {aoc_label}{model.addeconomics.AddOnOPEXTotalPerYear.value:10.2f} {model.addeconomics.AddOnOPEXTotalPerYear.CurrentUnits.value}\n')
 
                     f.write(f'      {econ.Coam.display_name}:            {(econ.Coam.value + econ.averageannualpumpingcosts.value + econ.averageannualheatpumpelectricitycost.value):10.2f} {econ.Coam.CurrentUnits.value}\n')
                 else:

src/geophires_x_schema_generator/geophires-result.json

@@ -152,8 +152,16 @@
         "Project VIR=PI=PIR   (including AddOns)": {},
         "Project MOIC  (including AddOns)": {},
         "Project Payback Period       (including AddOns)": {},
-        "Total Add-on CAPEX": {},
-        "Total Add-on OPEX": {},
+        "Total Add-on CAPEX": {
+          "type": "number",
+          "description": "AddOn CAPEX Total",
+          "units": "MUSD"
+        },
+        "Total Add-on OPEX": {
+          "type": "number",
+          "description": "AddOn OPEX Total Per Year",
+          "units": "MUSD/yr"
+        },
         "Total Add-on Net Elec": {},
         "Total Add-on Net Heat": {},
         "Total Add-on Profit": {},
@@ -402,7 +410,11 @@
           "description": "The calculated amount of cost escalation due to inflation over the construction period.",
           "units": "MUSD"
         },
-        "Total Add-on CAPEX": {},
+        "Total Add-on CAPEX": {
+          "type": "number",
+          "description": "AddOn CAPEX Total",
+          "units": "MUSD"
+        },
         "Total capital costs": {
           "type": "number",
           "description": "Total Capital Cost",
@@ -461,7 +473,11 @@
           "description": "Total redrilling costs over the Plant Lifetime are calculated as (Drilling and completion costs + Stimulation costs) \u00d7 Number of times redrilling. The total is then divided over Plant Lifetime years to calculate Redrilling costs per year.",
           "units": "MUSD/yr"
         },
-        "Total Add-on OPEX": {},
+        "Total Add-on OPEX": {
+          "type": "number",
+          "description": "AddOn OPEX Total Per Year",
+          "units": "MUSD/yr"
+        },
         "Total average annual O&M costs": {},
         "Total operating and maintenance costs": {
           "type": "number",