bugfix: correctly distinguish existing OCGT and CCGT

config/config.default.yaml

@@ -107,7 +107,7 @@ electricity:
     H2: 168
 
   extendable_carriers:
-    Generator: [solar, solar-hsat, onwind, offwind-ac, offwind-dc, offwind-float, OCGT]
+    Generator: [solar, solar-hsat, onwind, offwind-ac, offwind-dc, offwind-float, OCGT, CCGT]
     StorageUnit: [] # battery, H2
     Store: [battery, H2]
     Link: [] # H2 pipeline

doc/release_notes.rst

@@ -10,6 +10,9 @@ Release Notes
 Upcoming Release
 ================
 
+* Bugfix: Make sure that gas-fired power plants are correctly added as OCGT or
+  CCGT in :mod:`add_electricity`. Previously they were always added as OCGT.
+
 * Added default values for power distribution losses, assuming uniform losses of
   3% on distribution grid links (cf. ``sector: transmission_efficiency:
   electricity distribution grid: efficiency_static: 0.97``). Since distribution

scripts/add_electricity.py

@@ -270,7 +270,6 @@ def load_powerplants(ppl_fn):
         "bioenergy": "biomass",
         "ccgt, thermal": "CCGT",
         "hard coal": "coal",
-        "natural gas": "OCGT",
     }
     return (
         pd.read_csv(ppl_fn, index_col=0, dtype={"bus": "str"})

scripts/build_powerplants.py

@@ -148,7 +148,7 @@ def add_everywhere_powerplants(ppl, substations, everywhere_powerplants):
 
 
 def replace_natural_gas_technology(df):
-    mapping = {"Steam Turbine": "CCGT", "Combustion Engine": "OCGT"}
+    mapping = {"Steam Turbine": "CCGT", "Combustion Engine": "OCGT", "Not Found": "CCGT"}
     tech = df.Technology.replace(mapping).fillna("CCGT")
     return df.Technology.mask(df.Fueltype == "Natural Gas", tech)