From c273eb7f2cc6b1cb87512c5e0a602175e85e3d6b Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Sun, 23 Jan 2022 14:20:18 +0100
Subject: [PATCH 1/9] plot_network: legends, EqualEarth projection, w/wo
 retrofit compatibility

---
 scripts/plot_network.py | 407 ++++++++++++++++++++++++++--------------
 1 file changed, 268 insertions(+), 139 deletions(-)

diff --git a/scripts/plot_network.py b/scripts/plot_network.py
index 9b8cddc3..62ac5ad6 100644
--- a/scripts/plot_network.py
+++ b/scripts/plot_network.py
@@ -6,13 +6,14 @@ import matplotlib.pyplot as plt
 import cartopy.crs as ccrs
 
 from matplotlib.legend_handler import HandlerPatch
-from matplotlib.patches import Circle, Ellipse
+from matplotlib.patches import Circle, Patch
+from pypsa.plot import projected_area_factor
 
 from make_summary import assign_carriers
 from plot_summary import rename_techs, preferred_order
 from helper import override_component_attrs
 
-plt.style.use('ggplot')
+plt.style.use(['ggplot', "../matplotlibrc"])
 
 
 def rename_techs_tyndp(tech):
@@ -36,31 +37,65 @@ def rename_techs_tyndp(tech):
     else:
         return tech
 
+class HandlerCircle(HandlerPatch):
+    """
+    Legend Handler used to create circles for legend entries. 
+    
+    This handler resizes the circles in order to match the same dimensional 
+    scaling as in the applied axis.
+    """
+    def create_artists(
+        self, legend, orig_handle, xdescent, ydescent, width, height, fontsize, trans
+    ):
+        fig = legend.get_figure()
+        ax = legend.axes
 
-def make_handler_map_to_scale_circles_as_in(ax, dont_resize_actively=False):
-    fig = ax.get_figure()
+        unit = np.diff(ax.transData.transform([(0, 0), (1, 1)]), axis=0)[0][1]
+        radius = orig_handle.get_radius() * unit * (72 / fig.dpi)
+        center = 5 - xdescent, 3 - ydescent
+        p = plt.Circle(center, radius)
+        self.update_prop(p, orig_handle, legend)
+        p.set_transform(trans)
+        return [p]
 
-    def axes2pt():
-        return np.diff(ax.transData.transform([(0, 0), (1, 1)]), axis=0)[0] * (72. / fig.dpi)
 
-    ellipses = []
-    if not dont_resize_actively:
-        def update_width_height(event):
-            dist = axes2pt()
-            for e, radius in ellipses:
-                e.width, e.height = 2. * radius * dist
-        fig.canvas.mpl_connect('resize_event', update_width_height)
-        ax.callbacks.connect('xlim_changed', update_width_height)
-        ax.callbacks.connect('ylim_changed', update_width_height)
+def add_legend_circles(ax, sizes, labels, scale=1, srid=None, patch_kw={}, legend_kw={}):
+    
+    if srid is not None:
+        area_correction = projected_area_factor(ax, n.srid)**2 
+        print(area_correction)
+        sizes = [s * area_correction for s in sizes]
+    
+    handles = make_legend_circles_for(sizes, scale, **patch_kw)
+    
+    legend = ax.legend(
+        handles, labels,
+        handler_map={Circle: HandlerCircle()},
+        **legend_kw
+    )
 
-    def legend_circle_handler(legend, orig_handle, xdescent, ydescent,
-                              width, height, fontsize):
-        w, h = 2. * orig_handle.get_radius() * axes2pt()
-        e = Ellipse(xy=(0.5 * width - 0.5 * xdescent, 0.5 *
-                        height - 0.5 * ydescent), width=w, height=w)
-        ellipses.append((e, orig_handle.get_radius()))
-        return e
-    return {Circle: HandlerPatch(patch_func=legend_circle_handler)}
+    ax.add_artist(legend)
+    
+
+def add_legend_lines(ax, sizes, labels, scale=1, patch_kw={}, legend_kw={}):
+    
+    handles = [plt.Line2D([0], [0], linewidth=s/scale, **patch_kw) for s in sizes]
+    
+    legend = ax.legend(
+        handles, labels,
+        **legend_kw
+    )
+    
+    ax.add_artist(legend)
+
+
+def add_legend_patches(ax, colors, labels, patch_kw={}, legend_kw={}):
+    
+    handles = [Patch(facecolor=c, **patch_kw) for c in colors]
+    
+    legend = ax.legend(handles, labels, **legend_kw)
+
+    ax.add_artist(legend)
 
 
 def make_legend_circles_for(sizes, scale=1.0, **kw):
@@ -80,6 +115,8 @@ def assign_location(n):
 def plot_map(network, components=["links", "stores", "storage_units", "generators"],
              bus_size_factor=1.7e10, transmission=False):
 
+    tech_colors = snakemake.config['plotting']['tech_colors']
+
     n = network.copy()
     assign_location(n)
     # Drop non-electric buses so they don't clutter the plot
