From c89ce9f04512cf4a61c3bff6cb1b19fd9ff2aaf0 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 20 May 2024 15:00:46 +0200 Subject: [PATCH] bugfix: correctly distinguish existing OCGT and CCGT --- config/config.default.yaml | 2 +- doc/release_notes.rst | 3 +++ scripts/add_electricity.py | 1 - scripts/build_powerplants.py | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/config.default.yaml b/config/config.default.yaml index 5e08a0dd..ddca9f80 100644 --- a/config/config.default.yaml +++ b/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 diff --git a/doc/release_notes.rst b/doc/release_notes.rst index b9722464..ebb07b2a 100644 --- a/doc/release_notes.rst +++ b/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 diff --git a/scripts/add_electricity.py b/scripts/add_electricity.py index 0685e42f..7a856b95 100755 --- a/scripts/add_electricity.py +++ b/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"}) diff --git a/scripts/build_powerplants.py b/scripts/build_powerplants.py index 66a01624..c4bf10bc 100755 --- a/scripts/build_powerplants.py +++ b/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)