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

bugfix missing oil generator: remove else clause
2024-09-03 17:08:36 +02:00 · 2024-09-03 17:08:36 +02:00 · aa79ca0be9
commit aa79ca0be9
parent d2e7562962 f100504a1d
4 changed files with 16 additions and 16 deletions
--- a/doc/release_notes.rst
+++ b/doc/release_notes.rst
@ -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)
 ===================================

--- a/envs/environment.fixed.yaml
+++ b/envs/environment.fixed.yaml
@ -1,6 +1,6 @@
 name: pypsa-eur-20240812
 channels:
-  - http://conda.anaconda.org/gurobi
-  - conda-forge
-  - defaults
+- http://conda.anaconda.org/gurobi
+- conda-forge
+- defaults
 prefix: /home/fneum/miniconda3/envs/pypsa-eur-20240812
--- a/scripts/prepare_sector_network.py
+++ b/scripts/prepare_sector_network.py
@ -604,8 +604,6 @@ def add_carrier_buses(n, carrier, nodes=None):

            suffix = " primary"

-        else:
-
        n.madd(
            "Generator",
            nodes + suffix,