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

solve_network: Move country/carrier constraints to opts as CCL

Browse Source
This commit is contained in:
Jonas Hörsch 2019-06-17 23:33:06 +02:00
parent d7fcbbba7b
commit 2f728b33c8
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/solve_network.py
View File

@ -77,9 +77,9 @@ def add_opts_constraints(n, opts=None):
ext_gens_i = n.generators.index[n.generators.carrier.isin(conv_techs) & n.generators.p_nom_extendable]
n.model.safe_peakdemand = pypsa.opt.Constraint(expr=sum(n.model.generator_p_nom[gen] for gen in ext_gens_i) >= peakdemand - exist_conv_caps)
def add_country_carrier_generation_constraints(n):
# Add constraints on the per-carrier capacity in each country
if 'CCL' in opts:
agg_p_nom_limits = snakemake.config['electricity'].get('agg_p_nom_limits')
if agg_p_nom_limits is None: return
try:
agg_p_nom_minmax = pd.read_csv(agg_p_nom_limits, index_col=list(range(2)))
@ -176,7 +176,6 @@ def solve_network(n, config=None, solver_log=None, opts=None, callback=None):
pypsa.opf.network_lopf_build_model(n, formulation=solve_opts['formulation'])
add_country_carrier_generation_constraints(n, opts)
add_opts_constraints(n, opts)
if not fix_ext_lines: