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

Merge pull request #1257 from PyPSA/fix-oil-primary-bus

Browse Source 
bugfix missing oil generator: remove else clause
This commit is contained in:
lisazeyen 2024-09-03 17:08:36 +02:00 committed by GitHub
commit aa79ca0be9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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)
=================================== ===================================
@ -100,7 +102,7 @@ PyPSA-Eur 0.12.0 (30th August 2024)
share_unsustainable_use_retained`` and ``biomass: share_unsustainable_use_retained`` and ``biomass:
share_sustainable_potential_available``. share_sustainable_potential_available``.
(https://github.com/PyPSA/pypsa-eur/pull/1139) (https://github.com/PyPSA/pypsa-eur/pull/1139)
* Added energy penalty for BECC applications. * Added energy penalty for BECC applications.
(https://github.com/PyPSA/pypsa-eur/pull/1130) (https://github.com/PyPSA/pypsa-eur/pull/1130)
@ -258,7 +260,7 @@ PyPSA-Eur 0.12.0 (30th August 2024)
:mod:`prepare_sector_network`. (https://github.com/PyPSA/pypsa-eur/pull/1106) :mod:`prepare_sector_network`. (https://github.com/PyPSA/pypsa-eur/pull/1106)
* Fixed PDF encoding in ``build_biomass_transport_costs``. * Fixed PDF encoding in ``build_biomass_transport_costs``.
(https://github.com/PyPSA/pypsa-eur/pull/1219) (https://github.com/PyPSA/pypsa-eur/pull/1219)
* Dropped ``pycountry`` dependency in favour of ``country_converter``. * Dropped ``pycountry`` dependency in favour of ``country_converter``.
(https://github.com/PyPSA/pypsa-eur/pull/1188) (https://github.com/PyPSA/pypsa-eur/pull/1188)

2
doc/tutorial.rst
View File

@ -224,7 +224,7 @@ This triggers a workflow of multiple preceding jobs that depend on each rule's i
7 -> 24 7 -> 24
26 -> 25 26 -> 25
27 -> 25 27 -> 25
} }
| |

6
envs/environment.fixed.yaml
View File

@ -1,6 +1,6 @@
name: pypsa-eur-20240812 name: pypsa-eur-20240812
channels: channels:
- http://conda.anaconda.org/gurobi - http://conda.anaconda.org/gurobi
- conda-forge - conda-forge
- defaults - defaults
prefix: /home/fneum/miniconda3/envs/pypsa-eur-20240812 prefix: /home/fneum/miniconda3/envs/pypsa-eur-20240812

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