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

fix typo

Browse Source
This commit is contained in:
FabianHofmann 2019-10-31 14:59:51 +01:00
parent 4ee18ea9fa
commit 324ededa66
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config.default.yaml
View File

@ -34,15 +34,16 @@ electricity:
battery: 6 battery: 6
H2: 168 H2: 168
powerplants_filter: false
custom_powerplants: false #replace or add
restrict_buildyear: false #delete generators built after 2015
conventional_carriers: [] # nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass]
# estimate_renewable_capacities_from_capacity_stats: # estimate_renewable_capacities_from_capacity_stats:
# # Wind is the Fueltype in ppm.data.Capacity_stats, onwind, offwind-{ac,dc} the carrier in PyPSA-Eur # # Wind is the Fueltype in ppm.data.Capacity_stats, onwind, offwind-{ac,dc} the carrier in PyPSA-Eur
# Wind: [onwind, offwind-ac, offwind-dc] # Wind: [onwind, offwind-ac, offwind-dc]
# Solar: [solar] # Solar: [solar]
powerplants_filter: false
custom_powerplants: false #replace or add
restrict_buildyear: false #delete generators built after 2015
conventional_carriers: [] # nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass]
atlite: atlite:
nprocesses: 4 nprocesses: 4

2
scripts/build_powerplants.py
View File

@ -79,7 +79,7 @@ if __name__ == "__main__":
df.Technology.replace('Steam Turbine', df.Technology.replace('Steam Turbine',
'OCGT').fillna('OCGT'))))) 'OCGT').fillna('OCGT')))))
ppl_query = snakemake.config['electricity']['powerplant_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)