Merge branch 'master' into pellet-boiler

scripts/add_brownfield.py

@@ -139,4 +139,5 @@ if __name__ == "__main__":
 
     add_brownfield(n, n_p, year)
 
+    n.meta = dict(snakemake.config, **dict(wildcards=dict(snakemake.wildcards)))
     n.export_to_netcdf(snakemake.output[0])

scripts/add_existing_baseyear.py

@@ -495,4 +495,5 @@ if __name__ == "__main__":
         default_lifetime = snakemake.config['costs']['lifetime']
         add_heating_capacities_installed_before_baseyear(n, baseyear, grouping_years, ashp_cop, gshp_cop, time_dep_hp_cop, costs, default_lifetime)
 
+    n.meta = dict(snakemake.config, **dict(wildcards=dict(snakemake.wildcards)))
     n.export_to_netcdf(snakemake.output[0])

scripts/plot_network.py

@@ -307,7 +307,6 @@ def plot_h2_map(network):
     )
 
     n.plot(
-        geomap=False,
         bus_sizes=0,
         link_colors='#72d3d6',
         link_widths=link_widths_retro,
@@ -441,7 +440,6 @@ def plot_ch4_map(network):
     )
 
     n.plot(
-        geomap=False,
         ax=ax,
         bus_sizes=0.,
         link_colors='#e8d1d1',
@@ -451,7 +449,6 @@ def plot_ch4_map(network):
     )
 
     n.plot(
-        geomap=False,
         ax=ax,
         bus_sizes=0.,
         link_colors=link_color_used,

scripts/prepare_sector_network.py

@@ -2481,4 +2481,5 @@ if __name__ == "__main__":
     if options['electricity_grid_connection']:
         add_electricity_grid_connection(n, costs)
 
+    n.meta = dict(snakemake.config, **dict(wildcards=dict(snakemake.wildcards)))
     n.export_to_netcdf(snakemake.output[0])

scripts/solve_network.py

@@ -296,7 +296,7 @@ if __name__ == "__main__":
     if tmpdir is not None:
         from pathlib import Path
         Path(tmpdir).mkdir(parents=True, exist_ok=True)
-    opts = snakemake.wildcards.opts.split('-')
+    opts = snakemake.wildcards.sector_opts.split('-')
     solve_opts = snakemake.config['solving']['options']
 
     fn = getattr(snakemake.log, 'memory', None)
@@ -315,6 +315,7 @@ if __name__ == "__main__":
             n.line_volume_limit = n.global_constraints.at["lv_limit", "constant"]
             n.line_volume_limit_dual = n.global_constraints.at["lv_limit", "mu"]
 
+        n.meta = dict(snakemake.config, **dict(wildcards=dict(snakemake.wildcards)))
         n.export_to_netcdf(snakemake.output[0])
 
     logger.info("Maximum memory usage: {}".format(mem.mem_usage))