Total operating and maintenance costs result schema unit (MUSD/yr)

Author: softwareengineerprogrammer

src/geophires_x/Economics.py

@@ -1667,8 +1667,10 @@ def __init__(self, model: Model):
             PreferredUnits=CurrencyUnit.MDOLLARS,
             CurrentUnits=CurrencyUnit.MDOLLARS
         )
+        # noinspection SpellCheckingInspection
         self.Coam = self.OutputParameterDict[self.Coam.Name] = OutputParameter(
             Name="Total O&M Cost",
+            display_name='Total operating and maintenance costs',
             UnitType=Units.CURRENCYFREQUENCY,
             PreferredUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR,
             CurrentUnits=CurrencyFrequencyUnit.MDOLLARSPERYEAR

src/geophires_x/Outputs.py

@@ -505,9 +505,9 @@ def PrintOutputs(self, model: Model):
                         f.write(f'         Annual District Heating O&M Cost:              {model.economics.dhdistrictoandmcost.value:10.2f} {model.economics.dhdistrictoandmcost.CurrentUnits.value}\n')
                         f.write(f'         Average Annual Peaking Fuel Cost:              {model.economics.averageannualngcost.value:10.2f} {model.economics.averageannualngcost.CurrentUnits.value}\n')
 
-                    f.write(f'      Total operating and maintenance costs:            {(model.economics.Coam.value + model.economics.averageannualpumpingcosts.value+model.economics.averageannualheatpumpelectricitycost.value):10.2f} ' + model.economics.Coam.CurrentUnits.value + NL)
+                    f.write(f'      {econ.Coam.display_name}:            {(econ.Coam.value + econ.averageannualpumpingcosts.value + econ.averageannualheatpumpelectricitycost.value):10.2f} {econ.Coam.CurrentUnits.value}\n')
                 else:
-                    f.write(f'      Total operating and maintenance costs:            {model.economics.Coam.value:10.2f} ' + model.economics.Coam.CurrentUnits.value + NL)
+                    f.write(f'      {econ.Coam.display_name}:            {econ.Coam.value:10.2f} {econ.Coam.CurrentUnits.value}\n')
 
                 f.write(NL)
                 f.write(NL)

src/geophires_x_schema_generator/geophires-result.json

@@ -428,7 +428,11 @@
           "units": "MUSD/yr"
         },
         "Average annual pumping costs": {},
-        "Total operating and maintenance costs": {},
+        "Total operating and maintenance costs": {
+          "type": "number",
+          "description": "Total O&M Cost",
+          "units": "MUSD/yr"
+        },
         "OPEX": {},
         "Average annual auxiliary fuel cost": {},
         "Average annual pumping cost": {},