@@ -109,7 +146,7 @@ def plot_map(network, components=["links", "stores", "storage_units", "generator
     costs = costs[new_columns]
 
     for item in new_columns:
-        if item not in snakemake.config['plotting']['tech_colors']:
+        if item not in tech_colors:
             print("Warning!",item,"not in config/plotting/tech_colors")
 
     costs = costs.stack()  # .sort_index()
@@ -129,6 +166,11 @@ def plot_map(network, components=["links", "stores", "storage_units", "generator
     # make sure they are removed from index
     costs.index = pd.MultiIndex.from_tuples(costs.index.values)
 
+    threshold = 100e6 # 100 mEUR/a
+    carriers = costs.sum(level=1)
+    carriers = carriers.where(carriers > threshold).dropna()
+    carriers = list(carriers.index)
+
     # PDF has minimum width, so set these to zero
     line_lower_threshold = 500.
     line_upper_threshold = 1e4
@@ -140,23 +182,23 @@ def plot_map(network, components=["links", "stores", "storage_units", "generator
         # should be zero
         line_widths = n.lines.s_nom_opt - n.lines.s_nom
         link_widths = n.links.p_nom_opt - n.links.p_nom
-        title = "Transmission reinforcement"
+        title = "Added grid"
 
         if transmission:
             line_widths = n.lines.s_nom_opt
             link_widths = n.links.p_nom_opt
             linewidth_factor = 2e3
             line_lower_threshold = 0.
-            title = "Today's transmission"
+            title = "Today's grid"
     else:
         line_widths = n.lines.s_nom_opt - n.lines.s_nom_min
         link_widths = n.links.p_nom_opt - n.links.p_nom_min
-        title = "Transmission reinforcement"
+        title = "Added grid"
 
         if transmission:
             line_widths = n.lines.s_nom_opt
             link_widths = n.links.p_nom_opt
-            title = "Total transmission"
+            title = "Total grid"
 
     line_widths[line_widths < line_lower_threshold] = 0.
     link_widths[link_widths < line_lower_threshold] = 0.
@@ -164,12 +206,12 @@ def plot_map(network, components=["links", "stores", "storage_units", "generator
     line_widths[line_widths > line_upper_threshold] = line_upper_threshold
     link_widths[link_widths > line_upper_threshold] = line_upper_threshold
 
-    fig, ax = plt.subplots(subplot_kw={"projection": ccrs.PlateCarree()})
+    fig, ax = plt.subplots(subplot_kw={"projection": ccrs.EqualEarth()})
     fig.set_size_inches(7, 6)
 
     n.plot(
         bus_sizes=costs / bus_size_factor,
-        bus_colors=snakemake.config['plotting']['tech_colors'],
+        bus_colors=tech_colors,
         line_colors=ac_color,
         link_colors=dc_color,
         line_widths=line_widths / linewidth_factor,
@@ -177,45 +219,63 @@ def plot_map(network, components=["links", "stores", "storage_units", "generator
         ax=ax,  **map_opts
     )
 
-    handles = make_legend_circles_for(
-        [5e9, 1e9],
-        scale=bus_size_factor,
-        facecolor="gray"
-    )
+    sizes = [20, 10, 5]
+    labels = [f"{s} bEUR/a" for s in sizes]
 
-    labels = ["{} bEUR/a".format(s) for s in (5, 1)]
-
-    l2 = ax.legend(
-        handles, labels,
+    legend_kw = dict(
         loc="upper left",
-        bbox_to_anchor=(0.01, 1.01),
-        labelspacing=1.0,
+        bbox_to_anchor=(0.01, 1.06),
+        labelspacing=0.8,
         frameon=False,
+        handletextpad=0,
         title='System cost',
-        handler_map=make_handler_map_to_scale_circles_as_in(ax)
     )
 
-    ax.add_artist(l2)
+    add_legend_circles(
+        ax,
+        sizes,
+        labels,
+        scale=bus_size_factor/1e9,
+        srid=n.srid,
+        patch_kw=dict(facecolor="lightgrey"),
+        legend_kw=legend_kw
+    )
 
-    handles = []
-    labels = []
+    sizes = [10, 5]
+    labels = [f"{s} GW" for s in sizes]
 
-    for s in (10, 5):
-        handles.append(plt.Line2D([0], [0], color=ac_color,
-                                  linewidth=s * 1e3 / linewidth_factor))
-        labels.append("{} GW".format(s))
-
-    l1_1 = ax.legend(
-        handles, labels,
+    legend_kw = dict(
         loc="upper left",
-        bbox_to_anchor=(0.22, 1.01),
+        bbox_to_anchor=(0.27, 1.06),
         frameon=False,
         labelspacing=0.8,
-        handletextpad=1.5,
+        handletextpad=1,
         title=title
     )
 
-    ax.add_artist(l1_1)
+    add_legend_lines(
+        ax,
+        sizes,
+        labels,
+        scale=linewidth_factor/1e3,
+        patch_kw=dict(color='lightgrey'),
+        legend_kw=legend_kw
+    )
+    
+    legend_kw = dict(
+        bbox_to_anchor=(1.55, 1.04),
+        frameon=False,
+    )
+
+    colors = [tech_colors[c] for c in carriers] + [ac_color, dc_color]
+    labels = carriers + ["HVAC line", "HVDC link"]
+
+    add_legend_patches(
+        ax,
+        colors,
+        labels,
+        legend_kw=legend_kw,
+    )
 
     fig.savefig(
         snakemake.output.map,
@@ -226,6 +286,8 @@ def plot_map(network, components=["links", "stores", "storage_units", "generator
 
 def plot_h2_map(network):
 
+    tech_colors = snakemake.config['plotting']['tech_colors']
+
     n = network.copy()
     if "H2 pipeline" not in n.links.carrier.unique():
         return
@@ -240,7 +302,9 @@ def plot_h2_map(network):
     # Drop non-electric buses so they don't clutter the plot
     n.buses.drop(n.buses.index[n.buses.carrier != "AC"], inplace=True)
 
-    elec = n.links[n.links.carrier.isin(["H2 Electrolysis", "H2 Fuel Cell"])].index
+    carriers = ["H2 Electrolysis", "H2 Fuel Cell"]
+
+    elec = n.links[n.links.carrier.isin(carriers)].index
 
     bus_sizes = n.links.loc[elec,"p_nom_opt"].groupby([n.links["bus0"], n.links.carrier]).sum() / bus_size_factor
 
@@ -253,20 +317,28 @@ def plot_h2_map(network):
 
     h2_retro = n.links.loc[n.links.carrier=='H2 pipeline retrofitted']
 
-    positive_order = h2_retro.bus0 < h2_retro.bus1
-    h2_retro_p = h2_retro[positive_order]
-    swap_buses = {"bus0": "bus1", "bus1": "bus0"}
-    h2_retro_n = h2_retro[~positive_order].rename(columns=swap_buses)
-    h2_retro = pd.concat([h2_retro_p, h2_retro_n])
+    if not h2_retro.empty:
 
-    h2_retro.index = h2_retro.apply(
-        lambda x: f"H2 pipeline {x.bus0.replace(' H2', '')} -> {x.bus1.replace(' H2', '')}",
-        axis=1
-    )
+        positive_order = h2_retro.bus0 < h2_retro.bus1
+        h2_retro_p = h2_retro[positive_order]
+        swap_buses = {"bus0": "bus1", "bus1": "bus0"}
+        h2_retro_n = h2_retro[~positive_order].rename(columns=swap_buses)
+        h2_retro = pd.concat([h2_retro_p, h2_retro_n])
 
-    h2_retro = h2_retro["p_nom_opt"]
+        h2_retro.index = h2_retro.apply(
+            lambda x: f"H2 pipeline {x.bus0.replace(' H2', '')} -> {x.bus1.replace(' H2', '')}",
+            axis=1
+        )
 
-    link_widths_total = (h2_new + h2_retro) / linewidth_factor
+        h2_retro = h2_retro["p_nom_opt"]
+
+        h2_total = h2_new + h2_retro
+
+    else:
+
+        h2_total = h2_new
+
+    link_widths_total = h2_total / linewidth_factor
     link_widths_total = link_widths_total.groupby(level=0).sum().reindex(n.links.index).fillna(0.)
     link_widths_total[n.links.p_nom_opt < line_lower_threshold] = 0.
 
@@ -279,13 +351,17 @@ def plot_h2_map(network):
 
     fig, ax = plt.subplots(
         figsize=(7, 6),
-        subplot_kw={"projection": ccrs.PlateCarree()}
+        subplot_kw={"projection": ccrs.EqualEarth()}
     )
+
+    color_h2_pipe = '#a2f0f2'
+    color_retrofit = '#72d3d6'
     
     n.plot(
+        geomap=True,
         bus_sizes=bus_sizes,
-        bus_colors=snakemake.config['plotting']['tech_colors'],
-        link_colors='#a2f0f2',
+        bus_colors=tech_colors,
+        link_colors=color_h2_pipe,
         link_widths=link_widths_total,
         branch_components=["Link"],
         ax=ax,
@@ -293,54 +369,70 @@ def plot_h2_map(network):
     )
 
     n.plot(
-        geomap=False,
+        geomap=True, # set False in PyPSA 0.19
         bus_sizes=0,
-        link_colors='#72d3d6',
+        link_colors=color_retrofit,
         link_widths=link_widths_retro,
         branch_components=["Link"],
         ax=ax,
-        **map_opts
+        # color_geomap=False, # needs PyPSA 0.19
+        boundaries=map_opts["boundaries"]
     )
 
-    handles = make_legend_circles_for(
-        [50000, 10000],
-        scale=bus_size_factor,
-        facecolor='grey'
-    )
+    sizes = [50, 10]
+    labels = [f"{s} GW" for s in sizes]
 
-    labels = ["{} GW".format(s) for s in (50, 10)]
-
-    l2 = ax.legend(
-        handles, labels,
+    legend_kw = dict(
         loc="upper left",
-        bbox_to_anchor=(-0.03, 1.01),
-        labelspacing=1.0,
+        bbox_to_anchor=(0, 1),
+        labelspacing=0.8,
+        handletextpad=0,
         frameon=False,
-        title='Electrolyzer capacity',
-        handler_map=make_handler_map_to_scale_circles_as_in(ax)
     )
 
-    ax.add_artist(l2)
+    add_legend_circles(ax, sizes, labels,
+        scale=bus_size_factor/1e3,
+        srid=n.srid,
+        patch_kw=dict(facecolor='lightgrey'),
+        legend_kw=legend_kw
+    )
 
-    handles = []
-    labels = []
+    sizes = [50, 10]
+    labels = [f"{s} GW" for s in sizes]
 
-    for s in (50, 10):
-        handles.append(plt.Line2D([0], [0], color="grey",
-                                  linewidth=s * 1e3 / linewidth_factor))
-        labels.append("{} GW".format(s))
-
-    l1_1 = ax.legend(
-        handles, labels,
+    legend_kw = dict(
         loc="upper left",
-        bbox_to_anchor=(0.28, 1.01),
+        bbox_to_anchor=(0.23, 1),
         frameon=False,
         labelspacing=0.8,
-        handletextpad=1.5,
-        title='H2 pipeline capacity'
+        handletextpad=1,
     )
 
-    ax.add_artist(l1_1)
+    add_legend_lines(
+        ax,
+        sizes,
+        labels,
+        scale=linewidth_factor/1e3,
+        patch_kw=dict(color='lightgrey'),
+        legend_kw=legend_kw,
+    )
+
+    colors = [tech_colors[c] for c in carriers] + [color_h2_pipe, color_retrofit]
+    labels = carriers + ["H2 pipeline (total)", "H2 pipeline (repurposed)"]
+
+    legend_kw = dict(
+        loc="upper left",
+        bbox_to_anchor=(0, 1.13),
+        ncol=2,
+        frameon=False,
+    )
+
+    add_legend_patches(
+        ax,
+        colors,
+        labels,
+        legend_kw=legend_kw
+    )
 
     fig.savefig(
         snakemake.output.map.replace("-costs-all","-h2_network"),
@@ -400,89 +492,126 @@ def plot_ch4_map(network):
     link_widths_used =  max_usage / linewidth_factor
     link_widths_used[max_usage < line_lower_threshold] = 0.
 
-    link_color_used = n.links.carrier.map({"gas pipeline": "#f08080",
-                                           "gas pipeline new": "#c46868"})
+    tech_colors = snakemake.config['plotting']['tech_colors']
+
+    pipe_colors = {
+        "gas pipeline": "#f08080",
+        "gas pipeline new": "#c46868",
+        "gas pipeline (2020)": 'lightgrey',
+        "gas pipeline (available)": '#e8d1d1',
+    }
+
+    link_color_used = n.links.carrier.map(pipe_colors)
 
     n.links.bus0 = n.links.bus0.str.replace(" gas", "")
     n.links.bus1 = n.links.bus1.str.replace(" gas", "")
 
-    tech_colors = snakemake.config['plotting']['tech_colors']
-
     bus_colors = {
         "fossil gas": tech_colors["fossil gas"],
         "methanation": tech_colors["methanation"],
         "biogas": "seagreen"
     }
 
-    fig, ax = plt.subplots(figsize=(7,6), subplot_kw={"projection": ccrs.PlateCarree()})
+    fig, ax = plt.subplots(figsize=(7,6), subplot_kw={"projection": ccrs.EqualEarth()})
 
     n.plot(
         bus_sizes=bus_sizes,
         bus_colors=bus_colors,
-        link_colors='lightgrey',
+        link_colors=pipe_colors['gas pipeline (2020)'],
         link_widths=link_widths_orig,
         branch_components=["Link"],
         ax=ax, 
+        geomap=True,
         **map_opts
     )
 
     n.plot(
-        geomap=False,
+        geomap=True, # set False in PyPSA 0.19
         ax=ax,
         bus_sizes=0.,
-        link_colors='#e8d1d1',
+        link_colors=pipe_colors['gas pipeline (available)'],
         link_widths=link_widths_rem,
         branch_components=["Link"],
-        **map_opts
+        # color_geomap=False, # needs PyPSA 0.19
+        boundaries=map_opts["boundaries"]
     )
 
     n.plot(
-        geomap=False,
+        geomap=True, # set False in PyPSA 0.19
         ax=ax,
         bus_sizes=0.,
         link_colors=link_color_used,
         link_widths=link_widths_used,
         branch_components=["Link"],
-        **map_opts
+        # color_geomap=False, # needs PyPSA 0.19
+        boundaries=map_opts["boundaries"]
     )
 
-    handles = make_legend_circles_for(
-        [10e6, 100e6],
-        scale=bus_size_factor,
-        facecolor='grey'
-    )
-    labels = ["{} TWh".format(s) for s in (10, 100)]
+    sizes = [100, 10]
+    labels = [f"{s} TWh" for s in sizes]
     
-    l2 = ax.legend(
-        handles, labels,
+    legend_kw = dict(
         loc="upper left",
-        bbox_to_anchor=(-0.03, 1.01),
-        labelspacing=1.0,
+        bbox_to_anchor=(0, 1.03),
+        labelspacing=0.8,
         frameon=False,
-        title='gas generation',
-        handler_map=make_handler_map_to_scale_circles_as_in(ax)
+        handletextpad=1,
+        title='Gas Sources',
     )
     
-    ax.add_artist(l2)
+    add_legend_circles(
+        ax,
+        sizes,
+        labels,
+        scale=bus_size_factor/1e6,
+        srid=n.srid,
+        patch_kw=dict(facecolor='lightgrey'),
+        legend_kw=legend_kw,
+    )
 
-    handles = []
-    labels = []
-
-    for s in (50, 10):
-        handles.append(plt.Line2D([0], [0], color="grey", linewidth=s * 1e3 / linewidth_factor))
-        labels.append("{} GW".format(s))
+    sizes = [50, 10]
+    labels = [f"{s} GW" for s in sizes]
     
-    l1_1 = ax.legend(
-        handles, labels,
+    legend_kw = dict(
         loc="upper left",
-        bbox_to_anchor=(0.28, 1.01),
+        bbox_to_anchor=(0.25, 1.03),
         frameon=False,
         labelspacing=0.8,
-        handletextpad=1.5,
-        title='gas pipeline used capacity'
+        handletextpad=1,
+        title='Gas Pipeline'
     )
     
-    ax.add_artist(l1_1)
+    add_legend_lines(
+        ax,
+        sizes,
+        labels,
+        scale=linewidth_factor/1e3,
+        patch_kw=dict(color='lightgrey'),
+        legend_kw=legend_kw,
+    )
+
+    colors = list(pipe_colors.values()) + list(bus_colors.values())
+    labels = list(pipe_colors.keys()) + list(bus_colors.keys())
+  
+    # legend on the side
+    # legend_kw = dict(
+    #     bbox_to_anchor=(1.47, 1.04),
+    #     frameon=False,
+    # )
+
+    legend_kw = dict(
+        loc='upper left',
+        bbox_to_anchor=(0, 1.24),
+        ncol=2,
+        frameon=False,
+    )
+
+    add_legend_patches(
+        ax,
+        colors,
+        labels,
+        legend_kw=legend_kw,
+    )
 
     fig.savefig(
         snakemake.output.map.replace("-costs-all","-ch4_network"),
@@ -500,13 +629,13 @@ def plot_map_without(network):
 
     fig, ax = plt.subplots(
         figsize=(7, 6),
-        subplot_kw={"projection": ccrs.PlateCarree()}
+        subplot_kw={"projection": ccrs.EqualEarth()}
     )
 
     # PDF has minimum width, so set these to zero
     line_lower_threshold = 200.
     line_upper_threshold = 1e4
-    linewidth_factor = 2e3
+    linewidth_factor = 3e3
     ac_color = "gray"
     dc_color = "m"
 
@@ -709,7 +838,7 @@ if __name__ == "__main__":
 
     plot_map(n,
         components=["generators", "links", "stores", "storage_units"],
-        bus_size_factor=1.5e10,
+        bus_size_factor=2e10,
         transmission=False
     )
 

From 3323f348965794fc4e54a4c17abf10327897454b Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Fri, 4 Feb 2022 12:26:58 +0100
Subject: [PATCH 2/9] bugfix: also plot h2 corridors where no retrofit

---
 scripts/plot_network.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/scripts/plot_network.py b/scripts/plot_network.py
index 62ac5ad6..3a4859ce 100644
--- a/scripts/plot_network.py
+++ b/scripts/plot_network.py
@@ -13,7 +13,7 @@ from make_summary import assign_carriers
 from plot_summary import rename_techs, preferred_order
 from helper import override_component_attrs
 
-plt.style.use(['ggplot', "../matplotlibrc"])
+plt.style.use(['ggplot', "matplotlibrc"])
 
 
 def rename_techs_tyndp(tech):
@@ -313,7 +313,7 @@ def plot_h2_map(network):
 
     n.links.drop(n.links.index[~n.links.carrier.str.contains("H2 pipeline")], inplace=True)
 
-    h2_new = n.links.loc[n.links.carrier=="H2 pipeline", "p_nom_opt"]
+    h2_new = n.links.loc[n.links.carrier=="H2 pipeline"]
 
     h2_retro = n.links.loc[n.links.carrier=='H2 pipeline retrofitted']
 
@@ -325,21 +325,28 @@ def plot_h2_map(network):
         h2_retro_n = h2_retro[~positive_order].rename(columns=swap_buses)
         h2_retro = pd.concat([h2_retro_p, h2_retro_n])
 
+        h2_retro["index_orig"] = h2_retro.index
         h2_retro.index = h2_retro.apply(
             lambda x: f"H2 pipeline {x.bus0.replace(' H2', '')} -> {x.bus1.replace(' H2', '')}",
             axis=1
         )
 
-        h2_retro = h2_retro["p_nom_opt"]
+        retro_w_new_i = h2_retro.index.intersection(h2_new.index)
+        h2_retro_w_new = h2_retro.loc[retro_w_new_i]
 
-        h2_total = h2_new + h2_retro
+        retro_wo_new_i = h2_retro.index.difference(h2_new.index)
+        h2_retro_wo_new = h2_retro.loc[retro_wo_new_i]
+        h2_retro_wo_new.index = h2_retro_wo_new.index_orig
+
+        to_concat = [h2_new, h2_retro_w_new, h2_retro_wo_new]
+        h2_total = pd.concat(to_concat).p_nom_opt.groupby(level=0).sum()
 
     else:
 
         h2_total = h2_new
 
     link_widths_total = h2_total / linewidth_factor
-    link_widths_total = link_widths_total.groupby(level=0).sum().reindex(n.links.index).fillna(0.)
+    link_widths_total = link_widths_total.reindex(n.links.index).fillna(0.)
     link_widths_total[n.links.p_nom_opt < line_lower_threshold] = 0.
 
     retro = n.links.p_nom_opt.where(n.links.carrier=='H2 pipeline retrofitted', other=0.)

From 4b1360c3f0946238a41de75a66582bc1c71a48e2 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Sun, 20 Feb 2022 15:59:51 +0100
Subject: [PATCH 3/9] do not aggregate rooftop and solar PV in plots

---
 scripts/plot_network.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/plot_network.py b/scripts/plot_network.py
index 3a4859ce..e2409a99 100644
--- a/scripts/plot_network.py
+++ b/scripts/plot_network.py
@@ -26,8 +26,8 @@ def rename_techs_tyndp(tech):
         return "H2 storage"
     elif tech in ["OCGT", "CHP", "gas boiler", "H2 Fuel Cell"]:
         return "gas-to-power/heat"
-    elif "solar" in tech:
-        return "solar"
+    # elif "solar" in tech:
+    #     return "solar"
     elif tech == "Fischer-Tropsch":
         return "power-to-liquid"
     elif "offshore wind" in tech:

From c754f253bc21afb264aa9697d19ec42d4203944d Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Sun, 20 Feb 2022 16:13:11 +0100
Subject: [PATCH 4/9] plotting adjustments for pypsa 0.19.1

---
 config.default.yaml     |  2 +-
 scripts/plot_network.py | 27 ++++++++++++++++-----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/config.default.yaml b/config.default.yaml
index 5340682b..cb0b70ff 100644
--- a/config.default.yaml
+++ b/config.default.yaml
@@ -387,7 +387,7 @@ plotting:
     boundaries: [-11, 30, 34, 71]
     color_geomap:
       ocean: white
-      land: whitesmoke
+      land: white
   costs_max: 1000
   costs_threshold: 1
   energy_max: 20000
diff --git a/scripts/plot_network.py b/scripts/plot_network.py
index e2409a99..0f4abcee 100644
--- a/scripts/plot_network.py
+++ b/scripts/plot_network.py
@@ -263,7 +263,7 @@ def plot_map(network, components=["links", "stores", "storage_units", "generator
     )
     
     legend_kw = dict(
-        bbox_to_anchor=(1.55, 1.04),
+        bbox_to_anchor=(1.52, 1.04),
         frameon=False,
     )
 
@@ -361,13 +361,18 @@ def plot_h2_map(network):
         subplot_kw={"projection": ccrs.EqualEarth()}
     )
 
-    color_h2_pipe = '#a2f0f2'
-    color_retrofit = '#72d3d6'
+    color_h2_pipe = '#b3f3f4'
+    color_retrofit = '#54cacd'
     
+    bus_colors = {
+        "H2 Electrolysis": "#ff29d9",
+        "H2 Fuel Cell": "#6b3161",
+    }
+
     n.plot(
         geomap=True,
         bus_sizes=bus_sizes,
-        bus_colors=tech_colors,
+        bus_colors=bus_colors,
         link_colors=color_h2_pipe,
         link_widths=link_widths_total,
         branch_components=["Link"],
@@ -376,13 +381,13 @@ def plot_h2_map(network):
     )
 
     n.plot(
-        geomap=True, # set False in PyPSA 0.19
+        geomap=True,
         bus_sizes=0,
         link_colors=color_retrofit,
         link_widths=link_widths_retro,
         branch_components=["Link"],
         ax=ax,
-        # color_geomap=False, # needs PyPSA 0.19
+        color_geomap=False,
         boundaries=map_opts["boundaries"]
     )
 
@@ -424,7 +429,7 @@ def plot_h2_map(network):
         legend_kw=legend_kw,
     )
 
-    colors = [tech_colors[c] for c in carriers] + [color_h2_pipe, color_retrofit]
+    colors = [bus_colors[c] for c in carriers] + [color_h2_pipe, color_retrofit]
     labels = carriers + ["H2 pipeline (total)", "H2 pipeline (repurposed)"]
 
     legend_kw = dict(
@@ -533,24 +538,24 @@ def plot_ch4_map(network):
     )
 
     n.plot(
-        geomap=True, # set False in PyPSA 0.19
+        geomap=True,
         ax=ax,
         bus_sizes=0.,
         link_colors=pipe_colors['gas pipeline (available)'],
         link_widths=link_widths_rem,
         branch_components=["Link"],
-        # color_geomap=False, # needs PyPSA 0.19
+        color_geomap=False,
         boundaries=map_opts["boundaries"]
     )
 
     n.plot(
-        geomap=True, # set False in PyPSA 0.19
+        geomap=True,
         ax=ax,
         bus_sizes=0.,
         link_colors=link_color_used,
         link_widths=link_widths_used,
         branch_components=["Link"],
-        # color_geomap=False, # needs PyPSA 0.19
+        color_geomap=False,
         boundaries=map_opts["boundaries"]
     )
 

From a8171ec9f3e6b9c6a04edb6635420098f4c260e0 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Tue, 28 Jun 2022 18:03:29 +0200
Subject: [PATCH 5/9] color adaptations, new features

---
 Snakefile               |  3 +-
 scripts/helper.py       |  2 --
 scripts/plot_network.py | 77 +++++++++++++++++++++++++++++------------
 3 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/Snakefile b/Snakefile
index d428db45..b5756646 100644
--- a/Snakefile
+++ b/Snakefile
@@ -478,7 +478,8 @@ rule prepare_sector_network:
 rule plot_network:
     input:
         overrides="data/override_component_attrs",
-        network=RDIR + "/postnetworks/elec_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_{planning_horizons}.nc"
+        network=RDIR + "/postnetworks/elec_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_{planning_horizons}.nc",
+        regions='../pypsa-eur/resources/regions_onshore_elec_s{simpl}_{clusters}.geojson'
     output:
         map=RDIR + "/maps/elec_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}-costs-all_{planning_horizons}.pdf",
         today=RDIR + "/maps/elec_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_{planning_horizons}-today.pdf"
diff --git a/scripts/helper.py b/scripts/helper.py
index b176ccee..ca35c019 100644
--- a/scripts/helper.py
+++ b/scripts/helper.py
@@ -42,9 +42,7 @@ def mock_snakemake(rulename, **wildcards):
     This function is expected to be executed from the 'scripts'-directory of '
     the snakemake project. It returns a snakemake.script.Snakemake object,
     based on the Snakefile.
-
     If a rule has wildcards, you have to specify them in **wildcards.
-
     Parameters
     ----------
     rulename: str
diff --git a/scripts/plot_network.py b/scripts/plot_network.py
index 0f4abcee..fc252229 100644
--- a/scripts/plot_network.py
+++ b/scripts/plot_network.py
@@ -2,6 +2,7 @@ import pypsa
 
 import numpy as np
 import pandas as pd
+import geopandas as gpd
 import matplotlib.pyplot as plt
 import cartopy.crs as ccrs
 
@@ -63,7 +64,6 @@ def add_legend_circles(ax, sizes, labels, scale=1, srid=None, patch_kw={}, legen
     
     if srid is not None:
         area_correction = projected_area_factor(ax, n.srid)**2 
-        print(area_correction)
         sizes = [s * area_correction for s in sizes]
     
     handles = make_legend_circles_for(sizes, scale, **patch_kw)
@@ -113,7 +113,9 @@ def assign_location(n):
 
 
 def plot_map(network, components=["links", "stores", "storage_units", "generators"],
-             bus_size_factor=1.7e10, transmission=False):
+             bus_size_factor=1.7e10, transmission=False, with_legend=True):
+
+    tech_colors = snakemake.config['plotting']['tech_colors']
 
     tech_colors = snakemake.config['plotting']['tech_colors']
 
@@ -174,9 +176,9 @@ def plot_map(network, components=["links", "stores", "storage_units", "generator
     # PDF has minimum width, so set these to zero
     line_lower_threshold = 500.
     line_upper_threshold = 1e4
-    linewidth_factor = 2e3
-    ac_color = "gray"
-    dc_color = "m"
+    linewidth_factor = 4e3
+    ac_color = "rosybrown"
+    dc_color = "darkseagreen"
 
     if snakemake.wildcards["lv"] == "1.0":
         # should be zero
@@ -221,6 +223,7 @@ def plot_map(network, components=["links", "stores", "storage_units", "generator
 
     sizes = [20, 10, 5]
     labels = [f"{s} bEUR/a" for s in sizes]
+    sizes = [s/bus_size_factor*1e9 for s in sizes]
 
     legend_kw = dict(
         loc="upper left",
@@ -235,7 +238,6 @@ def plot_map(network, components=["links", "stores", "storage_units", "generator
         ax,
         sizes,
         labels,
-        scale=bus_size_factor/1e9,
         srid=n.srid,
         patch_kw=dict(facecolor="lightgrey"),
         legend_kw=legend_kw
@@ -267,15 +269,17 @@ def plot_map(network, components=["links", "stores", "storage_units", "generator
         frameon=False,
     )
 
-    colors = [tech_colors[c] for c in carriers] + [ac_color, dc_color]
-    labels = carriers + ["HVAC line", "HVDC link"]
+    if with_legend:
 
-    add_legend_patches(
-        ax,
-        colors,
-        labels,
-        legend_kw=legend_kw,
-    )
+        colors = [tech_colors[c] for c in carriers] + [ac_color, dc_color]
+        labels = carriers + ["HVAC line", "HVDC link"]
+
+        add_legend_patches(
+            ax,
+            colors,
+            labels,
+            legend_kw=legend_kw,
+        )
 
     fig.savefig(
         snakemake.output.map,
@@ -284,7 +288,7 @@ def plot_map(network, components=["links", "stores", "storage_units", "generator
     )
 
 
-def plot_h2_map(network):
+def plot_h2_map(network, regions):
 
     tech_colors = snakemake.config['plotting']['tech_colors']
 
@@ -294,6 +298,10 @@ def plot_h2_map(network):
 
     assign_location(n)
 
+    h2_storage = n.stores.query("carrier == 'H2'")
+    regions["H2"] = h2_storage.rename(index=h2_storage.bus.map(n.buses.location)).e_nom_opt.div(1e6) # TWh
+    regions["H2"] = regions["H2"].where(regions["H2"] > 0.1)
+
     bus_size_factor = 1e5
     linewidth_factor = 1e4
     # MW below which not drawn
@@ -356,17 +364,20 @@ def plot_h2_map(network):
     n.links.bus0 = n.links.bus0.str.replace(" H2", "")
     n.links.bus1 = n.links.bus1.str.replace(" H2", "")
 
+    proj = ccrs.EqualEarth()
+    regions = regions.to_crs(proj.proj4_init)
+
     fig, ax = plt.subplots(
         figsize=(7, 6),
-        subplot_kw={"projection": ccrs.EqualEarth()}
+        subplot_kw={"projection": proj}
     )
 
     color_h2_pipe = '#b3f3f4'
-    color_retrofit = '#54cacd'
+    color_retrofit = '#499a9c'
     
     bus_colors = {
         "H2 Electrolysis": "#ff29d9",
-        "H2 Fuel Cell": "#6b3161",
+        "H2 Fuel Cell": '#805394'
     }
 
     n.plot(
@@ -391,8 +402,24 @@ def plot_h2_map(network):
         boundaries=map_opts["boundaries"]
     )
 
+    regions.plot(
+        ax=ax,
+        column="H2",
+        cmap='Blues',
+        linewidths=0,
+        legend=True,
+        vmax=10,
+        vmin=0,
+        legend_kwds={
+            "label": "Hydrogen Storage [TWh]",
+            "shrink": 0.7,
+            "extend": "max",
+        },
+    )
+
     sizes = [50, 10]
     labels = [f"{s} GW" for s in sizes]
+    sizes = [s/bus_size_factor*1e3 for s in sizes]
 
     legend_kw = dict(
         loc="upper left",
@@ -403,7 +430,6 @@ def plot_h2_map(network):
     )
 
     add_legend_circles(ax, sizes, labels,
-        scale=bus_size_factor/1e3,
         srid=n.srid,
         patch_kw=dict(facecolor='lightgrey'),
         legend_kw=legend_kw
@@ -446,6 +472,9 @@ def plot_h2_map(network):
         legend_kw=legend_kw
     )
 
+    plt.gca().outline_patch.set_visible(False)
+    ax.set_facecolor("white")
+
     fig.savefig(
         snakemake.output.map.replace("-costs-all","-h2_network"),
         bbox_inches="tight"
@@ -561,6 +590,7 @@ def plot_ch4_map(network):
 
     sizes = [100, 10]
     labels = [f"{s} TWh" for s in sizes]
+    sizes = [s/bus_size_factor*1e6 for s in sizes]
     
     legend_kw = dict(
         loc="upper left",
@@ -575,7 +605,6 @@ def plot_ch4_map(network):
         ax,
         sizes,
         labels,
-        scale=bus_size_factor/1e6,
         srid=n.srid,
         patch_kw=dict(facecolor='lightgrey'),
         legend_kw=legend_kw,
@@ -648,8 +677,8 @@ def plot_map_without(network):
     line_lower_threshold = 200.
     line_upper_threshold = 1e4
     linewidth_factor = 3e3
-    ac_color = "gray"
-    dc_color = "m"
+    ac_color = "rosybrown"
+    dc_color = "darkseagreen"
 
     # hack because impossible to drop buses...
     if "EU gas" in n.buses.index:
@@ -846,6 +875,8 @@ if __name__ == "__main__":
     overrides = override_component_attrs(snakemake.input.overrides)
     n = pypsa.Network(snakemake.input.network, override_component_attrs=overrides)
 
+    regions = gpd.read_file(snakemake.input.regions).set_index("name")
+
     map_opts = snakemake.config['plotting']['map']
 
     plot_map(n,
@@ -854,7 +885,7 @@ if __name__ == "__main__":
         transmission=False
     )
 
-    plot_h2_map(n)
+    plot_h2_map(n, regions)
     plot_ch4_map(n)
     plot_map_without(n)
 

From 8143f7e0fda9ac4baf477b289939a14038884288 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Fri, 1 Jul 2022 10:16:11 +0200
Subject: [PATCH 6/9] remove accidental config file additions

---
 config.co2seq.yaml    | 595 ---------------------------------------
 config.cost.yaml      | 594 ---------------------------------------
 config.decentral.yaml | 592 ---------------------------------------
 config.gas.yaml       | 590 ---------------------------------------
 config.h2.yaml        | 596 ----------------------------------------
 config.import.yaml    | 626 ------------------------------------------
 config.lv.yaml        | 594 ---------------------------------------
 config.onw.yaml       | 594 ---------------------------------------
 config.spatial.yaml   | 593 ---------------------------------------
 config.temporal.yaml  | 590 ---------------------------------------
 10 files changed, 5964 deletions(-)
 delete mode 100644 config.co2seq.yaml
 delete mode 100644 config.cost.yaml
 delete mode 100644 config.decentral.yaml
 delete mode 100644 config.gas.yaml
 delete mode 100644 config.h2.yaml
 delete mode 100644 config.import.yaml
 delete mode 100644 config.lv.yaml
 delete mode 100644 config.onw.yaml
 delete mode 100644 config.spatial.yaml
 delete mode 100644 config.temporal.yaml

diff --git a/config.co2seq.yaml b/config.co2seq.yaml
deleted file mode 100644
index 7d3fa6c4..00000000
--- a/config.co2seq.yaml
+++ /dev/null
@@ -1,595 +0,0 @@
-version: 0.6.0
-
-logging_level: INFO
-
-results_dir: results/
-summary_dir: results
-costs_dir: ../technology-data/outputs/
-run: 20211218-181-co2seq  # use this to keep track of runs with different settings
-foresight: overnight # options are overnight, myopic, perfect (perfect is not yet implemented)
-# if you use myopic or perfect foresight, set the investment years in "planning_horizons" below
-
-scenario:
-  simpl: # only relevant for PyPSA-Eur
-    - ''
-  lv: # allowed transmission line volume expansion, can be any float >= 1.0 (today) or "opt"
-    - 1.5
-  clusters: # number of nodes in Europe, any integer between 37 (1 node per country-zone) and several hundred
-    - 181
-  opts: # only relevant for PyPSA-Eur
-    - ''
-  sector_opts: # this is where the main scenario settings are
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind+p0.5-seq50
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind+p0.5-seq100
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind+p0.5-seq200
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind+p0.5-seq400
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind+p0.5-seq600
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind+p0.5-seq800
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind+p0.5-seq1000
-  # to really understand the options here, look in scripts/prepare_sector_network.py
-  # Co2Lx specifies the CO2 target in x% of the 1990 values; default will give default (5%);
-  # Co2L0p25 will give 25% CO2 emissions; Co2Lm0p05 will give 5% negative emissions
-  # xH is the temporal resolution; 3H is 3-hourly, i.e. one snapshot every 3 hours
-  # single letters are sectors: T for land transport, H for building heating,
-  # B for biomass supply, I for industry, shipping and aviation,
-  # A for agriculture, forestry and fishing
-  # solar+c0.5 reduces the capital cost of solar to 50\% of reference value
-  # solar+p3 multiplies the available installable potential by factor 3
-  # co2 stored+e2 multiplies the potential of CO2 sequestration by a factor 2
-  # dist{n} includes distribution grids with investment cost of n times cost in data/costs.csv
-  # for myopic/perfect foresight cb states the carbon budget in GtCO2 (cumulative
-  # emissions throughout the transition path in the timeframe determined by the
-  # planning_horizons), be:beta decay; ex:exponential decay
-  # cb40ex0 distributes a carbon budget of 40 GtCO2 following an exponential
-  # decay with initial growth rate 0
-  planning_horizons: # investment years for myopic and perfect; or costs year for overnight
-    - 2030
-  # for example, set to [2020, 2030, 2040, 2050] for myopic foresight
-
-# CO2 budget as a fraction of 1990 emissions
-# this is over-ridden if CO2Lx is set in sector_opts
-# this is also over-ridden if cb is set in sector_opts
-co2_budget:
-  2020: 0.7011648746
-  2025: 0.5241935484
-  2030: 0.2970430108
-  2035: 0.1500896057
-  2040: 0.0712365591
-  2045: 0.0322580645
-  2050: 0
-
-# snapshots are originally set in PyPSA-Eur/config.yaml but used again by PyPSA-Eur-Sec
-snapshots:
-  # arguments to pd.date_range
-  start: "2013-01-01"
-  end: "2014-01-01"
-  closed: left # end is not inclusive
-
-atlite:
-  cutout: ../pypsa-eur/cutouts/europe-2013-era5.nc
-
-# this information is NOT used but needed as an argument for
-# pypsa-eur/scripts/add_electricity.py/load_costs in make_summary.py
-electricity:
-  max_hours:
-    battery: 6
-    H2: 168
-
-# regulate what components with which carriers are kept from PyPSA-Eur;
-# some technologies are removed because they are implemented differently
-# (e.g. battery or H2 storage) or have different year-dependent costs
-# in PyPSA-Eur-Sec
-pypsa_eur:
-  Bus:
-    - AC
-  Link:
-    - DC
-  Generator:
-    - onwind
-    - offwind-ac
-    - offwind-dc
-    - solar
-    - ror
-  StorageUnit:
-    - PHS
-    - hydro
-  Store: []
-
-
-energy:
-  energy_totals_year: 2011
-  base_emissions_year: 1990
-  eurostat_report_year: 2016
-  emissions: CO2 # "CO2" or "All greenhouse gases - (CO2 equivalent)"
-
-biomass:
-  year: 2030
-  scenario: ENS_Med
-  classes:
-    solid biomass:
-      - Agricultural waste
-      - Fuelwood residues
-      - Secondary Forestry residues - woodchips
-      - Sawdust
-      - Residues from landscape care
-      - Municipal waste
-    not included:
-      - Sugar from sugar beet
-      - Rape seed
-      - "Sunflower, soya seed "
-      - Bioethanol barley, wheat, grain maize, oats, other cereals and rye
-      - Miscanthus, switchgrass, RCG
-      - Willow
-      - Poplar
-      - FuelwoodRW
-      - C&P_RW
-    biogas:
-      - Manure solid, liquid
-      - Sludge
-
-
-solar_thermal:
-  clearsky_model: simple  # should be "simple" or "enhanced"?
-  orientation:
-    slope: 45.
-    azimuth: 180.
-
-# only relevant for foresight = myopic or perfect
-existing_capacities:
-  grouping_years: [1980, 1985, 1990, 1995, 2000, 2005, 2010, 2015, 2019]
-  threshold_capacity: 10
-  conventional_carriers:
-    - lignite
-    - coal
-    - oil
-    - uranium
-
-
-sector:
-  district_heating:
-    potential: 0.6  # maximum fraction of urban demand which can be supplied by district heating
-     # increase of today's district heating demand to potential maximum district heating share
-     # progress = 0 means today's district heating share, progress = 1 means maximum fraction of urban demand is supplied by district heating
-    progress: 1
-      # 2020: 0.0
-      # 2030: 0.3
-      # 2040: 0.6
-      # 2050: 1.0
-    district_heating_loss: 0.15
-  bev_dsm_restriction_value: 0.75  #Set to 0 for no restriction on BEV DSM
-  bev_dsm_restriction_time: 7  #Time at which SOC of BEV has to be dsm_restriction_value
-  transport_heating_deadband_upper: 20.
-  transport_heating_deadband_lower: 15.
-  ICE_lower_degree_factor: 0.375  #in per cent increase in fuel consumption per degree above deadband
-  ICE_upper_degree_factor: 1.6
-  EV_lower_degree_factor: 0.98
-  EV_upper_degree_factor: 0.63
-  bev_dsm: true #turns on EV battery
-  bev_availability: 0.5  #How many cars do smart charging
-  bev_energy: 0.05  #average battery size in MWh
-  bev_charge_efficiency: 0.9  #BEV (dis-)charging efficiency
-  bev_plug_to_wheel_efficiency: 0.2 #kWh/km from EPA https://www.fueleconomy.gov/feg/ for Tesla Model S
-  bev_charge_rate: 0.011 #3-phase charger with 11 kW
-  bev_avail_max: 0.95
-  bev_avail_mean: 0.8
-  v2g: true #allows feed-in to grid from EV battery
-  #what is not EV or FCEV is oil-fuelled ICE
-  land_transport_fuel_cell_share: 0.15 # 1 means all FCEVs
-    # 2020: 0
-    # 2030: 0.05
-    # 2040: 0.1
-    # 2050: 0.15
-  land_transport_electric_share: 0.85 # 1 means all EVs
-    # 2020: 0
-    # 2030: 0.25
-    # 2040: 0.6
-    # 2050: 0.85
-  transport_fuel_cell_efficiency: 0.5
-  transport_internal_combustion_efficiency: 0.3
-  agriculture_machinery_electric_share: 0
-  agriculture_machinery_fuel_efficiency: 0.7 # fuel oil per use
-  agriculture_machinery_electric_efficiency: 0.3 # electricity per use
-  shipping_average_efficiency: 0.4 #For conversion of fuel oil to propulsion in 2011
-  shipping_hydrogen_liquefaction: true # whether to consider liquefaction costs for shipping H2 demands
-  shipping_hydrogen_share: 1 # 1 means all hydrogen FC
-    # 2020: 0
-    # 2025: 0
-    # 2030: 0.05
-    # 2035: 0.15
-    # 2040: 0.3
-    # 2045: 0.6
-    # 2050: 1
-  time_dep_hp_cop: true #time dependent heat pump coefficient of performance
-  heat_pump_sink_T: 55. # Celsius, based on DTU / large area radiators; used in build_cop_profiles.py
-   # conservatively high to cover hot water and space heating in poorly-insulated buildings
-  reduce_space_heat_exogenously: true  # reduces space heat demand by a given factor (applied before losses in DH)
-  # this can represent e.g. building renovation, building demolition, or if
-  # the factor is negative: increasing floor area, increased thermal comfort, population growth
-  reduce_space_heat_exogenously_factor: 0.29 # per unit reduction in space heat demand
-  # the default factors are determined by the LTS scenario from http://tool.european-calculator.eu/app/buildings/building-types-area/?levers=1ddd4444421213bdbbbddd44444ffffff11f411111221111211l212221
-    # 2020: 0.10  # this results in a space heat demand reduction of 10%
-    # 2025: 0.09  # first heat demand increases compared to 2020 because of larger floor area per capita
-    # 2030: 0.09
-    # 2035: 0.11
-    # 2040: 0.16
-    # 2045: 0.21
-    # 2050: 0.29
-  retrofitting :  # co-optimises building renovation to reduce space heat demand
-    retro_endogen: false  # co-optimise space heat savings
-    cost_factor: 1.0   # weight costs for building renovation
-    interest_rate: 0.04  # for investment in building components
-    annualise_cost: true  # annualise the investment costs
-    tax_weighting: false   # weight costs depending on taxes in countries
-    construction_index: true   # weight costs depending on labour/material costs per country
-  tes: true
-  tes_tau: # 180 day time constant for centralised, 3 day for decentralised
-    decentral: 3
-    central: 180
-  boilers: true
-  oil_boilers: false
-  chp: true
-  micro_chp: false
-  solar_thermal: true
-  solar_cf_correction: 0.788457  # =  >>> 1/1.2683
-  marginal_cost_storage: 0. #1e-4
-  methanation: true
-  helmeth: false
-  dac: true
-  co2_vent: false
-  SMR: true
-  co2_sequestration_potential: 200  #MtCO2/a sequestration potential for Europe
-  co2_sequestration_cost: 20   #EUR/tCO2 for sequestration of CO2
-  co2_network: false
-  cc_fraction: 0.9  # default fraction of CO2 captured with post-combustion capture
-  hydrogen_underground_storage: true
-  hydrogen_underground_storage_locations:
-    # - onshore  # more than 50 km from sea
-    - nearshore  # within 50 km of sea
-    # - offshore
-  use_fischer_tropsch_waste_heat: true
-  use_fuel_cell_waste_heat: true
-  electricity_distribution_grid: true
-  electricity_distribution_grid_cost_factor: 1.0  #multiplies cost in data/costs.csv
-  electricity_grid_connection: true  # only applies to onshore wind and utility PV
-  H2_network: true
-  gas_network: false
-  H2_retrofit: true  # if set to True existing gas pipes can be retrofitted to H2 pipes
-  # according to hydrogen backbone strategy (April, 2020) p.15
-  # https://gasforclimate2050.eu/wp-content/uploads/2020/07/2020_European-Hydrogen-Backbone_Report.pdf
-  # 60% of original natural gas capacity could be used in cost-optimal case as H2 capacity
-  H2_retrofit_capacity_per_CH4: 0.6  # ratio for H2 capacity per original CH4 capacity of retrofitted pipelines
-  gas_network_connectivity_upgrade: 1 # https://networkx.org/documentation/stable/reference/algorithms/generated/networkx.algorithms.connectivity.edge_augmentation.k_edge_augmentation.html#networkx.algorithms.connectivity.edge_augmentation.k_edge_augmentation
-  gas_distribution_grid: true
-  gas_distribution_grid_cost_factor: 1.0  #multiplies cost in data/costs.csv
-  biomass_transport: false  # biomass transport between nodes
-  conventional_generation: # generator : carrier
-    OCGT: gas
-
-
-industry:
-  St_primary_fraction: 0.3 # fraction of steel produced via primary route versus secondary route (scrap+EAF); today fraction is 0.6
-    # 2020: 0.6
-    # 2025: 0.55
-    # 2030: 0.5
-    # 2035: 0.45
-    # 2040: 0.4
-    # 2045: 0.35
-    # 2050: 0.3
-  DRI_fraction: 1 # fraction of the primary route converted to DRI + EAF
-    # 2020: 0
-    # 2025: 0
-    # 2030: 0.05
-    # 2035: 0.2
-    # 2040: 0.4
-    # 2045: 0.7
-    # 2050: 1
-  H2_DRI: 1.7   #H2 consumption in Direct Reduced Iron (DRI),  MWh_H2,LHV/ton_Steel from 51kgH2/tSt in Vogl et al (2018) doi:10.1016/j.jclepro.2018.08.279
-  elec_DRI: 0.322   #electricity consumption in Direct Reduced Iron (DRI) shaft, MWh/tSt HYBRIT brochure https://ssabwebsitecdn.azureedge.net/-/media/hybrit/files/hybrit_brochure.pdf
-  Al_primary_fraction: 0.2 # fraction of aluminium produced via the primary route versus scrap; today fraction is 0.4
-    # 2020: 0.4
-    # 2025: 0.375
-    # 2030: 0.35
-    # 2035: 0.325
-    # 2040: 0.3
-    # 2045: 0.25
-    # 2050: 0.2
-  MWh_CH4_per_tNH3_SMR: 10.8 # 2012's demand from https://ec.europa.eu/docsroom/documents/4165/attachments/1/translations/en/renditions/pdf
-  MWh_elec_per_tNH3_SMR: 0.7 # same source, assuming 94-6% split methane-elec of total energy demand 11.5 MWh/tNH3
-  MWh_H2_per_tNH3_electrolysis: 6.5 # from https://doi.org/10.1016/j.joule.2018.04.017, around 0.197 tH2/tHN3 (>3/17 since some H2 lost and used for energy)
-  MWh_elec_per_tNH3_electrolysis: 1.17 # from https://doi.org/10.1016/j.joule.2018.04.017 Table 13 (air separation and HB)
-  NH3_process_emissions: 24.5 # in MtCO2/a from SMR for H2 production for NH3 from UNFCCC for 2015 for EU28
-  petrochemical_process_emissions: 25.5 # in MtCO2/a for petrochemical and other from UNFCCC for 2015 for EU28
-  HVC_primary_fraction: 0.45 # fraction of today's HVC produced via primary route
-  HVC_mechanical_recycling_fraction: 0.30 # fraction of today's HVC produced via mechanical recycling
-  HVC_chemical_recycling_fraction: 0.15 # fraction of today's HVC produced via chemical recycling
-  HVC_production_today: 52. # MtHVC/a from DECHEMA (2017), Figure 16, page 107; includes ethylene, propylene and BTX
-  MWh_elec_per_tHVC_mechanical_recycling: 0.547 # from SI of https://doi.org/10.1016/j.resconrec.2020.105010, Table S5, for HDPE, PP, PS, PET. LDPE would be 0.756.
-  MWh_elec_per_tHVC_chemical_recycling: 6.9 # Material Economics (2019), page 125; based on pyrolysis and electric steam cracking
-  chlorine_production_today: 9.58 # MtCl/a from DECHEMA (2017), Table 7, page 43
-  MWh_elec_per_tCl: 3.6 # DECHEMA (2017), Table 6, page 43
-  MWh_H2_per_tCl: -0.9372  # DECHEMA (2017), page 43; negative since hydrogen produced in chloralkali process
-  methanol_production_today: 1.5 # MtMeOH/a from DECHEMA (2017), page 62
-  MWh_elec_per_tMeOH: 0.167 # DECHEMA (2017), Table 14, page 65
-  MWh_CH4_per_tMeOH: 10.25 # DECHEMA (2017), Table 14, page 65
-  hotmaps_locate_missing: false
-  reference_year: 2015
-  # references:
-  # DECHEMA (2017): https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry-p-20002750.pdf
-  # Material Economics (2019): https://materialeconomics.com/latest-updates/industrial-transformation-2050
-
-costs:
-  lifetime: 25 #default lifetime
-  # From a Lion Hirth paper, also reflects average of Noothout et al 2016
-  discountrate: 0.07
-  # [EUR/USD] ECB: https://www.ecb.europa.eu/stats/exchange/eurofxref/html/eurofxref-graph-usd.en.html # noqa: E501
-  USD2013_to_EUR2013: 0.7532
-
-  # Marginal and capital costs can be overwritten
-  # capital_cost:
-  #   onwind: 500
-  marginal_cost:
-    solar: 0.01
-    onwind: 0.015
-    offwind: 0.015
-    hydro: 0.
-    H2: 0.
-    battery: 0.
-
-  emission_prices: # only used with the option Ep (emission prices)
-    co2: 0.
-
-  lines:
-    length_factor: 1.25 #to estimate offwind connection costs
-
-
-solving:
-  #tmpdir: "path/to/tmp"
-  options:
-    formulation: kirchhoff
-    clip_p_max_pu: 1.e-2
-    load_shedding: false
-    noisy_costs: true
-    skip_iterations: true
-    track_iterations: false
-    min_iterations: 4
-    max_iterations: 6
-    keep_shadowprices:
-      - Bus
-      - Line
-      - Link
-      - Transformer
-      - GlobalConstraint
-      - Generator
-      - Store
-      - StorageUnit
-  solver:
-    name: gurobi
-    threads: 4
-    method: 2 # barrier
-    crossover: 0
-    BarConvTol: 1.e-4
-    Seed: 123
-    AggFill: 0
-    PreDual: 0
-    GURO_PAR_BARDENSETHRESH: 200
-    #FeasibilityTol: 1.e-6
-
-    #name: cplex
-    #threads: 4
-    #lpmethod: 4 # barrier
-    #solutiontype: 2 # non basic solution, ie no crossover
-    #barrier_convergetol: 1.e-5
-    #feasopt_tolerance: 1.e-6
-  mem: 126000 #memory in MB; 20 GB enough for 50+B+I+H2; 100 GB for 181+B+I+H2
-
-
-plotting:
-  map:
-    boundaries: [-11, 30, 34, 71]
-    color_geomap:
-      ocean: white
-      land: white
-  costs_max: 1000
-  costs_threshold: 1
-  energy_max: 20000
-  energy_min: -20000
-  energy_threshold: 50
-  vre_techs:
-    - onwind
-    - offwind-ac
-    - offwind-dc
-    - solar
-    - ror
-  renewable_storage_techs:
-    - PHS
-    - hydro
-  conv_techs:
-    - OCGT
-    - CCGT
-    - Nuclear
-    - Coal
-  storage_techs:
-    - hydro+PHS
-    - battery
-    - H2
-  load_carriers:
-    - AC load
-  AC_carriers:
-    - AC line
-    - AC transformer
-  link_carriers:
-    - DC line
-    - Converter AC-DC
-  heat_links:
-    - heat pump
-    - resistive heater
-    - CHP heat
-    - CHP electric
-    - gas boiler
-    - central heat pump
-    - central resistive heater
-    - central CHP heat
-    - central CHP electric
-    - central gas boiler
-  heat_generators:
-    - gas boiler
-    - central gas boiler
-    - solar thermal collector
-    - central solar thermal collector
-  tech_colors:
-    # wind
-    onwind: "#235ebc"
-    onshore wind: "#235ebc"
-    offwind: "#6895dd"
-    offshore wind: "#6895dd"
-    offwind-ac: "#6895dd"
-    offshore wind (AC): "#6895dd"
-    offwind-dc: "#74c6f2"
-    offshore wind (DC): "#74c6f2"
-    # water
-    hydro: '#298c81'
-    hydro reservoir: '#298c81'
-    ror: '#3dbfb0'
-    run of river: '#3dbfb0'
-    hydroelectricity: '#298c81'
-    PHS: '#51dbcc'
-    wave: '#a7d4cf'
-    # solar
-    solar: "#f9d002"
-    solar PV: "#f9d002"
-    solar thermal: '#ffbf2b'
-    solar rooftop: '#ffea80'
-    # gas
-    OCGT: '#e0986c'
-    OCGT marginal: '#e0986c'
-    OCGT-heat: '#e0986c'
-    gas boiler: '#db6a25'
-    gas boilers: '#db6a25'
-    gas boiler marginal: '#db6a25'
-    gas: '#e05b09'
-    natural gas: '#e05b09'
-    CCGT: '#a85522'
-    CCGT marginal: '#a85522'
-    gas for industry co2 to atmosphere: '#692e0a'
-    gas for industry co2 to stored: '#8a3400'
-    gas for industry: '#853403'
-    gas for industry CC: '#692e0a'
-    gas pipeline: '#ebbca0'
-    # oil
-    oil: '#c9c9c9'
-    oil boiler: '#adadad'
-    agriculture machinery oil: '#949494'
-    shipping oil: "#808080"
-    land transport oil: '#afafaf'
-    # nuclear
-    Nuclear: '#ff8c00'
-    Nuclear marginal: '#ff8c00'
-    nuclear: '#ff8c00'
-    uranium: '#ff8c00'
-    # coal
-    Coal: '#545454'
-    coal: '#545454'
-    Coal marginal: '#545454'
-    Lignite: '#826837'
-    lignite: '#826837'
-    Lignite marginal: '#826837'
-    # biomass
-    biogas: '#e3d37d'
-    solid biomass: '#baa741'
-    solid biomass transport: '#baa741'
-    solid biomass for industry: '#7a6d26'
-    solid biomass for industry CC: '#47411c'
-    solid biomass for industry co2 from atmosphere: '#736412'
-    solid biomass for industry co2 to stored: '#47411c'
-    # power transmission
-    lines: '#6c9459'
-    transmission lines: '#6c9459'
-    electricity distribution grid: '#97ad8c'
-    # electricity demand
-    Electric load: '#110d63'
-    electric demand: '#110d63'
-    electricity: '#110d63'
-    industry electricity: '#2d2a66'
-    industry new electricity: '#2d2a66'
-    agriculture electricity: '#494778'
-    # battery + EVs
-    battery: '#ace37f'
-    battery storage: '#ace37f'
-    home battery: '#80c944'
-    home battery storage: '#80c944'
-    BEV charger: '#baf238'
-    V2G: '#e5ffa8'
-    land transport EV: '#baf238'
-    Li ion: '#baf238'
-    # hot water storage
-    water tanks: '#e69487'
-    hot water storage: '#e69487'
-    hot water charging: '#e69487'
-    hot water discharging: '#e69487'
-    # heat demand
-    Heat load: '#cc1f1f'
-    heat: '#cc1f1f'
-    heat demand: '#cc1f1f'
-    rural heat: '#ff5c5c'
-    central heat: '#cc1f1f'
-    decentral heat: '#750606'
-    low-temperature heat for industry: '#8f2727'
-    process heat: '#ff0000'
-    agriculture heat: '#d9a5a5'
-    # heat supply
-    heat pumps: '#2fb537'
-    heat pump: '#2fb537'
-    air heat pump: '#36eb41'
-    ground heat pump: '#2fb537'
-    Ambient: '#98eb9d'
-    CHP: '#8a5751'
-    CHP CC: '#634643'
-    CHP heat: '#8a5751'
-    CHP electric: '#8a5751'
-    district heating: '#e8beac'
-    resistive heater: '#c78536'
-    retrofitting: '#8487e8'
-    building retrofitting: '#8487e8'
-    # hydrogen
-    H2 for industry: "#f073da"
-    H2 for shipping: "#ebaee0"
-    H2: '#bf13a0'
-    SMR: '#870c71'
-    SMR CC: '#4f1745'
-    H2 liquefaction: '#d647bd'
-    hydrogen storage: '#bf13a0'
-    land transport fuel cell: '#6b3161'
-    H2 pipeline: '#f081dc'
-    H2 Fuel Cell: '#c251ae'
-    H2 Electrolysis: '#ff29d9'
-    # syngas
-    Sabatier: '#9850ad'
-    methanation: '#c44ce6'
-    helmeth: '#e899ff'
-    # synfuels
-    Fischer-Tropsch: '#25c49a'
-    kerosene for aviation: '#a1ffe6'
-    naphtha for industry: '#57ebc4'
-    # co2
-    CC: '#9e132c'
-    CO2 sequestration: '#9e132c'
-    DAC: '#ff5270'
-    co2 stored: '#f2385a'
-    co2: '#f29dae'
-    co2 vent: '#ffd4dc'
-    CO2 pipeline: '#f5627f'
-    # emissions
-    process emissions CC: '#000000'
-    process emissions: '#222222'
-    process emissions to stored: '#444444'
-    process emissions to atmosphere: '#888888'
-    oil emissions: '#aaaaaa'
-    shipping oil emissions: "#555555"
-    land transport oil emissions: '#777777'
-    agriculture machinery oil emissions: '#333333'
-    # other
-    shipping: '#03a2ff'
-    power-to-heat: '#cc1f1f'
-    power-to-gas: '#c44ce6'
-    power-to-liquid: '#25c49a'
-    gas-to-power/heat: '#ee8340'
diff --git a/config.cost.yaml b/config.cost.yaml
deleted file mode 100644
index 402b5943..00000000
--- a/config.cost.yaml
+++ /dev/null
@@ -1,594 +0,0 @@
-version: 0.6.0
-
-logging_level: INFO
-
-results_dir: results/
-summary_dir: results
-costs_dir: ../technology-data/outputs/
-run: 20211218-181-cost  # use this to keep track of runs with different settings
-foresight: overnight # options are overnight, myopic, perfect (perfect is not yet implemented)
-# if you use myopic or perfect foresight, set the investment years in "planning_horizons" below
-
-scenario:
-  simpl: # only relevant for PyPSA-Eur
-    - ''
-  lv: # allowed transmission line volume expansion, can be any float >= 1.0 (today) or "opt"
-    - 1.5
-  clusters: # number of nodes in Europe, any integer between 37 (1 node per country-zone) and several hundred
-    - 181
-  opts: # only relevant for PyPSA-Eur
-    - ''
-  sector_opts: # this is where the main scenario settings are
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind-p0.5-solar-c0.75
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind-p0.5-wind-c0.75
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind-p0.5-Electrolysis-c0.75
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind-p0.5-SMR-c0.75
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind-p0.5-battery-c0.75
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind-p0.5-DAC-c0.75
-  # to really understand the options here, look in scripts/prepare_sector_network.py
-  # Co2Lx specifies the CO2 target in x% of the 1990 values; default will give default (5%);
-  # Co2L0p25 will give 25% CO2 emissions; Co2Lm0p05 will give 5% negative emissions
-  # xH is the temporal resolution; 3H is 3-hourly, i.e. one snapshot every 3 hours
-  # single letters are sectors: T for land transport, H for building heating,
-  # B for biomass supply, I for industry, shipping and aviation,
-  # A for agriculture, forestry and fishing
-  # solar+c0.5 reduces the capital cost of solar to 50\% of reference value
-  # solar+p3 multiplies the available installable potential by factor 3
-  # co2 stored+e2 multiplies the potential of CO2 sequestration by a factor 2
-  # dist{n} includes distribution grids with investment cost of n times cost in data/costs.csv
-  # for myopic/perfect foresight cb states the carbon budget in GtCO2 (cumulative
-  # emissions throughout the transition path in the timeframe determined by the
-  # planning_horizons), be:beta decay; ex:exponential decay
-  # cb40ex0 distributes a carbon budget of 40 GtCO2 following an exponential
-  # decay with initial growth rate 0
-  planning_horizons: # investment years for myopic and perfect; or costs year for overnight
-    - 2030
-  # for example, set to [2020, 2030, 2040, 2050] for myopic foresight
-
-# CO2 budget as a fraction of 1990 emissions
-# this is over-ridden if CO2Lx is set in sector_opts
-# this is also over-ridden if cb is set in sector_opts
-co2_budget:
-  2020: 0.7011648746
-  2025: 0.5241935484
-  2030: 0.2970430108
-  2035: 0.1500896057
-  2040: 0.0712365591
-  2045: 0.0322580645
-  2050: 0
-
-# snapshots are originally set in PyPSA-Eur/config.yaml but used again by PyPSA-Eur-Sec
-snapshots:
-  # arguments to pd.date_range
-  start: "2013-01-01"
-  end: "2014-01-01"
-  closed: left # end is not inclusive
-
-atlite:
-  cutout: ../pypsa-eur/cutouts/europe-2013-era5.nc
-
-# this information is NOT used but needed as an argument for
-# pypsa-eur/scripts/add_electricity.py/load_costs in make_summary.py
-electricity:
-  max_hours:
-    battery: 6
-    H2: 168
-
-# regulate what components with which carriers are kept from PyPSA-Eur;
-# some technologies are removed because they are implemented differently
-# (e.g. battery or H2 storage) or have different year-dependent costs
-# in PyPSA-Eur-Sec
-pypsa_eur:
-  Bus:
-    - AC
-  Link:
-    - DC
-  Generator:
-    - onwind
-    - offwind-ac
-    - offwind-dc
-    - solar
-    - ror
-  StorageUnit:
-    - PHS
-    - hydro
-  Store: []
-
-
-energy:
-  energy_totals_year: 2011
-  base_emissions_year: 1990
-  eurostat_report_year: 2016
-  emissions: CO2 # "CO2" or "All greenhouse gases - (CO2 equivalent)"
-
-biomass:
-  year: 2030
-  scenario: ENS_Med
-  classes:
-    solid biomass:
-      - Agricultural waste
-      - Fuelwood residues
-      - Secondary Forestry residues - woodchips
-      - Sawdust
-      - Residues from landscape care
-      - Municipal waste
-    not included:
-      - Sugar from sugar beet
-      - Rape seed
-      - "Sunflower, soya seed "
-      - Bioethanol barley, wheat, grain maize, oats, other cereals and rye
-      - Miscanthus, switchgrass, RCG
-      - Willow
-      - Poplar
-      - FuelwoodRW
-      - C&P_RW
-    biogas:
-      - Manure solid, liquid
-      - Sludge
-
-
-solar_thermal:
-  clearsky_model: simple  # should be "simple" or "enhanced"?
-  orientation:
-    slope: 45.
-    azimuth: 180.
-
-# only relevant for foresight = myopic or perfect
-existing_capacities:
-  grouping_years: [1980, 1985, 1990, 1995, 2000, 2005, 2010, 2015, 2019]
-  threshold_capacity: 10
-  conventional_carriers:
-    - lignite
-    - coal
-    - oil
-    - uranium
-
-
-sector:
-  district_heating:
-    potential: 0.6  # maximum fraction of urban demand which can be supplied by district heating
-     # increase of today's district heating demand to potential maximum district heating share
-     # progress = 0 means today's district heating share, progress = 1 means maximum fraction of urban demand is supplied by district heating
-    progress: 1
-      # 2020: 0.0
-      # 2030: 0.3
-      # 2040: 0.6
-      # 2050: 1.0
-    district_heating_loss: 0.15
-  bev_dsm_restriction_value: 0.75  #Set to 0 for no restriction on BEV DSM
-  bev_dsm_restriction_time: 7  #Time at which SOC of BEV has to be dsm_restriction_value
-  transport_heating_deadband_upper: 20.
-  transport_heating_deadband_lower: 15.
-  ICE_lower_degree_factor: 0.375  #in per cent increase in fuel consumption per degree above deadband
-  ICE_upper_degree_factor: 1.6
-  EV_lower_degree_factor: 0.98
-  EV_upper_degree_factor: 0.63
-  bev_dsm: true #turns on EV battery
-  bev_availability: 0.5  #How many cars do smart charging
-  bev_energy: 0.05  #average battery size in MWh
-  bev_charge_efficiency: 0.9  #BEV (dis-)charging efficiency
-  bev_plug_to_wheel_efficiency: 0.2 #kWh/km from EPA https://www.fueleconomy.gov/feg/ for Tesla Model S
-  bev_charge_rate: 0.011 #3-phase charger with 11 kW
-  bev_avail_max: 0.95
-  bev_avail_mean: 0.8
-  v2g: true #allows feed-in to grid from EV battery
-  #what is not EV or FCEV is oil-fuelled ICE
-  land_transport_fuel_cell_share: 0.15 # 1 means all FCEVs
-    # 2020: 0
-    # 2030: 0.05
-    # 2040: 0.1
-    # 2050: 0.15
-  land_transport_electric_share: 0.85 # 1 means all EVs
-    # 2020: 0
-    # 2030: 0.25
-    # 2040: 0.6
-    # 2050: 0.85
-  transport_fuel_cell_efficiency: 0.5
-  transport_internal_combustion_efficiency: 0.3
-  agriculture_machinery_electric_share: 0
-  agriculture_machinery_fuel_efficiency: 0.7 # fuel oil per use
-  agriculture_machinery_electric_efficiency: 0.3 # electricity per use
-  shipping_average_efficiency: 0.4 #For conversion of fuel oil to propulsion in 2011
-  shipping_hydrogen_liquefaction: true # whether to consider liquefaction costs for shipping H2 demands
-  shipping_hydrogen_share: 1 # 1 means all hydrogen FC
-    # 2020: 0
-    # 2025: 0
-    # 2030: 0.05
-    # 2035: 0.15
-    # 2040: 0.3
-    # 2045: 0.6
-    # 2050: 1
-  time_dep_hp_cop: true #time dependent heat pump coefficient of performance
-  heat_pump_sink_T: 55. # Celsius, based on DTU / large area radiators; used in build_cop_profiles.py
-   # conservatively high to cover hot water and space heating in poorly-insulated buildings
-  reduce_space_heat_exogenously: true  # reduces space heat demand by a given factor (applied before losses in DH)
-  # this can represent e.g. building renovation, building demolition, or if
-  # the factor is negative: increasing floor area, increased thermal comfort, population growth
-  reduce_space_heat_exogenously_factor: 0.29 # per unit reduction in space heat demand
-  # the default factors are determined by the LTS scenario from http://tool.european-calculator.eu/app/buildings/building-types-area/?levers=1ddd4444421213bdbbbddd44444ffffff11f411111221111211l212221
-    # 2020: 0.10  # this results in a space heat demand reduction of 10%
-    # 2025: 0.09  # first heat demand increases compared to 2020 because of larger floor area per capita
-    # 2030: 0.09
-    # 2035: 0.11
-    # 2040: 0.16
-    # 2045: 0.21
-    # 2050: 0.29
-  retrofitting :  # co-optimises building renovation to reduce space heat demand
-    retro_endogen: false  # co-optimise space heat savings
-    cost_factor: 1.0   # weight costs for building renovation
-    interest_rate: 0.04  # for investment in building components
-    annualise_cost: true  # annualise the investment costs
-    tax_weighting: false   # weight costs depending on taxes in countries
-    construction_index: true   # weight costs depending on labour/material costs per country
-  tes: true
-  tes_tau: # 180 day time constant for centralised, 3 day for decentralised
-    decentral: 3
-    central: 180
-  boilers: true
-  oil_boilers: false
-  chp: true
-  micro_chp: false
-  solar_thermal: true
-  solar_cf_correction: 0.788457  # =  >>> 1/1.2683
-  marginal_cost_storage: 0. #1e-4
-  methanation: true
-  helmeth: false
-  dac: true
-  co2_vent: false
-  SMR: true
-  co2_sequestration_potential: 200  #MtCO2/a sequestration potential for Europe
-  co2_sequestration_cost: 20   #EUR/tCO2 for sequestration of CO2
-  co2_network: false
-  cc_fraction: 0.9  # default fraction of CO2 captured with post-combustion capture
-  hydrogen_underground_storage: true
-  hydrogen_underground_storage_locations:
-    # - onshore  # more than 50 km from sea
-    - nearshore  # within 50 km of sea
-    # - offshore
-  use_fischer_tropsch_waste_heat: true
-  use_fuel_cell_waste_heat: true
-  electricity_distribution_grid: true
-  electricity_distribution_grid_cost_factor: 1.0  #multiplies cost in data/costs.csv
-  electricity_grid_connection: true  # only applies to onshore wind and utility PV
-  H2_network: true
-  gas_network: false
-  H2_retrofit: true  # if set to True existing gas pipes can be retrofitted to H2 pipes
-  # according to hydrogen backbone strategy (April, 2020) p.15
-  # https://gasforclimate2050.eu/wp-content/uploads/2020/07/2020_European-Hydrogen-Backbone_Report.pdf
-  # 60% of original natural gas capacity could be used in cost-optimal case as H2 capacity
-  H2_retrofit_capacity_per_CH4: 0.6  # ratio for H2 capacity per original CH4 capacity of retrofitted pipelines
-  gas_network_connectivity_upgrade: 1 # https://networkx.org/documentation/stable/reference/algorithms/generated/networkx.algorithms.connectivity.edge_augmentation.k_edge_augmentation.html#networkx.algorithms.connectivity.edge_augmentation.k_edge_augmentation
-  gas_distribution_grid: true
-  gas_distribution_grid_cost_factor: 1.0  #multiplies cost in data/costs.csv
-  biomass_transport: false  # biomass transport between nodes
-  conventional_generation: # generator : carrier
-    OCGT: gas
-
-
-industry:
-  St_primary_fraction: 0.3 # fraction of steel produced via primary route versus secondary route (scrap+EAF); today fraction is 0.6
-    # 2020: 0.6
-    # 2025: 0.55
-    # 2030: 0.5
-    # 2035: 0.45
-    # 2040: 0.4
-    # 2045: 0.35
-    # 2050: 0.3
-  DRI_fraction: 1 # fraction of the primary route converted to DRI + EAF
-    # 2020: 0
-    # 2025: 0
-    # 2030: 0.05
-    # 2035: 0.2
-    # 2040: 0.4
-    # 2045: 0.7
-    # 2050: 1
-  H2_DRI: 1.7   #H2 consumption in Direct Reduced Iron (DRI),  MWh_H2,LHV/ton_Steel from 51kgH2/tSt in Vogl et al (2018) doi:10.1016/j.jclepro.2018.08.279
-  elec_DRI: 0.322   #electricity consumption in Direct Reduced Iron (DRI) shaft, MWh/tSt HYBRIT brochure https://ssabwebsitecdn.azureedge.net/-/media/hybrit/files/hybrit_brochure.pdf
-  Al_primary_fraction: 0.2 # fraction of aluminium produced via the primary route versus scrap; today fraction is 0.4
-    # 2020: 0.4
-    # 2025: 0.375
-    # 2030: 0.35
-    # 2035: 0.325
-    # 2040: 0.3
-    # 2045: 0.25
-    # 2050: 0.2
-  MWh_CH4_per_tNH3_SMR: 10.8 # 2012's demand from https://ec.europa.eu/docsroom/documents/4165/attachments/1/translations/en/renditions/pdf
-  MWh_elec_per_tNH3_SMR: 0.7 # same source, assuming 94-6% split methane-elec of total energy demand 11.5 MWh/tNH3
-  MWh_H2_per_tNH3_electrolysis: 6.5 # from https://doi.org/10.1016/j.joule.2018.04.017, around 0.197 tH2/tHN3 (>3/17 since some H2 lost and used for energy)
-  MWh_elec_per_tNH3_electrolysis: 1.17 # from https://doi.org/10.1016/j.joule.2018.04.017 Table 13 (air separation and HB)
-  NH3_process_emissions: 24.5 # in MtCO2/a from SMR for H2 production for NH3 from UNFCCC for 2015 for EU28
-  petrochemical_process_emissions: 25.5 # in MtCO2/a for petrochemical and other from UNFCCC for 2015 for EU28
-  HVC_primary_fraction: 0.45 # fraction of today's HVC produced via primary route
-  HVC_mechanical_recycling_fraction: 0.30 # fraction of today's HVC produced via mechanical recycling
-  HVC_chemical_recycling_fraction: 0.15 # fraction of today's HVC produced via chemical recycling
-  HVC_production_today: 52. # MtHVC/a from DECHEMA (2017), Figure 16, page 107; includes ethylene, propylene and BTX
-  MWh_elec_per_tHVC_mechanical_recycling: 0.547 # from SI of https://doi.org/10.1016/j.resconrec.2020.105010, Table S5, for HDPE, PP, PS, PET. LDPE would be 0.756.
-  MWh_elec_per_tHVC_chemical_recycling: 6.9 # Material Economics (2019), page 125; based on pyrolysis and electric steam cracking
-  chlorine_production_today: 9.58 # MtCl/a from DECHEMA (2017), Table 7, page 43
-  MWh_elec_per_tCl: 3.6 # DECHEMA (2017), Table 6, page 43
-  MWh_H2_per_tCl: -0.9372  # DECHEMA (2017), page 43; negative since hydrogen produced in chloralkali process
-  methanol_production_today: 1.5 # MtMeOH/a from DECHEMA (2017), page 62
-  MWh_elec_per_tMeOH: 0.167 # DECHEMA (2017), Table 14, page 65
-  MWh_CH4_per_tMeOH: 10.25 # DECHEMA (2017), Table 14, page 65
-  hotmaps_locate_missing: false
-  reference_year: 2015
-  # references:
-  # DECHEMA (2017): https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry-p-20002750.pdf
-  # Material Economics (2019): https://materialeconomics.com/latest-updates/industrial-transformation-2050
-
-costs:
-  lifetime: 25 #default lifetime
-  # From a Lion Hirth paper, also reflects average of Noothout et al 2016
-  discountrate: 0.07
-  # [EUR/USD] ECB: https://www.ecb.europa.eu/stats/exchange/eurofxref/html/eurofxref-graph-usd.en.html # noqa: E501
-  USD2013_to_EUR2013: 0.7532
-
-  # Marginal and capital costs can be overwritten
-  # capital_cost:
-  #   onwind: 500
-  marginal_cost:
-    solar: 0.01
-    onwind: 0.015
-    offwind: 0.015
-    hydro: 0.
-    H2: 0.
-    battery: 0.
-
-  emission_prices: # only used with the option Ep (emission prices)
-    co2: 0.
-
-  lines:
-    length_factor: 1.25 #to estimate offwind connection costs
-
-
-solving:
-  #tmpdir: "path/to/tmp"
-  options:
-    formulation: kirchhoff
-    clip_p_max_pu: 1.e-2
-    load_shedding: false
-    noisy_costs: true
-    skip_iterations: true
-    track_iterations: false
-    min_iterations: 4
-    max_iterations: 6
-    keep_shadowprices:
-      - Bus
-      - Line
-      - Link
-      - Transformer
-      - GlobalConstraint
-      - Generator
-      - Store
-      - StorageUnit
-  solver:
-    name: gurobi
-    threads: 4
-    method: 2 # barrier
-    crossover: 0
-    BarConvTol: 1.e-4
-    Seed: 123
-    AggFill: 0
-    PreDual: 0
-    GURO_PAR_BARDENSETHRESH: 200
-    #FeasibilityTol: 1.e-6
-
-    #name: cplex
-    #threads: 4
-    #lpmethod: 4 # barrier
-    #solutiontype: 2 # non basic solution, ie no crossover
-    #barrier_convergetol: 1.e-5
-    #feasopt_tolerance: 1.e-6
-  mem: 126000 #memory in MB; 20 GB enough for 50+B+I+H2; 100 GB for 181+B+I+H2
-
-
-plotting:
-  map:
-    boundaries: [-11, 30, 34, 71]
-    color_geomap:
-      ocean: white
-      land: white
-  costs_max: 1000
-  costs_threshold: 1
-  energy_max: 20000
-  energy_min: -20000
-  energy_threshold: 50
-  vre_techs:
-    - onwind
-    - offwind-ac
-    - offwind-dc
-    - solar
-    - ror
-  renewable_storage_techs:
-    - PHS
-    - hydro
-  conv_techs:
-    - OCGT
-    - CCGT
-    - Nuclear
-    - Coal
-  storage_techs:
-    - hydro+PHS
-    - battery
-    - H2
-  load_carriers:
-    - AC load
-  AC_carriers:
-    - AC line
-    - AC transformer
-  link_carriers:
-    - DC line
-    - Converter AC-DC
-  heat_links:
-    - heat pump
-    - resistive heater
-    - CHP heat
-    - CHP electric
-    - gas boiler
-    - central heat pump
-    - central resistive heater
-    - central CHP heat
-    - central CHP electric
-    - central gas boiler
-  heat_generators:
-    - gas boiler
-    - central gas boiler
-    - solar thermal collector
-    - central solar thermal collector
-  tech_colors:
-    # wind
-    onwind: "#235ebc"
-    onshore wind: "#235ebc"
-    offwind: "#6895dd"
-    offshore wind: "#6895dd"
-    offwind-ac: "#6895dd"
-    offshore wind (AC): "#6895dd"
-    offwind-dc: "#74c6f2"
-    offshore wind (DC): "#74c6f2"
-    # water
-    hydro: '#298c81'
-    hydro reservoir: '#298c81'
-    ror: '#3dbfb0'
-    run of river: '#3dbfb0'
-    hydroelectricity: '#298c81'
-    PHS: '#51dbcc'
-    wave: '#a7d4cf'
-    # solar
-    solar: "#f9d002"
-    solar PV: "#f9d002"
-    solar thermal: '#ffbf2b'
-    solar rooftop: '#ffea80'
-    # gas
-    OCGT: '#e0986c'
-    OCGT marginal: '#e0986c'
-    OCGT-heat: '#e0986c'
-    gas boiler: '#db6a25'
-    gas boilers: '#db6a25'
-    gas boiler marginal: '#db6a25'
-    gas: '#e05b09'
-    natural gas: '#e05b09'
-    CCGT: '#a85522'
-    CCGT marginal: '#a85522'
-    gas for industry co2 to atmosphere: '#692e0a'
-    gas for industry co2 to stored: '#8a3400'
-    gas for industry: '#853403'
-    gas for industry CC: '#692e0a'
-    gas pipeline: '#ebbca0'
-    # oil
-    oil: '#c9c9c9'
-    oil boiler: '#adadad'
-    agriculture machinery oil: '#949494'
-    shipping oil: "#808080"
-    land transport oil: '#afafaf'
-    # nuclear
-    Nuclear: '#ff8c00'
-    Nuclear marginal: '#ff8c00'
-    nuclear: '#ff8c00'
-    uranium: '#ff8c00'
-    # coal
-    Coal: '#545454'
-    coal: '#545454'
-    Coal marginal: '#545454'
-    Lignite: '#826837'
-    lignite: '#826837'
-    Lignite marginal: '#826837'
-    # biomass
-    biogas: '#e3d37d'
-    solid biomass: '#baa741'
-    solid biomass transport: '#baa741'
-    solid biomass for industry: '#7a6d26'
-    solid biomass for industry CC: '#47411c'
-    solid biomass for industry co2 from atmosphere: '#736412'
-    solid biomass for industry co2 to stored: '#47411c'
-    # power transmission
-    lines: '#6c9459'
-    transmission lines: '#6c9459'
-    electricity distribution grid: '#97ad8c'
-    # electricity demand
-    Electric load: '#110d63'
-    electric demand: '#110d63'
-    electricity: '#110d63'
-    industry electricity: '#2d2a66'
-    industry new electricity: '#2d2a66'
-    agriculture electricity: '#494778'
-    # battery + EVs
-    battery: '#ace37f'
-    battery storage: '#ace37f'
-    home battery: '#80c944'
-    home battery storage: '#80c944'
-    BEV charger: '#baf238'
-    V2G: '#e5ffa8'
-    land transport EV: '#baf238'
-    Li ion: '#baf238'
-    # hot water storage
-    water tanks: '#e69487'
-    hot water storage: '#e69487'
-    hot water charging: '#e69487'
-    hot water discharging: '#e69487'
-    # heat demand
-    Heat load: '#cc1f1f'
-    heat: '#cc1f1f'
-    heat demand: '#cc1f1f'
-    rural heat: '#ff5c5c'
-    central heat: '#cc1f1f'
-    decentral heat: '#750606'
-    low-temperature heat for industry: '#8f2727'
-    process heat: '#ff0000'
-    agriculture heat: '#d9a5a5'
-    # heat supply
-    heat pumps: '#2fb537'
-    heat pump: '#2fb537'
-    air heat pump: '#36eb41'
-    ground heat pump: '#2fb537'
-    Ambient: '#98eb9d'
-    CHP: '#8a5751'
-    CHP CC: '#634643'
-    CHP heat: '#8a5751'
-    CHP electric: '#8a5751'
-    district heating: '#e8beac'
-    resistive heater: '#c78536'
-    retrofitting: '#8487e8'
-    building retrofitting: '#8487e8'
-    # hydrogen
-    H2 for industry: "#f073da"
-    H2 for shipping: "#ebaee0"
-    H2: '#bf13a0'
-    SMR: '#870c71'
-    SMR CC: '#4f1745'
-    H2 liquefaction: '#d647bd'
-    hydrogen storage: '#bf13a0'
-    land transport fuel cell: '#6b3161'
-    H2 pipeline: '#f081dc'
-    H2 Fuel Cell: '#c251ae'
-    H2 Electrolysis: '#ff29d9'
-    # syngas
-    Sabatier: '#9850ad'
-    methanation: '#c44ce6'
-    helmeth: '#e899ff'
-    # synfuels
-    Fischer-Tropsch: '#25c49a'
-    kerosene for aviation: '#a1ffe6'
-    naphtha for industry: '#57ebc4'
-    # co2
-    CC: '#9e132c'
-    CO2 sequestration: '#9e132c'
-    DAC: '#ff5270'
-    co2 stored: '#f2385a'
-    co2: '#f29dae'
-    co2 vent: '#ffd4dc'
-    CO2 pipeline: '#f5627f'
-    # emissions
-    process emissions CC: '#000000'
-    process emissions: '#222222'
-    process emissions to stored: '#444444'
-    process emissions to atmosphere: '#888888'
-    oil emissions: '#aaaaaa'
-    shipping oil emissions: "#555555"
-    land transport oil emissions: '#777777'
-    agriculture machinery oil emissions: '#333333'
-    # other
-    shipping: '#03a2ff'
-    power-to-heat: '#cc1f1f'
-    power-to-gas: '#c44ce6'
-    power-to-liquid: '#25c49a'
-    gas-to-power/heat: '#ee8340'
diff --git a/config.decentral.yaml b/config.decentral.yaml
deleted file mode 100644
index 5d1489ea..00000000
--- a/config.decentral.yaml
+++ /dev/null
@@ -1,592 +0,0 @@
-version: 0.6.0
-
-logging_level: INFO
-
-results_dir: results/
-summary_dir: results
-costs_dir: ../technology-data/outputs/
-run: 20211218-181-decentral  # use this to keep track of runs with different settings
-foresight: overnight # options are overnight, myopic, perfect (perfect is not yet implemented)
-# if you use myopic or perfect foresight, set the investment years in "planning_horizons" below
-
-scenario:
-  simpl: # only relevant for PyPSA-Eur
-    - ''
-  lv: # allowed transmission line volume expansion, can be any float >= 1.0 (today) or "opt"
-    - opt
-  clusters: # number of nodes in Europe, any integer between 37 (1 node per country-zone) and several hundred
-    - 181
-  opts: # only relevant for PyPSA-Eur
-    - ''
-  sector_opts: # this is where the main scenario settings are
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-decentral
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-decentral-noH2network
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-decentral-onwind+p0
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-decentral-noH2network-onwind+p0
-  # to really understand the options here, look in scripts/prepare_sector_network.py
-  # Co2Lx specifies the CO2 target in x% of the 1990 values; default will give default (5%);
-  # Co2L0p25 will give 25% CO2 emissions; Co2Lm0p05 will give 5% negative emissions
-  # xH is the temporal resolution; 3H is 3-hourly, i.e. one snapshot every 3 hours
-  # single letters are sectors: T for land transport, H for building heating,
-  # B for biomass supply, I for industry, shipping and aviation,
-  # A for agriculture, forestry and fishing
-  # solar+c0.5 reduces the capital cost of solar to 50\% of reference value
-  # solar+p3 multiplies the available installable potential by factor 3
-  # co2 stored+e2 multiplies the potential of CO2 sequestration by a factor 2
-  # dist{n} includes distribution grids with investment cost of n times cost in data/costs.csv
-  # for myopic/perfect foresight cb states the carbon budget in GtCO2 (cumulative
-  # emissions throughout the transition path in the timeframe determined by the
-  # planning_horizons), be:beta decay; ex:exponential decay
-  # cb40ex0 distributes a carbon budget of 40 GtCO2 following an exponential
-  # decay with initial growth rate 0
-  planning_horizons: # investment years for myopic and perfect; or costs year for overnight
-    - 2030
-  # for example, set to [2020, 2030, 2040, 2050] for myopic foresight
-
-# CO2 budget as a fraction of 1990 emissions
-# this is over-ridden if CO2Lx is set in sector_opts
-# this is also over-ridden if cb is set in sector_opts
-co2_budget:
-  2020: 0.7011648746
-  2025: 0.5241935484
-  2030: 0.2970430108
-  2035: 0.1500896057
-  2040: 0.0712365591
-  2045: 0.0322580645
-  2050: 0
-
-# snapshots are originally set in PyPSA-Eur/config.yaml but used again by PyPSA-Eur-Sec
-snapshots:
-  # arguments to pd.date_range
-  start: "2013-01-01"
-  end: "2014-01-01"
-  closed: left # end is not inclusive
-
-atlite:
-  cutout: ../pypsa-eur/cutouts/europe-2013-era5.nc
-
-# this information is NOT used but needed as an argument for
-# pypsa-eur/scripts/add_electricity.py/load_costs in make_summary.py
-electricity:
-  max_hours:
-    battery: 6
-    H2: 168
-
-# regulate what components with which carriers are kept from PyPSA-Eur;
-# some technologies are removed because they are implemented differently
-# (e.g. battery or H2 storage) or have different year-dependent costs
-# in PyPSA-Eur-Sec
-pypsa_eur:
-  Bus:
-    - AC
-  Link:
-    - DC
-  Generator:
-    - onwind
-    - offwind-ac
-    - offwind-dc
-    - solar
-    - ror
-  StorageUnit:
-    - PHS
-    - hydro
-  Store: []
-
-
-energy:
-  energy_totals_year: 2011
-  base_emissions_year: 1990
-  eurostat_report_year: 2016
-  emissions: CO2 # "CO2" or "All greenhouse gases - (CO2 equivalent)"
-
-biomass:
-  year: 2030
-  scenario: ENS_Med
-  classes:
-    solid biomass:
-      - Agricultural waste
-      - Fuelwood residues
-      - Secondary Forestry residues - woodchips
-      - Sawdust
-      - Residues from landscape care
-      - Municipal waste
-    not included:
-      - Sugar from sugar beet
-      - Rape seed
-      - "Sunflower, soya seed "
-      - Bioethanol barley, wheat, grain maize, oats, other cereals and rye
-      - Miscanthus, switchgrass, RCG
-      - Willow
-      - Poplar
-      - FuelwoodRW
-      - C&P_RW
-    biogas:
-      - Manure solid, liquid
-      - Sludge
-
-
-solar_thermal:
-  clearsky_model: simple  # should be "simple" or "enhanced"?
-  orientation:
-    slope: 45.
-    azimuth: 180.
-
-# only relevant for foresight = myopic or perfect
-existing_capacities:
-  grouping_years: [1980, 1985, 1990, 1995, 2000, 2005, 2010, 2015, 2019]
-  threshold_capacity: 10
-  conventional_carriers:
-    - lignite
-    - coal
-    - oil
-    - uranium
-
-
-sector:
-  district_heating:
-    potential: 0.6  # maximum fraction of urban demand which can be supplied by district heating
-     # increase of today's district heating demand to potential maximum district heating share
-     # progress = 0 means today's district heating share, progress = 1 means maximum fraction of urban demand is supplied by district heating
-    progress: 1
-      # 2020: 0.0
-      # 2030: 0.3
-      # 2040: 0.6
-      # 2050: 1.0
-    district_heating_loss: 0.15
-  bev_dsm_restriction_value: 0.75  #Set to 0 for no restriction on BEV DSM
-  bev_dsm_restriction_time: 7  #Time at which SOC of BEV has to be dsm_restriction_value
-  transport_heating_deadband_upper: 20.
-  transport_heating_deadband_lower: 15.
-  ICE_lower_degree_factor: 0.375  #in per cent increase in fuel consumption per degree above deadband
-  ICE_upper_degree_factor: 1.6
-  EV_lower_degree_factor: 0.98
-  EV_upper_degree_factor: 0.63
-  bev_dsm: true #turns on EV battery
-  bev_availability: 0.5  #How many cars do smart charging
-  bev_energy: 0.05  #average battery size in MWh
-  bev_charge_efficiency: 0.9  #BEV (dis-)charging efficiency
-  bev_plug_to_wheel_efficiency: 0.2 #kWh/km from EPA https://www.fueleconomy.gov/feg/ for Tesla Model S
-  bev_charge_rate: 0.011 #3-phase charger with 11 kW
-  bev_avail_max: 0.95
-  bev_avail_mean: 0.8
-  v2g: true #allows feed-in to grid from EV battery
-  #what is not EV or FCEV is oil-fuelled ICE
-  land_transport_fuel_cell_share: 0.15 # 1 means all FCEVs
-    # 2020: 0
-    # 2030: 0.05
-    # 2040: 0.1
-    # 2050: 0.15
-  land_transport_electric_share: 0.85 # 1 means all EVs
-    # 2020: 0
-    # 2030: 0.25
-    # 2040: 0.6
-    # 2050: 0.85
-  transport_fuel_cell_efficiency: 0.5
-  transport_internal_combustion_efficiency: 0.3
-  agriculture_machinery_electric_share: 0
-  agriculture_machinery_fuel_efficiency: 0.7 # fuel oil per use
-  agriculture_machinery_electric_efficiency: 0.3 # electricity per use
-  shipping_average_efficiency: 0.4 #For conversion of fuel oil to propulsion in 2011
-  shipping_hydrogen_liquefaction: true # whether to consider liquefaction costs for shipping H2 demands
-  shipping_hydrogen_share: 1 # 1 means all hydrogen FC
-    # 2020: 0
-    # 2025: 0
-    # 2030: 0.05
-    # 2035: 0.15
-    # 2040: 0.3
-    # 2045: 0.6
-    # 2050: 1
-  time_dep_hp_cop: true #time dependent heat pump coefficient of performance
-  heat_pump_sink_T: 55. # Celsius, based on DTU / large area radiators; used in build_cop_profiles.py
-   # conservatively high to cover hot water and space heating in poorly-insulated buildings
-  reduce_space_heat_exogenously: true  # reduces space heat demand by a given factor (applied before losses in DH)
-  # this can represent e.g. building renovation, building demolition, or if
-  # the factor is negative: increasing floor area, increased thermal comfort, population growth
-  reduce_space_heat_exogenously_factor: 0.29 # per unit reduction in space heat demand
-  # the default factors are determined by the LTS scenario from http://tool.european-calculator.eu/app/buildings/building-types-area/?levers=1ddd4444421213bdbbbddd44444ffffff11f411111221111211l212221
-    # 2020: 0.10  # this results in a space heat demand reduction of 10%
-    # 2025: 0.09  # first heat demand increases compared to 2020 because of larger floor area per capita
-    # 2030: 0.09
-    # 2035: 0.11
-    # 2040: 0.16
-    # 2045: 0.21
-    # 2050: 0.29
-  retrofitting :  # co-optimises building renovation to reduce space heat demand
-    retro_endogen: false  # co-optimise space heat savings
-    cost_factor: 1.0   # weight costs for building renovation
-    interest_rate: 0.04  # for investment in building components
-    annualise_cost: true  # annualise the investment costs
-    tax_weighting: false   # weight costs depending on taxes in countries
-    construction_index: true   # weight costs depending on labour/material costs per country
-  tes: true
-  tes_tau: # 180 day time constant for centralised, 3 day for decentralised
-    decentral: 3
-    central: 180
-  boilers: true
-  oil_boilers: false
-  chp: true
-  micro_chp: false
-  solar_thermal: true
-  solar_cf_correction: 0.788457  # =  >>> 1/1.2683
-  marginal_cost_storage: 0. #1e-4
-  methanation: true
-  helmeth: false
-  dac: true
-  co2_vent: false
-  SMR: true
-  co2_sequestration_potential: 200  #MtCO2/a sequestration potential for Europe
-  co2_sequestration_cost: 20   #EUR/tCO2 for sequestration of CO2
-  co2_network: false
-  cc_fraction: 0.9  # default fraction of CO2 captured with post-combustion capture
-  hydrogen_underground_storage: true
-  hydrogen_underground_storage_locations:
-    # - onshore  # more than 50 km from sea
-    - nearshore  # within 50 km of sea
-    # - offshore
-  use_fischer_tropsch_waste_heat: true
-  use_fuel_cell_waste_heat: true
-  electricity_distribution_grid: true
-  electricity_distribution_grid_cost_factor: 1.0  #multiplies cost in data/costs.csv
-  electricity_grid_connection: true  # only applies to onshore wind and utility PV
-  H2_network: true
-  gas_network: false
-  H2_retrofit: true  # if set to True existing gas pipes can be retrofitted to H2 pipes
-  # according to hydrogen backbone strategy (April, 2020) p.15
-  # https://gasforclimate2050.eu/wp-content/uploads/2020/07/2020_European-Hydrogen-Backbone_Report.pdf
-  # 60% of original natural gas capacity could be used in cost-optimal case as H2 capacity
-  H2_retrofit_capacity_per_CH4: 0.6  # ratio for H2 capacity per original CH4 capacity of retrofitted pipelines
-  gas_network_connectivity_upgrade: 1 # https://networkx.org/documentation/stable/reference/algorithms/generated/networkx.algorithms.connectivity.edge_augmentation.k_edge_augmentation.html#networkx.algorithms.connectivity.edge_augmentation.k_edge_augmentation
-  gas_distribution_grid: true
-  gas_distribution_grid_cost_factor: 1.0  #multiplies cost in data/costs.csv
-  biomass_transport: false  # biomass transport between nodes
-  conventional_generation: # generator : carrier
-    OCGT: gas
-
-
-industry:
-  St_primary_fraction: 0.3 # fraction of steel produced via primary route versus secondary route (scrap+EAF); today fraction is 0.6
-    # 2020: 0.6
-    # 2025: 0.55
-    # 2030: 0.5
-    # 2035: 0.45
-    # 2040: 0.4
-    # 2045: 0.35
-    # 2050: 0.3
-  DRI_fraction: 1 # fraction of the primary route converted to DRI + EAF
-    # 2020: 0
-    # 2025: 0
-    # 2030: 0.05
-    # 2035: 0.2
-    # 2040: 0.4
-    # 2045: 0.7
-    # 2050: 1
-  H2_DRI: 1.7   #H2 consumption in Direct Reduced Iron (DRI),  MWh_H2,LHV/ton_Steel from 51kgH2/tSt in Vogl et al (2018) doi:10.1016/j.jclepro.2018.08.279
-  elec_DRI: 0.322   #electricity consumption in Direct Reduced Iron (DRI) shaft, MWh/tSt HYBRIT brochure https://ssabwebsitecdn.azureedge.net/-/media/hybrit/files/hybrit_brochure.pdf
-  Al_primary_fraction: 0.2 # fraction of aluminium produced via the primary route versus scrap; today fraction is 0.4
-    # 2020: 0.4
-    # 2025: 0.375
-    # 2030: 0.35
-    # 2035: 0.325
-    # 2040: 0.3
-    # 2045: 0.25
-    # 2050: 0.2
-  MWh_CH4_per_tNH3_SMR: 10.8 # 2012's demand from https://ec.europa.eu/docsroom/documents/4165/attachments/1/translations/en/renditions/pdf
-  MWh_elec_per_tNH3_SMR: 0.7 # same source, assuming 94-6% split methane-elec of total energy demand 11.5 MWh/tNH3
-  MWh_H2_per_tNH3_electrolysis: 6.5 # from https://doi.org/10.1016/j.joule.2018.04.017, around 0.197 tH2/tHN3 (>3/17 since some H2 lost and used for energy)
-  MWh_elec_per_tNH3_electrolysis: 1.17 # from https://doi.org/10.1016/j.joule.2018.04.017 Table 13 (air separation and HB)
-  NH3_process_emissions: 24.5 # in MtCO2/a from SMR for H2 production for NH3 from UNFCCC for 2015 for EU28
-  petrochemical_process_emissions: 25.5 # in MtCO2/a for petrochemical and other from UNFCCC for 2015 for EU28
-  HVC_primary_fraction: 0.45 # fraction of today's HVC produced via primary route
-  HVC_mechanical_recycling_fraction: 0.30 # fraction of today's HVC produced via mechanical recycling
-  HVC_chemical_recycling_fraction: 0.15 # fraction of today's HVC produced via chemical recycling
-  HVC_production_today: 52. # MtHVC/a from DECHEMA (2017), Figure 16, page 107; includes ethylene, propylene and BTX
-  MWh_elec_per_tHVC_mechanical_recycling: 0.547 # from SI of https://doi.org/10.1016/j.resconrec.2020.105010, Table S5, for HDPE, PP, PS, PET. LDPE would be 0.756.
-  MWh_elec_per_tHVC_chemical_recycling: 6.9 # Material Economics (2019), page 125; based on pyrolysis and electric steam cracking
-  chlorine_production_today: 9.58 # MtCl/a from DECHEMA (2017), Table 7, page 43
-  MWh_elec_per_tCl: 3.6 # DECHEMA (2017), Table 6, page 43
-  MWh_H2_per_tCl: -0.9372  # DECHEMA (2017), page 43; negative since hydrogen produced in chloralkali process
-  methanol_production_today: 1.5 # MtMeOH/a from DECHEMA (2017), page 62
-  MWh_elec_per_tMeOH: 0.167 # DECHEMA (2017), Table 14, page 65
-  MWh_CH4_per_tMeOH: 10.25 # DECHEMA (2017), Table 14, page 65
-  hotmaps_locate_missing: false
-  reference_year: 2015
-  # references:
-  # DECHEMA (2017): https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry-p-20002750.pdf
-  # Material Economics (2019): https://materialeconomics.com/latest-updates/industrial-transformation-2050
-
-costs:
-  lifetime: 25 #default lifetime
-  # From a Lion Hirth paper, also reflects average of Noothout et al 2016
-  discountrate: 0.07
-  # [EUR/USD] ECB: https://www.ecb.europa.eu/stats/exchange/eurofxref/html/eurofxref-graph-usd.en.html # noqa: E501
-  USD2013_to_EUR2013: 0.7532
-
-  # Marginal and capital costs can be overwritten
-  # capital_cost:
-  #   onwind: 500
-  marginal_cost:
-    solar: 0.01
-    onwind: 0.015
-    offwind: 0.015
-    hydro: 0.
-    H2: 0.
-    battery: 0.
-
-  emission_prices: # only used with the option Ep (emission prices)
-    co2: 0.
-
-  lines:
-    length_factor: 1.25 #to estimate offwind connection costs
-
-
-solving:
-  #tmpdir: "path/to/tmp"
-  options:
-    formulation: kirchhoff
-    clip_p_max_pu: 1.e-2
-    load_shedding: false
-    noisy_costs: true
-    skip_iterations: true
-    track_iterations: false
-    min_iterations: 4
-    max_iterations: 6
-    keep_shadowprices:
-      - Bus
-      - Line
-      - Link
-      - Transformer
-      - GlobalConstraint
-      - Generator
-      - Store
-      - StorageUnit
-  solver:
-    name: gurobi
-    threads: 4
-    method: 2 # barrier
-    crossover: 0
-    BarConvTol: 1.e-4
-    Seed: 123
-    AggFill: 0
-    PreDual: 0
-    GURO_PAR_BARDENSETHRESH: 200
-    #FeasibilityTol: 1.e-6
-
-    #name: cplex
-    #threads: 4
-    #lpmethod: 4 # barrier
-    #solutiontype: 2 # non basic solution, ie no crossover
-    #barrier_convergetol: 1.e-5
-    #feasopt_tolerance: 1.e-6
-  mem: 126000 #memory in MB; 20 GB enough for 50+B+I+H2; 100 GB for 181+B+I+H2
-
-
-plotting:
-  map:
-    boundaries: [-11, 30, 34, 71]
-    color_geomap:
-      ocean: white
-      land: white
-  costs_max: 1000
-  costs_threshold: 1
-  energy_max: 20000
-  energy_min: -20000
-  energy_threshold: 50
-  vre_techs:
-    - onwind
-    - offwind-ac
-    - offwind-dc
-    - solar
-    - ror
-  renewable_storage_techs:
-    - PHS
-    - hydro
-  conv_techs:
-    - OCGT
-    - CCGT
-    - Nuclear
-    - Coal
-  storage_techs:
-    - hydro+PHS
-    - battery
-    - H2
-  load_carriers:
-    - AC load
-  AC_carriers:
-    - AC line
-    - AC transformer
-  link_carriers:
-    - DC line
-    - Converter AC-DC
-  heat_links:
-    - heat pump
-    - resistive heater
-    - CHP heat
-    - CHP electric
-    - gas boiler
-    - central heat pump
-    - central resistive heater
-    - central CHP heat
-    - central CHP electric
-    - central gas boiler
-  heat_generators:
-    - gas boiler
-    - central gas boiler
-    - solar thermal collector
-    - central solar thermal collector
-  tech_colors:
-    # wind
-    onwind: "#235ebc"
-    onshore wind: "#235ebc"
-    offwind: "#6895dd"
-    offshore wind: "#6895dd"
-    offwind-ac: "#6895dd"
-    offshore wind (AC): "#6895dd"
-    offwind-dc: "#74c6f2"
-    offshore wind (DC): "#74c6f2"
-    # water
-    hydro: '#298c81'
-    hydro reservoir: '#298c81'
-    ror: '#3dbfb0'
-    run of river: '#3dbfb0'
-    hydroelectricity: '#298c81'
-    PHS: '#51dbcc'
-    wave: '#a7d4cf'
-    # solar
-    solar: "#f9d002"
-    solar PV: "#f9d002"
-    solar thermal: '#ffbf2b'
-    solar rooftop: '#ffea80'
-    # gas
-    OCGT: '#e0986c'
-    OCGT marginal: '#e0986c'
-    OCGT-heat: '#e0986c'
-    gas boiler: '#db6a25'
-    gas boilers: '#db6a25'
-    gas boiler marginal: '#db6a25'
-    gas: '#e05b09'
-    natural gas: '#e05b09'
-    CCGT: '#a85522'
-    CCGT marginal: '#a85522'
-    gas for industry co2 to atmosphere: '#692e0a'
-    gas for industry co2 to stored: '#8a3400'
-    gas for industry: '#853403'
-    gas for industry CC: '#692e0a'
-    gas pipeline: '#ebbca0'
-    # oil
-    oil: '#c9c9c9'
-    oil boiler: '#adadad'
-    agriculture machinery oil: '#949494'
-    shipping oil: "#808080"
-    land transport oil: '#afafaf'
-    # nuclear
-    Nuclear: '#ff8c00'
-    Nuclear marginal: '#ff8c00'
-    nuclear: '#ff8c00'
-    uranium: '#ff8c00'
-    # coal
-    Coal: '#545454'
-    coal: '#545454'
-    Coal marginal: '#545454'
-    Lignite: '#826837'
-    lignite: '#826837'
-    Lignite marginal: '#826837'
-    # biomass
-    biogas: '#e3d37d'
-    solid biomass: '#baa741'
-    solid biomass transport: '#baa741'
-    solid biomass for industry: '#7a6d26'
-    solid biomass for industry CC: '#47411c'
-    solid biomass for industry co2 from atmosphere: '#736412'
-    solid biomass for industry co2 to stored: '#47411c'
-    # power transmission
-    lines: '#6c9459'
-    transmission lines: '#6c9459'
-    electricity distribution grid: '#97ad8c'
-    # electricity demand
-    Electric load: '#110d63'
-    electric demand: '#110d63'
-    electricity: '#110d63'
-    industry electricity: '#2d2a66'
-    industry new electricity: '#2d2a66'
-    agriculture electricity: '#494778'
-    # battery + EVs
-    battery: '#ace37f'
-    battery storage: '#ace37f'
-    home battery: '#80c944'
-    home battery storage: '#80c944'
-    BEV charger: '#baf238'
-    V2G: '#e5ffa8'
-    land transport EV: '#baf238'
-    Li ion: '#baf238'
-    # hot water storage
-    water tanks: '#e69487'
-    hot water storage: '#e69487'
-    hot water charging: '#e69487'
-    hot water discharging: '#e69487'
-    # heat demand
-    Heat load: '#cc1f1f'
-    heat: '#cc1f1f'
-    heat demand: '#cc1f1f'
-    rural heat: '#ff5c5c'
-    central heat: '#cc1f1f'
-    decentral heat: '#750606'
-    low-temperature heat for industry: '#8f2727'
-    process heat: '#ff0000'
-    agriculture heat: '#d9a5a5'
-    # heat supply
-    heat pumps: '#2fb537'
-    heat pump: '#2fb537'
-    air heat pump: '#36eb41'
-    ground heat pump: '#2fb537'
-    Ambient: '#98eb9d'
-    CHP: '#8a5751'
-    CHP CC: '#634643'
-    CHP heat: '#8a5751'
-    CHP electric: '#8a5751'
-    district heating: '#e8beac'
-    resistive heater: '#c78536'
-    retrofitting: '#8487e8'
-    building retrofitting: '#8487e8'
-    # hydrogen
-    H2 for industry: "#f073da"
-    H2 for shipping: "#ebaee0"
-    H2: '#bf13a0'
-    SMR: '#870c71'
-    SMR CC: '#4f1745'
-    H2 liquefaction: '#d647bd'
-    hydrogen storage: '#bf13a0'
-    land transport fuel cell: '#6b3161'
-    H2 pipeline: '#f081dc'
-    H2 Fuel Cell: '#c251ae'
-    H2 Electrolysis: '#ff29d9'
-    # syngas
-    Sabatier: '#9850ad'
-    methanation: '#c44ce6'
-    helmeth: '#e899ff'
-    # synfuels
-    Fischer-Tropsch: '#25c49a'
-    kerosene for aviation: '#a1ffe6'
-    naphtha for industry: '#57ebc4'
-    # co2
-    CC: '#9e132c'
-    CO2 sequestration: '#9e132c'
-    DAC: '#ff5270'
-    co2 stored: '#f2385a'
-    co2: '#f29dae'
-    co2 vent: '#ffd4dc'
-    CO2 pipeline: '#f5627f'
-    # emissions
-    process emissions CC: '#000000'
-    process emissions: '#222222'
-    process emissions to stored: '#444444'
-    process emissions to atmosphere: '#888888'
-    oil emissions: '#aaaaaa'
-    shipping oil emissions: "#555555"
-    land transport oil emissions: '#777777'
-    agriculture machinery oil emissions: '#333333'
-    # other
-    shipping: '#03a2ff'
-    power-to-heat: '#cc1f1f'
-    power-to-gas: '#c44ce6'
-    power-to-liquid: '#25c49a'
-    gas-to-power/heat: '#ee8340'
diff --git a/config.gas.yaml b/config.gas.yaml
deleted file mode 100644
index e31abd80..00000000
--- a/config.gas.yaml
+++ /dev/null
@@ -1,590 +0,0 @@
-version: 0.6.0
-
-logging_level: INFO
-
-results_dir: results/
-summary_dir: results
-costs_dir: ../technology-data/outputs/
-run: 20211218-181-gas  # use this to keep track of runs with different settings
-foresight: overnight # options are overnight, myopic, perfect (perfect is not yet implemented)
-# if you use myopic or perfect foresight, set the investment years in "planning_horizons" below
-
-scenario:
-  simpl: # only relevant for PyPSA-Eur
-    - ''
-  lv: # allowed transmission line volume expansion, can be any float >= 1.0 (today) or "opt"
-    - 1.0
-    - 1.5
-  clusters: # number of nodes in Europe, any integer between 37 (1 node per country-zone) and several hundred
-    - 181
-  opts: # only relevant for PyPSA-Eur
-    - ''
-  sector_opts: # this is where the main scenario settings are
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10
-  # to really understand the options here, look in scripts/prepare_sector_network.py
-  # Co2Lx specifies the CO2 target in x% of the 1990 values; default will give default (5%);
-  # Co2L0p25 will give 25% CO2 emissions; Co2Lm0p05 will give 5% negative emissions
-  # xH is the temporal resolution; 3H is 3-hourly, i.e. one snapshot every 3 hours
-  # single letters are sectors: T for land transport, H for building heating,
-  # B for biomass supply, I for industry, shipping and aviation,
-  # A for agriculture, forestry and fishing
-  # solar+c0.5 reduces the capital cost of solar to 50\% of reference value
-  # solar+p3 multiplies the available installable potential by factor 3
-  # co2 stored+e2 multiplies the potential of CO2 sequestration by a factor 2
-  # dist{n} includes distribution grids with investment cost of n times cost in data/costs.csv
-  # for myopic/perfect foresight cb states the carbon budget in GtCO2 (cumulative
-  # emissions throughout the transition path in the timeframe determined by the
-  # planning_horizons), be:beta decay; ex:exponential decay
-  # cb40ex0 distributes a carbon budget of 40 GtCO2 following an exponential
-  # decay with initial growth rate 0
-  planning_horizons: # investment years for myopic and perfect; or costs year for overnight
-    - 2030
-  # for example, set to [2020, 2030, 2040, 2050] for myopic foresight
-
-# CO2 budget as a fraction of 1990 emissions
-# this is over-ridden if CO2Lx is set in sector_opts
-# this is also over-ridden if cb is set in sector_opts
-co2_budget:
-  2020: 0.7011648746
-  2025: 0.5241935484
-  2030: 0.2970430108
-  2035: 0.1500896057
-  2040: 0.0712365591
-  2045: 0.0322580645
-  2050: 0
-
-# snapshots are originally set in PyPSA-Eur/config.yaml but used again by PyPSA-Eur-Sec
-snapshots:
-  # arguments to pd.date_range
-  start: "2013-01-01"
-  end: "2014-01-01"
-  closed: left # end is not inclusive
-
-atlite:
-  cutout: ../pypsa-eur/cutouts/europe-2013-era5.nc
-
-# this information is NOT used but needed as an argument for
-# pypsa-eur/scripts/add_electricity.py/load_costs in make_summary.py
-electricity:
-  max_hours:
-    battery: 6
-    H2: 168
-
-# regulate what components with which carriers are kept from PyPSA-Eur;
-# some technologies are removed because they are implemented differently
-# (e.g. battery or H2 storage) or have different year-dependent costs
-# in PyPSA-Eur-Sec
-pypsa_eur:
-  Bus:
-    - AC
-  Link:
-    - DC
-  Generator:
-    - onwind
-    - offwind-ac
-    - offwind-dc
-    - solar
-    - ror
-  StorageUnit:
-    - PHS
-    - hydro
-  Store: []
-
-
-energy:
-  energy_totals_year: 2011
-  base_emissions_year: 1990
-  eurostat_report_year: 2016
-  emissions: CO2 # "CO2" or "All greenhouse gases - (CO2 equivalent)"
-
-biomass:
-  year: 2030
-  scenario: ENS_Med
-  classes:
-    solid biomass:
-      - Agricultural waste
-      - Fuelwood residues
-      - Secondary Forestry residues - woodchips
-      - Sawdust
-      - Residues from landscape care
-      - Municipal waste
-    not included:
-      - Sugar from sugar beet
-      - Rape seed
-      - "Sunflower, soya seed "
-      - Bioethanol barley, wheat, grain maize, oats, other cereals and rye
-      - Miscanthus, switchgrass, RCG
-      - Willow
-      - Poplar
-      - FuelwoodRW
-      - C&P_RW
-    biogas:
-      - Manure solid, liquid
-      - Sludge
-
-
-solar_thermal:
-  clearsky_model: simple  # should be "simple" or "enhanced"?
-  orientation:
-    slope: 45.
-    azimuth: 180.
-
-# only relevant for foresight = myopic or perfect
-existing_capacities:
-  grouping_years: [1980, 1985, 1990, 1995, 2000, 2005, 2010, 2015, 2019]
-  threshold_capacity: 10
-  conventional_carriers:
-    - lignite
-    - coal
-    - oil
-    - uranium
-
-
-sector:
-  district_heating:
-    potential: 0.6  # maximum fraction of urban demand which can be supplied by district heating
-     # increase of today's district heating demand to potential maximum district heating share
-     # progress = 0 means today's district heating share, progress = 1 means maximum fraction of urban demand is supplied by district heating
-    progress: 1
-      # 2020: 0.0
-      # 2030: 0.3
-      # 2040: 0.6
-      # 2050: 1.0
-    district_heating_loss: 0.15
-  bev_dsm_restriction_value: 0.75  #Set to 0 for no restriction on BEV DSM
-  bev_dsm_restriction_time: 7  #Time at which SOC of BEV has to be dsm_restriction_value
-  transport_heating_deadband_upper: 20.
-  transport_heating_deadband_lower: 15.
-  ICE_lower_degree_factor: 0.375  #in per cent increase in fuel consumption per degree above deadband
-  ICE_upper_degree_factor: 1.6
-  EV_lower_degree_factor: 0.98
-  EV_upper_degree_factor: 0.63
-  bev_dsm: true #turns on EV battery
-  bev_availability: 0.5  #How many cars do smart charging
-  bev_energy: 0.05  #average battery size in MWh
-  bev_charge_efficiency: 0.9  #BEV (dis-)charging efficiency
-  bev_plug_to_wheel_efficiency: 0.2 #kWh/km from EPA https://www.fueleconomy.gov/feg/ for Tesla Model S
-  bev_charge_rate: 0.011 #3-phase charger with 11 kW
-  bev_avail_max: 0.95
-  bev_avail_mean: 0.8
-  v2g: true #allows feed-in to grid from EV battery
-  #what is not EV or FCEV is oil-fuelled ICE
-  land_transport_fuel_cell_share: 0.15 # 1 means all FCEVs
-    # 2020: 0
-    # 2030: 0.05
-    # 2040: 0.1
-    # 2050: 0.15
-  land_transport_electric_share: 0.85 # 1 means all EVs
-    # 2020: 0
-    # 2030: 0.25
-    # 2040: 0.6
-    # 2050: 0.85
-  transport_fuel_cell_efficiency: 0.5
-  transport_internal_combustion_efficiency: 0.3
-  agriculture_machinery_electric_share: 0
-  agriculture_machinery_fuel_efficiency: 0.7 # fuel oil per use
-  agriculture_machinery_electric_efficiency: 0.3 # electricity per use
-  shipping_average_efficiency: 0.4 #For conversion of fuel oil to propulsion in 2011
-  shipping_hydrogen_liquefaction: true # whether to consider liquefaction costs for shipping H2 demands
-  shipping_hydrogen_share: 1 # 1 means all hydrogen FC
-    # 2020: 0
-    # 2025: 0
-    # 2030: 0.05
-    # 2035: 0.15
-    # 2040: 0.3
-    # 2045: 0.6
-    # 2050: 1
-  time_dep_hp_cop: true #time dependent heat pump coefficient of performance
-  heat_pump_sink_T: 55. # Celsius, based on DTU / large area radiators; used in build_cop_profiles.py
-   # conservatively high to cover hot water and space heating in poorly-insulated buildings
-  reduce_space_heat_exogenously: true  # reduces space heat demand by a given factor (applied before losses in DH)
-  # this can represent e.g. building renovation, building demolition, or if
-  # the factor is negative: increasing floor area, increased thermal comfort, population growth
-  reduce_space_heat_exogenously_factor: 0.29 # per unit reduction in space heat demand
-  # the default factors are determined by the LTS scenario from http://tool.european-calculator.eu/app/buildings/building-types-area/?levers=1ddd4444421213bdbbbddd44444ffffff11f411111221111211l212221
-    # 2020: 0.10  # this results in a space heat demand reduction of 10%
-    # 2025: 0.09  # first heat demand increases compared to 2020 because of larger floor area per capita
-    # 2030: 0.09
-    # 2035: 0.11
-    # 2040: 0.16
-    # 2045: 0.21
-    # 2050: 0.29
-  retrofitting :  # co-optimises building renovation to reduce space heat demand
-    retro_endogen: false  # co-optimise space heat savings
-    cost_factor: 1.0   # weight costs for building renovation
-    interest_rate: 0.04  # for investment in building components
-    annualise_cost: true  # annualise the investment costs
-    tax_weighting: false   # weight costs depending on taxes in countries
-    construction_index: true   # weight costs depending on labour/material costs per country
-  tes: true
-  tes_tau: # 180 day time constant for centralised, 3 day for decentralised
-    decentral: 3
-    central: 180
-  boilers: true
-  oil_boilers: false
-  chp: true
-  micro_chp: false
-  solar_thermal: true
-  solar_cf_correction: 0.788457  # =  >>> 1/1.2683
-  marginal_cost_storage: 0. #1e-4
-  methanation: true
-  helmeth: false
-  dac: true
-  co2_vent: false
-  SMR: true
-  co2_sequestration_potential: 200  #MtCO2/a sequestration potential for Europe
-  co2_sequestration_cost: 20   #EUR/tCO2 for sequestration of CO2
-  co2_network: false
-  cc_fraction: 0.9  # default fraction of CO2 captured with post-combustion capture
-  hydrogen_underground_storage: true
-  hydrogen_underground_storage_locations:
-    # - onshore  # more than 50 km from sea
-    - nearshore  # within 50 km of sea
-    # - offshore
-  use_fischer_tropsch_waste_heat: true
-  use_fuel_cell_waste_heat: true
-  electricity_distribution_grid: true
-  electricity_distribution_grid_cost_factor: 1.0  #multiplies cost in data/costs.csv
-  electricity_grid_connection: true  # only applies to onshore wind and utility PV
-  H2_network: true
-  gas_network: true
-  H2_retrofit: true  # if set to True existing gas pipes can be retrofitted to H2 pipes
-  # according to hydrogen backbone strategy (April, 2020) p.15
-  # https://gasforclimate2050.eu/wp-content/uploads/2020/07/2020_European-Hydrogen-Backbone_Report.pdf
-  # 60% of original natural gas capacity could be used in cost-optimal case as H2 capacity
-  H2_retrofit_capacity_per_CH4: 0.6  # ratio for H2 capacity per original CH4 capacity of retrofitted pipelines
-  gas_network_connectivity_upgrade: 1 # https://networkx.org/documentation/stable/reference/algorithms/generated/networkx.algorithms.connectivity.edge_augmentation.k_edge_augmentation.html#networkx.algorithms.connectivity.edge_augmentation.k_edge_augmentation
-  gas_distribution_grid: true
-  gas_distribution_grid_cost_factor: 1.0  #multiplies cost in data/costs.csv
-  biomass_transport: false  # biomass transport between nodes
-  conventional_generation: # generator : carrier
-    OCGT: gas
-
-
-industry:
-  St_primary_fraction: 0.3 # fraction of steel produced via primary route versus secondary route (scrap+EAF); today fraction is 0.6
-    # 2020: 0.6
-    # 2025: 0.55
-    # 2030: 0.5
-    # 2035: 0.45
-    # 2040: 0.4
-    # 2045: 0.35
-    # 2050: 0.3
-  DRI_fraction: 1 # fraction of the primary route converted to DRI + EAF
-    # 2020: 0
-    # 2025: 0
-    # 2030: 0.05
-    # 2035: 0.2
-    # 2040: 0.4
-    # 2045: 0.7
-    # 2050: 1
-  H2_DRI: 1.7   #H2 consumption in Direct Reduced Iron (DRI),  MWh_H2,LHV/ton_Steel from 51kgH2/tSt in Vogl et al (2018) doi:10.1016/j.jclepro.2018.08.279
-  elec_DRI: 0.322   #electricity consumption in Direct Reduced Iron (DRI) shaft, MWh/tSt HYBRIT brochure https://ssabwebsitecdn.azureedge.net/-/media/hybrit/files/hybrit_brochure.pdf
-  Al_primary_fraction: 0.2 # fraction of aluminium produced via the primary route versus scrap; today fraction is 0.4
-    # 2020: 0.4
-    # 2025: 0.375
-    # 2030: 0.35
-    # 2035: 0.325
-    # 2040: 0.3
-    # 2045: 0.25
-    # 2050: 0.2
-  MWh_CH4_per_tNH3_SMR: 10.8 # 2012's demand from https://ec.europa.eu/docsroom/documents/4165/attachments/1/translations/en/renditions/pdf
-  MWh_elec_per_tNH3_SMR: 0.7 # same source, assuming 94-6% split methane-elec of total energy demand 11.5 MWh/tNH3
-  MWh_H2_per_tNH3_electrolysis: 6.5 # from https://doi.org/10.1016/j.joule.2018.04.017, around 0.197 tH2/tHN3 (>3/17 since some H2 lost and used for energy)
-  MWh_elec_per_tNH3_electrolysis: 1.17 # from https://doi.org/10.1016/j.joule.2018.04.017 Table 13 (air separation and HB)
-  NH3_process_emissions: 24.5 # in MtCO2/a from SMR for H2 production for NH3 from UNFCCC for 2015 for EU28
-  petrochemical_process_emissions: 25.5 # in MtCO2/a for petrochemical and other from UNFCCC for 2015 for EU28
-  HVC_primary_fraction: 0.45 # fraction of today's HVC produced via primary route
-  HVC_mechanical_recycling_fraction: 0.30 # fraction of today's HVC produced via mechanical recycling
-  HVC_chemical_recycling_fraction: 0.15 # fraction of today's HVC produced via chemical recycling
-  HVC_production_today: 52. # MtHVC/a from DECHEMA (2017), Figure 16, page 107; includes ethylene, propylene and BTX
-  MWh_elec_per_tHVC_mechanical_recycling: 0.547 # from SI of https://doi.org/10.1016/j.resconrec.2020.105010, Table S5, for HDPE, PP, PS, PET. LDPE would be 0.756.
-  MWh_elec_per_tHVC_chemical_recycling: 6.9 # Material Economics (2019), page 125; based on pyrolysis and electric steam cracking
-  chlorine_production_today: 9.58 # MtCl/a from DECHEMA (2017), Table 7, page 43
-  MWh_elec_per_tCl: 3.6 # DECHEMA (2017), Table 6, page 43
-  MWh_H2_per_tCl: -0.9372  # DECHEMA (2017), page 43; negative since hydrogen produced in chloralkali process
-  methanol_production_today: 1.5 # MtMeOH/a from DECHEMA (2017), page 62
-  MWh_elec_per_tMeOH: 0.167 # DECHEMA (2017), Table 14, page 65
-  MWh_CH4_per_tMeOH: 10.25 # DECHEMA (2017), Table 14, page 65
-  hotmaps_locate_missing: false
-  reference_year: 2015
-  # references:
-  # DECHEMA (2017): https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry-p-20002750.pdf
-  # Material Economics (2019): https://materialeconomics.com/latest-updates/industrial-transformation-2050
-
-costs:
-  lifetime: 25 #default lifetime
-  # From a Lion Hirth paper, also reflects average of Noothout et al 2016
-  discountrate: 0.07
-  # [EUR/USD] ECB: https://www.ecb.europa.eu/stats/exchange/eurofxref/html/eurofxref-graph-usd.en.html # noqa: E501
-  USD2013_to_EUR2013: 0.7532
-
-  # Marginal and capital costs can be overwritten
-  # capital_cost:
-  #   onwind: 500
-  marginal_cost:
-    solar: 0.01
-    onwind: 0.015
-    offwind: 0.015
-    hydro: 0.
-    H2: 0.
-    battery: 0.
-
-  emission_prices: # only used with the option Ep (emission prices)
-    co2: 0.
-
-  lines:
-    length_factor: 1.25 #to estimate offwind connection costs
-
-
-solving:
-  #tmpdir: "path/to/tmp"
-  options:
-    formulation: kirchhoff
-    clip_p_max_pu: 1.e-2
-    load_shedding: false
-    noisy_costs: true
-    skip_iterations: true
-    track_iterations: false
-    min_iterations: 4
-    max_iterations: 6
-    keep_shadowprices:
-      - Bus
-      - Line
-      - Link
-      - Transformer
-      - GlobalConstraint
-      - Generator
-      - Store
-      - StorageUnit
-  solver:
-    name: gurobi
-    threads: 4
-    method: 2 # barrier
-    crossover: 0
-    BarConvTol: 1.e-4
-    Seed: 123
-    AggFill: 0
-    PreDual: 0
-    GURO_PAR_BARDENSETHRESH: 200
-    #FeasibilityTol: 1.e-6
-
-    #name: cplex
-    #threads: 4
-    #lpmethod: 4 # barrier
-    #solutiontype: 2 # non basic solution, ie no crossover
-    #barrier_convergetol: 1.e-5
-    #feasopt_tolerance: 1.e-6
-  mem: 170000 #memory in MB; 20 GB enough for 50+B+I+H2; 100 GB for 181+B+I+H2
-
-
-plotting:
-  map:
-    boundaries: [-11, 30, 34, 71]
-    color_geomap:
-      ocean: white
-      land: white
-  costs_max: 1000
-  costs_threshold: 1
-  energy_max: 20000
-  energy_min: -20000
-  energy_threshold: 50
-  vre_techs:
-    - onwind
-    - offwind-ac
-    - offwind-dc
-    - solar
-    - ror
-  renewable_storage_techs:
-    - PHS
-    - hydro
-  conv_techs:
-    - OCGT
-    - CCGT
-    - Nuclear
-    - Coal
-  storage_techs:
-    - hydro+PHS
-    - battery
-    - H2
-  load_carriers:
-    - AC load
-  AC_carriers:
-    - AC line
-    - AC transformer
-  link_carriers:
-    - DC line
-    - Converter AC-DC
-  heat_links:
-    - heat pump
-    - resistive heater
-    - CHP heat
-    - CHP electric
-    - gas boiler
-    - central heat pump
-    - central resistive heater
-    - central CHP heat
-    - central CHP electric
-    - central gas boiler
-  heat_generators:
-    - gas boiler
-    - central gas boiler
-    - solar thermal collector
-    - central solar thermal collector
-  tech_colors:
-    # wind
-    onwind: "#235ebc"
-    onshore wind: "#235ebc"
-    offwind: "#6895dd"
-    offshore wind: "#6895dd"
-    offwind-ac: "#6895dd"
-    offshore wind (AC): "#6895dd"
-    offwind-dc: "#74c6f2"
-    offshore wind (DC): "#74c6f2"
-    # water
-    hydro: '#298c81'
-    hydro reservoir: '#298c81'
-    ror: '#3dbfb0'
-    run of river: '#3dbfb0'
-    hydroelectricity: '#298c81'
-    PHS: '#51dbcc'
-    wave: '#a7d4cf'
-    # solar
-    solar: "#f9d002"
-    solar PV: "#f9d002"
-    solar thermal: '#ffbf2b'
-    solar rooftop: '#ffea80'
-    # gas
-    OCGT: '#e0986c'
-    OCGT marginal: '#e0986c'
-    OCGT-heat: '#e0986c'
-    gas boiler: '#db6a25'
-    gas boilers: '#db6a25'
-    gas boiler marginal: '#db6a25'
-    gas: '#e05b09'
-    natural gas: '#e05b09'
-    CCGT: '#a85522'
-    CCGT marginal: '#a85522'
-    gas for industry co2 to atmosphere: '#692e0a'
-    gas for industry co2 to stored: '#8a3400'
-    gas for industry: '#853403'
-    gas for industry CC: '#692e0a'
-    gas pipeline: '#ebbca0'
-    # oil
-    oil: '#c9c9c9'
-    oil boiler: '#adadad'
-    agriculture machinery oil: '#949494'
-    shipping oil: "#808080"
-    land transport oil: '#afafaf'
-    # nuclear
-    Nuclear: '#ff8c00'
-    Nuclear marginal: '#ff8c00'
-    nuclear: '#ff8c00'
-    uranium: '#ff8c00'
-    # coal
-    Coal: '#545454'
-    coal: '#545454'
-    Coal marginal: '#545454'
-    Lignite: '#826837'
-    lignite: '#826837'
-    Lignite marginal: '#826837'
-    # biomass
-    biogas: '#e3d37d'
-    solid biomass: '#baa741'
-    solid biomass transport: '#baa741'
-    solid biomass for industry: '#7a6d26'
-    solid biomass for industry CC: '#47411c'
-    solid biomass for industry co2 from atmosphere: '#736412'
-    solid biomass for industry co2 to stored: '#47411c'
-    # power transmission
-    lines: '#6c9459'
-    transmission lines: '#6c9459'
-    electricity distribution grid: '#97ad8c'
-    # electricity demand
-    Electric load: '#110d63'
-    electric demand: '#110d63'
-    electricity: '#110d63'
-    industry electricity: '#2d2a66'
-    industry new electricity: '#2d2a66'
-    agriculture electricity: '#494778'
-    # battery + EVs
-    battery: '#ace37f'
-    battery storage: '#ace37f'
-    home battery: '#80c944'
-    home battery storage: '#80c944'
-    BEV charger: '#baf238'
-    V2G: '#e5ffa8'
-    land transport EV: '#baf238'
-    Li ion: '#baf238'
-    # hot water storage
-    water tanks: '#e69487'
-    hot water storage: '#e69487'
-    hot water charging: '#e69487'
-    hot water discharging: '#e69487'
-    # heat demand
-    Heat load: '#cc1f1f'
-    heat: '#cc1f1f'
-    heat demand: '#cc1f1f'
-    rural heat: '#ff5c5c'
-    central heat: '#cc1f1f'
-    decentral heat: '#750606'
-    low-temperature heat for industry: '#8f2727'
-    process heat: '#ff0000'
-    agriculture heat: '#d9a5a5'
-    # heat supply
-    heat pumps: '#2fb537'
-    heat pump: '#2fb537'
-    air heat pump: '#36eb41'
-    ground heat pump: '#2fb537'
-    Ambient: '#98eb9d'
-    CHP: '#8a5751'
-    CHP CC: '#634643'
-    CHP heat: '#8a5751'
-    CHP electric: '#8a5751'
-    district heating: '#e8beac'
-    resistive heater: '#c78536'
-    retrofitting: '#8487e8'
-    building retrofitting: '#8487e8'
-    # hydrogen
-    H2 for industry: "#f073da"
-    H2 for shipping: "#ebaee0"
-    H2: '#bf13a0'
-    SMR: '#870c71'
-    SMR CC: '#4f1745'
-    H2 liquefaction: '#d647bd'
-    hydrogen storage: '#bf13a0'
-    land transport fuel cell: '#6b3161'
-    H2 pipeline: '#f081dc'
-    H2 Fuel Cell: '#c251ae'
-    H2 Electrolysis: '#ff29d9'
-    # syngas
-    Sabatier: '#9850ad'
-    methanation: '#c44ce6'
-    helmeth: '#e899ff'
-    # synfuels
-    Fischer-Tropsch: '#25c49a'
-    kerosene for aviation: '#a1ffe6'
-    naphtha for industry: '#57ebc4'
-    # co2
-    CC: '#9e132c'
-    CO2 sequestration: '#9e132c'
-    DAC: '#ff5270'
-    co2 stored: '#f2385a'
-    co2: '#f29dae'
-    co2 vent: '#ffd4dc'
-    CO2 pipeline: '#f5627f'
-    # emissions
-    process emissions CC: '#000000'
-    process emissions: '#222222'
-    process emissions to stored: '#444444'
-    process emissions to atmosphere: '#888888'
-    oil emissions: '#aaaaaa'
-    shipping oil emissions: "#555555"
-    land transport oil emissions: '#777777'
-    agriculture machinery oil emissions: '#333333'
-    # other
-    shipping: '#03a2ff'
-    power-to-heat: '#cc1f1f'
-    power-to-gas: '#c44ce6'
-    power-to-liquid: '#25c49a'
-    gas-to-power/heat: '#ee8340'
diff --git a/config.h2.yaml b/config.h2.yaml
deleted file mode 100644
index b69e7955..00000000
--- a/config.h2.yaml
+++ /dev/null
@@ -1,596 +0,0 @@
-version: 0.6.0
-
-logging_level: INFO
-
-results_dir: results/
-summary_dir: results
-costs_dir: ../technology-data/outputs/
-run: 20211218-181-h2  # use this to keep track of runs with different settings
-foresight: overnight # options are overnight, myopic, perfect (perfect is not yet implemented)
-# if you use myopic or perfect foresight, set the investment years in "planning_horizons" below
-
-scenario:
-  simpl: # only relevant for PyPSA-Eur
-    - ''
-  lv: # allowed transmission line volume expansion, can be any float >= 1.0 (today) or "opt"
-    - 1.0
-    #- 1.25
-    - opt
-  clusters: # number of nodes in Europe, any integer between 37 (1 node per country-zone) and several hundred
-    - 181
-  opts: # only relevant for PyPSA-Eur
-    - ''
-  sector_opts: # this is where the main scenario settings are
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-noH2network
-    #- Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-noH2network-onwind+p0.25
-    #- Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind+p0.25
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-noH2network-onwind+p0
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind+p0
-  # to really understand the options here, look in scripts/prepare_sector_network.py
-  # Co2Lx specifies the CO2 target in x% of the 1990 values; default will give default (5%);
-  # Co2L0p25 will give 25% CO2 emissions; Co2Lm0p05 will give 5% negative emissions
-  # xH is the temporal resolution; 3H is 3-hourly, i.e. one snapshot every 3 hours
-  # single letters are sectors: T for land transport, H for building heating,
-  # B for biomass supply, I for industry, shipping and aviation,
-  # A for agriculture, forestry and fishing
-  # solar+c0.5 reduces the capital cost of solar to 50\% of reference value
-  # solar+p3 multiplies the available installable potential by factor 3
-  # co2 stored+e2 multiplies the potential of CO2 sequestration by a factor 2
-  # dist{n} includes distribution grids with investment cost of n times cost in data/costs.csv
-  # for myopic/perfect foresight cb states the carbon budget in GtCO2 (cumulative
-  # emissions throughout the transition path in the timeframe determined by the
-  # planning_horizons), be:beta decay; ex:exponential decay
-  # cb40ex0 distributes a carbon budget of 40 GtCO2 following an exponential
-  # decay with initial growth rate 0
-  planning_horizons: # investment years for myopic and perfect; or costs year for overnight
-    - 2030
-  # for example, set to [2020, 2030, 2040, 2050] for myopic foresight
-
-# CO2 budget as a fraction of 1990 emissions
-# this is over-ridden if CO2Lx is set in sector_opts
-# this is also over-ridden if cb is set in sector_opts
-co2_budget:
-  2020: 0.7011648746
-  2025: 0.5241935484
-  2030: 0.2970430108
-  2035: 0.1500896057
-  2040: 0.0712365591
-  2045: 0.0322580645
-  2050: 0
-
-# snapshots are originally set in PyPSA-Eur/config.yaml but used again by PyPSA-Eur-Sec
-snapshots:
-  # arguments to pd.date_range
-  start: "2013-01-01"
-  end: "2014-01-01"
-  closed: left # end is not inclusive
-
-atlite:
-  cutout: ../pypsa-eur/cutouts/europe-2013-era5.nc
-
-# this information is NOT used but needed as an argument for
-# pypsa-eur/scripts/add_electricity.py/load_costs in make_summary.py
-electricity:
-  max_hours:
-    battery: 6
-    H2: 168
-
-# regulate what components with which carriers are kept from PyPSA-Eur;
-# some technologies are removed because they are implemented differently
-# (e.g. battery or H2 storage) or have different year-dependent costs
-# in PyPSA-Eur-Sec
-pypsa_eur:
-  Bus:
-    - AC
-  Link:
-    - DC
-  Generator:
-    - onwind
-    - offwind-ac
-    - offwind-dc
-    - solar
-    - ror
-  StorageUnit:
-    - PHS
-    - hydro
-  Store: []
-
-
-energy:
-  energy_totals_year: 2011
-  base_emissions_year: 1990
-  eurostat_report_year: 2016
-  emissions: CO2 # "CO2" or "All greenhouse gases - (CO2 equivalent)"
-
-biomass:
-  year: 2030
-  scenario: ENS_Med
-  classes:
-    solid biomass:
-      - Agricultural waste
-      - Fuelwood residues
-      - Secondary Forestry residues - woodchips
-      - Sawdust
-      - Residues from landscape care
-      - Municipal waste
-    not included:
-      - Sugar from sugar beet
-      - Rape seed
-      - "Sunflower, soya seed "
-      - Bioethanol barley, wheat, grain maize, oats, other cereals and rye
-      - Miscanthus, switchgrass, RCG
-      - Willow
-      - Poplar
-      - FuelwoodRW
-      - C&P_RW
-    biogas:
-      - Manure solid, liquid
-      - Sludge
-
-
-solar_thermal:
-  clearsky_model: simple  # should be "simple" or "enhanced"?
-  orientation:
-    slope: 45.
-    azimuth: 180.
-
-# only relevant for foresight = myopic or perfect
-existing_capacities:
-  grouping_years: [1980, 1985, 1990, 1995, 2000, 2005, 2010, 2015, 2019]
-  threshold_capacity: 10
-  conventional_carriers:
-    - lignite
-    - coal
-    - oil
-    - uranium
-
-
-sector:
-  district_heating:
-    potential: 0.6  # maximum fraction of urban demand which can be supplied by district heating
-     # increase of today's district heating demand to potential maximum district heating share
-     # progress = 0 means today's district heating share, progress = 1 means maximum fraction of urban demand is supplied by district heating
-    progress: 1
-      # 2020: 0.0
-      # 2030: 0.3
-      # 2040: 0.6
-      # 2050: 1.0
-    district_heating_loss: 0.15
-  bev_dsm_restriction_value: 0.75  #Set to 0 for no restriction on BEV DSM
-  bev_dsm_restriction_time: 7  #Time at which SOC of BEV has to be dsm_restriction_value
-  transport_heating_deadband_upper: 20.
-  transport_heating_deadband_lower: 15.
-  ICE_lower_degree_factor: 0.375  #in per cent increase in fuel consumption per degree above deadband
-  ICE_upper_degree_factor: 1.6
-  EV_lower_degree_factor: 0.98
-  EV_upper_degree_factor: 0.63
-  bev_dsm: true #turns on EV battery
-  bev_availability: 0.5  #How many cars do smart charging
-  bev_energy: 0.05  #average battery size in MWh
-  bev_charge_efficiency: 0.9  #BEV (dis-)charging efficiency
-  bev_plug_to_wheel_efficiency: 0.2 #kWh/km from EPA https://www.fueleconomy.gov/feg/ for Tesla Model S
-  bev_charge_rate: 0.011 #3-phase charger with 11 kW
-  bev_avail_max: 0.95
-  bev_avail_mean: 0.8
-  v2g: true #allows feed-in to grid from EV battery
-  #what is not EV or FCEV is oil-fuelled ICE
-  land_transport_fuel_cell_share: 0.15 # 1 means all FCEVs
-    # 2020: 0
-    # 2030: 0.05
-    # 2040: 0.1
-    # 2050: 0.15
-  land_transport_electric_share: 0.85 # 1 means all EVs
-    # 2020: 0
-    # 2030: 0.25
-    # 2040: 0.6
-    # 2050: 0.85
-  transport_fuel_cell_efficiency: 0.5
-  transport_internal_combustion_efficiency: 0.3
-  agriculture_machinery_electric_share: 0
-  agriculture_machinery_fuel_efficiency: 0.7 # fuel oil per use
-  agriculture_machinery_electric_efficiency: 0.3 # electricity per use
-  shipping_average_efficiency: 0.4 #For conversion of fuel oil to propulsion in 2011
-  shipping_hydrogen_liquefaction: true # whether to consider liquefaction costs for shipping H2 demands
-  shipping_hydrogen_share: 1 # 1 means all hydrogen FC
-    # 2020: 0
-    # 2025: 0
-    # 2030: 0.05
-    # 2035: 0.15
-    # 2040: 0.3
-    # 2045: 0.6
-    # 2050: 1
-  time_dep_hp_cop: true #time dependent heat pump coefficient of performance
-  heat_pump_sink_T: 55. # Celsius, based on DTU / large area radiators; used in build_cop_profiles.py
-   # conservatively high to cover hot water and space heating in poorly-insulated buildings
-  reduce_space_heat_exogenously: true  # reduces space heat demand by a given factor (applied before losses in DH)
-  # this can represent e.g. building renovation, building demolition, or if
-  # the factor is negative: increasing floor area, increased thermal comfort, population growth
-  reduce_space_heat_exogenously_factor: 0.29 # per unit reduction in space heat demand
-  # the default factors are determined by the LTS scenario from http://tool.european-calculator.eu/app/buildings/building-types-area/?levers=1ddd4444421213bdbbbddd44444ffffff11f411111221111211l212221
-    # 2020: 0.10  # this results in a space heat demand reduction of 10%
-    # 2025: 0.09  # first heat demand increases compared to 2020 because of larger floor area per capita
-    # 2030: 0.09
-    # 2035: 0.11
-    # 2040: 0.16
-    # 2045: 0.21
-    # 2050: 0.29
-  retrofitting :  # co-optimises building renovation to reduce space heat demand
-    retro_endogen: false  # co-optimise space heat savings
-    cost_factor: 1.0   # weight costs for building renovation
-    interest_rate: 0.04  # for investment in building components
-    annualise_cost: true  # annualise the investment costs
-    tax_weighting: false   # weight costs depending on taxes in countries
-    construction_index: true   # weight costs depending on labour/material costs per country
-  tes: true
-  tes_tau: # 180 day time constant for centralised, 3 day for decentralised
-    decentral: 3
-    central: 180
-  boilers: true
-  oil_boilers: false
-  chp: true
-  micro_chp: false
-  solar_thermal: true
-  solar_cf_correction: 0.788457  # =  >>> 1/1.2683
-  marginal_cost_storage: 0. #1e-4
-  methanation: true
-  helmeth: false
-  dac: true
-  co2_vent: false
-  SMR: true
-  co2_sequestration_potential: 200  #MtCO2/a sequestration potential for Europe
-  co2_sequestration_cost: 20   #EUR/tCO2 for sequestration of CO2
-  co2_network: false
-  cc_fraction: 0.9  # default fraction of CO2 captured with post-combustion capture
-  hydrogen_underground_storage: true
-  hydrogen_underground_storage_locations:
-    # - onshore  # more than 50 km from sea
-    - nearshore  # within 50 km of sea
-    # - offshore
-  use_fischer_tropsch_waste_heat: true
-  use_fuel_cell_waste_heat: true
-  electricity_distribution_grid: true
-  electricity_distribution_grid_cost_factor: 1.0  #multiplies cost in data/costs.csv
-  electricity_grid_connection: true  # only applies to onshore wind and utility PV
-  H2_network: true
-  gas_network: false
-  H2_retrofit: true  # if set to True existing gas pipes can be retrofitted to H2 pipes
-  # according to hydrogen backbone strategy (April, 2020) p.15
-  # https://gasforclimate2050.eu/wp-content/uploads/2020/07/2020_European-Hydrogen-Backbone_Report.pdf
-  # 60% of original natural gas capacity could be used in cost-optimal case as H2 capacity
-  H2_retrofit_capacity_per_CH4: 0.6  # ratio for H2 capacity per original CH4 capacity of retrofitted pipelines
-  gas_network_connectivity_upgrade: 1 # https://networkx.org/documentation/stable/reference/algorithms/generated/networkx.algorithms.connectivity.edge_augmentation.k_edge_augmentation.html#networkx.algorithms.connectivity.edge_augmentation.k_edge_augmentation
-  gas_distribution_grid: true
-  gas_distribution_grid_cost_factor: 1.0  #multiplies cost in data/costs.csv
-  biomass_transport: false  # biomass transport between nodes
-  conventional_generation: # generator : carrier
-    OCGT: gas
-
-
-industry:
-  St_primary_fraction: 0.3 # fraction of steel produced via primary route versus secondary route (scrap+EAF); today fraction is 0.6
-    # 2020: 0.6
-    # 2025: 0.55
-    # 2030: 0.5
-    # 2035: 0.45
-    # 2040: 0.4
-    # 2045: 0.35
-    # 2050: 0.3
-  DRI_fraction: 1 # fraction of the primary route converted to DRI + EAF
-    # 2020: 0
-    # 2025: 0
-    # 2030: 0.05
-    # 2035: 0.2
-    # 2040: 0.4
-    # 2045: 0.7
-    # 2050: 1
-  H2_DRI: 1.7   #H2 consumption in Direct Reduced Iron (DRI),  MWh_H2,LHV/ton_Steel from 51kgH2/tSt in Vogl et al (2018) doi:10.1016/j.jclepro.2018.08.279
-  elec_DRI: 0.322   #electricity consumption in Direct Reduced Iron (DRI) shaft, MWh/tSt HYBRIT brochure https://ssabwebsitecdn.azureedge.net/-/media/hybrit/files/hybrit_brochure.pdf
-  Al_primary_fraction: 0.2 # fraction of aluminium produced via the primary route versus scrap; today fraction is 0.4
-    # 2020: 0.4
-    # 2025: 0.375
-    # 2030: 0.35
-    # 2035: 0.325
-    # 2040: 0.3
-    # 2045: 0.25
-    # 2050: 0.2
-  MWh_CH4_per_tNH3_SMR: 10.8 # 2012's demand from https://ec.europa.eu/docsroom/documents/4165/attachments/1/translations/en/renditions/pdf
-  MWh_elec_per_tNH3_SMR: 0.7 # same source, assuming 94-6% split methane-elec of total energy demand 11.5 MWh/tNH3
-  MWh_H2_per_tNH3_electrolysis: 6.5 # from https://doi.org/10.1016/j.joule.2018.04.017, around 0.197 tH2/tHN3 (>3/17 since some H2 lost and used for energy)
-  MWh_elec_per_tNH3_electrolysis: 1.17 # from https://doi.org/10.1016/j.joule.2018.04.017 Table 13 (air separation and HB)
-  NH3_process_emissions: 24.5 # in MtCO2/a from SMR for H2 production for NH3 from UNFCCC for 2015 for EU28
-  petrochemical_process_emissions: 25.5 # in MtCO2/a for petrochemical and other from UNFCCC for 2015 for EU28
-  HVC_primary_fraction: 0.45 # fraction of today's HVC produced via primary route
-  HVC_mechanical_recycling_fraction: 0.30 # fraction of today's HVC produced via mechanical recycling
-  HVC_chemical_recycling_fraction: 0.15 # fraction of today's HVC produced via chemical recycling
-  HVC_production_today: 52. # MtHVC/a from DECHEMA (2017), Figure 16, page 107; includes ethylene, propylene and BTX
-  MWh_elec_per_tHVC_mechanical_recycling: 0.547 # from SI of https://doi.org/10.1016/j.resconrec.2020.105010, Table S5, for HDPE, PP, PS, PET. LDPE would be 0.756.
-  MWh_elec_per_tHVC_chemical_recycling: 6.9 # Material Economics (2019), page 125; based on pyrolysis and electric steam cracking
-  chlorine_production_today: 9.58 # MtCl/a from DECHEMA (2017), Table 7, page 43
-  MWh_elec_per_tCl: 3.6 # DECHEMA (2017), Table 6, page 43
-  MWh_H2_per_tCl: -0.9372  # DECHEMA (2017), page 43; negative since hydrogen produced in chloralkali process
-  methanol_production_today: 1.5 # MtMeOH/a from DECHEMA (2017), page 62
-  MWh_elec_per_tMeOH: 0.167 # DECHEMA (2017), Table 14, page 65
-  MWh_CH4_per_tMeOH: 10.25 # DECHEMA (2017), Table 14, page 65
-  hotmaps_locate_missing: false
-  reference_year: 2015
-  # references:
-  # DECHEMA (2017): https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry-p-20002750.pdf
-  # Material Economics (2019): https://materialeconomics.com/latest-updates/industrial-transformation-2050
-
-costs:
-  lifetime: 25 #default lifetime
-  # From a Lion Hirth paper, also reflects average of Noothout et al 2016
-  discountrate: 0.07
-  # [EUR/USD] ECB: https://www.ecb.europa.eu/stats/exchange/eurofxref/html/eurofxref-graph-usd.en.html # noqa: E501
-  USD2013_to_EUR2013: 0.7532
-
-  # Marginal and capital costs can be overwritten
-  # capital_cost:
-  #   onwind: 500
-  marginal_cost:
-    solar: 0.01
-    onwind: 0.015
-    offwind: 0.015
-    hydro: 0.
-    H2: 0.
-    battery: 0.
-
-  emission_prices: # only used with the option Ep (emission prices)
-    co2: 0.
-
-  lines:
-    length_factor: 1.25 #to estimate offwind connection costs
-
-
-solving:
-  #tmpdir: "path/to/tmp"
-  options:
-    formulation: kirchhoff
-    clip_p_max_pu: 1.e-2
-    load_shedding: false
-    noisy_costs: true
-    skip_iterations: true
-    track_iterations: false
-    min_iterations: 4
-    max_iterations: 6
-    keep_shadowprices:
-      - Bus
-      - Line
-      - Link
-      - Transformer
-      - GlobalConstraint
-      - Generator
-      - Store
-      - StorageUnit
-  solver:
-    name: gurobi
-    threads: 4
-    method: 2 # barrier
-    crossover: 0
-    BarConvTol: 1.e-4
-    Seed: 123
-    AggFill: 0
-    PreDual: 0
-    GURO_PAR_BARDENSETHRESH: 200
-    #FeasibilityTol: 1.e-6
-
-    #name: cplex
-    #threads: 4
-    #lpmethod: 4 # barrier
-    #solutiontype: 2 # non basic solution, ie no crossover
-    #barrier_convergetol: 1.e-5
-    #feasopt_tolerance: 1.e-6
-  mem: 126000 #memory in MB; 20 GB enough for 50+B+I+H2; 100 GB for 181+B+I+H2
-
-
-plotting:
-  map:
-    boundaries: [-11, 30, 34, 71]
-    color_geomap:
-      ocean: white
-      land: white
-  costs_max: 1000
-  costs_threshold: 1
-  energy_max: 20000
-  energy_min: -20000
-  energy_threshold: 50
-  vre_techs:
-    - onwind
-    - offwind-ac
-    - offwind-dc
-    - solar
-    - ror
-  renewable_storage_techs:
-    - PHS
-    - hydro
-  conv_techs:
-    - OCGT
-    - CCGT
-    - Nuclear
-    - Coal
-  storage_techs:
-    - hydro+PHS
-    - battery
-    - H2
-  load_carriers:
-    - AC load
-  AC_carriers:
-    - AC line
-    - AC transformer
-  link_carriers:
-    - DC line
-    - Converter AC-DC
-  heat_links:
-    - heat pump
-    - resistive heater
-    - CHP heat
-    - CHP electric
-    - gas boiler
-    - central heat pump
-    - central resistive heater
-    - central CHP heat
-    - central CHP electric
-    - central gas boiler
-  heat_generators:
-    - gas boiler
-    - central gas boiler
-    - solar thermal collector
-    - central solar thermal collector
-  tech_colors:
-    # wind
-    onwind: "#235ebc"
-    onshore wind: "#235ebc"
-    offwind: "#6895dd"
-    offshore wind: "#6895dd"
-    offwind-ac: "#6895dd"
-    offshore wind (AC): "#6895dd"
-    offwind-dc: "#74c6f2"
-    offshore wind (DC): "#74c6f2"
-    # water
-    hydro: '#298c81'
-    hydro reservoir: '#298c81'
-    ror: '#3dbfb0'
-    run of river: '#3dbfb0'
-    hydroelectricity: '#298c81'
-    PHS: '#51dbcc'
-    wave: '#a7d4cf'
-    # solar
-    solar: "#f9d002"
-    solar PV: "#f9d002"
-    solar thermal: '#ffbf2b'
-    solar rooftop: '#ffea80'
-    # gas
-    OCGT: '#e0986c'
-    OCGT marginal: '#e0986c'
-    OCGT-heat: '#e0986c'
-    gas boiler: '#db6a25'
-    gas boilers: '#db6a25'
-    gas boiler marginal: '#db6a25'
-    gas: '#e05b09'
-    natural gas: '#e05b09'
-    CCGT: '#a85522'
-    CCGT marginal: '#a85522'
-    gas for industry co2 to atmosphere: '#692e0a'
-    gas for industry co2 to stored: '#8a3400'
-    gas for industry: '#853403'
-    gas for industry CC: '#692e0a'
-    gas pipeline: '#ebbca0'
-    # oil
-    oil: '#c9c9c9'
-    oil boiler: '#adadad'
-    agriculture machinery oil: '#949494'
-    shipping oil: "#808080"
-    land transport oil: '#afafaf'
-    # nuclear
-    Nuclear: '#ff8c00'
-    Nuclear marginal: '#ff8c00'
-    nuclear: '#ff8c00'
-    uranium: '#ff8c00'
-    # coal
-    Coal: '#545454'
-    coal: '#545454'
-    Coal marginal: '#545454'
-    Lignite: '#826837'
-    lignite: '#826837'
-    Lignite marginal: '#826837'
-    # biomass
-    biogas: '#e3d37d'
-    solid biomass: '#baa741'
-    solid biomass transport: '#baa741'
-    solid biomass for industry: '#7a6d26'
-    solid biomass for industry CC: '#47411c'
-    solid biomass for industry co2 from atmosphere: '#736412'
-    solid biomass for industry co2 to stored: '#47411c'
-    # power transmission
-    lines: '#6c9459'
-    transmission lines: '#6c9459'
-    electricity distribution grid: '#97ad8c'
-    # electricity demand
-    Electric load: '#110d63'
-    electric demand: '#110d63'
-    electricity: '#110d63'
-    industry electricity: '#2d2a66'
-    industry new electricity: '#2d2a66'
-    agriculture electricity: '#494778'
-    # battery + EVs
-    battery: '#ace37f'
-    battery storage: '#ace37f'
-    home battery: '#80c944'
-    home battery storage: '#80c944'
-    BEV charger: '#baf238'
-    V2G: '#e5ffa8'
-    land transport EV: '#baf238'
-    Li ion: '#baf238'
-    # hot water storage
-    water tanks: '#e69487'
-    hot water storage: '#e69487'
-    hot water charging: '#e69487'
-    hot water discharging: '#e69487'
-    # heat demand
-    Heat load: '#cc1f1f'
-    heat: '#cc1f1f'
-    heat demand: '#cc1f1f'
-    rural heat: '#ff5c5c'
-    central heat: '#cc1f1f'
-    decentral heat: '#750606'
-    low-temperature heat for industry: '#8f2727'
-    process heat: '#ff0000'
-    agriculture heat: '#d9a5a5'
-    # heat supply
-    heat pumps: '#2fb537'
-    heat pump: '#2fb537'
-    air heat pump: '#36eb41'
-    ground heat pump: '#2fb537'
-    Ambient: '#98eb9d'
-    CHP: '#8a5751'
-    CHP CC: '#634643'
-    CHP heat: '#8a5751'
-    CHP electric: '#8a5751'
-    district heating: '#e8beac'
-    resistive heater: '#c78536'
-    retrofitting: '#8487e8'
-    building retrofitting: '#8487e8'
-    # hydrogen
-    H2 for industry: "#f073da"
-    H2 for shipping: "#ebaee0"
-    H2: '#bf13a0'
-    SMR: '#870c71'
-    SMR CC: '#4f1745'
-    H2 liquefaction: '#d647bd'
-    hydrogen storage: '#bf13a0'
-    land transport fuel cell: '#6b3161'
-    H2 pipeline: '#f081dc'
-    H2 Fuel Cell: '#c251ae'
-    H2 Electrolysis: '#ff29d9'
-    # syngas
-    Sabatier: '#9850ad'
-    methanation: '#c44ce6'
-    helmeth: '#e899ff'
-    # synfuels
-    Fischer-Tropsch: '#25c49a'
-    kerosene for aviation: '#a1ffe6'
-    naphtha for industry: '#57ebc4'
-    # co2
-    CC: '#9e132c'
-    CO2 sequestration: '#9e132c'
-    DAC: '#ff5270'
-    co2 stored: '#f2385a'
-    co2: '#f29dae'
-    co2 vent: '#ffd4dc'
-    CO2 pipeline: '#f5627f'
-    # emissions
-    process emissions CC: '#000000'
-    process emissions: '#222222'
-    process emissions to stored: '#444444'
-    process emissions to atmosphere: '#888888'
-    oil emissions: '#aaaaaa'
-    shipping oil emissions: "#555555"
-    land transport oil emissions: '#777777'
-    agriculture machinery oil emissions: '#333333'
-    # other
-    shipping: '#03a2ff'
-    power-to-heat: '#cc1f1f'
-    power-to-gas: '#c44ce6'
-    power-to-liquid: '#25c49a'
-    gas-to-power/heat: '#ee8340'
diff --git a/config.import.yaml b/config.import.yaml
deleted file mode 100644
index f5a6cc20..00000000
--- a/config.import.yaml
+++ /dev/null
@@ -1,626 +0,0 @@
-version: 0.6.0
-
-logging_level: INFO
-
-results_dir: results/
-summary_dir: results
-costs_dir: ../technology-data/outputs/
-run: 20211218-181-import  # use this to keep track of runs with different settings
-foresight: overnight # options are overnight, myopic, perfect (perfect is not yet implemented)
-# if you use myopic or perfect foresight, set the investment years in "planning_horizons" below
-
-scenario:
-  simpl: # only relevant for PyPSA-Eur
-    - ''
-  lv: # allowed transmission line volume expansion, can be any float >= 1.0 (today) or "opt"
-    - 1.5
-  clusters: # number of nodes in Europe, any integer between 37 (1 node per country-zone) and several hundred
-    - 181
-  opts: # only relevant for PyPSA-Eur 
-    - ''
-  sector_opts: # this is where the main scenario settings are
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-import
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10
-  # to really understand the options here, look in scripts/prepare_sector_network.py
-  # Co2Lx specifies the CO2 target in x% of the 1990 values; default will give default (5%);
-  # Co2L0p25 will give 25% CO2 emissions; Co2Lm0p05 will give 5% negative emissions
-  # xH is the temporal resolution; 3H is 3-hourly, i.e. one snapshot every 3 hours
-  # single letters are sectors: T for land transport, H for building heating,
-  # B for biomass supply, I for industry, shipping and aviation,
-  # A for agriculture, forestry and fishing
-  # solar+c0.5 reduces the capital cost of solar to 50\% of reference value
-  # solar+p3 multiplies the available installable potential by factor 3
-  # co2 stored+e2 multiplies the potential of CO2 sequestration by a factor 2
-  # dist{n} includes distribution grids with investment cost of n times cost in data/costs.csv
-  # for myopic/perfect foresight cb states the carbon budget in GtCO2 (cumulative
-  # emissions throughout the transition path in the timeframe determined by the
-  # planning_horizons), be:beta decay; ex:exponential decay
-  # cb40ex0 distributes a carbon budget of 40 GtCO2 following an exponential
-  # decay with initial growth rate 0
-  planning_horizons: [2030] # investment years for myopic and perfect; or costs year for overnight
-  # for example, set to [2020, 2030, 2040, 2050] for myopic foresight
-
-# CO2 budget as a fraction of 1990 emissions
-# this is over-ridden if CO2Lx is set in sector_opts
-# this is also over-ridden if cb is set in sector_opts
-co2_budget:
-  2020: 0.7011648746
-  2025: 0.5241935484
-  2030: 0.2970430108
-  2035: 0.1500896057
-  2040: 0.0712365591
-  2045: 0.0322580645
-  2050: 0
-
-# snapshots are originally set in PyPSA-Eur/config.yaml but used again by PyPSA-Eur-Sec
-snapshots:
-  # arguments to pd.date_range
-  start: "2013-01-01"
-  end: "2014-01-01"
-  closed: left # end is not inclusive
-
-atlite:
-  cutout: ../pypsa-eur/cutouts/europe-2013-era5.nc
-
-# this information is NOT used but needed as an argument for
-# pypsa-eur/scripts/add_electricity.py/load_costs in make_summary.py
-electricity:
-  max_hours:
-    battery: 6
-    H2: 168
-
-# regulate what components with which carriers are kept from PyPSA-Eur;
-# some technologies are removed because they are implemented differently
-# (e.g. battery or H2 storage) or have different year-dependent costs
-# in PyPSA-Eur-Sec
-pypsa_eur:
-  Bus:
-    - AC
-  Link:
-    - DC
-  Generator:
-    - onwind
-    - offwind-ac
-    - offwind-dc
-    - solar
-    - ror
-  StorageUnit:
-    - PHS
-    - hydro
-  Store: []
-
-
-energy:
-  energy_totals_year: 2011
-  base_emissions_year: 1990
-  eurostat_report_year: 2016
-  emissions: CO2 # "CO2" or "All greenhouse gases - (CO2 equivalent)"
-
-biomass:
-  year: 2030
-  scenario: ENS_Med
-  classes:
-    solid biomass:
-      - Agricultural waste
-      - Fuelwood residues
-      - Secondary Forestry residues - woodchips
-      - Sawdust
-      - Residues from landscape care
-      - Municipal waste
-    not included:
-      - Sugar from sugar beet
-      - Rape seed
-      - "Sunflower, soya seed "
-      - Bioethanol barley, wheat, grain maize, oats, other cereals and rye
-      - Miscanthus, switchgrass, RCG
-      - Willow
-      - Poplar
-      - FuelwoodRW
-      - C&P_RW
-    biogas:
-      - Manure solid, liquid
-      - Sludge
-
-
-solar_thermal:
-  clearsky_model: simple  # should be "simple" or "enhanced"?
-  orientation:
-    slope: 45.
-    azimuth: 180.
-
-# only relevant for foresight = myopic or perfect
-existing_capacities:
-  grouping_years: [1980, 1985, 1990, 1995, 2000, 2005, 2010, 2015, 2019]
-  threshold_capacity: 10
-  conventional_carriers:
-    - lignite
-    - coal
-    - oil
-    - uranium
-
-
-sector:
-  district_heating:
-    potential: 0.6  # maximum fraction of urban demand which can be supplied by district heating
-     # increase of today's district heating demand to potential maximum district heating share
-     # progress = 0 means today's district heating share, progress = 1 means maximum fraction of urban demand is supplied by district heating
-    progress: 1
-      # 2020: 0.0
-      # 2030: 0.3
-      # 2040: 0.6
-      # 2050: 1.0
-    district_heating_loss: 0.15
-  bev_dsm_restriction_value: 0.75  #Set to 0 for no restriction on BEV DSM
-  bev_dsm_restriction_time: 7  #Time at which SOC of BEV has to be dsm_restriction_value
-  transport_heating_deadband_upper: 20.
-  transport_heating_deadband_lower: 15.
-  ICE_lower_degree_factor: 0.375  #in per cent increase in fuel consumption per degree above deadband
-  ICE_upper_degree_factor: 1.6
-  EV_lower_degree_factor: 0.98
-  EV_upper_degree_factor: 0.63
-  bev_dsm: true #turns on EV battery
-  bev_availability: 0.5  #How many cars do smart charging
-  bev_energy: 0.05  #average battery size in MWh
-  bev_charge_efficiency: 0.9  #BEV (dis-)charging efficiency
-  bev_plug_to_wheel_efficiency: 0.2 #kWh/km from EPA https://www.fueleconomy.gov/feg/ for Tesla Model S
-  bev_charge_rate: 0.011 #3-phase charger with 11 kW
-  bev_avail_max: 0.95
-  bev_avail_mean: 0.8
-  v2g: true #allows feed-in to grid from EV battery
-  #what is not EV or FCEV is oil-fuelled ICE
-  land_transport_fuel_cell_share: 0.15 # 1 means all FCEVs
-    # 2020: 0
-    # 2030: 0.05
-    # 2040: 0.1
-    # 2050: 0.15
-  land_transport_electric_share: 0.85 # 1 means all EVs
-    # 2020: 0
-    # 2030: 0.25
-    # 2040: 0.6
-    # 2050: 0.85
-  transport_fuel_cell_efficiency: 0.5
-  transport_internal_combustion_efficiency: 0.3
-  agriculture_machinery_electric_share: 0
-  agriculture_machinery_fuel_efficiency: 0.7 # fuel oil per use
-  agriculture_machinery_electric_efficiency: 0.3 # electricity per use
-  shipping_average_efficiency: 0.4 #For conversion of fuel oil to propulsion in 2011
-  shipping_hydrogen_liquefaction: true # whether to consider liquefaction costs for shipping H2 demands
-  shipping_hydrogen_share: 1 # 1 means all hydrogen FC
-    # 2020: 0
-    # 2025: 0
-    # 2030: 0.05
-    # 2035: 0.15
-    # 2040: 0.3
-    # 2045: 0.6
-    # 2050: 1
-  time_dep_hp_cop: true #time dependent heat pump coefficient of performance
-  heat_pump_sink_T: 55. # Celsius, based on DTU / large area radiators; used in build_cop_profiles.py
-   # conservatively high to cover hot water and space heating in poorly-insulated buildings
-  reduce_space_heat_exogenously: true  # reduces space heat demand by a given factor (applied before losses in DH)
-  # this can represent e.g. building renovation, building demolition, or if
-  # the factor is negative: increasing floor area, increased thermal comfort, population growth
-  reduce_space_heat_exogenously_factor: 0.29 # per unit reduction in space heat demand
-  # the default factors are determined by the LTS scenario from http://tool.european-calculator.eu/app/buildings/building-types-area/?levers=1ddd4444421213bdbbbddd44444ffffff11f411111221111211l212221
-    # 2020: 0.10  # this results in a space heat demand reduction of 10%
-    # 2025: 0.09  # first heat demand increases compared to 2020 because of larger floor area per capita
-    # 2030: 0.09
-    # 2035: 0.11
-    # 2040: 0.16
-    # 2045: 0.21
-    # 2050: 0.29
-  retrofitting :  # co-optimises building renovation to reduce space heat demand
-    retro_endogen: false  # co-optimise space heat savings
-    cost_factor: 1.0   # weight costs for building renovation
-    interest_rate: 0.04  # for investment in building components
-    annualise_cost: true  # annualise the investment costs
-    tax_weighting: false   # weight costs depending on taxes in countries
-    construction_index: true   # weight costs depending on labour/material costs per country
-  tes: true
-  tes_tau: # 180 day time constant for centralised, 3 day for decentralised
-    decentral: 3
-    central: 180
-  boilers: true
-  oil_boilers: false
-  chp: true
-  micro_chp: false
-  solar_thermal: true
-  solar_cf_correction: 0.788457  # =  >>> 1/1.2683
-  marginal_cost_storage: 0. #1e-4
-  methanation: true
-  helmeth: false
-  dac: true
-  co2_vent: false
-  SMR: true
-  co2_sequestration_potential: 200  #MtCO2/a sequestration potential for Europe
-  co2_sequestration_cost: 20   #EUR/tCO2 for sequestration of CO2
-  co2_network: false
-  cc_fraction: 0.9  # default fraction of CO2 captured with post-combustion capture
-  hydrogen_underground_storage: true
-  hydrogen_underground_storage_locations:
-    # - onshore  # more than 50 km from sea
-    - nearshore  # within 50 km of sea
-    # - offshore
-  use_fischer_tropsch_waste_heat: true
-  use_fuel_cell_waste_heat: true
-  electricity_distribution_grid: true
-  electricity_distribution_grid_cost_factor: 1.0  #multiplies cost in data/costs.csv
-  electricity_grid_connection: true  # only applies to onshore wind and utility PV
-  H2_network: true
-  gas_network: false
-  H2_retrofit: true  # if set to True existing gas pipes can be retrofitted to H2 pipes
-  # according to hydrogen backbone strategy (April, 2020) p.15
-  # https://gasforclimate2050.eu/wp-content/uploads/2020/07/2020_European-Hydrogen-Backbone_Report.pdf
-  # 60% of original natural gas capacity could be used in cost-optimal case as H2 capacity
-  H2_retrofit_capacity_per_CH4: 0.6  # ratio for H2 capacity per original CH4 capacity of retrofitted pipelines
-  gas_network_connectivity_upgrade: 3 # https://networkx.org/documentation/stable/reference/algorithms/generated/networkx.algorithms.connectivity.edge_augmentation.k_edge_augmentation.html#networkx.algorithms.connectivity.edge_augmentation.k_edge_augmentation
-  gas_distribution_grid: true
-  gas_distribution_grid_cost_factor: 1.0  #multiplies cost in data/costs.csv
-  biomass_transport: false  # biomass transport between nodes
-  conventional_generation: # generator : carrier
-    OCGT: gas
-  import:
-    capacity_boost: 2
-    options:
-      - pipeline-h2
-      - shipping-lh2
-      - shipping-lch4
-      - shipping-ftfuel
-      - hvdc
-    # limit: 100 # TWh
-
-
-industry:
-  St_primary_fraction: 0.3 # fraction of steel produced via primary route versus secondary route (scrap+EAF); today fraction is 0.6
-    # 2020: 0.6
-    # 2025: 0.55
-    # 2030: 0.5
-    # 2035: 0.45
-    # 2040: 0.4
-    # 2045: 0.35
-    # 2050: 0.3
-  DRI_fraction: 1 # fraction of the primary route converted to DRI + EAF
-    # 2020: 0
-    # 2025: 0
-    # 2030: 0.05
-    # 2035: 0.2
-    # 2040: 0.4
-    # 2045: 0.7
-    # 2050: 1
-  H2_DRI: 1.7   #H2 consumption in Direct Reduced Iron (DRI),  MWh_H2,LHV/ton_Steel from 51kgH2/tSt in Vogl et al (2018) doi:10.1016/j.jclepro.2018.08.279
-  elec_DRI: 0.322   #electricity consumption in Direct Reduced Iron (DRI) shaft, MWh/tSt HYBRIT brochure https://ssabwebsitecdn.azureedge.net/-/media/hybrit/files/hybrit_brochure.pdf
-  Al_primary_fraction: 0.2 # fraction of aluminium produced via the primary route versus scrap; today fraction is 0.4
-    # 2020: 0.4
-    # 2025: 0.375
-    # 2030: 0.35
-    # 2035: 0.325
-    # 2040: 0.3
-    # 2045: 0.25
-    # 2050: 0.2
-  MWh_CH4_per_tNH3_SMR: 10.8 # 2012's demand from https://ec.europa.eu/docsroom/documents/4165/attachments/1/translations/en/renditions/pdf
-  MWh_elec_per_tNH3_SMR: 0.7 # same source, assuming 94-6% split methane-elec of total energy demand 11.5 MWh/tNH3
-  MWh_H2_per_tNH3_electrolysis: 6.5 # from https://doi.org/10.1016/j.joule.2018.04.017, around 0.197 tH2/tHN3 (>3/17 since some H2 lost and used for energy)
-  MWh_elec_per_tNH3_electrolysis: 1.17 # from https://doi.org/10.1016/j.joule.2018.04.017 Table 13 (air separation and HB)
-  NH3_process_emissions: 24.5 # in MtCO2/a from SMR for H2 production for NH3 from UNFCCC for 2015 for EU28
-  petrochemical_process_emissions: 25.5 # in MtCO2/a for petrochemical and other from UNFCCC for 2015 for EU28
-  HVC_primary_fraction: 0.45 # fraction of today's HVC produced via primary route
-  HVC_mechanical_recycling_fraction: 0.30 # fraction of today's HVC produced via mechanical recycling
-  HVC_chemical_recycling_fraction: 0.15 # fraction of today's HVC produced via chemical recycling
-  HVC_production_today: 52. # MtHVC/a from DECHEMA (2017), Figure 16, page 107; includes ethylene, propylene and BTX
-  MWh_elec_per_tHVC_mechanical_recycling: 0.547 # from SI of https://doi.org/10.1016/j.resconrec.2020.105010, Table S5, for HDPE, PP, PS, PET. LDPE would be 0.756.
-  MWh_elec_per_tHVC_chemical_recycling: 6.9 # Material Economics (2019), page 125; based on pyrolysis and electric steam cracking
-  chlorine_production_today: 9.58 # MtCl/a from DECHEMA (2017), Table 7, page 43
-  MWh_elec_per_tCl: 3.6 # DECHEMA (2017), Table 6, page 43
-  MWh_H2_per_tCl: -0.9372  # DECHEMA (2017), page 43; negative since hydrogen produced in chloralkali process
-  methanol_production_today: 1.5 # MtMeOH/a from DECHEMA (2017), page 62
-  MWh_elec_per_tMeOH: 0.167 # DECHEMA (2017), Table 14, page 65
-  MWh_CH4_per_tMeOH: 10.25 # DECHEMA (2017), Table 14, page 65
-  hotmaps_locate_missing: false
-  reference_year: 2015
-  # references:
-  # DECHEMA (2017): https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry-p-20002750.pdf
-  # Material Economics (2019): https://materialeconomics.com/latest-updates/industrial-transformation-2050
-  import:
-  capacity_boost: 2
-  options:
-    - pipeline-h2
-    - shipping-lh2
-    - shipping-lch4
-    - shipping-ftfuel
-    - hvdc
-  # limit: 100 # TWh
-
-costs:
-  lifetime: 25 #default lifetime
-  # From a Lion Hirth paper, also reflects average of Noothout et al 2016
-  discountrate: 0.07
-  # [EUR/USD] ECB: https://www.ecb.europa.eu/stats/exchange/eurofxref/html/eurofxref-graph-usd.en.html # noqa: E501
-  USD2013_to_EUR2013: 0.7532
-
-  # Marginal and capital costs can be overwritten
-  # capital_cost:
-  #   onwind: 500
-  marginal_cost:
-    solar: 0.01
-    onwind: 0.015
-    offwind: 0.015
-    hydro: 0.
-    H2: 0.
-    battery: 0.
-
-  emission_prices: # only used with the option Ep (emission prices)
-    co2: 0.
-
-  lines:
-    length_factor: 1.25 #to estimate offwind connection costs
-
-
-solving:
-  #tmpdir: "path/to/tmp"
-  options:
-    formulation: kirchhoff
-    clip_p_max_pu: 1.e-2
-    load_shedding: false
-    noisy_costs: true
-    skip_iterations: true
-    track_iterations: false
-    min_iterations: 4
-    max_iterations: 6
-    keep_shadowprices:
-      - Bus
-      - Line
-      - Link
-      - Transformer
-      - GlobalConstraint
-      - Generator
-      - Store
-      - StorageUnit
-  solver:
-    name: gurobi
-    threads: 8
-    method: 2 # barrier
-    crossover: 0
-    BarConvTol: 1.e-4
-    Seed: 123
-    AggFill: 0
-    PreDual: 0
-    GURO_PAR_BARDENSETHRESH: 200
-    #FeasibilityTol: 1.e-6
-
-    #name: cplex
-    #threads: 4
-    #lpmethod: 4 # barrier
-    #solutiontype: 2 # non basic solution, ie no crossover
-    #barrier_convergetol: 1.e-5
-    #feasopt_tolerance: 1.e-6
-  mem: 160000 #memory in MB; 20 GB enough for 50+B+I+H2; 100 GB for 181+B+I+H2
-
-
-plotting:
-  map:
-    boundaries: [-11, 30, 34, 71]
-    color_geomap:
-      ocean: white
-      land: white
-  costs_max: 1000
-  costs_threshold: 1
-  energy_max: 20000
-  energy_min: -20000
-  energy_threshold: 50
-  vre_techs:
-    - onwind
-    - offwind-ac
-    - offwind-dc
-    - solar
-    - ror
-  renewable_storage_techs:
-    - PHS
-    - hydro
-  conv_techs:
-    - OCGT
-    - CCGT
-    - Nuclear
-    - Coal
-  storage_techs:
-    - hydro+PHS
-    - battery
-    - H2
-  load_carriers:
-    - AC load
-  AC_carriers:
-    - AC line
-    - AC transformer
-  link_carriers:
-    - DC line
-    - Converter AC-DC
-  heat_links:
-    - heat pump
-    - resistive heater
-    - CHP heat
-    - CHP electric
-    - gas boiler
-    - central heat pump
-    - central resistive heater
-    - central CHP heat
-    - central CHP electric
-    - central gas boiler
-  heat_generators:
-    - gas boiler
-    - central gas boiler
-    - solar thermal collector
-    - central solar thermal collector
-  tech_colors:
-    # wind
-    onwind: "#235ebc"
-    onshore wind: "#235ebc"
-    offwind: "#6895dd"
-    offshore wind: "#6895dd"
-    offwind-ac: "#6895dd"
-    offshore wind (AC): "#6895dd"
-    offwind-dc: "#74c6f2"
-    offshore wind (DC): "#74c6f2"
-    # water
-    hydro: '#298c81'
-    hydro reservoir: '#298c81'
-    ror: '#3dbfb0'
-    run of river: '#3dbfb0'
-    hydroelectricity: '#298c81'
-    PHS: '#51dbcc'
-    wave: '#a7d4cf'
-    # solar
-    solar: "#f9d002"
-    solar PV: "#f9d002"
-    solar thermal: '#ffbf2b'
-    solar rooftop: '#ffea80'
-    # gas
-    OCGT: '#e0986c'
-    OCGT marginal: '#e0986c'
-    OCGT-heat: '#e0986c'
-    gas boiler: '#db6a25'
-    gas boilers: '#db6a25'
-    gas boiler marginal: '#db6a25'
-    gas: '#e05b09'
-    fossil gas: '#e05b09'
-    natural gas: '#e05b09'
-    CCGT: '#a85522'
-    CCGT marginal: '#a85522'
-    gas for industry co2 to atmosphere: '#692e0a'
-    gas for industry co2 to stored: '#8a3400'
-    gas for industry: '#853403'
-    gas for industry CC: '#692e0a'
-    gas pipeline: '#ebbca0'
-    gas pipeline new: '#a87c62'
-    # oil
-    oil: '#c9c9c9'
-    oil boiler: '#adadad'
-    agriculture machinery oil: '#949494'
-    shipping oil: "#808080"
-    land transport oil: '#afafaf'
-    # nuclear
-    Nuclear: '#ff8c00'
-    Nuclear marginal: '#ff8c00'
-    nuclear: '#ff8c00'
-    uranium: '#ff8c00'
-    # coal
-    Coal: '#545454'
-    coal: '#545454'
-    Coal marginal: '#545454'
-    solid: '#545454'
-    Lignite: '#826837'
-    lignite: '#826837'
-    Lignite marginal: '#826837'
-    # biomass
-    biogas: '#e3d37d'
-    biomass: '#baa741'
-    solid biomass: '#baa741'
-    solid biomass transport: '#baa741'
-    solid biomass for industry: '#7a6d26'
-    solid biomass for industry CC: '#47411c'
-    solid biomass for industry co2 from atmosphere: '#736412'
-    solid biomass for industry co2 to stored: '#47411c'
-    # power transmission
-    lines: '#6c9459'
-    transmission lines: '#6c9459'
-    electricity distribution grid: '#97ad8c'
-    # electricity demand
-    Electric load: '#110d63'
-    electric demand: '#110d63'
-    electricity: '#110d63'
-    industry electricity: '#2d2a66'
-    industry new electricity: '#2d2a66'
-    agriculture electricity: '#494778'
-    # battery + EVs
-    battery: '#ace37f'
-    battery storage: '#ace37f'
-    home battery: '#80c944'
-    home battery storage: '#80c944'
-    BEV charger: '#baf238'
-    V2G: '#e5ffa8'
-    land transport EV: '#baf238'
-    Li ion: '#baf238'
-    # hot water storage
-    water tanks: '#e69487'
-    hot water storage: '#e69487'
-    hot water charging: '#e69487'
-    hot water discharging: '#e69487'
-    # heat demand
-    Heat load: '#cc1f1f'
-    heat: '#cc1f1f'
-    heat demand: '#cc1f1f'
-    rural heat: '#ff5c5c'
-    central heat: '#cc1f1f'
-    decentral heat: '#750606'
-    low-temperature heat for industry: '#8f2727'
-    process heat: '#ff0000'
-    agriculture heat: '#d9a5a5'
-    # heat supply
-    heat pumps: '#2fb537'
-    heat pump: '#2fb537'
-    air heat pump: '#36eb41'
-    ground heat pump: '#2fb537'
-    Ambient: '#98eb9d'
-    CHP: '#8a5751'
-    CHP CC: '#634643'
-    CHP heat: '#8a5751'
-    CHP electric: '#8a5751'
-    district heating: '#e8beac'
-    resistive heater: '#d8f9b8'
-    retrofitting: '#8487e8'
-    building retrofitting: '#8487e8'
-    # hydrogen
-    H2 for industry: "#f073da"
-    H2 for shipping: "#ebaee0"
-    H2: '#bf13a0'
-    hydrogen: '#bf13a0'
-    SMR: '#870c71'
-    SMR CC: '#4f1745'
-    H2 liquefaction: '#d647bd'
-    hydrogen storage: '#bf13a0'
-    H2 storage: '#bf13a0'
-    land transport fuel cell: '#6b3161'
-    H2 pipeline: '#f081dc'
-    H2 pipeline retrofitted: '#ba99b5'
-    H2 Fuel Cell: '#c251ae'
-    H2 Electrolysis: '#ff29d9'
-    # syngas
-    Sabatier: '#9850ad'
-    methanation: '#c44ce6'
-    methane: '#c44ce6'
-    helmeth: '#e899ff'
-    # synfuels
-    Fischer-Tropsch: '#25c49a'
-    liquid: '#25c49a'
-    kerosene for aviation: '#a1ffe6'
-    naphtha for industry: '#57ebc4'
-    # co2
-    CC: '#f29dae'
-    CCS: '#f29dae'
-    CO2 sequestration: '#f29dae'
-    DAC: '#ff5270'
-    co2 stored: '#f2385a'
-    co2: '#f29dae'
-    co2 vent: '#ffd4dc'
-    CO2 pipeline: '#f5627f'
-    # emissions
-    process emissions CC: '#000000'
-    process emissions: '#222222'
-    process emissions to stored: '#444444'
-    process emissions to atmosphere: '#888888'
-    oil emissions: '#aaaaaa'
-    shipping oil emissions: "#555555"
-    land transport oil emissions: '#777777'
-    agriculture machinery oil emissions: '#333333'
-    # other
-    shipping: '#03a2ff'
-    power-to-heat: '#2fb537'
-    power-to-gas: '#c44ce6'
-    power-to-H2: '#ff29d9'
-    power-to-liquid: '#25c49a'
-    gas-to-power/heat: '#ee8340'
-    waste: '#e3d37d'
-    other: '#000000'
-    import pipeline-h2: '#fff6e0'
-    import shipping-lh2: '#ebe1ca'
-    import shipping-lch4: '#d6cbb2'
-    import shipping-ftfuel: '#bdb093'
-    import hvdc: '#91856a'
-
diff --git a/config.lv.yaml b/config.lv.yaml
deleted file mode 100644
index 04a10a3c..00000000
--- a/config.lv.yaml
+++ /dev/null
@@ -1,594 +0,0 @@
-version: 0.6.0
-
-logging_level: INFO
-
-results_dir: results/
-summary_dir: results
-costs_dir: ../technology-data/outputs/
-run: 20211218-181-lv  # use this to keep track of runs with different settings
-foresight: overnight # options are overnight, myopic, perfect (perfect is not yet implemented)
-# if you use myopic or perfect foresight, set the investment years in "planning_horizons" below
-
-scenario:
-  simpl: # only relevant for PyPSA-Eur
-    - ''
-  lv: # allowed transmission line volume expansion, can be any float >= 1.0 (today) or "opt"
-    - 1.0
-    - 1.125
-    - 1.25
-    - 1.5
-    - 1.75
-    - 2.0
-  clusters: # number of nodes in Europe, any integer between 37 (1 node per country-zone) and several hundred
-    - 181
-  opts: # only relevant for PyPSA-Eur
-    - ''
-  sector_opts: # this is where the main scenario settings are
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10
-  # to really understand the options here, look in scripts/prepare_sector_network.py
-  # Co2Lx specifies the CO2 target in x% of the 1990 values; default will give default (5%);
-  # Co2L0p25 will give 25% CO2 emissions; Co2Lm0p05 will give 5% negative emissions
-  # xH is the temporal resolution; 3H is 3-hourly, i.e. one snapshot every 3 hours
-  # single letters are sectors: T for land transport, H for building heating,
-  # B for biomass supply, I for industry, shipping and aviation,
-  # A for agriculture, forestry and fishing
-  # solar+c0.5 reduces the capital cost of solar to 50\% of reference value
-  # solar+p3 multiplies the available installable potential by factor 3
-  # co2 stored+e2 multiplies the potential of CO2 sequestration by a factor 2
-  # dist{n} includes distribution grids with investment cost of n times cost in data/costs.csv
-  # for myopic/perfect foresight cb states the carbon budget in GtCO2 (cumulative
-  # emissions throughout the transition path in the timeframe determined by the
-  # planning_horizons), be:beta decay; ex:exponential decay
-  # cb40ex0 distributes a carbon budget of 40 GtCO2 following an exponential
-  # decay with initial growth rate 0
-  planning_horizons: # investment years for myopic and perfect; or costs year for overnight
-    - 2030
-  # for example, set to [2020, 2030, 2040, 2050] for myopic foresight
-
-# CO2 budget as a fraction of 1990 emissions
-# this is over-ridden if CO2Lx is set in sector_opts
-# this is also over-ridden if cb is set in sector_opts
-co2_budget:
-  2020: 0.7011648746
-  2025: 0.5241935484
-  2030: 0.2970430108
-  2035: 0.1500896057
-  2040: 0.0712365591
-  2045: 0.0322580645
-  2050: 0
-
-# snapshots are originally set in PyPSA-Eur/config.yaml but used again by PyPSA-Eur-Sec
-snapshots:
-  # arguments to pd.date_range
-  start: "2013-01-01"
-  end: "2014-01-01"
-  closed: left # end is not inclusive
-
-atlite:
-  cutout: ../pypsa-eur/cutouts/europe-2013-era5.nc
-
-# this information is NOT used but needed as an argument for
-# pypsa-eur/scripts/add_electricity.py/load_costs in make_summary.py
-electricity:
-  max_hours:
-    battery: 6
-    H2: 168
-
-# regulate what components with which carriers are kept from PyPSA-Eur;
-# some technologies are removed because they are implemented differently
-# (e.g. battery or H2 storage) or have different year-dependent costs
-# in PyPSA-Eur-Sec
-pypsa_eur:
-  Bus:
-    - AC
-  Link:
-    - DC
-  Generator:
-    - onwind
-    - offwind-ac
-    - offwind-dc
-    - solar
-    - ror
-  StorageUnit:
-    - PHS
-    - hydro
-  Store: []
-
-
-energy:
-  energy_totals_year: 2011
-  base_emissions_year: 1990
-  eurostat_report_year: 2016
-  emissions: CO2 # "CO2" or "All greenhouse gases - (CO2 equivalent)"
-
-biomass:
-  year: 2030
-  scenario: ENS_Med
-  classes:
-    solid biomass:
-      - Agricultural waste
-      - Fuelwood residues
-      - Secondary Forestry residues - woodchips
-      - Sawdust
-      - Residues from landscape care
-      - Municipal waste
-    not included:
-      - Sugar from sugar beet
-      - Rape seed
-      - "Sunflower, soya seed "
-      - Bioethanol barley, wheat, grain maize, oats, other cereals and rye
-      - Miscanthus, switchgrass, RCG
-      - Willow
-      - Poplar
-      - FuelwoodRW
-      - C&P_RW
-    biogas:
-      - Manure solid, liquid
-      - Sludge
-
-
-solar_thermal:
-  clearsky_model: simple  # should be "simple" or "enhanced"?
-  orientation:
-    slope: 45.
-    azimuth: 180.
-
-# only relevant for foresight = myopic or perfect
-existing_capacities:
-  grouping_years: [1980, 1985, 1990, 1995, 2000, 2005, 2010, 2015, 2019]
-  threshold_capacity: 10
-  conventional_carriers:
-    - lignite
-    - coal
-    - oil
-    - uranium
-
-
-sector:
-  district_heating:
-    potential: 0.6  # maximum fraction of urban demand which can be supplied by district heating
-     # increase of today's district heating demand to potential maximum district heating share
-     # progress = 0 means today's district heating share, progress = 1 means maximum fraction of urban demand is supplied by district heating
-    progress: 1
-      # 2020: 0.0
-      # 2030: 0.3
-      # 2040: 0.6
-      # 2050: 1.0
-    district_heating_loss: 0.15
-  bev_dsm_restriction_value: 0.75  #Set to 0 for no restriction on BEV DSM
-  bev_dsm_restriction_time: 7  #Time at which SOC of BEV has to be dsm_restriction_value
-  transport_heating_deadband_upper: 20.
-  transport_heating_deadband_lower: 15.
-  ICE_lower_degree_factor: 0.375  #in per cent increase in fuel consumption per degree above deadband
-  ICE_upper_degree_factor: 1.6
-  EV_lower_degree_factor: 0.98
-  EV_upper_degree_factor: 0.63
-  bev_dsm: true #turns on EV battery
-  bev_availability: 0.5  #How many cars do smart charging
-  bev_energy: 0.05  #average battery size in MWh
-  bev_charge_efficiency: 0.9  #BEV (dis-)charging efficiency
-  bev_plug_to_wheel_efficiency: 0.2 #kWh/km from EPA https://www.fueleconomy.gov/feg/ for Tesla Model S
-  bev_charge_rate: 0.011 #3-phase charger with 11 kW
-  bev_avail_max: 0.95
-  bev_avail_mean: 0.8
-  v2g: true #allows feed-in to grid from EV battery
-  #what is not EV or FCEV is oil-fuelled ICE
-  land_transport_fuel_cell_share: 0.15 # 1 means all FCEVs
-    # 2020: 0
-    # 2030: 0.05
-    # 2040: 0.1
-    # 2050: 0.15
-  land_transport_electric_share: 0.85 # 1 means all EVs
-    # 2020: 0
-    # 2030: 0.25
-    # 2040: 0.6
-    # 2050: 0.85
-  transport_fuel_cell_efficiency: 0.5
-  transport_internal_combustion_efficiency: 0.3
-  agriculture_machinery_electric_share: 0
-  agriculture_machinery_fuel_efficiency: 0.7 # fuel oil per use
-  agriculture_machinery_electric_efficiency: 0.3 # electricity per use
-  shipping_average_efficiency: 0.4 #For conversion of fuel oil to propulsion in 2011
-  shipping_hydrogen_liquefaction: true # whether to consider liquefaction costs for shipping H2 demands
-  shipping_hydrogen_share: 1 # 1 means all hydrogen FC
-    # 2020: 0
-    # 2025: 0
-    # 2030: 0.05
-    # 2035: 0.15
-    # 2040: 0.3
-    # 2045: 0.6
-    # 2050: 1
-  time_dep_hp_cop: true #time dependent heat pump coefficient of performance
-  heat_pump_sink_T: 55. # Celsius, based on DTU / large area radiators; used in build_cop_profiles.py
-   # conservatively high to cover hot water and space heating in poorly-insulated buildings
-  reduce_space_heat_exogenously: true  # reduces space heat demand by a given factor (applied before losses in DH)
-  # this can represent e.g. building renovation, building demolition, or if
-  # the factor is negative: increasing floor area, increased thermal comfort, population growth
-  reduce_space_heat_exogenously_factor: 0.29 # per unit reduction in space heat demand
-  # the default factors are determined by the LTS scenario from http://tool.european-calculator.eu/app/buildings/building-types-area/?levers=1ddd4444421213bdbbbddd44444ffffff11f411111221111211l212221
-    # 2020: 0.10  # this results in a space heat demand reduction of 10%
-    # 2025: 0.09  # first heat demand increases compared to 2020 because of larger floor area per capita
-    # 2030: 0.09
-    # 2035: 0.11
-    # 2040: 0.16
-    # 2045: 0.21
-    # 2050: 0.29
-  retrofitting :  # co-optimises building renovation to reduce space heat demand
-    retro_endogen: false  # co-optimise space heat savings
-    cost_factor: 1.0   # weight costs for building renovation
-    interest_rate: 0.04  # for investment in building components
-    annualise_cost: true  # annualise the investment costs
-    tax_weighting: false   # weight costs depending on taxes in countries
-    construction_index: true   # weight costs depending on labour/material costs per country
-  tes: true
-  tes_tau: # 180 day time constant for centralised, 3 day for decentralised
-    decentral: 3
-    central: 180
-  boilers: true
-  oil_boilers: false
-  chp: true
-  micro_chp: false
-  solar_thermal: true
-  solar_cf_correction: 0.788457  # =  >>> 1/1.2683
-  marginal_cost_storage: 0. #1e-4
-  methanation: true
-  helmeth: false
-  dac: true
-  co2_vent: false
-  SMR: true
-  co2_sequestration_potential: 200  #MtCO2/a sequestration potential for Europe
-  co2_sequestration_cost: 20   #EUR/tCO2 for sequestration of CO2
-  co2_network: false
-  cc_fraction: 0.9  # default fraction of CO2 captured with post-combustion capture
-  hydrogen_underground_storage: true
-  hydrogen_underground_storage_locations:
-    # - onshore  # more than 50 km from sea
-    - nearshore  # within 50 km of sea
-    # - offshore
-  use_fischer_tropsch_waste_heat: true
-  use_fuel_cell_waste_heat: true
-  electricity_distribution_grid: true
-  electricity_distribution_grid_cost_factor: 1.0  #multiplies cost in data/costs.csv
-  electricity_grid_connection: true  # only applies to onshore wind and utility PV
-  H2_network: true
-  gas_network: false
-  H2_retrofit: true  # if set to True existing gas pipes can be retrofitted to H2 pipes
-  # according to hydrogen backbone strategy (April, 2020) p.15
-  # https://gasforclimate2050.eu/wp-content/uploads/2020/07/2020_European-Hydrogen-Backbone_Report.pdf
-  # 60% of original natural gas capacity could be used in cost-optimal case as H2 capacity
-  H2_retrofit_capacity_per_CH4: 0.6  # ratio for H2 capacity per original CH4 capacity of retrofitted pipelines
-  gas_network_connectivity_upgrade: 1 # https://networkx.org/documentation/stable/reference/algorithms/generated/networkx.algorithms.connectivity.edge_augmentation.k_edge_augmentation.html#networkx.algorithms.connectivity.edge_augmentation.k_edge_augmentation
-  gas_distribution_grid: true
-  gas_distribution_grid_cost_factor: 1.0  #multiplies cost in data/costs.csv
-  biomass_transport: false  # biomass transport between nodes
-  conventional_generation: # generator : carrier
-    OCGT: gas
-
-
-industry:
-  St_primary_fraction: 0.3 # fraction of steel produced via primary route versus secondary route (scrap+EAF); today fraction is 0.6
-    # 2020: 0.6
-    # 2025: 0.55
-    # 2030: 0.5
-    # 2035: 0.45
-    # 2040: 0.4
-    # 2045: 0.35
-    # 2050: 0.3
-  DRI_fraction: 1 # fraction of the primary route converted to DRI + EAF
-    # 2020: 0
-    # 2025: 0
-    # 2030: 0.05
-    # 2035: 0.2
-    # 2040: 0.4
-    # 2045: 0.7
-    # 2050: 1
-  H2_DRI: 1.7   #H2 consumption in Direct Reduced Iron (DRI),  MWh_H2,LHV/ton_Steel from 51kgH2/tSt in Vogl et al (2018) doi:10.1016/j.jclepro.2018.08.279
-  elec_DRI: 0.322   #electricity consumption in Direct Reduced Iron (DRI) shaft, MWh/tSt HYBRIT brochure https://ssabwebsitecdn.azureedge.net/-/media/hybrit/files/hybrit_brochure.pdf
-  Al_primary_fraction: 0.2 # fraction of aluminium produced via the primary route versus scrap; today fraction is 0.4
-    # 2020: 0.4
-    # 2025: 0.375
-    # 2030: 0.35
-    # 2035: 0.325
-    # 2040: 0.3
-    # 2045: 0.25
-    # 2050: 0.2
-  MWh_CH4_per_tNH3_SMR: 10.8 # 2012's demand from https://ec.europa.eu/docsroom/documents/4165/attachments/1/translations/en/renditions/pdf
-  MWh_elec_per_tNH3_SMR: 0.7 # same source, assuming 94-6% split methane-elec of total energy demand 11.5 MWh/tNH3
-  MWh_H2_per_tNH3_electrolysis: 6.5 # from https://doi.org/10.1016/j.joule.2018.04.017, around 0.197 tH2/tHN3 (>3/17 since some H2 lost and used for energy)
-  MWh_elec_per_tNH3_electrolysis: 1.17 # from https://doi.org/10.1016/j.joule.2018.04.017 Table 13 (air separation and HB)
-  NH3_process_emissions: 24.5 # in MtCO2/a from SMR for H2 production for NH3 from UNFCCC for 2015 for EU28
-  petrochemical_process_emissions: 25.5 # in MtCO2/a for petrochemical and other from UNFCCC for 2015 for EU28
-  HVC_primary_fraction: 0.45 # fraction of today's HVC produced via primary route
-  HVC_mechanical_recycling_fraction: 0.30 # fraction of today's HVC produced via mechanical recycling
-  HVC_chemical_recycling_fraction: 0.15 # fraction of today's HVC produced via chemical recycling
-  HVC_production_today: 52. # MtHVC/a from DECHEMA (2017), Figure 16, page 107; includes ethylene, propylene and BTX
-  MWh_elec_per_tHVC_mechanical_recycling: 0.547 # from SI of https://doi.org/10.1016/j.resconrec.2020.105010, Table S5, for HDPE, PP, PS, PET. LDPE would be 0.756.
-  MWh_elec_per_tHVC_chemical_recycling: 6.9 # Material Economics (2019), page 125; based on pyrolysis and electric steam cracking
-  chlorine_production_today: 9.58 # MtCl/a from DECHEMA (2017), Table 7, page 43
-  MWh_elec_per_tCl: 3.6 # DECHEMA (2017), Table 6, page 43
-  MWh_H2_per_tCl: -0.9372  # DECHEMA (2017), page 43; negative since hydrogen produced in chloralkali process
-  methanol_production_today: 1.5 # MtMeOH/a from DECHEMA (2017), page 62
-  MWh_elec_per_tMeOH: 0.167 # DECHEMA (2017), Table 14, page 65
-  MWh_CH4_per_tMeOH: 10.25 # DECHEMA (2017), Table 14, page 65
-  hotmaps_locate_missing: false
-  reference_year: 2015
-  # references:
-  # DECHEMA (2017): https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry-p-20002750.pdf
-  # Material Economics (2019): https://materialeconomics.com/latest-updates/industrial-transformation-2050
-
-costs:
-  lifetime: 25 #default lifetime
-  # From a Lion Hirth paper, also reflects average of Noothout et al 2016
-  discountrate: 0.07
-  # [EUR/USD] ECB: https://www.ecb.europa.eu/stats/exchange/eurofxref/html/eurofxref-graph-usd.en.html # noqa: E501
-  USD2013_to_EUR2013: 0.7532
-
-  # Marginal and capital costs can be overwritten
-  # capital_cost:
-  #   onwind: 500
-  marginal_cost:
-    solar: 0.01
-    onwind: 0.015
-    offwind: 0.015
-    hydro: 0.
-    H2: 0.
-    battery: 0.
-
-  emission_prices: # only used with the option Ep (emission prices)
-    co2: 0.
-
-  lines:
-    length_factor: 1.25 #to estimate offwind connection costs
-
-
-solving:
-  #tmpdir: "path/to/tmp"
-  options:
-    formulation: kirchhoff
-    clip_p_max_pu: 1.e-2
-    load_shedding: false
-    noisy_costs: true
-    skip_iterations: true
-    track_iterations: false
-    min_iterations: 4
-    max_iterations: 6
-    keep_shadowprices:
-      - Bus
-      - Line
-      - Link
-      - Transformer
-      - GlobalConstraint
-      - Generator
-      - Store
-      - StorageUnit
-  solver:
-    name: gurobi
-    threads: 4
-    method: 2 # barrier
-    crossover: 0
-    BarConvTol: 1.e-4
-    Seed: 123
-    AggFill: 0
-    PreDual: 0
-    GURO_PAR_BARDENSETHRESH: 200
-    #FeasibilityTol: 1.e-6
-
-    #name: cplex
-    #threads: 4
-    #lpmethod: 4 # barrier
-    #solutiontype: 2 # non basic solution, ie no crossover
-    #barrier_convergetol: 1.e-5
-    #feasopt_tolerance: 1.e-6
-  mem: 126000 #memory in MB; 20 GB enough for 50+B+I+H2; 100 GB for 181+B+I+H2
-
-
-plotting:
-  map:
-    boundaries: [-11, 30, 34, 71]
-    color_geomap:
-      ocean: white
-      land: white
-  costs_max: 1000
-  costs_threshold: 1
-  energy_max: 20000
-  energy_min: -20000
-  energy_threshold: 50
-  vre_techs:
-    - onwind
-    - offwind-ac
-    - offwind-dc
-    - solar
-    - ror
-  renewable_storage_techs:
-    - PHS
-    - hydro
-  conv_techs:
-    - OCGT
-    - CCGT
-    - Nuclear
-    - Coal
-  storage_techs:
-    - hydro+PHS
-    - battery
-    - H2
-  load_carriers:
-    - AC load
-  AC_carriers:
-    - AC line
-    - AC transformer
-  link_carriers:
-    - DC line
-    - Converter AC-DC
-  heat_links:
-    - heat pump
-    - resistive heater
-    - CHP heat
-    - CHP electric
-    - gas boiler
-    - central heat pump
-    - central resistive heater
-    - central CHP heat
-    - central CHP electric
-    - central gas boiler
-  heat_generators:
-    - gas boiler
-    - central gas boiler
-    - solar thermal collector
-    - central solar thermal collector
-  tech_colors:
-    # wind
-    onwind: "#235ebc"
-    onshore wind: "#235ebc"
-    offwind: "#6895dd"
-    offshore wind: "#6895dd"
-    offwind-ac: "#6895dd"
-    offshore wind (AC): "#6895dd"
-    offwind-dc: "#74c6f2"
-    offshore wind (DC): "#74c6f2"
-    # water
-    hydro: '#298c81'
-    hydro reservoir: '#298c81'
-    ror: '#3dbfb0'
-    run of river: '#3dbfb0'
-    hydroelectricity: '#298c81'
-    PHS: '#51dbcc'
-    wave: '#a7d4cf'
-    # solar
-    solar: "#f9d002"
-    solar PV: "#f9d002"
-    solar thermal: '#ffbf2b'
-    solar rooftop: '#ffea80'
-    # gas
-    OCGT: '#e0986c'
-    OCGT marginal: '#e0986c'
-    OCGT-heat: '#e0986c'
-    gas boiler: '#db6a25'
-    gas boilers: '#db6a25'
-    gas boiler marginal: '#db6a25'
-    gas: '#e05b09'
-    natural gas: '#e05b09'
-    CCGT: '#a85522'
-    CCGT marginal: '#a85522'
-    gas for industry co2 to atmosphere: '#692e0a'
-    gas for industry co2 to stored: '#8a3400'
-    gas for industry: '#853403'
-    gas for industry CC: '#692e0a'
-    gas pipeline: '#ebbca0'
-    # oil
-    oil: '#c9c9c9'
-    oil boiler: '#adadad'
-    agriculture machinery oil: '#949494'
-    shipping oil: "#808080"
-    land transport oil: '#afafaf'
-    # nuclear
-    Nuclear: '#ff8c00'
-    Nuclear marginal: '#ff8c00'
-    nuclear: '#ff8c00'
-    uranium: '#ff8c00'
-    # coal
-    Coal: '#545454'
-    coal: '#545454'
-    Coal marginal: '#545454'
-    Lignite: '#826837'
-    lignite: '#826837'
-    Lignite marginal: '#826837'
-    # biomass
-    biogas: '#e3d37d'
-    solid biomass: '#baa741'
-    solid biomass transport: '#baa741'
-    solid biomass for industry: '#7a6d26'
-    solid biomass for industry CC: '#47411c'
-    solid biomass for industry co2 from atmosphere: '#736412'
-    solid biomass for industry co2 to stored: '#47411c'
-    # power transmission
-    lines: '#6c9459'
-    transmission lines: '#6c9459'
-    electricity distribution grid: '#97ad8c'
-    # electricity demand
-    Electric load: '#110d63'
-    electric demand: '#110d63'
-    electricity: '#110d63'
-    industry electricity: '#2d2a66'
-    industry new electricity: '#2d2a66'
-    agriculture electricity: '#494778'
-    # battery + EVs
-    battery: '#ace37f'
-    battery storage: '#ace37f'
-    home battery: '#80c944'
-    home battery storage: '#80c944'
-    BEV charger: '#baf238'
-    V2G: '#e5ffa8'
-    land transport EV: '#baf238'
-    Li ion: '#baf238'
-    # hot water storage
-    water tanks: '#e69487'
-    hot water storage: '#e69487'
-    hot water charging: '#e69487'
-    hot water discharging: '#e69487'
-    # heat demand
-    Heat load: '#cc1f1f'
-    heat: '#cc1f1f'
-    heat demand: '#cc1f1f'
-    rural heat: '#ff5c5c'
-    central heat: '#cc1f1f'
-    decentral heat: '#750606'
-    low-temperature heat for industry: '#8f2727'
-    process heat: '#ff0000'
-    agriculture heat: '#d9a5a5'
-    # heat supply
-    heat pumps: '#2fb537'
-    heat pump: '#2fb537'
-    air heat pump: '#36eb41'
-    ground heat pump: '#2fb537'
-    Ambient: '#98eb9d'
-    CHP: '#8a5751'
-    CHP CC: '#634643'
-    CHP heat: '#8a5751'
-    CHP electric: '#8a5751'
-    district heating: '#e8beac'
-    resistive heater: '#c78536'
-    retrofitting: '#8487e8'
-    building retrofitting: '#8487e8'
-    # hydrogen
-    H2 for industry: "#f073da"
-    H2 for shipping: "#ebaee0"
-    H2: '#bf13a0'
-    SMR: '#870c71'
-    SMR CC: '#4f1745'
-    H2 liquefaction: '#d647bd'
-    hydrogen storage: '#bf13a0'
-    land transport fuel cell: '#6b3161'
-    H2 pipeline: '#f081dc'
-    H2 Fuel Cell: '#c251ae'
-    H2 Electrolysis: '#ff29d9'
-    # syngas
-    Sabatier: '#9850ad'
-    methanation: '#c44ce6'
-    helmeth: '#e899ff'
-    # synfuels
-    Fischer-Tropsch: '#25c49a'
-    kerosene for aviation: '#a1ffe6'
-    naphtha for industry: '#57ebc4'
-    # co2
-    CC: '#9e132c'
-    CO2 sequestration: '#9e132c'
-    DAC: '#ff5270'
-    co2 stored: '#f2385a'
-    co2: '#f29dae'
-    co2 vent: '#ffd4dc'
-    CO2 pipeline: '#f5627f'
-    # emissions
-    process emissions CC: '#000000'
-    process emissions: '#222222'
-    process emissions to stored: '#444444'
-    process emissions to atmosphere: '#888888'
-    oil emissions: '#aaaaaa'
-    shipping oil emissions: "#555555"
-    land transport oil emissions: '#777777'
-    agriculture machinery oil emissions: '#333333'
-    # other
-    shipping: '#03a2ff'
-    power-to-heat: '#cc1f1f'
-    power-to-gas: '#c44ce6'
-    power-to-liquid: '#25c49a'
-    gas-to-power/heat: '#ee8340'
diff --git a/config.onw.yaml b/config.onw.yaml
deleted file mode 100644
index 6b1e31f2..00000000
--- a/config.onw.yaml
+++ /dev/null
@@ -1,594 +0,0 @@
-version: 0.6.0
-
-logging_level: INFO
-
-results_dir: results/
-summary_dir: results
-costs_dir: ../technology-data/outputs/
-run: 20211218-181-onw  # use this to keep track of runs with different settings
-foresight: overnight # options are overnight, myopic, perfect (perfect is not yet implemented)
-# if you use myopic or perfect foresight, set the investment years in "planning_horizons" below
-
-scenario:
-  simpl: # only relevant for PyPSA-Eur
-    - ''
-  lv: # allowed transmission line volume expansion, can be any float >= 1.0 (today) or "opt"
-    - 1.25
-  clusters: # number of nodes in Europe, any integer between 37 (1 node per country-zone) and several hundred
-    - 181
-  opts: # only relevant for PyPSA-Eur
-    - ''
-  sector_opts: # this is where the main scenario settings are
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind+p0
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind+p0.125
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind+p0.25
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind+p0.5
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind+p0.75
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind+p1
-  # to really understand the options here, look in scripts/prepare_sector_network.py
-  # Co2Lx specifies the CO2 target in x% of the 1990 values; default will give default (5%);
-  # Co2L0p25 will give 25% CO2 emissions; Co2Lm0p05 will give 5% negative emissions
-  # xH is the temporal resolution; 3H is 3-hourly, i.e. one snapshot every 3 hours
-  # single letters are sectors: T for land transport, H for building heating,
-  # B for biomass supply, I for industry, shipping and aviation,
-  # A for agriculture, forestry and fishing
-  # solar+c0.5 reduces the capital cost of solar to 50\% of reference value
-  # solar+p3 multiplies the available installable potential by factor 3
-  # co2 stored+e2 multiplies the potential of CO2 sequestration by a factor 2
-  # dist{n} includes distribution grids with investment cost of n times cost in data/costs.csv
-  # for myopic/perfect foresight cb states the carbon budget in GtCO2 (cumulative
-  # emissions throughout the transition path in the timeframe determined by the
-  # planning_horizons), be:beta decay; ex:exponential decay
-  # cb40ex0 distributes a carbon budget of 40 GtCO2 following an exponential
-  # decay with initial growth rate 0
-  planning_horizons: # investment years for myopic and perfect; or costs year for overnight
-    - 2030
-  # for example, set to [2020, 2030, 2040, 2050] for myopic foresight
-
-# CO2 budget as a fraction of 1990 emissions
-# this is over-ridden if CO2Lx is set in sector_opts
-# this is also over-ridden if cb is set in sector_opts
-co2_budget:
-  2020: 0.7011648746
-  2025: 0.5241935484
-  2030: 0.2970430108
-  2035: 0.1500896057
-  2040: 0.0712365591
-  2045: 0.0322580645
-  2050: 0
-
-# snapshots are originally set in PyPSA-Eur/config.yaml but used again by PyPSA-Eur-Sec
-snapshots:
-  # arguments to pd.date_range
-  start: "2013-01-01"
-  end: "2014-01-01"
-  closed: left # end is not inclusive
-
-atlite:
-  cutout: ../pypsa-eur/cutouts/europe-2013-era5.nc
-
-# this information is NOT used but needed as an argument for
-# pypsa-eur/scripts/add_electricity.py/load_costs in make_summary.py
-electricity:
-  max_hours:
-    battery: 6
-    H2: 168
-
-# regulate what components with which carriers are kept from PyPSA-Eur;
-# some technologies are removed because they are implemented differently
-# (e.g. battery or H2 storage) or have different year-dependent costs
-# in PyPSA-Eur-Sec
-pypsa_eur:
-  Bus:
-    - AC
-  Link:
-    - DC
-  Generator:
-    - onwind
-    - offwind-ac
-    - offwind-dc
-    - solar
-    - ror
-  StorageUnit:
-    - PHS
-    - hydro
-  Store: []
-
-
-energy:
-  energy_totals_year: 2011
-  base_emissions_year: 1990
-  eurostat_report_year: 2016
-  emissions: CO2 # "CO2" or "All greenhouse gases - (CO2 equivalent)"
-
-biomass:
-  year: 2030
-  scenario: ENS_Med
-  classes:
-    solid biomass:
-      - Agricultural waste
-      - Fuelwood residues
-      - Secondary Forestry residues - woodchips
-      - Sawdust
-      - Residues from landscape care
-      - Municipal waste
-    not included:
-      - Sugar from sugar beet
-      - Rape seed
-      - "Sunflower, soya seed "
-      - Bioethanol barley, wheat, grain maize, oats, other cereals and rye
-      - Miscanthus, switchgrass, RCG
-      - Willow
-      - Poplar
-      - FuelwoodRW
-      - C&P_RW
-    biogas:
-      - Manure solid, liquid
-      - Sludge
-
-
-solar_thermal:
-  clearsky_model: simple  # should be "simple" or "enhanced"?
-  orientation:
-    slope: 45.
-    azimuth: 180.
-
-# only relevant for foresight = myopic or perfect
-existing_capacities:
-  grouping_years: [1980, 1985, 1990, 1995, 2000, 2005, 2010, 2015, 2019]
-  threshold_capacity: 10
-  conventional_carriers:
-    - lignite
-    - coal
-    - oil
-    - uranium
-
-
-sector:
-  district_heating:
-    potential: 0.6  # maximum fraction of urban demand which can be supplied by district heating
-     # increase of today's district heating demand to potential maximum district heating share
-     # progress = 0 means today's district heating share, progress = 1 means maximum fraction of urban demand is supplied by district heating
-    progress: 1
-      # 2020: 0.0
-      # 2030: 0.3
-      # 2040: 0.6
-      # 2050: 1.0
-    district_heating_loss: 0.15
-  bev_dsm_restriction_value: 0.75  #Set to 0 for no restriction on BEV DSM
-  bev_dsm_restriction_time: 7  #Time at which SOC of BEV has to be dsm_restriction_value
-  transport_heating_deadband_upper: 20.
-  transport_heating_deadband_lower: 15.
-  ICE_lower_degree_factor: 0.375  #in per cent increase in fuel consumption per degree above deadband
-  ICE_upper_degree_factor: 1.6
-  EV_lower_degree_factor: 0.98
-  EV_upper_degree_factor: 0.63
-  bev_dsm: true #turns on EV battery
-  bev_availability: 0.5  #How many cars do smart charging
-  bev_energy: 0.05  #average battery size in MWh
-  bev_charge_efficiency: 0.9  #BEV (dis-)charging efficiency
-  bev_plug_to_wheel_efficiency: 0.2 #kWh/km from EPA https://www.fueleconomy.gov/feg/ for Tesla Model S
-  bev_charge_rate: 0.011 #3-phase charger with 11 kW
-  bev_avail_max: 0.95
-  bev_avail_mean: 0.8
-  v2g: true #allows feed-in to grid from EV battery
-  #what is not EV or FCEV is oil-fuelled ICE
-  land_transport_fuel_cell_share: 0.15 # 1 means all FCEVs
-    # 2020: 0
-    # 2030: 0.05
-    # 2040: 0.1
-    # 2050: 0.15
-  land_transport_electric_share: 0.85 # 1 means all EVs
-    # 2020: 0
-    # 2030: 0.25
-    # 2040: 0.6
-    # 2050: 0.85
-  transport_fuel_cell_efficiency: 0.5
-  transport_internal_combustion_efficiency: 0.3
-  agriculture_machinery_electric_share: 0
-  agriculture_machinery_fuel_efficiency: 0.7 # fuel oil per use
-  agriculture_machinery_electric_efficiency: 0.3 # electricity per use
-  shipping_average_efficiency: 0.4 #For conversion of fuel oil to propulsion in 2011
-  shipping_hydrogen_liquefaction: true # whether to consider liquefaction costs for shipping H2 demands
-  shipping_hydrogen_share: 1 # 1 means all hydrogen FC
-    # 2020: 0
-    # 2025: 0
-    # 2030: 0.05
-    # 2035: 0.15
-    # 2040: 0.3
-    # 2045: 0.6
-    # 2050: 1
-  time_dep_hp_cop: true #time dependent heat pump coefficient of performance
-  heat_pump_sink_T: 55. # Celsius, based on DTU / large area radiators; used in build_cop_profiles.py
-   # conservatively high to cover hot water and space heating in poorly-insulated buildings
-  reduce_space_heat_exogenously: true  # reduces space heat demand by a given factor (applied before losses in DH)
-  # this can represent e.g. building renovation, building demolition, or if
-  # the factor is negative: increasing floor area, increased thermal comfort, population growth
-  reduce_space_heat_exogenously_factor: 0.29 # per unit reduction in space heat demand
-  # the default factors are determined by the LTS scenario from http://tool.european-calculator.eu/app/buildings/building-types-area/?levers=1ddd4444421213bdbbbddd44444ffffff11f411111221111211l212221
-    # 2020: 0.10  # this results in a space heat demand reduction of 10%
-    # 2025: 0.09  # first heat demand increases compared to 2020 because of larger floor area per capita
-    # 2030: 0.09
-    # 2035: 0.11
-    # 2040: 0.16
-    # 2045: 0.21
-    # 2050: 0.29
-  retrofitting :  # co-optimises building renovation to reduce space heat demand
-    retro_endogen: false  # co-optimise space heat savings
-    cost_factor: 1.0   # weight costs for building renovation
-    interest_rate: 0.04  # for investment in building components
-    annualise_cost: true  # annualise the investment costs
-    tax_weighting: false   # weight costs depending on taxes in countries
-    construction_index: true   # weight costs depending on labour/material costs per country
-  tes: true
-  tes_tau: # 180 day time constant for centralised, 3 day for decentralised
-    decentral: 3
-    central: 180
-  boilers: true
-  oil_boilers: false
-  chp: true
-  micro_chp: false
-  solar_thermal: true
-  solar_cf_correction: 0.788457  # =  >>> 1/1.2683
-  marginal_cost_storage: 0. #1e-4
-  methanation: true
-  helmeth: false
-  dac: true
-  co2_vent: false
-  SMR: true
-  co2_sequestration_potential: 200  #MtCO2/a sequestration potential for Europe
-  co2_sequestration_cost: 20   #EUR/tCO2 for sequestration of CO2
-  co2_network: false
-  cc_fraction: 0.9  # default fraction of CO2 captured with post-combustion capture
-  hydrogen_underground_storage: true
-  hydrogen_underground_storage_locations:
-    # - onshore  # more than 50 km from sea
-    - nearshore  # within 50 km of sea
-    # - offshore
-  use_fischer_tropsch_waste_heat: true
-  use_fuel_cell_waste_heat: true
-  electricity_distribution_grid: true
-  electricity_distribution_grid_cost_factor: 1.0  #multiplies cost in data/costs.csv
-  electricity_grid_connection: true  # only applies to onshore wind and utility PV
-  H2_network: true
-  gas_network: false
-  H2_retrofit: true  # if set to True existing gas pipes can be retrofitted to H2 pipes
-  # according to hydrogen backbone strategy (April, 2020) p.15
-  # https://gasforclimate2050.eu/wp-content/uploads/2020/07/2020_European-Hydrogen-Backbone_Report.pdf
-  # 60% of original natural gas capacity could be used in cost-optimal case as H2 capacity
-  H2_retrofit_capacity_per_CH4: 0.6  # ratio for H2 capacity per original CH4 capacity of retrofitted pipelines
-  gas_network_connectivity_upgrade: 1 # https://networkx.org/documentation/stable/reference/algorithms/generated/networkx.algorithms.connectivity.edge_augmentation.k_edge_augmentation.html#networkx.algorithms.connectivity.edge_augmentation.k_edge_augmentation
-  gas_distribution_grid: true
-  gas_distribution_grid_cost_factor: 1.0  #multiplies cost in data/costs.csv
-  biomass_transport: false  # biomass transport between nodes
-  conventional_generation: # generator : carrier
-    OCGT: gas
-
-
-industry:
-  St_primary_fraction: 0.3 # fraction of steel produced via primary route versus secondary route (scrap+EAF); today fraction is 0.6
-    # 2020: 0.6
-    # 2025: 0.55
-    # 2030: 0.5
-    # 2035: 0.45
-    # 2040: 0.4
-    # 2045: 0.35
-    # 2050: 0.3
-  DRI_fraction: 1 # fraction of the primary route converted to DRI + EAF
-    # 2020: 0
-    # 2025: 0
-    # 2030: 0.05
-    # 2035: 0.2
-    # 2040: 0.4
-    # 2045: 0.7
-    # 2050: 1
-  H2_DRI: 1.7   #H2 consumption in Direct Reduced Iron (DRI),  MWh_H2,LHV/ton_Steel from 51kgH2/tSt in Vogl et al (2018) doi:10.1016/j.jclepro.2018.08.279
-  elec_DRI: 0.322   #electricity consumption in Direct Reduced Iron (DRI) shaft, MWh/tSt HYBRIT brochure https://ssabwebsitecdn.azureedge.net/-/media/hybrit/files/hybrit_brochure.pdf
-  Al_primary_fraction: 0.2 # fraction of aluminium produced via the primary route versus scrap; today fraction is 0.4
-    # 2020: 0.4
-    # 2025: 0.375
-    # 2030: 0.35
-    # 2035: 0.325
-    # 2040: 0.3
-    # 2045: 0.25
-    # 2050: 0.2
-  MWh_CH4_per_tNH3_SMR: 10.8 # 2012's demand from https://ec.europa.eu/docsroom/documents/4165/attachments/1/translations/en/renditions/pdf
-  MWh_elec_per_tNH3_SMR: 0.7 # same source, assuming 94-6% split methane-elec of total energy demand 11.5 MWh/tNH3
-  MWh_H2_per_tNH3_electrolysis: 6.5 # from https://doi.org/10.1016/j.joule.2018.04.017, around 0.197 tH2/tHN3 (>3/17 since some H2 lost and used for energy)
-  MWh_elec_per_tNH3_electrolysis: 1.17 # from https://doi.org/10.1016/j.joule.2018.04.017 Table 13 (air separation and HB)
-  NH3_process_emissions: 24.5 # in MtCO2/a from SMR for H2 production for NH3 from UNFCCC for 2015 for EU28
-  petrochemical_process_emissions: 25.5 # in MtCO2/a for petrochemical and other from UNFCCC for 2015 for EU28
-  HVC_primary_fraction: 0.45 # fraction of today's HVC produced via primary route
-  HVC_mechanical_recycling_fraction: 0.30 # fraction of today's HVC produced via mechanical recycling
-  HVC_chemical_recycling_fraction: 0.15 # fraction of today's HVC produced via chemical recycling
-  HVC_production_today: 52. # MtHVC/a from DECHEMA (2017), Figure 16, page 107; includes ethylene, propylene and BTX
-  MWh_elec_per_tHVC_mechanical_recycling: 0.547 # from SI of https://doi.org/10.1016/j.resconrec.2020.105010, Table S5, for HDPE, PP, PS, PET. LDPE would be 0.756.
-  MWh_elec_per_tHVC_chemical_recycling: 6.9 # Material Economics (2019), page 125; based on pyrolysis and electric steam cracking
-  chlorine_production_today: 9.58 # MtCl/a from DECHEMA (2017), Table 7, page 43
-  MWh_elec_per_tCl: 3.6 # DECHEMA (2017), Table 6, page 43
-  MWh_H2_per_tCl: -0.9372  # DECHEMA (2017), page 43; negative since hydrogen produced in chloralkali process
-  methanol_production_today: 1.5 # MtMeOH/a from DECHEMA (2017), page 62
-  MWh_elec_per_tMeOH: 0.167 # DECHEMA (2017), Table 14, page 65
-  MWh_CH4_per_tMeOH: 10.25 # DECHEMA (2017), Table 14, page 65
-  hotmaps_locate_missing: false
-  reference_year: 2015
-  # references:
-  # DECHEMA (2017): https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry-p-20002750.pdf
-  # Material Economics (2019): https://materialeconomics.com/latest-updates/industrial-transformation-2050
-
-costs:
-  lifetime: 25 #default lifetime
-  # From a Lion Hirth paper, also reflects average of Noothout et al 2016
-  discountrate: 0.07
-  # [EUR/USD] ECB: https://www.ecb.europa.eu/stats/exchange/eurofxref/html/eurofxref-graph-usd.en.html # noqa: E501
-  USD2013_to_EUR2013: 0.7532
-
-  # Marginal and capital costs can be overwritten
-  # capital_cost:
-  #   onwind: 500
-  marginal_cost:
-    solar: 0.01
-    onwind: 0.015
-    offwind: 0.015
-    hydro: 0.
-    H2: 0.
-    battery: 0.
-
-  emission_prices: # only used with the option Ep (emission prices)
-    co2: 0.
-
-  lines:
-    length_factor: 1.25 #to estimate offwind connection costs
-
-
-solving:
-  #tmpdir: "path/to/tmp"
-  options:
-    formulation: kirchhoff
-    clip_p_max_pu: 1.e-2
-    load_shedding: false
-    noisy_costs: true
-    skip_iterations: true
-    track_iterations: false
-    min_iterations: 4
-    max_iterations: 6
-    keep_shadowprices:
-      - Bus
-      - Line
-      - Link
-      - Transformer
-      - GlobalConstraint
-      - Generator
-      - Store
-      - StorageUnit
-  solver:
-    name: gurobi
-    threads: 4
-    method: 2 # barrier
-    crossover: 0
-    BarConvTol: 1.e-4
-    Seed: 123
-    AggFill: 0
-    PreDual: 0
-    GURO_PAR_BARDENSETHRESH: 200
-    #FeasibilityTol: 1.e-6
-
-    #name: cplex
-    #threads: 4
-    #lpmethod: 4 # barrier
-    #solutiontype: 2 # non basic solution, ie no crossover
-    #barrier_convergetol: 1.e-5
-    #feasopt_tolerance: 1.e-6
-  mem: 126000 #memory in MB; 20 GB enough for 50+B+I+H2; 100 GB for 181+B+I+H2
-
-
-plotting:
-  map:
-    boundaries: [-11, 30, 34, 71]
-    color_geomap:
-      ocean: white
-      land: white
-  costs_max: 1000
-  costs_threshold: 1
-  energy_max: 20000
-  energy_min: -20000
-  energy_threshold: 50
-  vre_techs:
-    - onwind
-    - offwind-ac
-    - offwind-dc
-    - solar
-    - ror
-  renewable_storage_techs:
-    - PHS
-    - hydro
-  conv_techs:
-    - OCGT
-    - CCGT
-    - Nuclear
-    - Coal
-  storage_techs:
-    - hydro+PHS
-    - battery
-    - H2
-  load_carriers:
-    - AC load
-  AC_carriers:
-    - AC line
-    - AC transformer
-  link_carriers:
-    - DC line
-    - Converter AC-DC
-  heat_links:
-    - heat pump
-    - resistive heater
-    - CHP heat
-    - CHP electric
-    - gas boiler
-    - central heat pump
-    - central resistive heater
-    - central CHP heat
-    - central CHP electric
-    - central gas boiler
-  heat_generators:
-    - gas boiler
-    - central gas boiler
-    - solar thermal collector
-    - central solar thermal collector
-  tech_colors:
-    # wind
-    onwind: "#235ebc"
-    onshore wind: "#235ebc"
-    offwind: "#6895dd"
-    offshore wind: "#6895dd"
-    offwind-ac: "#6895dd"
-    offshore wind (AC): "#6895dd"
-    offwind-dc: "#74c6f2"
-    offshore wind (DC): "#74c6f2"
-    # water
-    hydro: '#298c81'
-    hydro reservoir: '#298c81'
-    ror: '#3dbfb0'
-    run of river: '#3dbfb0'
-    hydroelectricity: '#298c81'
-    PHS: '#51dbcc'
-    wave: '#a7d4cf'
-    # solar
-    solar: "#f9d002"
-    solar PV: "#f9d002"
-    solar thermal: '#ffbf2b'
-    solar rooftop: '#ffea80'
-    # gas
-    OCGT: '#e0986c'
-    OCGT marginal: '#e0986c'
-    OCGT-heat: '#e0986c'
-    gas boiler: '#db6a25'
-    gas boilers: '#db6a25'
-    gas boiler marginal: '#db6a25'
-    gas: '#e05b09'
-    natural gas: '#e05b09'
-    CCGT: '#a85522'
-    CCGT marginal: '#a85522'
-    gas for industry co2 to atmosphere: '#692e0a'
-    gas for industry co2 to stored: '#8a3400'
-    gas for industry: '#853403'
-    gas for industry CC: '#692e0a'
-    gas pipeline: '#ebbca0'
-    # oil
-    oil: '#c9c9c9'
-    oil boiler: '#adadad'
-    agriculture machinery oil: '#949494'
-    shipping oil: "#808080"
-    land transport oil: '#afafaf'
-    # nuclear
-    Nuclear: '#ff8c00'
-    Nuclear marginal: '#ff8c00'
-    nuclear: '#ff8c00'
-    uranium: '#ff8c00'
-    # coal
-    Coal: '#545454'
-    coal: '#545454'
-    Coal marginal: '#545454'
-    Lignite: '#826837'
-    lignite: '#826837'
-    Lignite marginal: '#826837'
-    # biomass
-    biogas: '#e3d37d'
-    solid biomass: '#baa741'
-    solid biomass transport: '#baa741'
-    solid biomass for industry: '#7a6d26'
-    solid biomass for industry CC: '#47411c'
-    solid biomass for industry co2 from atmosphere: '#736412'
-    solid biomass for industry co2 to stored: '#47411c'
-    # power transmission
-    lines: '#6c9459'
-    transmission lines: '#6c9459'
-    electricity distribution grid: '#97ad8c'
-    # electricity demand
-    Electric load: '#110d63'
-    electric demand: '#110d63'
-    electricity: '#110d63'
-    industry electricity: '#2d2a66'
-    industry new electricity: '#2d2a66'
-    agriculture electricity: '#494778'
-    # battery + EVs
-    battery: '#ace37f'
-    battery storage: '#ace37f'
-    home battery: '#80c944'
-    home battery storage: '#80c944'
-    BEV charger: '#baf238'
-    V2G: '#e5ffa8'
-    land transport EV: '#baf238'
-    Li ion: '#baf238'
-    # hot water storage
-    water tanks: '#e69487'
-    hot water storage: '#e69487'
-    hot water charging: '#e69487'
-    hot water discharging: '#e69487'
-    # heat demand
-    Heat load: '#cc1f1f'
-    heat: '#cc1f1f'
-    heat demand: '#cc1f1f'
-    rural heat: '#ff5c5c'
-    central heat: '#cc1f1f'
-    decentral heat: '#750606'
-    low-temperature heat for industry: '#8f2727'
-    process heat: '#ff0000'
-    agriculture heat: '#d9a5a5'
-    # heat supply
-    heat pumps: '#2fb537'
-    heat pump: '#2fb537'
-    air heat pump: '#36eb41'
-    ground heat pump: '#2fb537'
-    Ambient: '#98eb9d'
-    CHP: '#8a5751'
-    CHP CC: '#634643'
-    CHP heat: '#8a5751'
-    CHP electric: '#8a5751'
-    district heating: '#e8beac'
-    resistive heater: '#c78536'
-    retrofitting: '#8487e8'
-    building retrofitting: '#8487e8'
-    # hydrogen
-    H2 for industry: "#f073da"
-    H2 for shipping: "#ebaee0"
-    H2: '#bf13a0'
-    SMR: '#870c71'
-    SMR CC: '#4f1745'
-    H2 liquefaction: '#d647bd'
-    hydrogen storage: '#bf13a0'
-    land transport fuel cell: '#6b3161'
-    H2 pipeline: '#f081dc'
-    H2 Fuel Cell: '#c251ae'
-    H2 Electrolysis: '#ff29d9'
-    # syngas
-    Sabatier: '#9850ad'
-    methanation: '#c44ce6'
-    helmeth: '#e899ff'
-    # synfuels
-    Fischer-Tropsch: '#25c49a'
-    kerosene for aviation: '#a1ffe6'
-    naphtha for industry: '#57ebc4'
-    # co2
-    CC: '#9e132c'
-    CO2 sequestration: '#9e132c'
-    DAC: '#ff5270'
-    co2 stored: '#f2385a'
-    co2: '#f29dae'
-    co2 vent: '#ffd4dc'
-    CO2 pipeline: '#f5627f'
-    # emissions
-    process emissions CC: '#000000'
-    process emissions: '#222222'
-    process emissions to stored: '#444444'
-    process emissions to atmosphere: '#888888'
-    oil emissions: '#aaaaaa'
-    shipping oil emissions: "#555555"
-    land transport oil emissions: '#777777'
-    agriculture machinery oil emissions: '#333333'
-    # other
-    shipping: '#03a2ff'
-    power-to-heat: '#cc1f1f'
-    power-to-gas: '#c44ce6'
-    power-to-liquid: '#25c49a'
-    gas-to-power/heat: '#ee8340'
diff --git a/config.spatial.yaml b/config.spatial.yaml
deleted file mode 100644
index 44b4e90d..00000000
--- a/config.spatial.yaml
+++ /dev/null
@@ -1,593 +0,0 @@
-version: 0.6.0
-
-logging_level: INFO
-
-results_dir: results/
-summary_dir: results
-costs_dir: ../technology-data/outputs/
-run: 20211218-spatial  # use this to keep track of runs with different settings
-foresight: overnight # options are overnight, myopic, perfect (perfect is not yet implemented)
-# if you use myopic or perfect foresight, set the investment years in "planning_horizons" below
-
-scenario:
-  simpl: # only relevant for PyPSA-Eur
-    - ''
-  lv: # allowed transmission line volume expansion, can be any float >= 1.0 (today) or "opt"
-    - 1.5
-  clusters: # number of nodes in Europe, any integer between 37 (1 node per country-zone) and several hundred
-    - 37
-    - 50
-    - 100
-    - 150
-    - 181
-  opts: # only relevant for PyPSA-Eur
-    - ''
-  sector_opts: # this is where the main scenario settings are
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind-p0.5
-  # to really understand the options here, look in scripts/prepare_sector_network.py
-  # Co2Lx specifies the CO2 target in x% of the 1990 values; default will give default (5%);
-  # Co2L0p25 will give 25% CO2 emissions; Co2Lm0p05 will give 5% negative emissions
-  # xH is the temporal resolution; 3H is 3-hourly, i.e. one snapshot every 3 hours
-  # single letters are sectors: T for land transport, H for building heating,
-  # B for biomass supply, I for industry, shipping and aviation,
-  # A for agriculture, forestry and fishing
-  # solar+c0.5 reduces the capital cost of solar to 50\% of reference value
-  # solar+p3 multiplies the available installable potential by factor 3
-  # co2 stored+e2 multiplies the potential of CO2 sequestration by a factor 2
-  # dist{n} includes distribution grids with investment cost of n times cost in data/costs.csv
-  # for myopic/perfect foresight cb states the carbon budget in GtCO2 (cumulative
-  # emissions throughout the transition path in the timeframe determined by the
-  # planning_horizons), be:beta decay; ex:exponential decay
-  # cb40ex0 distributes a carbon budget of 40 GtCO2 following an exponential
-  # decay with initial growth rate 0
-  planning_horizons: # investment years for myopic and perfect; or costs year for overnight
-    - 2030
-  # for example, set to [2020, 2030, 2040, 2050] for myopic foresight
-
-# CO2 budget as a fraction of 1990 emissions
-# this is over-ridden if CO2Lx is set in sector_opts
-# this is also over-ridden if cb is set in sector_opts
-co2_budget:
-  2020: 0.7011648746
-  2025: 0.5241935484
-  2030: 0.2970430108
-  2035: 0.1500896057
-  2040: 0.0712365591
-  2045: 0.0322580645
-  2050: 0
-
-# snapshots are originally set in PyPSA-Eur/config.yaml but used again by PyPSA-Eur-Sec
-snapshots:
-  # arguments to pd.date_range
-  start: "2013-01-01"
-  end: "2014-01-01"
-  closed: left # end is not inclusive
-
-atlite:
-  cutout: ../pypsa-eur/cutouts/europe-2013-era5.nc
-
-# this information is NOT used but needed as an argument for
-# pypsa-eur/scripts/add_electricity.py/load_costs in make_summary.py
-electricity:
-  max_hours:
-    battery: 6
-    H2: 168
-
-# regulate what components with which carriers are kept from PyPSA-Eur;
-# some technologies are removed because they are implemented differently
-# (e.g. battery or H2 storage) or have different year-dependent costs
-# in PyPSA-Eur-Sec
-pypsa_eur:
-  Bus:
-    - AC
-  Link:
-    - DC
-  Generator:
-    - onwind
-    - offwind-ac
-    - offwind-dc
-    - solar
-    - ror
-  StorageUnit:
-    - PHS
-    - hydro
-  Store: []
-
-
-energy:
-  energy_totals_year: 2011
-  base_emissions_year: 1990
-  eurostat_report_year: 2016
-  emissions: CO2 # "CO2" or "All greenhouse gases - (CO2 equivalent)"
-
-biomass:
-  year: 2030
-  scenario: ENS_Med
-  classes:
-    solid biomass:
-      - Agricultural waste
-      - Fuelwood residues
-      - Secondary Forestry residues - woodchips
-      - Sawdust
-      - Residues from landscape care
-      - Municipal waste
-    not included:
-      - Sugar from sugar beet
-      - Rape seed
-      - "Sunflower, soya seed "
-      - Bioethanol barley, wheat, grain maize, oats, other cereals and rye
-      - Miscanthus, switchgrass, RCG
-      - Willow
-      - Poplar
-      - FuelwoodRW
-      - C&P_RW
-    biogas:
-      - Manure solid, liquid
-      - Sludge
-
-
-solar_thermal:
-  clearsky_model: simple  # should be "simple" or "enhanced"?
-  orientation:
-    slope: 45.
-    azimuth: 180.
-
-# only relevant for foresight = myopic or perfect
-existing_capacities:
-  grouping_years: [1980, 1985, 1990, 1995, 2000, 2005, 2010, 2015, 2019]
-  threshold_capacity: 10
-  conventional_carriers:
-    - lignite
-    - coal
-    - oil
-    - uranium
-
-
-sector:
-  district_heating:
-    potential: 0.6  # maximum fraction of urban demand which can be supplied by district heating
-     # increase of today's district heating demand to potential maximum district heating share
-     # progress = 0 means today's district heating share, progress = 1 means maximum fraction of urban demand is supplied by district heating
-    progress: 1
-      # 2020: 0.0
-      # 2030: 0.3
-      # 2040: 0.6
-      # 2050: 1.0
-    district_heating_loss: 0.15
-  bev_dsm_restriction_value: 0.75  #Set to 0 for no restriction on BEV DSM
-  bev_dsm_restriction_time: 7  #Time at which SOC of BEV has to be dsm_restriction_value
-  transport_heating_deadband_upper: 20.
-  transport_heating_deadband_lower: 15.
-  ICE_lower_degree_factor: 0.375  #in per cent increase in fuel consumption per degree above deadband
-  ICE_upper_degree_factor: 1.6
-  EV_lower_degree_factor: 0.98
-  EV_upper_degree_factor: 0.63
-  bev_dsm: true #turns on EV battery
-  bev_availability: 0.5  #How many cars do smart charging
-  bev_energy: 0.05  #average battery size in MWh
-  bev_charge_efficiency: 0.9  #BEV (dis-)charging efficiency
-  bev_plug_to_wheel_efficiency: 0.2 #kWh/km from EPA https://www.fueleconomy.gov/feg/ for Tesla Model S
-  bev_charge_rate: 0.011 #3-phase charger with 11 kW
-  bev_avail_max: 0.95
-  bev_avail_mean: 0.8
-  v2g: true #allows feed-in to grid from EV battery
-  #what is not EV or FCEV is oil-fuelled ICE
-  land_transport_fuel_cell_share: 0.15 # 1 means all FCEVs
-    # 2020: 0
-    # 2030: 0.05
-    # 2040: 0.1
-    # 2050: 0.15
-  land_transport_electric_share: 0.85 # 1 means all EVs
-    # 2020: 0
-    # 2030: 0.25
-    # 2040: 0.6
-    # 2050: 0.85
-  transport_fuel_cell_efficiency: 0.5
-  transport_internal_combustion_efficiency: 0.3
-  agriculture_machinery_electric_share: 0
-  agriculture_machinery_fuel_efficiency: 0.7 # fuel oil per use
-  agriculture_machinery_electric_efficiency: 0.3 # electricity per use
-  shipping_average_efficiency: 0.4 #For conversion of fuel oil to propulsion in 2011
-  shipping_hydrogen_liquefaction: true # whether to consider liquefaction costs for shipping H2 demands
-  shipping_hydrogen_share: 1 # 1 means all hydrogen FC
-    # 2020: 0
-    # 2025: 0
-    # 2030: 0.05
-    # 2035: 0.15
-    # 2040: 0.3
-    # 2045: 0.6
-    # 2050: 1
-  time_dep_hp_cop: true #time dependent heat pump coefficient of performance
-  heat_pump_sink_T: 55. # Celsius, based on DTU / large area radiators; used in build_cop_profiles.py
-   # conservatively high to cover hot water and space heating in poorly-insulated buildings
-  reduce_space_heat_exogenously: true  # reduces space heat demand by a given factor (applied before losses in DH)
-  # this can represent e.g. building renovation, building demolition, or if
-  # the factor is negative: increasing floor area, increased thermal comfort, population growth
-  reduce_space_heat_exogenously_factor: 0.29 # per unit reduction in space heat demand
-  # the default factors are determined by the LTS scenario from http://tool.european-calculator.eu/app/buildings/building-types-area/?levers=1ddd4444421213bdbbbddd44444ffffff11f411111221111211l212221
-    # 2020: 0.10  # this results in a space heat demand reduction of 10%
-    # 2025: 0.09  # first heat demand increases compared to 2020 because of larger floor area per capita
-    # 2030: 0.09
-    # 2035: 0.11
-    # 2040: 0.16
-    # 2045: 0.21
-    # 2050: 0.29
-  retrofitting :  # co-optimises building renovation to reduce space heat demand
-    retro_endogen: false  # co-optimise space heat savings
-    cost_factor: 1.0   # weight costs for building renovation
-    interest_rate: 0.04  # for investment in building components
-    annualise_cost: true  # annualise the investment costs
-    tax_weighting: false   # weight costs depending on taxes in countries
-    construction_index: true   # weight costs depending on labour/material costs per country
-  tes: true
-  tes_tau: # 180 day time constant for centralised, 3 day for decentralised
-    decentral: 3
-    central: 180
-  boilers: true
-  oil_boilers: false
-  chp: true
-  micro_chp: false
-  solar_thermal: true
-  solar_cf_correction: 0.788457  # =  >>> 1/1.2683
-  marginal_cost_storage: 0. #1e-4
-  methanation: true
-  helmeth: false
-  dac: true
-  co2_vent: false
-  SMR: true
-  co2_sequestration_potential: 200  #MtCO2/a sequestration potential for Europe
-  co2_sequestration_cost: 20   #EUR/tCO2 for sequestration of CO2
-  co2_network: false
-  cc_fraction: 0.9  # default fraction of CO2 captured with post-combustion capture
-  hydrogen_underground_storage: true
-  hydrogen_underground_storage_locations:
-    # - onshore  # more than 50 km from sea
-    - nearshore  # within 50 km of sea
-    # - offshore
-  use_fischer_tropsch_waste_heat: true
-  use_fuel_cell_waste_heat: true
-  electricity_distribution_grid: true
-  electricity_distribution_grid_cost_factor: 1.0  #multiplies cost in data/costs.csv
-  electricity_grid_connection: true  # only applies to onshore wind and utility PV
-  H2_network: true
-  gas_network: false
-  H2_retrofit: true  # if set to True existing gas pipes can be retrofitted to H2 pipes
-  # according to hydrogen backbone strategy (April, 2020) p.15
-  # https://gasforclimate2050.eu/wp-content/uploads/2020/07/2020_European-Hydrogen-Backbone_Report.pdf
-  # 60% of original natural gas capacity could be used in cost-optimal case as H2 capacity
-  H2_retrofit_capacity_per_CH4: 0.6  # ratio for H2 capacity per original CH4 capacity of retrofitted pipelines
-  gas_network_connectivity_upgrade: 1 # https://networkx.org/documentation/stable/reference/algorithms/generated/networkx.algorithms.connectivity.edge_augmentation.k_edge_augmentation.html#networkx.algorithms.connectivity.edge_augmentation.k_edge_augmentation
-  gas_distribution_grid: true
-  gas_distribution_grid_cost_factor: 1.0  #multiplies cost in data/costs.csv
-  biomass_transport: false  # biomass transport between nodes
-  conventional_generation: # generator : carrier
-    OCGT: gas
-
-
-industry:
-  St_primary_fraction: 0.3 # fraction of steel produced via primary route versus secondary route (scrap+EAF); today fraction is 0.6
-    # 2020: 0.6
-    # 2025: 0.55
-    # 2030: 0.5
-    # 2035: 0.45
-    # 2040: 0.4
-    # 2045: 0.35
-    # 2050: 0.3
-  DRI_fraction: 1 # fraction of the primary route converted to DRI + EAF
-    # 2020: 0
-    # 2025: 0
-    # 2030: 0.05
-    # 2035: 0.2
-    # 2040: 0.4
-    # 2045: 0.7
-    # 2050: 1
-  H2_DRI: 1.7   #H2 consumption in Direct Reduced Iron (DRI),  MWh_H2,LHV/ton_Steel from 51kgH2/tSt in Vogl et al (2018) doi:10.1016/j.jclepro.2018.08.279
-  elec_DRI: 0.322   #electricity consumption in Direct Reduced Iron (DRI) shaft, MWh/tSt HYBRIT brochure https://ssabwebsitecdn.azureedge.net/-/media/hybrit/files/hybrit_brochure.pdf
-  Al_primary_fraction: 0.2 # fraction of aluminium produced via the primary route versus scrap; today fraction is 0.4
-    # 2020: 0.4
-    # 2025: 0.375
-    # 2030: 0.35
-    # 2035: 0.325
-    # 2040: 0.3
-    # 2045: 0.25
-    # 2050: 0.2
-  MWh_CH4_per_tNH3_SMR: 10.8 # 2012's demand from https://ec.europa.eu/docsroom/documents/4165/attachments/1/translations/en/renditions/pdf
-  MWh_elec_per_tNH3_SMR: 0.7 # same source, assuming 94-6% split methane-elec of total energy demand 11.5 MWh/tNH3
-  MWh_H2_per_tNH3_electrolysis: 6.5 # from https://doi.org/10.1016/j.joule.2018.04.017, around 0.197 tH2/tHN3 (>3/17 since some H2 lost and used for energy)
-  MWh_elec_per_tNH3_electrolysis: 1.17 # from https://doi.org/10.1016/j.joule.2018.04.017 Table 13 (air separation and HB)
-  NH3_process_emissions: 24.5 # in MtCO2/a from SMR for H2 production for NH3 from UNFCCC for 2015 for EU28
-  petrochemical_process_emissions: 25.5 # in MtCO2/a for petrochemical and other from UNFCCC for 2015 for EU28
-  HVC_primary_fraction: 0.45 # fraction of today's HVC produced via primary route
-  HVC_mechanical_recycling_fraction: 0.30 # fraction of today's HVC produced via mechanical recycling
-  HVC_chemical_recycling_fraction: 0.15 # fraction of today's HVC produced via chemical recycling
-  HVC_production_today: 52. # MtHVC/a from DECHEMA (2017), Figure 16, page 107; includes ethylene, propylene and BTX
-  MWh_elec_per_tHVC_mechanical_recycling: 0.547 # from SI of https://doi.org/10.1016/j.resconrec.2020.105010, Table S5, for HDPE, PP, PS, PET. LDPE would be 0.756.
-  MWh_elec_per_tHVC_chemical_recycling: 6.9 # Material Economics (2019), page 125; based on pyrolysis and electric steam cracking
-  chlorine_production_today: 9.58 # MtCl/a from DECHEMA (2017), Table 7, page 43
-  MWh_elec_per_tCl: 3.6 # DECHEMA (2017), Table 6, page 43
-  MWh_H2_per_tCl: -0.9372  # DECHEMA (2017), page 43; negative since hydrogen produced in chloralkali process
-  methanol_production_today: 1.5 # MtMeOH/a from DECHEMA (2017), page 62
-  MWh_elec_per_tMeOH: 0.167 # DECHEMA (2017), Table 14, page 65
-  MWh_CH4_per_tMeOH: 10.25 # DECHEMA (2017), Table 14, page 65
-  hotmaps_locate_missing: false
-  reference_year: 2015
-  # references:
-  # DECHEMA (2017): https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry-p-20002750.pdf
-  # Material Economics (2019): https://materialeconomics.com/latest-updates/industrial-transformation-2050
-
-costs:
-  lifetime: 25 #default lifetime
-  # From a Lion Hirth paper, also reflects average of Noothout et al 2016
-  discountrate: 0.07
-  # [EUR/USD] ECB: https://www.ecb.europa.eu/stats/exchange/eurofxref/html/eurofxref-graph-usd.en.html # noqa: E501
-  USD2013_to_EUR2013: 0.7532
-
-  # Marginal and capital costs can be overwritten
-  # capital_cost:
-  #   onwind: 500
-  marginal_cost:
-    solar: 0.01
-    onwind: 0.015
-    offwind: 0.015
-    hydro: 0.
-    H2: 0.
-    battery: 0.
-
-  emission_prices: # only used with the option Ep (emission prices)
-    co2: 0.
-
-  lines:
-    length_factor: 1.25 #to estimate offwind connection costs
-
-
-solving:
-  #tmpdir: "path/to/tmp"
-  options:
-    formulation: kirchhoff
-    clip_p_max_pu: 1.e-2
-    load_shedding: false
-    noisy_costs: true
-    skip_iterations: true
-    track_iterations: false
-    min_iterations: 4
-    max_iterations: 6
-    keep_shadowprices:
-      - Bus
-      - Line
-      - Link
-      - Transformer
-      - GlobalConstraint
-      - Generator
-      - Store
-      - StorageUnit
-  solver:
-    name: gurobi
-    threads: 4
-    method: 2 # barrier
-    crossover: 0
-    BarConvTol: 1.e-4
-    Seed: 123
-    AggFill: 0
-    PreDual: 0
-    GURO_PAR_BARDENSETHRESH: 200
-    #FeasibilityTol: 1.e-6
-
-    #name: cplex
-    #threads: 4
-    #lpmethod: 4 # barrier
-    #solutiontype: 2 # non basic solution, ie no crossover
-    #barrier_convergetol: 1.e-5
-    #feasopt_tolerance: 1.e-6
-  mem: 126000 #memory in MB; 20 GB enough for 50+B+I+H2; 100 GB for 181+B+I+H2
-
-
-plotting:
-  map:
-    boundaries: [-11, 30, 34, 71]
-    color_geomap:
-      ocean: white
-      land: white
-  costs_max: 1000
-  costs_threshold: 1
-  energy_max: 20000
-  energy_min: -20000
-  energy_threshold: 50
-  vre_techs:
-    - onwind
-    - offwind-ac
-    - offwind-dc
-    - solar
-    - ror
-  renewable_storage_techs:
-    - PHS
-    - hydro
-  conv_techs:
-    - OCGT
-    - CCGT
-    - Nuclear
-    - Coal
-  storage_techs:
-    - hydro+PHS
-    - battery
-    - H2
-  load_carriers:
-    - AC load
-  AC_carriers:
-    - AC line
-    - AC transformer
-  link_carriers:
-    - DC line
-    - Converter AC-DC
-  heat_links:
-    - heat pump
-    - resistive heater
-    - CHP heat
-    - CHP electric
-    - gas boiler
-    - central heat pump
-    - central resistive heater
-    - central CHP heat
-    - central CHP electric
-    - central gas boiler
-  heat_generators:
-    - gas boiler
-    - central gas boiler
-    - solar thermal collector
-    - central solar thermal collector
-  tech_colors:
-    # wind
-    onwind: "#235ebc"
-    onshore wind: "#235ebc"
-    offwind: "#6895dd"
-    offshore wind: "#6895dd"
-    offwind-ac: "#6895dd"
-    offshore wind (AC): "#6895dd"
-    offwind-dc: "#74c6f2"
-    offshore wind (DC): "#74c6f2"
-    # water
-    hydro: '#298c81'
-    hydro reservoir: '#298c81'
-    ror: '#3dbfb0'
-    run of river: '#3dbfb0'
-    hydroelectricity: '#298c81'
-    PHS: '#51dbcc'
-    wave: '#a7d4cf'
-    # solar
-    solar: "#f9d002"
-    solar PV: "#f9d002"
-    solar thermal: '#ffbf2b'
-    solar rooftop: '#ffea80'
-    # gas
-    OCGT: '#e0986c'
-    OCGT marginal: '#e0986c'
-    OCGT-heat: '#e0986c'
-    gas boiler: '#db6a25'
-    gas boilers: '#db6a25'
-    gas boiler marginal: '#db6a25'
-    gas: '#e05b09'
-    natural gas: '#e05b09'
-    CCGT: '#a85522'
-    CCGT marginal: '#a85522'
-    gas for industry co2 to atmosphere: '#692e0a'
-    gas for industry co2 to stored: '#8a3400'
-    gas for industry: '#853403'
-    gas for industry CC: '#692e0a'
-    gas pipeline: '#ebbca0'
-    # oil
-    oil: '#c9c9c9'
-    oil boiler: '#adadad'
-    agriculture machinery oil: '#949494'
-    shipping oil: "#808080"
-    land transport oil: '#afafaf'
-    # nuclear
-    Nuclear: '#ff8c00'
-    Nuclear marginal: '#ff8c00'
-    nuclear: '#ff8c00'
-    uranium: '#ff8c00'
-    # coal
-    Coal: '#545454'
-    coal: '#545454'
-    Coal marginal: '#545454'
-    Lignite: '#826837'
-    lignite: '#826837'
-    Lignite marginal: '#826837'
-    # biomass
-    biogas: '#e3d37d'
-    solid biomass: '#baa741'
-    solid biomass transport: '#baa741'
-    solid biomass for industry: '#7a6d26'
-    solid biomass for industry CC: '#47411c'
-    solid biomass for industry co2 from atmosphere: '#736412'
-    solid biomass for industry co2 to stored: '#47411c'
-    # power transmission
-    lines: '#6c9459'
-    transmission lines: '#6c9459'
-    electricity distribution grid: '#97ad8c'
-    # electricity demand
-    Electric load: '#110d63'
-    electric demand: '#110d63'
-    electricity: '#110d63'
-    industry electricity: '#2d2a66'
-    industry new electricity: '#2d2a66'
-    agriculture electricity: '#494778'
-    # battery + EVs
-    battery: '#ace37f'
-    battery storage: '#ace37f'
-    home battery: '#80c944'
-    home battery storage: '#80c944'
-    BEV charger: '#baf238'
-    V2G: '#e5ffa8'
-    land transport EV: '#baf238'
-    Li ion: '#baf238'
-    # hot water storage
-    water tanks: '#e69487'
-    hot water storage: '#e69487'
-    hot water charging: '#e69487'
-    hot water discharging: '#e69487'
-    # heat demand
-    Heat load: '#cc1f1f'
-    heat: '#cc1f1f'
-    heat demand: '#cc1f1f'
-    rural heat: '#ff5c5c'
-    central heat: '#cc1f1f'
-    decentral heat: '#750606'
-    low-temperature heat for industry: '#8f2727'
-    process heat: '#ff0000'
-    agriculture heat: '#d9a5a5'
-    # heat supply
-    heat pumps: '#2fb537'
-    heat pump: '#2fb537'
-    air heat pump: '#36eb41'
-    ground heat pump: '#2fb537'
-    Ambient: '#98eb9d'
-    CHP: '#8a5751'
-    CHP CC: '#634643'
-    CHP heat: '#8a5751'
-    CHP electric: '#8a5751'
-    district heating: '#e8beac'
-    resistive heater: '#c78536'
-    retrofitting: '#8487e8'
-    building retrofitting: '#8487e8'
-    # hydrogen
-    H2 for industry: "#f073da"
-    H2 for shipping: "#ebaee0"
-    H2: '#bf13a0'
-    SMR: '#870c71'
-    SMR CC: '#4f1745'
-    H2 liquefaction: '#d647bd'
-    hydrogen storage: '#bf13a0'
-    land transport fuel cell: '#6b3161'
-    H2 pipeline: '#f081dc'
-    H2 Fuel Cell: '#c251ae'
-    H2 Electrolysis: '#ff29d9'
-    # syngas
-    Sabatier: '#9850ad'
-    methanation: '#c44ce6'
-    helmeth: '#e899ff'
-    # synfuels
-    Fischer-Tropsch: '#25c49a'
-    kerosene for aviation: '#a1ffe6'
-    naphtha for industry: '#57ebc4'
-    # co2
-    CC: '#9e132c'
-    CO2 sequestration: '#9e132c'
-    DAC: '#ff5270'
-    co2 stored: '#f2385a'
-    co2: '#f29dae'
-    co2 vent: '#ffd4dc'
-    CO2 pipeline: '#f5627f'
-    # emissions
-    process emissions CC: '#000000'
-    process emissions: '#222222'
-    process emissions to stored: '#444444'
-    process emissions to atmosphere: '#888888'
-    oil emissions: '#aaaaaa'
-    shipping oil emissions: "#555555"
-    land transport oil emissions: '#777777'
-    agriculture machinery oil emissions: '#333333'
-    # other
-    shipping: '#03a2ff'
-    power-to-heat: '#cc1f1f'
-    power-to-gas: '#c44ce6'
-    power-to-liquid: '#25c49a'
-    gas-to-power/heat: '#ee8340'
diff --git a/config.temporal.yaml b/config.temporal.yaml
deleted file mode 100644
index 7b5b6b01..00000000
--- a/config.temporal.yaml
+++ /dev/null
@@ -1,590 +0,0 @@
-version: 0.6.0
-
-logging_level: INFO
-
-results_dir: results/
-summary_dir: results
-costs_dir: ../technology-data/outputs/
-run: 20211218-181-temporal  # use this to keep track of runs with different settings
-foresight: overnight # options are overnight, myopic, perfect (perfect is not yet implemented)
-# if you use myopic or perfect foresight, set the investment years in "planning_horizons" below
-
-scenario:
-  simpl: # only relevant for PyPSA-Eur
-    - ''
-  lv: # allowed transmission line volume expansion, can be any float >= 1.0 (today) or "opt"
-    - 1.5
-  clusters: # number of nodes in Europe, any integer between 37 (1 node per country-zone) and several hundred
-    - 181
-  opts: # only relevant for PyPSA-Eur
-    - ''
-  sector_opts: # this is where the main scenario settings are
-    - Co2L0-3H-T-H-B-I-A-solar+p3-linemaxext10-onwind-p0.5
-    - Co2L0-4H-T-H-B-I-A-solar+p3-linemaxext10-onwind-p0.5
-  # to really understand the options here, look in scripts/prepare_sector_network.py
-  # Co2Lx specifies the CO2 target in x% of the 1990 values; default will give default (5%);
-  # Co2L0p25 will give 25% CO2 emissions; Co2Lm0p05 will give 5% negative emissions
-  # xH is the temporal resolution; 3H is 3-hourly, i.e. one snapshot every 3 hours
-  # single letters are sectors: T for land transport, H for building heating,
-  # B for biomass supply, I for industry, shipping and aviation,
-  # A for agriculture, forestry and fishing
-  # solar+c0.5 reduces the capital cost of solar to 50\% of reference value
-  # solar+p3 multiplies the available installable potential by factor 3
-  # co2 stored+e2 multiplies the potential of CO2 sequestration by a factor 2
-  # dist{n} includes distribution grids with investment cost of n times cost in data/costs.csv
-  # for myopic/perfect foresight cb states the carbon budget in GtCO2 (cumulative
-  # emissions throughout the transition path in the timeframe determined by the
-  # planning_horizons), be:beta decay; ex:exponential decay
-  # cb40ex0 distributes a carbon budget of 40 GtCO2 following an exponential
-  # decay with initial growth rate 0
-  planning_horizons: # investment years for myopic and perfect; or costs year for overnight
-    - 2030
-  # for example, set to [2020, 2030, 2040, 2050] for myopic foresight
-
-# CO2 budget as a fraction of 1990 emissions
-# this is over-ridden if CO2Lx is set in sector_opts
-# this is also over-ridden if cb is set in sector_opts
-co2_budget:
-  2020: 0.7011648746
-  2025: 0.5241935484
-  2030: 0.2970430108
-  2035: 0.1500896057
-  2040: 0.0712365591
-  2045: 0.0322580645
-  2050: 0
-
-# snapshots are originally set in PyPSA-Eur/config.yaml but used again by PyPSA-Eur-Sec
-snapshots:
-  # arguments to pd.date_range
-  start: "2013-01-01"
-  end: "2014-01-01"
-  closed: left # end is not inclusive
-
-atlite:
-  cutout: ../pypsa-eur/cutouts/europe-2013-era5.nc
-
-# this information is NOT used but needed as an argument for
-# pypsa-eur/scripts/add_electricity.py/load_costs in make_summary.py
-electricity:
-  max_hours:
-    battery: 6
-    H2: 168
-
-# regulate what components with which carriers are kept from PyPSA-Eur;
-# some technologies are removed because they are implemented differently
-# (e.g. battery or H2 storage) or have different year-dependent costs
-# in PyPSA-Eur-Sec
-pypsa_eur:
-  Bus:
-    - AC
-  Link:
-    - DC
-  Generator:
-    - onwind
-    - offwind-ac
-    - offwind-dc
-    - solar
-    - ror
-  StorageUnit:
-    - PHS
-    - hydro
-  Store: []
-
-
-energy:
-  energy_totals_year: 2011
-  base_emissions_year: 1990
-  eurostat_report_year: 2016
-  emissions: CO2 # "CO2" or "All greenhouse gases - (CO2 equivalent)"
-
-biomass:
-  year: 2030
-  scenario: ENS_Med
-  classes:
-    solid biomass:
-      - Agricultural waste
-      - Fuelwood residues
-      - Secondary Forestry residues - woodchips
-      - Sawdust
-      - Residues from landscape care
-      - Municipal waste
-    not included:
-      - Sugar from sugar beet
-      - Rape seed
-      - "Sunflower, soya seed "
-      - Bioethanol barley, wheat, grain maize, oats, other cereals and rye
-      - Miscanthus, switchgrass, RCG
-      - Willow
-      - Poplar
-      - FuelwoodRW
-      - C&P_RW
-    biogas:
-      - Manure solid, liquid
-      - Sludge
-
-
-solar_thermal:
-  clearsky_model: simple  # should be "simple" or "enhanced"?
-  orientation:
-    slope: 45.
-    azimuth: 180.
-
-# only relevant for foresight = myopic or perfect
-existing_capacities:
-  grouping_years: [1980, 1985, 1990, 1995, 2000, 2005, 2010, 2015, 2019]
-  threshold_capacity: 10
-  conventional_carriers:
-    - lignite
-    - coal
-    - oil
-    - uranium
-
-
-sector:
-  district_heating:
-    potential: 0.6  # maximum fraction of urban demand which can be supplied by district heating
-     # increase of today's district heating demand to potential maximum district heating share
-     # progress = 0 means today's district heating share, progress = 1 means maximum fraction of urban demand is supplied by district heating
-    progress: 1
-      # 2020: 0.0
-      # 2030: 0.3
-      # 2040: 0.6
-      # 2050: 1.0
-    district_heating_loss: 0.15
-  bev_dsm_restriction_value: 0.75  #Set to 0 for no restriction on BEV DSM
-  bev_dsm_restriction_time: 7  #Time at which SOC of BEV has to be dsm_restriction_value
-  transport_heating_deadband_upper: 20.
-  transport_heating_deadband_lower: 15.
-  ICE_lower_degree_factor: 0.375  #in per cent increase in fuel consumption per degree above deadband
-  ICE_upper_degree_factor: 1.6
-  EV_lower_degree_factor: 0.98
-  EV_upper_degree_factor: 0.63
-  bev_dsm: true #turns on EV battery
-  bev_availability: 0.5  #How many cars do smart charging
-  bev_energy: 0.05  #average battery size in MWh
-  bev_charge_efficiency: 0.9  #BEV (dis-)charging efficiency
-  bev_plug_to_wheel_efficiency: 0.2 #kWh/km from EPA https://www.fueleconomy.gov/feg/ for Tesla Model S
-  bev_charge_rate: 0.011 #3-phase charger with 11 kW
-  bev_avail_max: 0.95
-  bev_avail_mean: 0.8
-  v2g: true #allows feed-in to grid from EV battery
-  #what is not EV or FCEV is oil-fuelled ICE
-  land_transport_fuel_cell_share: 0.15 # 1 means all FCEVs
-    # 2020: 0
-    # 2030: 0.05
-    # 2040: 0.1
-    # 2050: 0.15
-  land_transport_electric_share: 0.85 # 1 means all EVs
-    # 2020: 0
-    # 2030: 0.25
-    # 2040: 0.6
-    # 2050: 0.85
-  transport_fuel_cell_efficiency: 0.5
-  transport_internal_combustion_efficiency: 0.3
-  agriculture_machinery_electric_share: 0
-  agriculture_machinery_fuel_efficiency: 0.7 # fuel oil per use
-  agriculture_machinery_electric_efficiency: 0.3 # electricity per use
-  shipping_average_efficiency: 0.4 #For conversion of fuel oil to propulsion in 2011
-  shipping_hydrogen_liquefaction: true # whether to consider liquefaction costs for shipping H2 demands
-  shipping_hydrogen_share: 1 # 1 means all hydrogen FC
-    # 2020: 0
-    # 2025: 0
-    # 2030: 0.05
-    # 2035: 0.15
-    # 2040: 0.3
-    # 2045: 0.6
-    # 2050: 1
-  time_dep_hp_cop: true #time dependent heat pump coefficient of performance
-  heat_pump_sink_T: 55. # Celsius, based on DTU / large area radiators; used in build_cop_profiles.py
-   # conservatively high to cover hot water and space heating in poorly-insulated buildings
-  reduce_space_heat_exogenously: true  # reduces space heat demand by a given factor (applied before losses in DH)
-  # this can represent e.g. building renovation, building demolition, or if
-  # the factor is negative: increasing floor area, increased thermal comfort, population growth
-  reduce_space_heat_exogenously_factor: 0.29 # per unit reduction in space heat demand
-  # the default factors are determined by the LTS scenario from http://tool.european-calculator.eu/app/buildings/building-types-area/?levers=1ddd4444421213bdbbbddd44444ffffff11f411111221111211l212221
-    # 2020: 0.10  # this results in a space heat demand reduction of 10%
-    # 2025: 0.09  # first heat demand increases compared to 2020 because of larger floor area per capita
-    # 2030: 0.09
-    # 2035: 0.11
-    # 2040: 0.16
-    # 2045: 0.21
-    # 2050: 0.29
-  retrofitting :  # co-optimises building renovation to reduce space heat demand
-    retro_endogen: false  # co-optimise space heat savings
-    cost_factor: 1.0   # weight costs for building renovation
-    interest_rate: 0.04  # for investment in building components
-    annualise_cost: true  # annualise the investment costs
-    tax_weighting: false   # weight costs depending on taxes in countries
-    construction_index: true   # weight costs depending on labour/material costs per country
-  tes: true
-  tes_tau: # 180 day time constant for centralised, 3 day for decentralised
-    decentral: 3
-    central: 180
-  boilers: true
-  oil_boilers: false
-  chp: true
-  micro_chp: false
-  solar_thermal: true
-  solar_cf_correction: 0.788457  # =  >>> 1/1.2683
-  marginal_cost_storage: 0. #1e-4
-  methanation: true
-  helmeth: false
-  dac: true
-  co2_vent: false
-  SMR: true
-  co2_sequestration_potential: 200  #MtCO2/a sequestration potential for Europe
-  co2_sequestration_cost: 20   #EUR/tCO2 for sequestration of CO2
-  co2_network: false
-  cc_fraction: 0.9  # default fraction of CO2 captured with post-combustion capture
-  hydrogen_underground_storage: true
-  hydrogen_underground_storage_locations:
-    # - onshore  # more than 50 km from sea
-    - nearshore  # within 50 km of sea
-    # - offshore
-  use_fischer_tropsch_waste_heat: true
-  use_fuel_cell_waste_heat: true
-  electricity_distribution_grid: true
-  electricity_distribution_grid_cost_factor: 1.0  #multiplies cost in data/costs.csv
-  electricity_grid_connection: true  # only applies to onshore wind and utility PV
-  H2_network: true
-  gas_network: false
-  H2_retrofit: true  # if set to True existing gas pipes can be retrofitted to H2 pipes
-  # according to hydrogen backbone strategy (April, 2020) p.15
-  # https://gasforclimate2050.eu/wp-content/uploads/2020/07/2020_European-Hydrogen-Backbone_Report.pdf
-  # 60% of original natural gas capacity could be used in cost-optimal case as H2 capacity
-  H2_retrofit_capacity_per_CH4: 0.6  # ratio for H2 capacity per original CH4 capacity of retrofitted pipelines
-  gas_network_connectivity_upgrade: 1 # https://networkx.org/documentation/stable/reference/algorithms/generated/networkx.algorithms.connectivity.edge_augmentation.k_edge_augmentation.html#networkx.algorithms.connectivity.edge_augmentation.k_edge_augmentation
-  gas_distribution_grid: true
-  gas_distribution_grid_cost_factor: 1.0  #multiplies cost in data/costs.csv
-  biomass_transport: false  # biomass transport between nodes
-  conventional_generation: # generator : carrier
-    OCGT: gas
-
-
-industry:
-  St_primary_fraction: 0.3 # fraction of steel produced via primary route versus secondary route (scrap+EAF); today fraction is 0.6
-    # 2020: 0.6
-    # 2025: 0.55
-    # 2030: 0.5
-    # 2035: 0.45
-    # 2040: 0.4
-    # 2045: 0.35
-    # 2050: 0.3
-  DRI_fraction: 1 # fraction of the primary route converted to DRI + EAF
-    # 2020: 0
-    # 2025: 0
-    # 2030: 0.05
-    # 2035: 0.2
-    # 2040: 0.4
-    # 2045: 0.7
-    # 2050: 1
-  H2_DRI: 1.7   #H2 consumption in Direct Reduced Iron (DRI),  MWh_H2,LHV/ton_Steel from 51kgH2/tSt in Vogl et al (2018) doi:10.1016/j.jclepro.2018.08.279
-  elec_DRI: 0.322   #electricity consumption in Direct Reduced Iron (DRI) shaft, MWh/tSt HYBRIT brochure https://ssabwebsitecdn.azureedge.net/-/media/hybrit/files/hybrit_brochure.pdf
-  Al_primary_fraction: 0.2 # fraction of aluminium produced via the primary route versus scrap; today fraction is 0.4
-    # 2020: 0.4
-    # 2025: 0.375
-    # 2030: 0.35
-    # 2035: 0.325
-    # 2040: 0.3
-    # 2045: 0.25
-    # 2050: 0.2
-  MWh_CH4_per_tNH3_SMR: 10.8 # 2012's demand from https://ec.europa.eu/docsroom/documents/4165/attachments/1/translations/en/renditions/pdf
-  MWh_elec_per_tNH3_SMR: 0.7 # same source, assuming 94-6% split methane-elec of total energy demand 11.5 MWh/tNH3
-  MWh_H2_per_tNH3_electrolysis: 6.5 # from https://doi.org/10.1016/j.joule.2018.04.017, around 0.197 tH2/tHN3 (>3/17 since some H2 lost and used for energy)
-  MWh_elec_per_tNH3_electrolysis: 1.17 # from https://doi.org/10.1016/j.joule.2018.04.017 Table 13 (air separation and HB)
-  NH3_process_emissions: 24.5 # in MtCO2/a from SMR for H2 production for NH3 from UNFCCC for 2015 for EU28
-  petrochemical_process_emissions: 25.5 # in MtCO2/a for petrochemical and other from UNFCCC for 2015 for EU28
-  HVC_primary_fraction: 0.45 # fraction of today's HVC produced via primary route
-  HVC_mechanical_recycling_fraction: 0.30 # fraction of today's HVC produced via mechanical recycling
-  HVC_chemical_recycling_fraction: 0.15 # fraction of today's HVC produced via chemical recycling
-  HVC_production_today: 52. # MtHVC/a from DECHEMA (2017), Figure 16, page 107; includes ethylene, propylene and BTX
-  MWh_elec_per_tHVC_mechanical_recycling: 0.547 # from SI of https://doi.org/10.1016/j.resconrec.2020.105010, Table S5, for HDPE, PP, PS, PET. LDPE would be 0.756.
-  MWh_elec_per_tHVC_chemical_recycling: 6.9 # Material Economics (2019), page 125; based on pyrolysis and electric steam cracking
-  chlorine_production_today: 9.58 # MtCl/a from DECHEMA (2017), Table 7, page 43
-  MWh_elec_per_tCl: 3.6 # DECHEMA (2017), Table 6, page 43
-  MWh_H2_per_tCl: -0.9372  # DECHEMA (2017), page 43; negative since hydrogen produced in chloralkali process
-  methanol_production_today: 1.5 # MtMeOH/a from DECHEMA (2017), page 62
-  MWh_elec_per_tMeOH: 0.167 # DECHEMA (2017), Table 14, page 65
-  MWh_CH4_per_tMeOH: 10.25 # DECHEMA (2017), Table 14, page 65
-  hotmaps_locate_missing: false
-  reference_year: 2015
-  # references:
-  # DECHEMA (2017): https://dechema.de/dechema_media/Downloads/Positionspapiere/Technology_study_Low_carbon_energy_and_feedstock_for_the_European_chemical_industry-p-20002750.pdf
-  # Material Economics (2019): https://materialeconomics.com/latest-updates/industrial-transformation-2050
-
-costs:
-  lifetime: 25 #default lifetime
-  # From a Lion Hirth paper, also reflects average of Noothout et al 2016
-  discountrate: 0.07
-  # [EUR/USD] ECB: https://www.ecb.europa.eu/stats/exchange/eurofxref/html/eurofxref-graph-usd.en.html # noqa: E501
-  USD2013_to_EUR2013: 0.7532
-
-  # Marginal and capital costs can be overwritten
-  # capital_cost:
-  #   onwind: 500
-  marginal_cost:
-    solar: 0.01
-    onwind: 0.015
-    offwind: 0.015
-    hydro: 0.
-    H2: 0.
-    battery: 0.
-
-  emission_prices: # only used with the option Ep (emission prices)
-    co2: 0.
-
-  lines:
-    length_factor: 1.25 #to estimate offwind connection costs
-
-
-solving:
-  #tmpdir: "path/to/tmp"
-  options:
-    formulation: kirchhoff
-    clip_p_max_pu: 1.e-2
-    load_shedding: false
-    noisy_costs: true
-    skip_iterations: true
-    track_iterations: false
-    min_iterations: 4
-    max_iterations: 6
-    keep_shadowprices:
-      - Bus
-      - Line
-      - Link
-      - Transformer
-      - GlobalConstraint
-      - Generator
-      - Store
-      - StorageUnit
-  solver:
-    name: gurobi
-    threads: 4
-    method: 2 # barrier
-    crossover: 0
-    BarConvTol: 1.e-4
-    Seed: 123
-    AggFill: 0
-    PreDual: 0
-    GURO_PAR_BARDENSETHRESH: 200
-    #FeasibilityTol: 1.e-6
-
-    #name: cplex
-    #threads: 4
-    #lpmethod: 4 # barrier
-    #solutiontype: 2 # non basic solution, ie no crossover
-    #barrier_convergetol: 1.e-5
-    #feasopt_tolerance: 1.e-6
-  mem: 126000 #memory in MB; 20 GB enough for 50+B+I+H2; 100 GB for 181+B+I+H2
-
-
-plotting:
-  map:
-    boundaries: [-11, 30, 34, 71]
-    color_geomap:
-      ocean: white
-      land: white
-  costs_max: 1000
-  costs_threshold: 1
-  energy_max: 20000
-  energy_min: -20000
-  energy_threshold: 50
-  vre_techs:
-    - onwind
-    - offwind-ac
-    - offwind-dc
-    - solar
-    - ror
-  renewable_storage_techs:
-    - PHS
-    - hydro
-  conv_techs:
-    - OCGT
-    - CCGT
-    - Nuclear
-    - Coal
-  storage_techs:
-    - hydro+PHS
-    - battery
-    - H2
-  load_carriers:
-    - AC load
-  AC_carriers:
-    - AC line
-    - AC transformer
-  link_carriers:
-    - DC line
-    - Converter AC-DC
-  heat_links:
-    - heat pump
-    - resistive heater
-    - CHP heat
-    - CHP electric
-    - gas boiler
-    - central heat pump
-    - central resistive heater
-    - central CHP heat
-    - central CHP electric
-    - central gas boiler
-  heat_generators:
-    - gas boiler
-    - central gas boiler
-    - solar thermal collector
-    - central solar thermal collector
-  tech_colors:
-    # wind
-    onwind: "#235ebc"
-    onshore wind: "#235ebc"
-    offwind: "#6895dd"
-    offshore wind: "#6895dd"
-    offwind-ac: "#6895dd"
-    offshore wind (AC): "#6895dd"
-    offwind-dc: "#74c6f2"
-    offshore wind (DC): "#74c6f2"
-    # water
-    hydro: '#298c81'
-    hydro reservoir: '#298c81'
-    ror: '#3dbfb0'
-    run of river: '#3dbfb0'
-    hydroelectricity: '#298c81'
-    PHS: '#51dbcc'
-    wave: '#a7d4cf'
-    # solar
-    solar: "#f9d002"
-    solar PV: "#f9d002"
-    solar thermal: '#ffbf2b'
-    solar rooftop: '#ffea80'
-    # gas
-    OCGT: '#e0986c'
-    OCGT marginal: '#e0986c'
-    OCGT-heat: '#e0986c'
-    gas boiler: '#db6a25'
-    gas boilers: '#db6a25'
-    gas boiler marginal: '#db6a25'
-    gas: '#e05b09'
-    natural gas: '#e05b09'
-    CCGT: '#a85522'
-    CCGT marginal: '#a85522'
-    gas for industry co2 to atmosphere: '#692e0a'
-    gas for industry co2 to stored: '#8a3400'
-    gas for industry: '#853403'
-    gas for industry CC: '#692e0a'
-    gas pipeline: '#ebbca0'
-    # oil
-    oil: '#c9c9c9'
-    oil boiler: '#adadad'
-    agriculture machinery oil: '#949494'
-    shipping oil: "#808080"
-    land transport oil: '#afafaf'
-    # nuclear
-    Nuclear: '#ff8c00'
-    Nuclear marginal: '#ff8c00'
-    nuclear: '#ff8c00'
-    uranium: '#ff8c00'
-    # coal
-    Coal: '#545454'
-    coal: '#545454'
-    Coal marginal: '#545454'
-    Lignite: '#826837'
-    lignite: '#826837'
-    Lignite marginal: '#826837'
-    # biomass
-    biogas: '#e3d37d'
-    solid biomass: '#baa741'
-    solid biomass transport: '#baa741'
-    solid biomass for industry: '#7a6d26'
-    solid biomass for industry CC: '#47411c'
-    solid biomass for industry co2 from atmosphere: '#736412'
-    solid biomass for industry co2 to stored: '#47411c'
-    # power transmission
-    lines: '#6c9459'
-    transmission lines: '#6c9459'
-    electricity distribution grid: '#97ad8c'
-    # electricity demand
-    Electric load: '#110d63'
-    electric demand: '#110d63'
-    electricity: '#110d63'
-    industry electricity: '#2d2a66'
-    industry new electricity: '#2d2a66'
-    agriculture electricity: '#494778'
-    # battery + EVs
-    battery: '#ace37f'
-    battery storage: '#ace37f'
-    home battery: '#80c944'
-    home battery storage: '#80c944'
-    BEV charger: '#baf238'
-    V2G: '#e5ffa8'
-    land transport EV: '#baf238'
-    Li ion: '#baf238'
-    # hot water storage
-    water tanks: '#e69487'
-    hot water storage: '#e69487'
-    hot water charging: '#e69487'
-    hot water discharging: '#e69487'
-    # heat demand
-    Heat load: '#cc1f1f'
-    heat: '#cc1f1f'
-    heat demand: '#cc1f1f'
-    rural heat: '#ff5c5c'
-    central heat: '#cc1f1f'
-    decentral heat: '#750606'
-    low-temperature heat for industry: '#8f2727'
-    process heat: '#ff0000'
-    agriculture heat: '#d9a5a5'
-    # heat supply
-    heat pumps: '#2fb537'
-    heat pump: '#2fb537'
-    air heat pump: '#36eb41'
-    ground heat pump: '#2fb537'
-    Ambient: '#98eb9d'
-    CHP: '#8a5751'
-    CHP CC: '#634643'
-    CHP heat: '#8a5751'
-    CHP electric: '#8a5751'
-    district heating: '#e8beac'
-    resistive heater: '#c78536'
-    retrofitting: '#8487e8'
-    building retrofitting: '#8487e8'
-    # hydrogen
-    H2 for industry: "#f073da"
-    H2 for shipping: "#ebaee0"
-    H2: '#bf13a0'
-    SMR: '#870c71'
-    SMR CC: '#4f1745'
-    H2 liquefaction: '#d647bd'
-    hydrogen storage: '#bf13a0'
-    land transport fuel cell: '#6b3161'
-    H2 pipeline: '#f081dc'
-    H2 Fuel Cell: '#c251ae'
-    H2 Electrolysis: '#ff29d9'
-    # syngas
-    Sabatier: '#9850ad'
-    methanation: '#c44ce6'
-    helmeth: '#e899ff'
-    # synfuels
-    Fischer-Tropsch: '#25c49a'
-    kerosene for aviation: '#a1ffe6'
-    naphtha for industry: '#57ebc4'
-    # co2
-    CC: '#9e132c'
-    CO2 sequestration: '#9e132c'
-    DAC: '#ff5270'
-    co2 stored: '#f2385a'
-    co2: '#f29dae'
-    co2 vent: '#ffd4dc'
-    CO2 pipeline: '#f5627f'
-    # emissions
-    process emissions CC: '#000000'
-    process emissions: '#222222'
-    process emissions to stored: '#444444'
-    process emissions to atmosphere: '#888888'
-    oil emissions: '#aaaaaa'
-    shipping oil emissions: "#555555"
-    land transport oil emissions: '#777777'
-    agriculture machinery oil emissions: '#333333'
-    # other
-    shipping: '#03a2ff'
-    power-to-heat: '#cc1f1f'
-    power-to-gas: '#c44ce6'
-    power-to-liquid: '#25c49a'
-    gas-to-power/heat: '#ee8340'

From 520cad53a2e90d9af0b871f3360e8ff8df065d71 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Wed, 28 Dec 2022 14:11:47 +0100
Subject: [PATCH 7/9] address sum(level) deprecation

---
 scripts/plot_network.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/plot_network.py b/scripts/plot_network.py
index 521da448..257b565f 100644
--- a/scripts/plot_network.py
+++ b/scripts/plot_network.py
@@ -119,8 +119,6 @@ def plot_map(network, components=["links", "stores", "storage_units", "generator
 
     tech_colors = snakemake.config['plotting']['tech_colors']
 
-    tech_colors = snakemake.config['plotting']['tech_colors']
-
     n = network.copy()
     assign_location(n)
     # Drop non-electric buses so they don't clutter the plot
@@ -173,7 +171,7 @@ def plot_map(network, components=["links", "stores", "storage_units", "generator
     costs.index = pd.MultiIndex.from_tuples(costs.index.values)
 
     threshold = 100e6 # 100 mEUR/a
-    carriers = costs.sum(level=1)
+    carriers = costs.groupby(level=1).sum()
     carriers = carriers.where(carriers > threshold).dropna()
     carriers = list(carriers.index)
 

From 6f901f4c500ec53c614e6cca5ea79597ccacc33a Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Wed, 28 Dec 2022 15:43:43 +0100
Subject: [PATCH 8/9] restore compatibility with latest master version

---
 Snakefile               |   2 +-
 matplotlibrc            |   1 -
 scripts/helper.py       |   2 +
 scripts/plot_network.py | 117 ++++++++++------------------------------
 4 files changed, 30 insertions(+), 92 deletions(-)

diff --git a/Snakefile b/Snakefile
index b21d01e7..77f5fdd6 100644
--- a/Snakefile
+++ b/Snakefile
@@ -517,7 +517,7 @@ rule plot_network:
     input:
         overrides="data/override_component_attrs",
         network=RDIR + "/postnetworks/elec_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_{planning_horizons}.nc",
-        regions='../pypsa-eur/resources/regions_onshore_elec_s{simpl}_{clusters}.geojson'
+        regions=pypsaeur('resources/regions_onshore_elec_s{simpl}_{clusters}.geojson')
     output:
         map=RDIR + "/maps/elec_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}-costs-all_{planning_horizons}.pdf",
         today=RDIR + "/maps/elec_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_{planning_horizons}-today.pdf"
diff --git a/matplotlibrc b/matplotlibrc
index db5e7ce8..57754c44 100644
--- a/matplotlibrc
+++ b/matplotlibrc
@@ -1,4 +1,3 @@
-backend: Agg
 font.family: sans-serif
 font.sans-serif: Ubuntu, DejaVu Sans
 image.cmap: viridis
\ No newline at end of file
diff --git a/scripts/helper.py b/scripts/helper.py
index 4161c126..e6ddfd4a 100644
--- a/scripts/helper.py
+++ b/scripts/helper.py
@@ -45,7 +45,9 @@ def mock_snakemake(rulename, **wildcards):
     This function is expected to be executed from the 'scripts'-directory of '
     the snakemake project. It returns a snakemake.script.Snakemake object,
     based on the Snakefile.
+
     If a rule has wildcards, you have to specify them in **wildcards.
+
     Parameters
     ----------
     rulename: str
diff --git a/scripts/plot_network.py b/scripts/plot_network.py
index 257b565f..386a45b7 100644
--- a/scripts/plot_network.py
+++ b/scripts/plot_network.py
@@ -1,14 +1,11 @@
 import pypsa
 
-import numpy as np
 import pandas as pd
 import geopandas as gpd
 import matplotlib.pyplot as plt
 import cartopy.crs as ccrs
 
-from matplotlib.legend_handler import HandlerPatch
-from matplotlib.patches import Circle, Patch
-from pypsa.plot import projected_area_factor
+from pypsa.plot import add_legend_circles, add_legend_patches, add_legend_lines
 
 from make_summary import assign_carriers
 from plot_summary import rename_techs, preferred_order
@@ -40,69 +37,6 @@ def rename_techs_tyndp(tech):
     else:
         return tech
 
-class HandlerCircle(HandlerPatch):
-    """
-    Legend Handler used to create circles for legend entries. 
-    
-    This handler resizes the circles in order to match the same dimensional 
-    scaling as in the applied axis.
-    """
-    def create_artists(
-        self, legend, orig_handle, xdescent, ydescent, width, height, fontsize, trans
-    ):
-        fig = legend.get_figure()
-        ax = legend.axes
-
-        unit = np.diff(ax.transData.transform([(0, 0), (1, 1)]), axis=0)[0][1]
-        radius = orig_handle.get_radius() * unit * (72 / fig.dpi)
-        center = 5 - xdescent, 3 - ydescent
-        p = plt.Circle(center, radius)
-        self.update_prop(p, orig_handle, legend)
-        p.set_transform(trans)
-        return [p]
-
-
-def add_legend_circles(ax, sizes, labels, scale=1, srid=None, patch_kw={}, legend_kw={}):
-    
-    if srid is not None:
-        area_correction = projected_area_factor(ax, n.srid)**2 
-        sizes = [s * area_correction for s in sizes]
-    
-    handles = make_legend_circles_for(sizes, scale, **patch_kw)
-    
-    legend = ax.legend(
-        handles, labels,
-        handler_map={Circle: HandlerCircle()},
-        **legend_kw
-    )
-
-    ax.add_artist(legend)
-    
-
-def add_legend_lines(ax, sizes, labels, scale=1, patch_kw={}, legend_kw={}):
-    
-    handles = [plt.Line2D([0], [0], linewidth=s/scale, **patch_kw) for s in sizes]
-    
-    legend = ax.legend(
-        handles, labels,
-        **legend_kw
-    )
-    
-    ax.add_artist(legend)
-
-
-def add_legend_patches(ax, colors, labels, patch_kw={}, legend_kw={}):
-    
-    handles = [Patch(facecolor=c, **patch_kw) for c in colors]
-    
-    legend = ax.legend(handles, labels, **legend_kw)
-
-    ax.add_artist(legend)
-
-
-def make_legend_circles_for(sizes, scale=1.0, **kw):
-    return [Circle((0, 0), radius=(s / scale)**0.5, **kw) for s in sizes]
-
 
 def assign_location(n):
     for c in n.iterate_components(n.one_port_components | n.branch_components):
@@ -186,23 +120,23 @@ def plot_map(network, components=["links", "stores", "storage_units", "generator
         # should be zero
         line_widths = n.lines.s_nom_opt - n.lines.s_nom
         link_widths = n.links.p_nom_opt - n.links.p_nom
-        title = "Added grid"
+        title = "added grid"
 
         if transmission:
             line_widths = n.lines.s_nom_opt
             link_widths = n.links.p_nom_opt
             linewidth_factor = 2e3
             line_lower_threshold = 0.
-            title = "Today's grid"
+            title = "current grid"
     else:
         line_widths = n.lines.s_nom_opt - n.lines.s_nom_min
         link_widths = n.links.p_nom_opt - n.links.p_nom_min
-        title = "Added grid"
+        title = "added grid"
 
         if transmission:
             line_widths = n.lines.s_nom_opt
             link_widths = n.links.p_nom_opt
-            title = "Total grid"
+            title = "total grid"
 
     line_widths[line_widths < line_lower_threshold] = 0.
     link_widths[link_widths < line_lower_threshold] = 0.
@@ -233,7 +167,7 @@ def plot_map(network, components=["links", "stores", "storage_units", "generator
         labelspacing=0.8,
         frameon=False,
         handletextpad=0,
-        title='System cost',
+        title='system cost',
     )
 
     add_legend_circles(
@@ -247,6 +181,8 @@ def plot_map(network, components=["links", "stores", "storage_units", "generator
 
     sizes = [10, 5]
     labels = [f"{s} GW" for s in sizes]
+    scale = 1e3 / linewidth_factor
+    sizes = [s*scale for s in sizes]
 
     legend_kw = dict(
         loc="upper left",
@@ -261,7 +197,6 @@ def plot_map(network, components=["links", "stores", "storage_units", "generator
         ax,
         sizes,
         labels,
-        scale=linewidth_factor/1e3,
         patch_kw=dict(color='lightgrey'),
         legend_kw=legend_kw
     )
@@ -312,8 +247,6 @@ def group_pipes(df, drop_direction=False):
 
 def plot_h2_map(network, regions):
 
-    tech_colors = snakemake.config['plotting']['tech_colors']
-
     n = network.copy()
     if "H2 pipeline" not in n.links.carrier.unique():
         return
@@ -345,9 +278,11 @@ def plot_h2_map(network, regions):
 
     h2_new = n.links.loc[n.links.carrier=="H2 pipeline"]
     h2_retro = n.links.loc[n.links.carrier=='H2 pipeline retrofitted']
-    # sum capacitiy for pipelines from different investment periods
-    h2_new = group_pipes(h2_new)
-    h2_retro = group_pipes(h2_retro, drop_direction=True).reindex(h2_new.index).fillna(0)
+
+    if snakemake.config['foresight'] == 'myopic':
+        # sum capacitiy for pipelines from different investment periods
+        h2_new = group_pipes(h2_new)
+        h2_retro = group_pipes(h2_retro, drop_direction=True).reindex(h2_new.index).fillna(0)
 
     if not h2_retro.empty:
 
@@ -419,6 +354,7 @@ def plot_h2_map(network, regions):
     )
 
     n.plot(
+        geomap=True,
         bus_sizes=0,
         link_colors=color_retrofit,
         link_widths=link_widths_retro,
@@ -461,8 +397,10 @@ def plot_h2_map(network, regions):
         legend_kw=legend_kw
     )
 
-    sizes = [50, 10]
+    sizes = [30, 10]
     labels = [f"{s} GW" for s in sizes]
+    scale = 1e3 / linewidth_factor
+    sizes = [s*scale for s in sizes]
 
     legend_kw = dict(
         loc="upper left",
@@ -476,7 +414,6 @@ def plot_h2_map(network, regions):
         ax,
         sizes,
         labels,
-        scale=linewidth_factor/1e3,
         patch_kw=dict(color='lightgrey'),
         legend_kw=legend_kw,
     )
@@ -498,7 +435,6 @@ def plot_h2_map(network, regions):
         legend_kw=legend_kw
     )
 
-    plt.gca().outline_patch.set_visible(False)
     ax.set_facecolor("white")
 
     fig.savefig(
@@ -564,7 +500,7 @@ def plot_ch4_map(network):
     pipe_colors = {
         "gas pipeline": "#f08080",
         "gas pipeline new": "#c46868",
-        "gas pipeline (2020)": 'lightgrey',
+        "gas pipeline (in 2020)": 'lightgrey',
         "gas pipeline (available)": '#e8d1d1',
     }
 
@@ -584,7 +520,7 @@ def plot_ch4_map(network):
     n.plot(
         bus_sizes=bus_sizes,
         bus_colors=bus_colors,
-        link_colors=pipe_colors['gas pipeline (2020)'],
+        link_colors=pipe_colors['gas pipeline (in 2020)'],
         link_widths=link_widths_orig,
         branch_components=["Link"],
         ax=ax,
@@ -621,7 +557,7 @@ def plot_ch4_map(network):
         labelspacing=0.8,
         frameon=False,
         handletextpad=1,
-        title='Gas Sources',
+        title='gas sources',
     )
     
     add_legend_circles(
@@ -635,6 +571,8 @@ def plot_ch4_map(network):
 
     sizes = [50, 10]
     labels = [f"{s} GW" for s in sizes]
+    scale = 1e3 / linewidth_factor
+    sizes = [s*scale for s in sizes]
     
     legend_kw = dict(
         loc="upper left",
@@ -642,14 +580,13 @@ def plot_ch4_map(network):
         frameon=False,
         labelspacing=0.8,
         handletextpad=1,
-        title='Gas Pipeline'
+        title='gas pipeline'
     )
     
     add_legend_lines(
         ax,
         sizes,
         labels,
-        scale=linewidth_factor/1e3,
         patch_kw=dict(color='lightgrey'),
         legend_kw=legend_kw,
     )
@@ -740,7 +677,7 @@ def plot_map_without(network):
     for s in (10, 5):
         handles.append(plt.Line2D([0], [0], color=ac_color,
                                   linewidth=s * 1e3 / linewidth_factor))
-        labels.append("{} GW".format(s))
+        labels.append(f"{s} GW")
     l1_1 = ax.legend(handles, labels,
                      loc="upper left", bbox_to_anchor=(0.05, 1.01),
                      frameon=False,
@@ -890,10 +827,10 @@ if __name__ == "__main__":
         snakemake = mock_snakemake(
             'plot_network',
             simpl='',
-            clusters="45",
-            lv=1.0,
+            clusters="181",
+            lv='opt',
             opts='',
-            sector_opts='168H-T-H-B-I-A-solar+p3-dist1',
+            sector_opts='Co2L0-730H-T-H-B-I-A-solar+p3-linemaxext10',
             planning_horizons="2050",
         )
 

From 8edc9042b9db35c04b2253ed5021a609d9d8952a Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Wed, 28 Dec 2022 15:46:11 +0100
Subject: [PATCH 9/9] add release note

---
 doc/release_notes.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/release_notes.rst b/doc/release_notes.rst
index 918f885c..ef92357a 100644
--- a/doc/release_notes.rst
+++ b/doc/release_notes.rst
@@ -86,6 +86,8 @@ incorporates retrofitting options to hydrogen.
 
 * Shipping demand now defaults to (synthetic) oil rather than liquefied hydrogen until 2050.
 
+* Improved network plots including better legends, hydrogen retrofitting network display, and change to EqualEarth projection.
+
 **Bugfixes**
 
 * The CO2 sequestration limit implemented as GlobalConstraint (introduced in the previous version)