WIP stash - interest rate disambiguation

Author: softwareengineerprogrammer

src/geophires_x/Economics.py

@@ -1798,7 +1798,8 @@ def __init__(self, model: Model):
             Name='Interest Rate',
             UnitType=Units.PERCENT,
             PreferredUnits=PercentUnit.PERCENT,
-            CurrentUnits=PercentUnit.PERCENT
+            CurrentUnits=PercentUnit.PERCENT,
+            ToolTipText=f'Equivalent to {self.FixedInternalRate.Name}'
         )
 
         # TODO this is displayed as "Project Net Revenue" in Revenue & Cashflow Profile which is probably not an
@@ -2209,7 +2210,7 @@ def discount_rate_display() -> str:
                                  f'values ({discount_rate_display()}; {self.FixedInternalRate.quantity()}). '
                                  f'It is recommended to only provide one of these values.')
 
-        self.interest_rate.value = self.discountrate.quantity().to(convertible_unit(self.interest_rate.CurrentUnits)).magnitude
+        self.interest_rate.value = self.FixedInternalRate.quantity().to(convertible_unit(self.interest_rate.CurrentUnits)).magnitude
 
     def sync_well_drilling_and_completion_capital_cost_adjustment_factor(self, model):
         if (self.production_well_cost_adjustment_factor.Provided

src/geophires_x/Outputs.py

@@ -241,15 +241,18 @@ def PrintOutputs(self, model: Model):
                 f.write(NL)
                 f.write('                           ***ECONOMIC PARAMETERS***\n')
                 f.write(NL)
-                if model.economics.econmodel.value == EconomicModel.FCR:
-                    f.write(f'      Economic Model = {model.economics.econmodel.value.value}\n')
-                    f.write(f'      Fixed Charge Rate (FCR):                          {model.economics.FCR.value*100.0:10.2f} {model.economics.FCR.CurrentUnits.value}\n')
-                elif model.economics.econmodel.value == EconomicModel.STANDARDIZED_LEVELIZED_COST:
+                if model.economics.econmodel.value != EconomicModel.CLGS:
                     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.SAM_SINGLE_OWNER_PPA):
-                    f.write(f'      Economic Model = {model.economics.econmodel.value.value}\n')
+                    if model.economics.econmodel.value == EconomicModel.FCR:
+                        #f.write(f'      Economic Model = {model.economics.econmodel.value.value}\n')
+                        f.write(f'      Fixed Charge Rate (FCR):                          {model.economics.FCR.value*100.0:10.2f} {model.economics.FCR.CurrentUnits.value}\n')
+                    else:
+                        #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.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')
                 f.write(f'      Capacity factor:                                 {model.surfaceplant.utilization_factor.value * 100:10.1f} %\n')

src/geophires_x_schema_generator/geophires-result.json

@@ -71,7 +71,7 @@
         "Economic Model": {},
         "Interest Rate": {
           "type": "number",
-          "description": "",
+          "description": "Equivalent to Fixed Internal Rate",
           "units": "%"
         },
         "Accrued financing during construction": {},