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

incorporate suggestions of #69

Browse Source
This commit is contained in:
Fabian Hofmann 2019-10-31 14:48:10 +01:00
parent 0d778eaf42
commit 4ee18ea9fa
2 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.default.yaml
View File

@ -39,9 +39,10 @@ electricity:
# 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] conventional_carriers: [] # nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass]
custom_powerplants: replace #replace or add
restrict_buildyear: 2015 #delete generators built after 2015
atlite: atlite:
nprocesses: 4 nprocesses: 4

39
scripts/build_powerplants.py
View File

@ -34,7 +34,7 @@ Description
""" """
import logging, os import logging
from scipy.spatial import cKDTree as KDTree from scipy.spatial import cKDTree as KDTree
import pypsa import pypsa
@ -44,36 +44,23 @@ import pandas as pd
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
def add_custom_powerplants(ppl):
def add_custom_carriers(ppl): custom_ppl_query = snakemake.config['electricity']['custom_powerplants']
switch = snakemake.config['electricity']['custom_powerplants'] if not custom_ppl_query:
if switch not in ('replace', 'add'):
logger.warning('custom_carriers is invalid keyword, try '
'"replace" or "add"]. powerplants remain unchanged.')
return ppl return ppl
dirname = os.path.abspath(os.path.join(os.path.dirname(__file__),"..")) add_ppls = pd.read_csv(snakemake.input.custom_powerplants, index_col=0)
add_ppls = pd.read_csv(dirname + "/data/custom_powerplants.csv", index_col=0) if isinstance(custom_ppl_query, str):
if switch == 'replace': add_ppls.query(add_ppls, inplace=True)
countries = add_ppls.Country.unique().tolist() return ppl.append(add_ppls, sort=False)
carriers = add_ppls.Fueltype.unique().tolist()
logger.info('replacing ' + str(carriers) + ' in ' + str(countries) + '...')
ppl.query('Fueltype != @carriers or Country != @countries',inplace=True)
logger.info('adding custom carriers...')
return ppl.append(add_ppls, sort='False')
def restrict_buildyear(ppl):
year = snakemake.config['electricity']['restrict_buildyear']
logger.info('restricting build year of generators to ' + str(year) + '...')
ppl.YearCommissioned = ppl.YearCommissioned.fillna(0).astype(int) #in case of bad arrangement
ppl.YearCommissioned = ppl.YearCommissioned.astype(int)
ppl.query('YearCommissioned <= @year',inplace=True)
if __name__ == "__main__": if __name__ == "__main__":
if 'snakemake' not in globals(): if 'snakemake' not in globals():
from vresutils.snakemake import MockSnakemake, Dict from vresutils.snakemake import MockSnakemake, Dict
snakemake = MockSnakemake( snakemake = MockSnakemake(
input=Dict(base_network='networks/base.nc'), input=Dict(base_network='networks/base.nc',
custom_powerplants='data/custom_powerplants.csv'),
output=['resources/powerplants.csv'] output=['resources/powerplants.csv']
) )
@ -92,9 +79,11 @@ if __name__ == "__main__":
df.Technology.replace('Steam Turbine', df.Technology.replace('Steam Turbine',
'OCGT').fillna('OCGT'))))) 'OCGT').fillna('OCGT')))))
ppl = add_custom_carriers(ppl) # add carriers from own powerplant files ppl_query = snakemake.config['electricity']['powerplant_filter']
restrict_buildyear(ppl) if isinstance(ppl_query, str):
ppl.query(ppl_query, inplace=True)
ppl = add_custom_powerplants(ppl) # add carriers from own powerplant files
cntries_without_ppl = [c for c in countries if c not in ppl.Country.unique()] cntries_without_ppl = [c for c in countries if c not in ppl.Country.unique()]