method rename, py39 compat

Author: softwareengineerprogrammer

src/geophires_x/Economics.py

@@ -4,7 +4,7 @@
 import numpy as np
 import numpy_financial as npf
 import geophires_x.Model as Model
-from geophires_x.EconomicsSam import compute_sam_financials
+from geophires_x.EconomicsSam import calculate_sam_economics
 from geophires_x.OptionList import Configuration, WellDrillingCostCorrelation, EconomicModel, EndUseOptions, PlantType, \
     _WellDrillingCostCorrelationCitation
 from geophires_x.Parameter import intParameter, floatParameter, OutputParameter, ReadParameter, boolParameter, \
@@ -471,7 +471,7 @@ def CalculateLCOELCOHLCOC(econ, model: Model) -> tuple:
                 model.surfaceplant.annual_heating_demand.value * discount_vector) * 1E2  # cents/kWh
             LCOH = LCOH * 2.931  # $/Million Btu
     elif econ.econmodel.value == EconomicModel.SAM_SINGLE_OWNER_PPA:
-        LCOE = compute_sam_financials(model)['LCOE']['value']
+        LCOE = calculate_sam_economics(model)['LCOE']['value']
     else:
         # must be BICYCLE
         # average return on investment (tax and inflation adjusted)
@@ -2963,7 +2963,7 @@ def Calculate(self, model: Model) -> None:
             )
 
         if self.econmodel.value == EconomicModel.SAM_SINGLE_OWNER_PPA:
-            sam_economics = compute_sam_financials(model)
+            sam_economics = calculate_sam_economics(model)
             self.ProjectNPV.value = sam_economics['NPV']['value']
             self.ProjectIRR.value = sam_economics['IRR']['value']
             # FIXME WIP VIR + MOIC

src/geophires_x/EconomicsSam.py

@@ -55,7 +55,7 @@ def get_single_owner_parameters(model: Model) -> dict[str, Any]:
     return ret
 
 
-def compute_sam_financials(
+def calculate_sam_economics(
     model: Model
 ) -> dict[str, dict[str, Any]]:
     custom_gen = CustomGeneration.new()
@@ -69,7 +69,7 @@ def compute_sam_financials(
     file_names = [f'{project_name}_{module}' for module in ['custom_generation', 'grid', 'utilityrate5', 'singleowner']]
     modules = [custom_gen, grid, utility_rate, single_owner]
 
-    for module_file, module in zip(file_names, modules, strict=True):
+    for module_file, module in zip(file_names, modules):
         with open(Path(project_dir, f'{module_file}.json'), encoding='utf-8') as file:
             data = json.load(file)
             # loop through each key-value pair