Merge branch 'master' into fix_msw

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

View File

@ -11,6 +11,8 @@ Release Notes
.. 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)
===================================

View File

@ -604,8 +604,6 @@ def add_carrier_buses(n, carrier, nodes=None):
suffix = " primary"
else:
n.madd(
"Generator",
nodes + suffix,