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

add_electricity, prepare_network: Enable lv='inf' and remove converter link costs

Browse Source
This commit is contained in:
Jonas Hörsch 2018-10-22 23:22:34 +02:00
parent 0b60159575
commit 1df85468aa
3 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Snakefile
View File

@ -195,7 +195,7 @@ rule cluster_network:
# script: "scripts/add_sectors.py"
rule prepare_network:
input: 'networks/{network}_s{simpl}_{clusters}.nc'
input: 'networks/{network}_s{simpl}_{clusters}.nc', tech_costs='data/costs.csv'
output: 'networks/{network}_s{simpl}_{clusters}_lv{lv}_{opts}.nc'
threads: 1
resources: mem=1000

6
scripts/add_electricity.py
View File

@ -137,11 +137,15 @@ def attach_load(n):
### Set line costs
def update_transmission_costs(n, costs, length_factor=1.0):
def update_transmission_costs(n, costs, length_factor=1.0, simple_hvdc_costs=False):
n.lines['capital_cost'] = (n.lines['length'] * length_factor *
costs.at['HVAC overhead', 'capital_cost'])
dc_b = n.links.carrier == 'DC'
if simple_hvdc_costs:
n.links.loc[dc_b, 'capital_cost'] = (n.links.loc[dc_b, 'length'] * length_factor *
costs.at['HVDC overhead', 'capital_cost'])
else:
n.links.loc[dc_b, 'capital_cost'] = (n.links.loc[dc_b, 'length'] * length_factor *
((1. - n.links.loc[dc_b, 'underwater_fraction']) *
costs.at['HVDC overhead', 'capital_cost'] +

19
scripts/prepare_network.py
View File

@ -14,6 +14,7 @@ from six import iteritems
import geopandas as gpd
import pypsa
from add_electricity import load_costs, update_transmission_costs
def add_co2limit(n, Nyears=1.):
n.add("GlobalConstraint", "CO2Limit",
@ -41,9 +42,16 @@ def set_line_s_max_pu(n):
n.links.loc[dc_b, 'p_min_pu'] = - s_max_pu
def set_line_volume_limit(n, lv):
links_dc_b = n.links.carrier == 'DC'
if np.isinf(lv):
costs = load_costs(Nyears, snakemake.input.tech_costs,
snakemake.config['costs'], snakemake.config['electricity'])
update_transmission_costs(n, costs, simple_hvdc_costs=True)
else:
# Either line_volume cap or cost
n.lines['capital_cost'] = 0.
n.links['capital_cost'] = 0.
n.links.loc[links_dc_b, 'capital_cost'] = 0.
if lv > 1.0:
lines_s_nom = n.lines.s_nom.where(
@ -54,13 +62,13 @@ def set_line_volume_limit(n, lv):
)
n.lines['s_nom_min'] = lines_s_nom
n.links['p_nom_min'] = n.links['p_nom']
n.lines['s_nom_extendable'] = True
n.links['p_nom_extendable'] = True
n.links.loc[links_dc_b, 'p_nom_min'] = n.links.loc[links_dc_b, 'p_nom']
n.links.loc[links_dc_b, 'p_nom_extendable'] = True
n.line_volume_limit = lv * ((lines_s_nom * n.lines['length']).sum() +
n.links.loc[n.links.carrier=='DC'].eval('p_nom * length').sum())
n.links.loc[links_dc_b].eval('p_nom * length').sum())
return n
@ -115,7 +123,6 @@ if __name__ == "__main__":
# if 'Ep' in opts:
# add_emission_prices(n)
if snakemake.wildcards.lv != 'inf':
set_line_volume_limit(n, float(snakemake.wildcards.lv))
n.export_to_netcdf(snakemake.output[0])