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

Merge branch 'master' into patch-1

Browse Source
This commit is contained in:
Fabian Hofmann 2022-08-09 16:52:04 +02:00 committed by GitHub
commit 10b909e691
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/build_powerplants.py
View File

@ -92,7 +92,13 @@ def add_custom_powerplants(ppl, custom_powerplants, custom_ppl_query=False):
return pd.concat([ppl, add_ppls], sort=False, ignore_index=True, verify_integrity=True)
def replace_natural_gas_by_technology(df):
def replace_natural_gas_technology(df):
mapping = {'Steam Turbine': 'OCGT', "Combustion Engine": "OCGT"}
tech = df.Technology.replace(mapping).fillna('OCGT')
return df.Technology.where(df.Fueltype != 'Natural Gas', tech)
def replace_natural_gas_fueltype(df):
return df.Fueltype.where(df.Fueltype != 'Natural Gas', df.Technology)
@ -110,8 +116,8 @@ if __name__ == "__main__":
.powerplant.fill_missing_decommissioning_years()
.powerplant.convert_country_to_alpha2()
.query('Fueltype not in ["Solar", "Wind"] and Country in @countries')
.replace({'Technology': {'Steam Turbine': 'OCGT', "Combustion Engine": "OCGT"}})
.assign(Fueltype=replace_natural_gas_by_technology))
.assign(Technology=replace_natural_gas_technology)
.assign(Fueltype=replace_natural_gas_fueltype))
# Correct bioenergy for countries where possible
opsd = pm.data.OPSD_VRE().powerplant.convert_country_to_alpha2()