From 0c114c403ca649973df4e6b0cae89b68a498f7b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20H=C3=B6rsch?= <jonas.hoersch@kit.edu>
Date: Mon, 22 Oct 2018 23:31:13 +0200
Subject: [PATCH] config: Update network_plot settings

---
 Snakefile   |  8 ++++----
 config.yaml | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Snakefile b/Snakefile
index b82c76b8..5fa579af 100644
--- a/Snakefile
+++ b/Snakefile
@@ -247,11 +247,11 @@ rule solve_operations_network:
 
 rule plot_network:
     input:
-        network='results/networks/{cost}_{resarea}_{sectors}_{opts}.nc',
-        supply_regions='data/supply_regions/supply_regions.shp',
-        resarea=lambda w: config['data']['resarea'][w.resarea]
+        network="results/networks/{network}_s{simpl}_{clusters}_lv{lv}_{opts}.nc",
+        costs='data/costs.csv'
     output:
-        'results/plots/network_{cost}_{resarea}_{sectors}_{opts}_{attr}.pdf'
+        only_map="results/plots/{network}_s{simpl}_{clusters}_lv{lv}_{opts}_{attr}.pdf",
+        ext="results/plots/{network}_s{simpl}_{clusters}_lv{lv}_{opts}_{attr}_ext.pdf"
     script: "scripts/plot_network.py"
 
 # rule plot_costs:
diff --git a/config.yaml b/config.yaml
index 34e801ae..efecf8ae 100644
--- a/config.yaml
+++ b/config.yaml
@@ -172,18 +172,18 @@ solving:
 plotting:
   map:
     figsize: [7, 7]
-    boundaries: [16, -35, 33, -22]
+    boundaries: [-10.2, 29, 35,  72]
     p_nom:
       bus_size_factor: 5.e+4
       linewidth_factor: 3.e+3 # 1.e+3  #3.e+3
 
   costs_max: 800
 
-  vre_techs: ["Wind", "PV"]
+  vre_techs: ["onwind", "offwind", "solar", "ror"]
   conv_techs: ["OCGT", "CCGT", "Nuclear", "Coal"]
-  storage_techs: ["Hydro", "CAES", "Battery", "Pumped storage", "Hydro+PS"]
-  store_techs: ["Li ion", "water tanks"]
-  load_carriers: ["AC load", "heat load", "Li ion load"]
+  storage_techs: ["hydro+PHS", "battery", "H2"]
+  # store_techs: ["Li ion", "water tanks"]
+  load_carriers: ["AC load"] #, "heat load", "Li ion load"]
   AC_carriers: ["AC line", "AC transformer"]
   link_carriers: ["DC line", "Converter AC-DC"] 
   heat_links: ["heat pump", "resistive heater", "CHP heat", "CHP electric",
@@ -194,7 +194,7 @@ plotting:
     onwind: "xkcd:azure"
     offwind: "blue"
     hydro: "g"
-    ror: "g"
+    ror: "lightgreen"
     PHS: "g"
     hydro+PHS: "g"
     solar: "yellow"