Economic model name: 'SAM Single Owner PPA'

Author: softwareengineerprogrammer

src/geophires_x/Economics.py

@@ -470,7 +470,7 @@ def CalculateLCOELCOHLCOC(econ, model: Model) -> tuple:
                  econ.annualngcost.value) * discount_vector)) / np.sum(
                 model.surfaceplant.annual_heating_demand.value * discount_vector) * 1E2  # cents/kWh
             LCOH = LCOH * 2.931  # $/Million Btu
-    elif econ.econmodel.value == EconomicModel.SINGLE_OWNER_PPA:
+    elif econ.econmodel.value == EconomicModel.SAM_SINGLE_OWNER_PPA:
         LCOE = compute_sam_financials(model)['LCOE']['value']
     else:
         # must be BICYCLE
@@ -2962,7 +2962,7 @@ def Calculate(self, model: Model) -> None:
                 self.discount_initial_year_cashflow.value
             )
 
-        if self.econmodel.value == EconomicModel.SINGLE_OWNER_PPA:
+        if self.econmodel.value == EconomicModel.SAM_SINGLE_OWNER_PPA:
             sam_economics = compute_sam_financials(model)
             self.ProjectNPV.value = sam_economics['NPV']['value']
             self.ProjectIRR.value = sam_economics['IRR']['value']

src/geophires_x/OptionList.py

@@ -89,7 +89,7 @@ class EconomicModel(GeophiresInputEnum):
     STANDARDIZED_LEVELIZED_COST = 2, "Standard Levelized Cost"
     BICYCLE = 3, "BICYCLE"
     CLGS = 4, "Simple (CLGS)"
-    SINGLE_OWNER_PPA = 5, "Single Owner PPA (SAM)"
+    SAM_SINGLE_OWNER_PPA = 5, "SAM Single Owner PPA"
 
     @staticmethod
     def from_int(int_val):

src/geophires_x/Outputs.py

@@ -246,7 +246,7 @@ def PrintOutputs(self, model: Model):
                     f.write(f'      Economic Model = {model.economics.econmodel.value.value}\n')
                     f.write(f'      {model.economics.interest_rate.Name}:                                    {model.economics.interest_rate.value:10.2f} {model.economics.interest_rate.CurrentUnits.value}\n')
 
-                elif model.economics.econmodel.value in (EconomicModel.BICYCLE, EconomicModel.SINGLE_OWNER_PPA):
+                elif model.economics.econmodel.value in (EconomicModel.BICYCLE, EconomicModel.SAM_SINGLE_OWNER_PPA):
                     f.write(f'      Economic Model = {model.economics.econmodel.value.value}\n')
                 f.write(f'      Accrued financing during construction:            {model.economics.inflrateconstruction.value*100:10.2f} {model.economics.inflrateconstruction.CurrentUnits.value}\n')
                 f.write(f'      Project lifetime:                              {model.surfaceplant.plant_lifetime.value:10.0f} {model.surfaceplant.plant_lifetime.CurrentUnits.value}\n')

src/geophires_x_schema_generator/geophires-request.json

@@ -1343,13 +1343,13 @@
       "maximum": 200.0
     },
     "Economic Model": {
-      "description": "Specify the economic model to calculate the levelized cost of energy. 1: Fixed Charge Rate (FCR); 2: Standard Levelized Cost; 3: BICYCLE; 4: Simple (CLGS)",
+      "description": "Specify the economic model to calculate the levelized cost of energy. 1: Fixed Charge Rate (FCR); 2: Standard Levelized Cost; 3: BICYCLE; 4: Simple (CLGS); 5: SAM Single Owner PPA",
       "type": "integer",
       "units": null,
       "category": "Economics",
       "default": 2,
       "minimum": 1,
-      "maximum": 4,
+      "maximum": 5,
       "enum_values": [
         {
           "name": "FCR",
@@ -1370,6 +1370,11 @@
           "name": "CLGS",
           "value": "Simple (CLGS)",
           "int_value": 4
+        },
+        {
+          "name": "SAM_SINGLE_OWNER_PPA",
+          "value": "SAM Single Owner PPA",
+          "int_value": 5
         }
       ]
     },