bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into pz-max-patch-2

Browse Source
This commit is contained in:
Max Parzen 2022-12-16 12:20:58 +00:00 committed by GitHub
commit 545a734b7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/release_notes.rst
View File

@ -14,6 +14,8 @@ Upcoming Release
* Fix EQ constraint for the case no hydro inflow is available * Fix EQ constraint for the case no hydro inflow is available
* Bugfix in the reserve constraint will increase demand related reserve requirements
PyPSA-Eur 0.6.1 (20th September 2022) PyPSA-Eur 0.6.1 (20th September 2022)
===================================== =====================================

2
scripts/solve_network.py
View File

@ -281,7 +281,7 @@ def add_operational_reserve_margin_constraint(n, config):
).sum(1) ).sum(1)
# Total demand at t # Total demand at t
demand = n.loads_t.p.sum(1) demand = n.loads_t.p_set.sum(1)
# VRES potential of non extendable generators # VRES potential of non extendable generators
capacity_factor = n.generators_t.p_max_pu[vres_i.difference(ext_i)] capacity_factor = n.generators_t.p_max_pu[vres_i.difference(ext_i)]