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

Add conditional use of add_land_use_constraint (only for config['foresight']='myopic')

Browse Source
This commit is contained in:
martavp 2020-07-08 16:32:17 +02:00
parent a4c22a29a4
commit dedabe695e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/solve_network.py
View File

@ -168,9 +168,10 @@ def add_land_use_constraint(n):
def extra_functionality(n, snapshots):
#add_opts_constraints(n, opts)
#add_eps_storage_constraint(n)
add_chp_constraints(n)
add_land_use_constraint(n)
add_chp_constraints(n)
add_battery_constraints(n)
if snakemake.config['foresight']=='myopic':
add_land_use_constraint(n)
@ -343,7 +344,7 @@ if __name__ == "__main__":
log=dict(gurobi="logs/{network}_s{simpl}_{clusters}_lv{lv}_{sector_opts}_{co2_budget_name}_{planning_horizons}_gurobi-test.log",
python="logs/{network}_s{simpl}_{clusters}_lv{lv}_{sector_opts}_{co2_budget_name}_{planning_horizons}_python-test.log")
)
#%%
tmpdir = snakemake.config['solving'].get('tmpdir')
if tmpdir is not None:
patch_pyomo_tmpdir(tmpdir)