bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

bugfix: correctly distinguish existing OCGT and CCGT

Browse Source
This commit is contained in:
Fabian Neumann 2024-05-20 15:00:46 +02:00
parent 7ce15931e5
commit c89ce9f045
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.default.yaml
View File

@ -107,7 +107,7 @@ electricity:
H2: 168 H2: 168
extendable_carriers: 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 StorageUnit: [] # battery, H2
Store: [battery, H2] Store: [battery, H2]
Link: [] # H2 pipeline Link: [] # H2 pipeline

3
doc/release_notes.rst
View File

@ -10,6 +10,9 @@ Release Notes
Upcoming Release 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 * Added default values for power distribution losses, assuming uniform losses of
3% on distribution grid links (cf. ``sector: transmission_efficiency: 3% on distribution grid links (cf. ``sector: transmission_efficiency:
electricity distribution grid: efficiency_static: 0.97``). Since distribution electricity distribution grid: efficiency_static: 0.97``). Since distribution

1
scripts/add_electricity.py
View File

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

2
scripts/build_powerplants.py
View File

@ -148,7 +148,7 @@ def add_everywhere_powerplants(ppl, substations, everywhere_powerplants):
def replace_natural_gas_technology(df): 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") tech = df.Technology.replace(mapping).fillna("CCGT")
return df.Technology.mask(df.Fueltype == "Natural Gas", tech) return df.Technology.mask(df.Fueltype == "Natural Gas", tech)