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

Merge branch 'eu-energy-security' into results-dir

Browse Source
This commit is contained in:
Fabian Neumann 2022-04-08 12:34:11 +02:00
commit 4a18d59789
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.default.yaml
View File

@ -61,7 +61,7 @@ electricity:
H2: 168 H2: 168
# use pandas query strings here, e.g. Country not in ['Germany'] # use pandas query strings here, e.g. Country not in ['Germany']
powerplants_filter: (DateOut >= 2021 or DateOut != DateOut) powerplants_filter: (DateOut >= 2022 or DateOut != DateOut)
# use pandas query strings here, e.g. Country in ['Germany'] # use pandas query strings here, e.g. Country in ['Germany']
custom_powerplants: false custom_powerplants: false
conventional_carriers: [nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass] conventional_carriers: [nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass]

2
envs/environment.yaml
View File

@ -56,4 +56,4 @@ dependencies:
- pip: - pip:
- vresutils>=0.3.1 - vresutils>=0.3.1
- tsam>=1.1.0 - tsam>=1.1.0
- powerplantmatching>=0.5.1 - powerplantmatching>=0.5.3

8
scripts/build_powerplants.py
View File

@ -115,6 +115,14 @@ if __name__ == "__main__":
.replace({'Technology': {'Steam Turbine': 'OCGT', "Combustion Engine": "OCGT"}}) .replace({'Technology': {'Steam Turbine': 'OCGT', "Combustion Engine": "OCGT"}})
.assign(Fueltype=replace_natural_gas_by_technology)) .assign(Fueltype=replace_natural_gas_by_technology))
# Correct bioenergy for countries where possible
opsd = pm.data.OPSD_VRE().powerplant.convert_country_to_alpha2()
opsd = opsd.query('Country in @countries and Fueltype == "Bioenergy"')
opsd['Fueltype'] = 'biomass'
available_countries = opsd.Country.unique()
ppl = ppl.query('not (Country in @available_countries and Fueltype == "Bioenergy")')
ppl = pd.concat([ppl, opsd])
ppl_query = snakemake.config['electricity']['powerplants_filter'] ppl_query = snakemake.config['electricity']['powerplants_filter']
if isinstance(ppl_query, str): if isinstance(ppl_query, str):
ppl.query(ppl_query, inplace=True) ppl.query(ppl_query, inplace=True)