bug: add_electricity only add carriers in powerplant dataset for coun…

…try subset
PyPSA · May 25, 2024 · 7ad930e · 7ad930e
1 parent a60e6fc
commit 7ad930e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/scripts/add_electricity.py b/scripts/add_electricity.py
@@ -448,8 +448,6 @@ def attach_conventional_generators(
     fuel_price=None,
 ):
     carriers = list(set(conventional_carriers) | set(extendable_carriers["Generator"]))
-    add_missing_carriers(n, carriers)
-    add_co2_emissions(n, costs, carriers)
 
     # Replace carrier "natural gas" with the respective technology (OCGT or
     # CCGT) to align with PyPSA names of "carriers" and avoid filtering "natural
@@ -465,6 +463,11 @@ def attach_conventional_generators(
     )
     ppl["efficiency"] = ppl.efficiency.fillna(ppl.efficiency_r)
 
+    # reduce carriers to those in power plant dataset
+    carriers = list(set(carriers) & set(ppl.carrier.unique()))
+    add_missing_carriers(n, carriers)
+    add_co2_emissions(n, costs, carriers)
+
     if unit_commitment is not None:
         committable_attrs = ppl.carrier.isin(unit_commitment).to_frame("committable")
         for attr in unit_commitment.index: