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

Fix by changing po.Constraint.Skip into pypsa.opt.Constraint.Skip

Browse Source
This commit is contained in:
Jeroen Peters 2019-06-18 11:25:59 +02:00 committed by Jonas Hörsch
parent ac32f2cad6
commit 97985e3c52
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/solve_network.py
View File

@ -95,14 +95,14 @@ def add_opts_constraints(n, opts=None):
return ((sum(model.generator_p_nom[gen] return ((sum(model.generator_p_nom[gen]
for gen in n.generators.index[(gen_country == country) & (n.generators.carrier == carrier)]) for gen in n.generators.index[(gen_country == country) & (n.generators.carrier == carrier)])
>= min) >= min)
if np.isfinite(min) else po.Constraint.Skip) if np.isfinite(min) else pypsa.opt.Constraint.Skip)
def agg_p_nom_max_rule(model, country, carrier): def agg_p_nom_max_rule(model, country, carrier):
max = agg_p_nom_minmax.at[(country, carrier), 'max'] max = agg_p_nom_minmax.at[(country, carrier), 'max']
return ((sum(model.generator_p_nom[gen] return ((sum(model.generator_p_nom[gen]
for gen in n.generators.index[(gen_country == country) & (n.generators.carrier == carrier)]) for gen in n.generators.index[(gen_country == country) & (n.generators.carrier == carrier)])
<= max) <= max)
if np.isfinite(max) else po.Constraint.Skip) if np.isfinite(max) else pypsa.opt.Constraint.Skip)
n.model.agg_p_nom_min = pypsa.opt.Constraint(list(agg_p_nom_minmax.index), rule=agg_p_nom_min_rule) n.model.agg_p_nom_min = pypsa.opt.Constraint(list(agg_p_nom_minmax.index), rule=agg_p_nom_min_rule)
n.model.agg_p_nom_max = pypsa.opt.Constraint(list(agg_p_nom_minmax.index), rule=agg_p_nom_max_rule) n.model.agg_p_nom_max = pypsa.opt.Constraint(list(agg_p_nom_minmax.index), rule=agg_p_nom_max_rule)