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

Fix plotting settings

Browse Source
This commit is contained in:
Jonas Hoersch 2019-01-16 12:08:46 +01:00
parent a340e4f1a3
commit f70e0304e5
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Snakefile
View File

@ -266,8 +266,8 @@ rule make_summary:
script: "scripts/make_summary.py" script: "scripts/make_summary.py"
rule plot_summary: rule plot_summary:
input: directory("results/summaries/{network}_s{simpl}_{clusters}_lv{lv}_{opts}") input: "results/summaries/{network}_s{simpl}_{clusters}_lv{lv}_{opts}_{country}"
output: "results/plots/summary_{summary}_{network}_s{simpl}_{clusters}_lv{lv}_{opts}.{ext}" output: "results/plots/summary_{summary}_{network}_s{simpl}_{clusters}_lv{lv}_{opts}_{country}.{ext}"
script: "scripts/plot_summary.py" script: "scripts/plot_summary.py"
# Local Variables: # Local Variables:

6
config.yaml
View File

@ -206,7 +206,7 @@ plotting:
energy_threshold: 50. energy_threshold: 50.
vre_techs: ["onwind", "offwind", "solar", "ror"] vre_techs: ["onwind", "offwind-ac", "offwind-dc", "solar", "ror"]
conv_techs: ["OCGT", "CCGT", "Nuclear", "Coal"] conv_techs: ["OCGT", "CCGT", "Nuclear", "Coal"]
storage_techs: ["hydro+PHS", "battery", "H2"] storage_techs: ["hydro+PHS", "battery", "H2"]
# store_techs: ["Li ion", "water tanks"] # store_techs: ["Li ion", "water tanks"]
@ -221,7 +221,11 @@ plotting:
"onwind" : "b" "onwind" : "b"
"onshore wind" : "b" "onshore wind" : "b"
'offwind' : "c" 'offwind' : "c"
'offwind-ac' : "c"
'offwind-dc' : "aquamarine"
'offshore wind' : "c" 'offshore wind' : "c"
'offshore wind ac' : "c"
'offshore wind dc' : "aquamarine"
"hydro" : "#3B5323" "hydro" : "#3B5323"
"hydro+PHS" : "#3B5323" "hydro+PHS" : "#3B5323"
"hydro reservoir" : "#3B5323" "hydro reservoir" : "#3B5323"

6
scripts/plot_network.py
View File

@ -187,7 +187,7 @@ fig.savefig(snakemake.output.only_map, dpi=150,
ax1 = ax = fig.add_axes([-0.115, 0.625, 0.2, 0.2]) ax1 = ax = fig.add_axes([-0.115, 0.625, 0.2, 0.2])
ax.set_title('Energy per technology', fontdict=dict(fontsize="medium")) ax.set_title('Energy per technology', fontdict=dict(fontsize="medium"))
e_primary = aggregate_p(n).drop('load').loc[lambda s: s>0] e_primary = aggregate_p(n).drop('load', errors='ignore').loc[lambda s: s>0]
patches, texts, autotexts = ax.pie(e_primary, patches, texts, autotexts = ax.pie(e_primary,
startangle=90, startangle=90,
@ -214,8 +214,8 @@ def split_costs(n):
costs, costs_cap_ex, costs_cap_new, costs_marg = split_costs(n) costs, costs_cap_ex, costs_cap_new, costs_marg = split_costs(n)
costs_graph = pd.DataFrame(dict(a=costs.drop('load')), costs_graph = pd.DataFrame(dict(a=costs.drop('load', errors='ignore')),
index=['AC-AC', 'AC line', 'onwind', 'offwind', 'solar', 'OCGT', 'battery', 'H2']).dropna() index=['AC-AC', 'AC line', 'onwind', 'offwind-ac', 'offwind-dc', 'solar', 'OCGT', 'battery', 'H2']).dropna()
bottom = np.array([0., 0.]) bottom = np.array([0., 0.])
texts = [] texts = []

6
scripts/plot_summary.py
View File

@ -31,6 +31,10 @@ def rename_techs(label):
label = "methanation" label = "methanation"
elif label == "offwind": elif label == "offwind":
label = "offshore wind" label = "offshore wind"
elif label == "offwind-ac":
label = "offshore wind ac"
elif label == "offwind-dc":
label = "offshore wind dc"
elif label == "onwind": elif label == "onwind":
label = "onshore wind" label = "onshore wind"
elif label == "ror": elif label == "ror":
@ -47,7 +51,7 @@ def rename_techs(label):
return label return label
preferred_order = pd.Index(["transmission lines","hydroelectricity","hydro reservoir","run of river","pumped hydro storage","onshore wind","offshore wind","solar PV","solar thermal","building retrofitting","ground heat pump","air heat pump","resistive heater","CHP","OCGT","gas boiler","gas","natural gas","methanation","hydrogen storage","battery storage","hot water storage"]) preferred_order = pd.Index(["transmission lines","hydroelectricity","hydro reservoir","run of river","pumped hydro storage","onshore wind","offshore wind ac", "offshore wind dc","solar PV","solar thermal","building retrofitting","ground heat pump","air heat pump","resistive heater","CHP","OCGT","gas boiler","gas","natural gas","methanation","hydrogen storage","battery storage","hot water storage"])
def plot_costs(infn, fn=None): def plot_costs(infn, fn=None):