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

Merge branch 'master' into fix_msw

Browse Source
This commit is contained in:
Philipp Glaum 2024-09-04 08:26:50 +02:00 committed by GitHub
commit e940e4b73a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/release_notes.rst
View File

@ -11,6 +11,8 @@ Release Notes
.. Upcoming Release .. Upcoming Release
.. ================ .. ================
* bugfix: The oil generator was incorrectly dropped when the config `oil_refining_emissions` was greater than zero. This was the default behaviour in 0.12.0.
PyPSA-Eur 0.12.0 (30th August 2024) PyPSA-Eur 0.12.0 (30th August 2024)
=================================== ===================================

18
scripts/prepare_sector_network.py
View File

@ -604,16 +604,14 @@ def add_carrier_buses(n, carrier, nodes=None):
suffix = " primary" suffix = " primary"
else: n.madd(
"Generator",
n.madd( nodes + suffix,
"Generator", bus=nodes + suffix,
nodes + suffix, p_nom_extendable=True,
bus=nodes + suffix, carrier=carrier + suffix,
p_nom_extendable=True, marginal_cost=costs.at[carrier, "fuel"],
carrier=carrier + suffix, )
marginal_cost=costs.at[carrier, "fuel"],
)
# TODO: PyPSA-Eur merge issue # TODO: PyPSA-Eur merge issue