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

Merge branch 'master' of github.com:PyPSA/pypsa-eur

Browse Source
This commit is contained in:
Fabian Neumann 2024-05-20 15:01:05 +02:00
commit 408e24de80
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/solve_network.py
View File

@ -735,9 +735,9 @@ def add_operational_reserve_margin(n, sns, config):
.loc[vres_i.intersection(ext_i)] .loc[vres_i.intersection(ext_i)]
.rename({"Generator-ext": "Generator"}) .rename({"Generator-ext": "Generator"})
) )
lhs = summed_reserve + (p_nom_vres * (-EPSILON_VRES * capacity_factor)).sum( lhs = summed_reserve + (
"Generator" p_nom_vres * (-EPSILON_VRES * xr.DataArray(capacity_factor))
) ).sum("Generator")
# Total demand per t # Total demand per t
demand = get_as_dense(n, "Load", "p_set").sum(axis=1) demand = get_as_dense(n, "Load", "p_set").sum(axis=1)
@ -767,7 +767,7 @@ def add_operational_reserve_margin(n, sns, config):
p_max_pu = get_as_dense(n, "Generator", "p_max_pu") p_max_pu = get_as_dense(n, "Generator", "p_max_pu")
lhs = dispatch + reserve - capacity_variable * p_max_pu[ext_i] lhs = dispatch + reserve - capacity_variable * xr.DataArray(p_max_pu[ext_i])
rhs = (p_max_pu[fix_i] * capacity_fixed).reindex(columns=gen_i, fill_value=0) rhs = (p_max_pu[fix_i] * capacity_fixed).reindex(columns=gen_i, fill_value=0)