Merge branch 'master' into fix_msw
This commit is contained in:
commit
e940e4b73a
@ -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)
|
||||||
===================================
|
===================================
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user