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

add_electricity: Fix unit mistake, since inflow is in MW instead of pu

Browse Source
This commit is contained in:
Jonas Hörsch 2018-07-25 23:57:58 +02:00
parent 59c8c41aaf
commit e2a67d624f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/add_electricity.py
View File

@ -196,7 +196,7 @@ def attach_hydro(n, costs, ppl):
.assign_coords(name=ppl.index[ppl.has_inflow]) .assign_coords(name=ppl.index[ppl.has_inflow])
.transpose('time', 'name') .transpose('time', 'name')
.to_pandas() .to_pandas()
.multiply(dist_key / ppl.loc[ppl.has_inflow, 'p_nom'], axis=1) .multiply(dist_key, axis=1)
) )
if 'ror' in carriers: if 'ror' in carriers:
@ -209,6 +209,7 @@ def attach_hydro(n, costs, ppl):
capital_cost=costs.at['ror', 'capital_cost'], capital_cost=costs.at['ror', 'capital_cost'],
weight=ror['p_nom'], weight=ror['p_nom'],
p_max_pu=(inflow_t.loc[:, ror.index] p_max_pu=(inflow_t.loc[:, ror.index]
.divide(ror['p_nom'], axis=1)
.where(lambda df: df<=1., other=1.))) .where(lambda df: df<=1., other=1.)))
if 'PHS' in carriers: if 'PHS' in carriers: