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

Merge branch 'eu-energy-security' into renewable-caps

Browse Source
This commit is contained in:
Fabian Neumann 2022-04-04 19:04:44 +02:00 committed by GitHub
commit cb9730118b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
envs/environment.yaml
View File

@ -24,7 +24,6 @@ dependencies:
- yaml - yaml
- pytables - pytables
- lxml - lxml
- powerplantmatching>=0.5.1
- numpy - numpy
- pandas - pandas
- geopandas - geopandas
@ -57,3 +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

2
scripts/build_powerplants.py
View File

@ -104,7 +104,7 @@ if __name__ == "__main__":
countries = n.buses.country.unique() countries = n.buses.country.unique()
ppl = (pm.powerplants(from_url=True) ppl = (pm.powerplants(from_url=True)
.powerplant.fill_missing_decommyears() .powerplant.fill_missing_decommissioning_years()
.powerplant.convert_country_to_alpha2() .powerplant.convert_country_to_alpha2()
.query('Fueltype not in ["Solar", "Wind"] and Country in @countries') .query('Fueltype not in ["Solar", "Wind"] and Country in @countries')
.replace({'Technology': {'Steam Turbine': 'OCGT'}}) .replace({'Technology': {'Steam Turbine': 'OCGT'}})