From eb2fa1b24eb3aebcd5289453427190513a3acae6 Mon Sep 17 00:00:00 2001
From: Tom Brown <tom@nworbmot.org>
Date: Thu, 19 Dec 2019 11:39:38 +0100
Subject: [PATCH] Adjust plotting for new CCS scheme

---
 config.yaml             | 4 +++-
 scripts/plot_summary.py | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/config.yaml b/config.yaml
index b3f0b6f8..31020ef5 100644
--- a/config.yaml
+++ b/config.yaml
@@ -160,7 +160,7 @@ plotting:
   costs_threshold: 1
 
 
-  energy_max: 15000.
+  energy_max: 20000.
   energy_min: -15000.
   energy_threshold: 50.
 
@@ -234,6 +234,7 @@ plotting:
     "DAC" : "#E74C3C"
     "co2 stored" : "#123456"
     "CO2 sequestration" : "#123456"
+    "CCS" : "k"
     "co2" : "#123456"
     "co2 vent" : "#654321"
     "solid biomass for industry co2 from atmosphere" : "#654321"
@@ -277,6 +278,7 @@ plotting:
     "industry new electricity" : "#222222"
     "process emissions to stored" : "#444444"
     "process emissions to atmosphere" : "#888888"
+    "process emissions" : "#222222"
     "transport fuel cell" : "#AAAAAA"
     "biogas" : "#800000"
     "solid biomass" : "#DAA520"
diff --git a/scripts/plot_summary.py b/scripts/plot_summary.py
index 2a39a5e4..57642471 100644
--- a/scripts/plot_summary.py
+++ b/scripts/plot_summary.py
@@ -21,7 +21,8 @@ def rename_techs(label):
     rename_if_contains_dict = {"water tanks" : "hot water storage",
                                "retrofitting" : "building retrofitting",
                                "H2" : "hydrogen storage",
-                               "battery" : "battery storage"}
+                               "battery" : "battery storage",
+                               "CCS" : "CCS"}
 
     rename = {"solar" : "solar PV",
               "Sabatier" : "methanation",
@@ -133,6 +134,8 @@ def plot_energy():
 
     print(df.sum())
 
+    print(df)
+
     new_index = (preferred_order&df.index).append(df.index.difference(preferred_order))
 
     new_columns = df.columns.sort_values()
@@ -140,6 +143,8 @@ def plot_energy():
     fig, ax = plt.subplots()
     fig.set_size_inches((12,8))
 
+    print(df.loc[new_index,new_columns])
+
     df.loc[new_index,new_columns].T.plot(kind="bar",ax=ax,stacked=True,color=[snakemake.config['plotting']['tech_colors'][i] for i in new_index])