Merge branch 'master' into snakemake_dependencies_in_functions
This commit is contained in:
commit
c45691d305
@ -154,6 +154,7 @@ renewable:
|
|||||||
# sector: The economic potential of photovoltaics and concentrating solar
|
# sector: The economic potential of photovoltaics and concentrating solar
|
||||||
# power." Applied Energy 135 (2014): 704-720.
|
# power." Applied Energy 135 (2014): 704-720.
|
||||||
# This correction factor of 0.854337 may be in order if using reanalysis data.
|
# This correction factor of 0.854337 may be in order if using reanalysis data.
|
||||||
|
# for discussion refer to https://github.com/PyPSA/pypsa-eur/pull/304
|
||||||
# correction_factor: 0.854337
|
# correction_factor: 0.854337
|
||||||
corine: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
|
corine: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
|
||||||
14, 15, 16, 17, 18, 19, 20, 26, 31, 32]
|
14, 15, 16, 17, 18, 19, 20, 26, 31, 32]
|
||||||
|
@ -70,7 +70,7 @@ def load_timeseries(fn, years, countries, powerstatistics=True):
|
|||||||
"""
|
"""
|
||||||
logger.info(f"Retrieving load data from '{fn}'.")
|
logger.info(f"Retrieving load data from '{fn}'.")
|
||||||
|
|
||||||
pattern = 'power_statistics' if powerstatistics else '_transparency'
|
pattern = 'power_statistics' if powerstatistics else 'transparency'
|
||||||
pattern = f'_load_actual_entsoe_{pattern}'
|
pattern = f'_load_actual_entsoe_{pattern}'
|
||||||
rename = lambda s: s[:-len(pattern)]
|
rename = lambda s: s[:-len(pattern)]
|
||||||
date_parser = lambda x: dateutil.parser.parse(x, ignoretz=True)
|
date_parser = lambda x: dateutil.parser.parse(x, ignoretz=True)
|
||||||
|
Loading…
Reference in New Issue
Block a user