From 1e9f8717eeee9d449c40234b313bd48d3b2a3879 Mon Sep 17 00:00:00 2001
From: FabianHofmann <hofmann@fias.uni-frankfurt.de>
Date: Wed, 29 Jan 2020 17:01:57 +0100
Subject: [PATCH] add names to config, add color column to n.carriers

---
 config.default.yaml        | 5 +++++
 config.tutorial.yaml       | 5 +++++
 scripts/add_electricity.py | 2 ++
 test/config.test1.yaml     | 5 +++++
 4 files changed, 17 insertions(+)
 mode change 100644 => 100755 config.default.yaml
 mode change 100644 => 100755 config.tutorial.yaml
 mode change 100644 => 100755 test/config.test1.yaml

diff --git a/config.default.yaml b/config.default.yaml
old mode 100644
new mode 100755
index dceb0ac4..7ca37868
--- a/config.default.yaml
+++ b/config.default.yaml
@@ -324,6 +324,9 @@ plotting:
     offwind-ac: "Offshore Wind (AC)"
     offwind-dc: "Offshore Wind (DC)"
     onwind: "Onshore Wind"
+    solar: "Solar"
+    PHS: "Pumped Hydro Storage"
+    hydro: "Reservoir & Dam"
     battery: "Battery Storage"
     H2: "Hydrogen Storage"
     lines: "Transmission lines"
@@ -338,4 +341,6 @@ plotting:
     H2: "Hydrogen\nStorage"
     lines: "Transmission\nlines"
     ror: "Run of\nriver"
+    PHS: "Pumped Hydro\nStorage"
+    hydro: "Reservoir\n& Dam"
 
diff --git a/config.tutorial.yaml b/config.tutorial.yaml
old mode 100644
new mode 100755
index 9c6a1ec2..53f2e6d7
--- a/config.tutorial.yaml
+++ b/config.tutorial.yaml
@@ -303,6 +303,9 @@ plotting:
     offwind-ac: "Offshore Wind (AC)"
     offwind-dc: "Offshore Wind (DC)"
     onwind: "Onshore Wind"
+    solar: "Solar"
+    PHS: "Pumped Hydro Storage"
+    hydro: "Reservoir & Dam"
     battery: "Battery Storage"
     H2: "Hydrogen Storage"
     lines: "Transmission lines"
@@ -317,3 +320,5 @@ plotting:
     H2: "Hydrogen\nStorage"
     lines: "Transmission\nlines"
     ror: "Run of\nriver"
+    PHS: "Pumped Hydro\nStorage"
+    hydro: "Reservoir\n& Dam"
diff --git a/scripts/add_electricity.py b/scripts/add_electricity.py
index 7ba0fe8f..658a1d34 100755
--- a/scripts/add_electricity.py
+++ b/scripts/add_electricity.py
@@ -504,6 +504,8 @@ def add_nice_carrier_names(n, config=None):
     if config is None: config = snakemake.config
     nice_names = pd.Series(config['plotting']['nice_names'])
     n.carriers['nice_name'] = nice_names[n.carriers.index]
+    colors = pd.Series(config['plotting']['tech_colors'])
+    n.carriers['color'] = colors[n.carriers.index]
 
 
 if __name__ == "__main__":
diff --git a/test/config.test1.yaml b/test/config.test1.yaml
old mode 100644
new mode 100755
index d5deb82f..a92dbb53
--- a/test/config.test1.yaml
+++ b/test/config.test1.yaml
@@ -303,6 +303,9 @@ plotting:
     offwind-ac: "Offshore Wind (AC)"
     offwind-dc: "Offshore Wind (DC)"
     onwind: "Onshore Wind"
+    solar: "Solar"
+    PHS: "Pumped Hydro Storage"
+    hydro: "Reservoir & Dam"
     battery: "Battery Storage"
     H2: "Hydrogen Storage"
     lines: "Transmission lines"
@@ -317,3 +320,5 @@ plotting:
     H2: "Hydrogen\nStorage"
     lines: "Transmission\nlines"
     ror: "Run of\nriver"
+    PHS: "Pumped Hydro\nStorage"
+    hydro: "Reservoir\n& Dam"