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

build_renewable_profiles: Move progressbar around atlite calls into atlite

Browse Source
This commit is contained in:
Jonas Hoersch 2018-12-19 10:28:35 +01:00
parent 350af4a273
commit bddea86b1e
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/build_renewable_profiles.py
View File

@ -116,24 +116,17 @@ if __name__ == '__main__':
potmatrix.data[potmatrix.data < 1.] = 0 # ignore weather cells where only less than 1 MW can be installed potmatrix.data[potmatrix.data < 1.] = 0 # ignore weather cells where only less than 1 MW can be installed
potmatrix.eliminate_zeros() potmatrix.eliminate_zeros()
with pgb.ProgressBar(prefix='Compute capacity factors: ', max_value=1) as progressbar:
progressbar.update(0)
resource = config['resource'] resource = config['resource']
func = getattr(cutout, resource.pop('method')) func = getattr(cutout, resource.pop('method'))
correction_factor = config.get('correction_factor', 1.) correction_factor = config.get('correction_factor', 1.)
if correction_factor != 1.: if correction_factor != 1.:
logger.warning('correction_factor is set as {}'.format(correction_factor)) logger.warning('correction_factor is set as {}'.format(correction_factor))
capacity_factor = correction_factor * func(capacity_factor=True, **resource).stack(spatial=('y', 'x')).values capacity_factor = correction_factor * func(capacity_factor=True, show_progress='Compute capacity factors: ', **resource).stack(spatial=('y', 'x')).values
layoutmatrix = potmatrix * spdiag(capacity_factor) layoutmatrix = potmatrix * spdiag(capacity_factor)
progressbar.update(1)
with pgb.ProgressBar(prefix='Compute profiles: ', max_value=1) as progressbar:
progressbar.update(0)
profile, capacities = func(matrix=layoutmatrix, index=buses, per_unit=True, profile, capacities = func(matrix=layoutmatrix, index=buses, per_unit=True,
return_capacity=True, **resource) return_capacity=True, show_progress='Compute profiles: ',
progressbar.update(1) **resource)
p_nom_max_meth = config.get('potential', 'conservative') p_nom_max_meth = config.get('potential', 'conservative')