Merge pull request #184 from PyPSA/plotting-adjustments

plot: correct h2 map legend overlap, change aggregation of techs

scripts/plot_network.py

@@ -19,9 +19,11 @@ def rename_techs_tyndp(tech):
     tech = rename_techs(tech)
     if "heat pump" in tech or "resistive heater" in tech:
         return "power-to-heat"
-    elif tech in ["methanation", "hydrogen storage", "helmeth"]:
+    elif tech in ["H2 Electrolysis", "methanation", "helmeth", "H2 liquefaction"]:
         return "power-to-gas"
-    elif tech in ["OCGT", "CHP", "gas boiler"]:
+    elif tech == "H2":
+        return "H2 storage"
+    elif tech in ["OCGT", "CHP", "gas boiler", "H2 Fuel Cell"]:
         return "gas-to-power/heat"
     elif "solar" in tech:
         return "solar"
@@ -29,6 +31,8 @@ def rename_techs_tyndp(tech):
         return "power-to-liquid"
     elif "offshore wind" in tech:
         return "offshore wind"
+    elif "CC" in tech or "sequestration" in tech:
+        return "CCS"
     else:
         return tech
 
@@ -283,7 +287,7 @@ def plot_h2_map(network):
     l2 = ax.legend(
         handles, labels,
         loc="upper left",
-        bbox_to_anchor=(0.01, 1.01),
+        bbox_to_anchor=(-0.03, 1.01),
         labelspacing=1.0,
         frameon=False,
         title='Electrolyzer capacity',

scripts/plot_summary.py

@@ -34,6 +34,9 @@ def rename_techs(label):
     rename_if_contains_dict = {
         "water tanks": "hot water storage",
         "retrofitting": "building retrofitting",
+        # "H2 Electrolysis": "hydrogen storage",
+        # "H2 Fuel Cell": "hydrogen storage",
+        # "H2 pipeline": "hydrogen storage",
         "battery": "battery storage",
         # "CC": "CC"
     }
@@ -87,6 +90,7 @@ preferred_order = pd.Index([
     "offshore wind (DC)",
     "solar PV",
     "solar thermal",
+    "solar rooftop",
     "solar",
     "building retrofitting",
     "ground heat pump",