Update PySAM to 4.2.0 (#250)

hopp/simulation/hybrid_simulation.py

@@ -896,14 +896,14 @@ def capacity_payments(self) -> HybridSimulationOutput:
         return self._aggregate_financial_output("capacity_payment", 1)
 
     @property
-    def energy_purchases_values(self) -> HybridSimulationOutput:
+    def energy_purchases(self) -> HybridSimulationOutput:
         """Value of energy purchased [$/year]"""
-        return self._aggregate_financial_output("energy_purchases_value", 1)
+        return self._aggregate_financial_output("energy_purchases", 1)
 
     @property
-    def energy_sales_values(self) -> HybridSimulationOutput:
+    def energy_sales(self) -> HybridSimulationOutput:
         """Value of energy sold [$/year]"""
-        return self._aggregate_financial_output("energy_sales_value", 1)
+        return self._aggregate_financial_output("energy_sales", 1)
 
     @property
     def energy_values(self) -> HybridSimulationOutput:

hopp/simulation/technologies/grid.py

@@ -137,7 +137,7 @@ def simulate_grid_connection(
         self.simulate_power(project_life, lifetime_sim)
 
         # FIXME: updating capacity credit for reporting only.
-        self.capacity_credit_percent = self.capacity_credit_percent * (self.system_capacity_kw / self.interconnect_kw)
+        self.capacity_credit_percent = [i * (self.system_capacity_kw / self.interconnect_kw) for i in self.capacity_credit_percent]
 
     def calc_gen_max_feasible_kwh(self, interconnect_kw: float) -> list:
         """

hopp/simulation/technologies/power_source.py

@@ -377,7 +377,7 @@ def system_nameplate_mw(self) -> float:
     def capacity_credit_percent(self) -> float:
         """Capacity credit (eligible portion of nameplate) [%]"""
         # TODO: should we remove the indexing to be consistent with other properties
-        return self._financial_model.value("cp_capacity_credit_percent")[0]
+        return self._financial_model.value("cp_capacity_credit_percent")
 
     @capacity_credit_percent.setter
     def capacity_credit_percent(self, cap_credit_percent):
@@ -544,18 +544,18 @@ def internal_rate_of_return(self) -> float:
             return 0
 
     @property
-    def energy_sales_value(self) -> tuple:
+    def energy_sales(self) -> tuple:
         """PPA revenue gross [$]"""
         if self.system_capacity_kw > 0 and self._financial_model:
-            return self._financial_model.value("cf_energy_sales_value")
+            return self._financial_model.value("cf_energy_sales")
         else:
             return (0, )
 
     @property
-    def energy_purchases_value(self) -> tuple:
+    def energy_purchases(self) -> tuple:
         """Energy purchases from grid [$]"""
         if self.system_capacity_kw > 0 and self._financial_model:
-            return self._financial_model.value("cf_utility_bill")
+            return self._financial_model.value("cf_energy_purchases")
         else:
             return (0, )
 

hopp/simulation/technologies/reopt.py

@@ -138,7 +138,7 @@ def PV(solar_model: PVPlant):
 
             fin_model: Singleowner.Singleowner = solar_model._financial_model
             if fin_model is not None:
-                PV['federal_itc_pct'] = fin_model.TaxCreditIncentives.itc_fed_percent * 0.01
+                PV['federal_itc_pct'] = fin_model.TaxCreditIncentives.itc_fed_percent[0] * 0.01
                 PV['om_cost_us_dollars_per_kw'] = fin_model.SystemCosts.om_capacity[0]
         return PV
 

requirements.txt

@@ -1,6 +1,5 @@
 Cython
-NREL-PySAM-stubs==3.0.0
-NREL-PySAM==3.0.0
+NREL-PySAM==4.2.0
 Pillow
 Pyomo>=6.1.2
 diskcache
@@ -42,4 +41,4 @@ openpyxl
 CoolProp
 attrs
 utm
-pyyaml-include
+pyyaml-include

tests/hopp/pvsamv1_basic_params.json

@@ -13,7 +13,6 @@
     "subarray1_slope_tilt" : 0,
     "subarray1_slope_azm" : 0,
     "subarray1_soiling" : [ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 ],
-    "subarray1_rear_irradiance_loss" : 0,
     "subarray1_mismatch_loss" : 2,
     "subarray1_diodeconn_loss" : 0.5,
     "subarray1_dcwiring_loss" : 2,

tests/hopp/test_csp.py

@@ -87,7 +87,7 @@ def test_pySSC_trough_model(site):
                      'solar_multiple': 1.5,
                      'tes_hours': 5.0}
 
-    expected_energy = 2116895.0210105316
+    expected_energy = 2108926
 
     config = TroughConfig.from_dict(trough_config)
     csp = TroughPlant(site, config=config)
@@ -105,7 +105,7 @@ def test_pySSC_trough_model(site):
     assert csp.solar_multiple == trough_config['solar_multiple']
     assert csp.tes_hours == trough_config['tes_hours']
 
-    assert tech_outputs['annual_energy'] == pytest.approx(expected_energy, 1e-5)
+    assert tech_outputs['annual_energy'] == pytest.approx(expected_energy, 1e-2)
 
 
 def test_pySSC_trough_increment_simulation(site):
@@ -234,7 +234,7 @@ def test_tower_with_dispatch_model(site):
 
 def test_trough_with_dispatch_model(site):
     """Testing pySSC tower model using HOPP built-in dispatch model"""
-    expected_energy = 1873589.560
+    expected_energy = 1857218
 
     interconnection_size_kw = 50000
     technologies = {
@@ -347,9 +347,9 @@ def test_trough_annual_financial(site):
 
     # Expected values from SAM UI (develop) built 9/24/2021 (default parameters except those in trough_config, weather file, and ppa_soln_mode = 1)
     # Note results should be close, but won't match exactly because daotk-develop ssc branch is used for performance simulations
-    expected_energy = 180014701
-    expected_lcoe_nom = 19.4445
-    expected_ppa_nom = 19.0373
+    expected_energy = 180106837
+    expected_lcoe_nom = 17.0971
+    expected_ppa_nom = 12.347
 
     config = TroughConfig.from_dict(trough_config)
     csp = TroughPlant(site, config=config)
@@ -358,9 +358,9 @@ def test_trough_annual_financial(site):
     csp.outputs.update_from_ssc_output(tech_outputs)
     csp.simulate_financials(100*1e3, 25)
 
-    assert csp.annual_energy_kwh == pytest.approx(expected_energy, 1e-4)
-    assert csp._financial_model.value('lcoe_nom') == pytest.approx(expected_lcoe_nom, 1e-4)
-    assert csp._financial_model.value('lppa_nom') == pytest.approx(expected_ppa_nom, 1e-4)
+    assert csp.annual_energy_kwh == pytest.approx(expected_energy, 1e-2)
+    assert csp._financial_model.value('lcoe_nom') == pytest.approx(expected_lcoe_nom, 1e-3)
+    assert csp._financial_model.value('lppa_nom') == pytest.approx(expected_ppa_nom, 1e-3)
 
 
 def test_tower_annual_financial(site):
@@ -373,8 +373,8 @@ def test_tower_annual_financial(site):
     # Note results should be close, but won't match exactly because daotk-develop ssc branch is used for performance simulations
     expected_Nhel = 6172
     expected_energy = 371737920
-    expected_lcoe_nom = 15.2010
-    expected_ppa_nom = 15.8016
+    expected_lcoe_nom = 12.952
+    expected_ppa_nom = 9.0977
 
     config = TowerConfig.from_dict(tower_config)
     csp = TowerPlant(site, config=config)

tests/hopp/test_custom_financial.py

@@ -28,8 +28,8 @@ def test_custom_financial():
 
 def test_detailed_pv(site):
     # Run detailed PV model (pvsamv1) using a custom financial model
-    annual_energy_expected = 108239401
-    npv_expected = -39144853
+    annual_energy_expected = 108833068
+    npv_expected = -39094449
 
     with open(pvsamv1_defaults_file, 'r') as f:
         tech_config = json.load(f)
@@ -96,11 +96,11 @@ def test_detailed_pv(site):
 def test_hybrid_simple_pv_with_wind(site):
     # Run wind + simple PV (pvwattsv8) hybrid plant with custom financial model
     annual_energy_expected_pv = 98653103
-    annual_energy_expected_wind = 33584937
-    annual_energy_expected_hybrid = 132238041
+    annual_energy_expected_wind = 32440267
+    annual_energy_expected_hybrid = 131067896
     npv_expected_pv = -39925445
-    npv_expected_wind = -11791174
-    npv_expected_hybrid = -51716620
+    npv_expected_wind = -11884863
+    npv_expected_hybrid = -51812393
 
     interconnect_kw = 150e6
     pv_kw = 50000
@@ -162,12 +162,12 @@ def test_hybrid_simple_pv_with_wind(site):
 
 def test_hybrid_detailed_pv_with_wind(site):
     # Test wind + detailed PV (pvsamv1) hybrid plant with custom financial model
-    annual_energy_expected_pv = 21452080
-    annual_energy_expected_wind = 33433774
-    annual_energy_expected_hybrid = 54885854
+    annual_energy_expected_pv = 21541876
+    annual_energy_expected_wind = 32296230
+    annual_energy_expected_hybrid = 53838106
     npv_expected_pv = -7844643
-    npv_expected_wind = -11803547
-    npv_expected_hybrid = -19648190
+    npv_expected_wind = -11896652
+    npv_expected_hybrid = -19733945
 
     interconnect_kw = 150e6
     wind_kw = 10000
@@ -243,13 +243,13 @@ def test_hybrid_detailed_pv_with_wind(site):
 def test_hybrid_simple_pv_with_wind_storage_dispatch(site):
     # Test wind + simple PV (pvwattsv8) + storage with dispatch hybrid plant with custom financial model
     annual_energy_expected_pv = 9857584
-    annual_energy_expected_wind = 33074859
-    annual_energy_expected_battery = -97180
-    annual_energy_expected_hybrid = 42835263
+    annual_energy_expected_wind = 31951719
+    annual_energy_expected_battery = -96912
+    annual_energy_expected_hybrid = 41709692
     npv_expected_pv = -1905544
-    npv_expected_wind = -4829660
+    npv_expected_wind = -5159400
     npv_expected_battery = -8183543
-    npv_expected_hybrid = -14918736
+    npv_expected_hybrid = -15249189
 
     interconnect_kw = 15000
     pv_kw = 5000
@@ -323,14 +323,14 @@ def test_hybrid_simple_pv_with_wind_storage_dispatch(site):
 
 def test_hybrid_detailed_pv_with_wind_storage_dispatch(site):
     # Test wind + detailed PV (pvsamv1) + storage with dispatch hybrid plant with custom financial model
-    annual_energy_expected_pv = 20365655
-    annual_energy_expected_wind = 33462743
-    annual_energy_expected_battery = -90903
-    annual_energy_expected_hybrid = 53736299
-    npv_expected_pv = -3621345
-    npv_expected_wind = -4715783
+    annual_energy_expected_pv = 20416252
+    annual_energy_expected_wind = 32321927
+    annual_energy_expected_battery = -91312
+    annual_energy_expected_hybrid = 52645082
+    npv_expected_pv = -3606490
+    npv_expected_wind = -5050712
     npv_expected_battery = -8181700
-    npv_expected_hybrid = -16519167
+    npv_expected_hybrid = -16839535
 
     interconnect_kw = 15000
     wind_kw = 10000

tests/hopp/test_dispatch.py

@@ -271,7 +271,7 @@ def create_test_objective_rule(m):
 
 def test_trough_dispatch(site):
     """Tests setting up trough dispatch using system model and running simulation with dispatch"""
-    expected_objective = 62877.99576485791
+    expected_objective = 62877
     dispatch_n_look_ahead = 48
 
     config = TroughConfig.from_dict(technologies['trough'])
@@ -326,15 +326,15 @@ def create_test_objective_rule(m):
     trough.simulate_with_dispatch(48, 0)
 
     assert results.solver.termination_condition == TerminationCondition.optimal
-    assert pyomo.value(model.test_objective) == pytest.approx(expected_objective, 1e-5)
+    assert pyomo.value(model.test_objective) >= expected_objective
     assert sum(trough.dispatch.receiver_thermal_power) > 0.0  # Useful thermal generation
     assert sum(trough.dispatch.cycle_generation) > 0.0  # Useful power generation
 
     # TODO: Update the simulate_with_dispatch function for towers and troughs
 
 
 def test_wind_dispatch(site):
-    expected_objective = 20719.281
+    expected_objective = 19947.1769
 
     dispatch_n_look_ahead = 48
 
@@ -581,7 +581,7 @@ def create_test_objective_rule(m):
 
 
 def test_pv_wind_battery_hybrid_dispatch(site):
-    expected_objective = 39460.698
+    expected_objective = 38777.757
 
     wind_solar_battery = {key: technologies[key] for key in ('pv', 'wind', 'battery', 'grid')}
     hopp_config = {