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

fix spatial resolution for solid biomass links and naphtha oil loads under 'co2_spatial: true' flag

Browse Source
This commit is contained in:
chrstphtrs 2023-11-08 09:57:24 +01:00
parent 2ad9ca8f7b
commit 82ac430fd9
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/prepare_sector_network.py
View File

@ -145,6 +145,7 @@ def define_spatial(nodes, options):
spatial.oil.nodes = nodes + " oil" spatial.oil.nodes = nodes + " oil"
spatial.oil.locations = nodes spatial.oil.locations = nodes
spatial.oil.naphtha = nodes + " naphtha for industry" spatial.oil.naphtha = nodes + " naphtha for industry"
spatial.oil.naphtha_process_emissions = nodes + " naphtha process emissions"
spatial.oil.kerosene = nodes + " kerosene for aviation" spatial.oil.kerosene = nodes + " kerosene for aviation"
spatial.oil.shipping = nodes + " shipping oil" spatial.oil.shipping = nodes + " shipping oil"
spatial.oil.agriculture_machinery = nodes + " agriculture machinery oil" spatial.oil.agriculture_machinery = nodes + " agriculture machinery oil"
@ -152,6 +153,7 @@ def define_spatial(nodes, options):
spatial.oil.nodes = ["EU oil"] spatial.oil.nodes = ["EU oil"]
spatial.oil.locations = ["EU"] spatial.oil.locations = ["EU"]
spatial.oil.naphtha = ["EU naphtha for industry"] spatial.oil.naphtha = ["EU naphtha for industry"]
spatial.oil.naphtha_process_emissions = "EU naphtha process emissions"
spatial.oil.kerosene = ["EU kerosene for aviation"] spatial.oil.kerosene = ["EU kerosene for aviation"]
spatial.oil.shipping = ["EU shipping oil"] spatial.oil.shipping = ["EU shipping oil"]
spatial.oil.agriculture_machinery = ["EU agriculture machinery oil"] spatial.oil.agriculture_machinery = ["EU agriculture machinery oil"]
@ -2443,9 +2445,14 @@ def add_industry(n, costs):
efficiency=1.0, efficiency=1.0,
) )
if len(spatial.biomass.industry_cc)<=1 and len(spatial.co2.nodes)>1:
link_names = nodes + " " + spatial.biomass.industry_cc
else:
link_names = spatial.biomass.industry_cc
n.madd( n.madd(
"Link", "Link",
spatial.biomass.industry_cc, link_names,
bus0=spatial.biomass.nodes, bus0=spatial.biomass.nodes,
bus1=spatial.biomass.industry, bus1=spatial.biomass.industry,
bus2="co2 atmosphere", bus2="co2 atmosphere",
@ -2820,7 +2827,7 @@ def add_industry(n, costs):
n.madd( n.madd(
"Load", "Load",
["naphtha for industry into process emissions from feedstock"], spatial.oil.naphtha_process_emissions,
bus=spatial.oil.nodes, bus=spatial.oil.nodes,
carrier="naphtha for industry", carrier="naphtha for industry",
p_set=p_set_process_emissions, p_set=p_set_process_emissions,