Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pysam #17

Merged
merged 37 commits into from
Jan 26, 2022
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
31c01e4
update to pysam v 2.2.4
dguittet Oct 18, 2021
4d5d070
fix some battery inputs for pysam v2.2.4
dguittet Oct 19, 2021
11246a4
fix om_expense outputs
dguittet Oct 19, 2021
48d4008
fix warning with log_name
dguittet Oct 20, 2021
9cb02e0
remove construction financing and add depreciation and debt
dguittet Oct 20, 2021
a128ea1
fix test results
dguittet Oct 20, 2021
ce8d4b5
update .gitignore
dguittet Oct 30, 2021
dd3542a
fix battery financials for new version
dguittet Oct 30, 2021
ecf0ad1
add battery replacement output
dguittet Oct 31, 2021
dbad8e9
remove taxes from grid_dispatch.py
dguittet Nov 1, 2021
2b78a27
fix test results
dguittet Nov 1, 2021
243d424
fix test results
dguittet Nov 1, 2021
52267ac
Update ci.yml
dguittet Nov 2, 2021
df4755c
fix test results
dguittet Nov 2, 2021
55754dd
Merge branch 'update_pysam' of https://github.com/NREL/HOPP into upda…
dguittet Nov 2, 2021
4235d08
fix test results
dguittet Nov 2, 2021
96af1e6
fix test results
dguittet Nov 2, 2021
36c2ecb
modify solar PTC, add location from paper
dguittet Nov 6, 2021
cc60d61
weight hybrid financials by production or cost ratio or evenly; add t…
dguittet Nov 6, 2021
e3d4388
update tests
dguittet Nov 6, 2021
0ece88e
fix tests
dguittet Nov 6, 2021
f60714d
add pv_charging_only to dispatch options for ITC qualification
dguittet Nov 7, 2021
4299574
fix battery financial simulation to not run if 0 battery
dguittet Nov 10, 2021
3342cc5
fix test results
dguittet Nov 10, 2021
6e52874
use power_sources for system_capacity_kw property
dguittet Nov 17, 2021
82a2144
rename solar files in Docs to pv
dguittet Nov 26, 2021
533d8c0
add battery.rst
dguittet Nov 29, 2021
940d9cc
Merge branch 'master' into update_pysam
dguittet Nov 30, 2021
2469b28
update requirements-dev.txt
dguittet Jan 24, 2022
c15721b
update to pysam 3.0.0
dguittet Jan 24, 2022
af86f52
pvwattsv8 & O&M for battery
dguittet Jan 25, 2022
ef5acbd
O&M costs for hybrid with tests
dguittet Jan 25, 2022
7b1079d
more tests for battery O&M variable cost
dguittet Jan 25, 2022
0d99049
production tax credits test
dguittet Jan 25, 2022
615fdab
fix tests
dguittet Jan 25, 2022
c8d8962
fix accidental commit
dguittet Jan 26, 2022
f5bc5c0
update test results
dguittet Jan 26, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion hybrid/hybrid_simulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ def simulate(self,
gen = np.tile(self.battery.generation_profile,
int(project_life / (len(self.battery.generation_profile) // self.site.n_timesteps)))
total_gen += gen
self.battery.simulate_financials(project_life)
self.battery.simulate_financials(project_life)
# copy over replacement info
self.grid._financial_model.BatterySystem.assign(self.battery._financial_model.BatterySystem.export())

Expand All @@ -414,6 +414,15 @@ def simulate(self,

logger.info(f"Hybrid Simulation complete. NPVs are {self.net_present_values}. AEPs are {self.annual_energies}.")

@property
def system_capacity_kw(self):
cap = self.outputs_factory.create()
for v in ("pv", "wind", "battery"):
dguittet marked this conversation as resolved.
Show resolved Hide resolved
if hasattr(self, v):
setattr(cap, v, getattr(getattr(self, v), "system_capacity_kw"))
cap.hybrid = self.grid.system_capacity_kw
return cap

@property
def annual_energies(self):
aep = self.outputs_factory.create()
Expand Down