From b2d346f02cdeb3f16f15c258a98cf864c33f7a2a Mon Sep 17 00:00:00 2001
From: lisazeyen <lisa.zeyen@web.de>
Date: Thu, 1 Aug 2024 17:47:21 +0200
Subject: [PATCH] some simplifications

---
 scripts/prepare_sector_network.py | 34 +++++++++++--------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py
index 35de1fe7..cdd12866 100644
--- a/scripts/prepare_sector_network.py
+++ b/scripts/prepare_sector_network.py
@@ -543,21 +543,16 @@ def add_carrier_buses(n, carrier, nodes=None):
     )
 
     fossils = ["coal", "gas", "oil", "lignite"]
-    if not options.get("fossil_fuels", True) and carrier in fossils:
-        print("Not adding fossil ", carrier)
-        extendable = False
-    else:
-        print("Adding fossil ", carrier)
-        extendable = True
-
-    n.madd(
-        "Generator",
-        nodes,
-        bus=nodes,
-        p_nom_extendable=extendable,
-        carrier=carrier,
-        marginal_cost=costs.at[carrier, "fuel"],
-    )
+    if options.get("fossil_fuels", True) and carrier in fossils:
+       
+        n.madd(
+            "Generator",
+            nodes,
+            bus=nodes,
+            p_nom_extendable=True,
+            carrier=carrier,
+            marginal_cost=costs.at[carrier, "fuel"],
+        )
 
 
 # TODO: PyPSA-Eur merge issue
@@ -2906,17 +2901,12 @@ def add_industry(n, costs):
             carrier="oil",
         )
 
-    if not options.get("fossil_fuels", True):
-        extendable = False
-    else:
-        extendable = True
-
-    if "oil" not in n.generators.carrier.unique():
+    if options.get("fossil_fuels", True) and "oil" not in n.generators.carrier.unique():
         n.madd(
             "Generator",
             spatial.oil.nodes,
             bus=spatial.oil.nodes,
-            p_nom_extendable=extendable,
+            p_nom_extendable=True,
             carrier="oil",
             marginal_cost=costs.at["oil", "fuel"],
         )