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

bugfix missing oil generator: remove else clause

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)
 ===================================
 
@@ -100,7 +102,7 @@ PyPSA-Eur 0.12.0 (30th August 2024)
     share_unsustainable_use_retained`` and ``biomass:
     share_sustainable_potential_available``.
     (https://github.com/PyPSA/pypsa-eur/pull/1139)
-  
+
   * Added energy penalty for BECC applications.
     (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)
 
 * 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``.
   (https://github.com/PyPSA/pypsa-eur/pull/1188)

doc/tutorial.rst

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

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

scripts/prepare_sector_network.py

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