Merge pull request #332 from pypsa-meets-earth/Params_build_base_ener…

…gy_totals

Add Params to Rule build_base_energy_totals

Snakefile

@@ -317,6 +317,11 @@ rule prepare_heat_data:
 
 
 rule build_base_energy_totals:
+    params:
+        space_heat_share=config["sector"]["space_heat_share"],
+        update_data=config["demand_data"]["update_data"],
+        base_year=config["demand_data"]["base_year"],
+        countries=config["countries"],
     input:
         unsd_paths="data/demand/unsd/paths/Energy_Statistics_Database.xlsx",
     output:

scripts/build_base_energy_totals.py

@@ -136,11 +136,11 @@ def calc_sector(sector):
                     round(
                         df_sector[df_sector.Commodity.isin(heat)].Quantity_TWh.sum(), 4
                     )
-                    * snakemake.config["sector"]["space_heat_share"]
+                    * snakemake.params.space_heat_share
                 )
                 energy_totals_base.at[country, "total residential water"] = round(
                     df_sector[df_sector.Commodity.isin(heat)].Quantity_TWh.sum(), 4
-                ) * (1 - snakemake.config["sector"]["space_heat_share"])
+                ) * (1 - snakemake.params.space_heat_share)
 
             elif sector == "services":
                 energy_totals_base.at[country, "services electricity"] = round(
@@ -166,11 +166,11 @@ def calc_sector(sector):
                     round(
                         df_sector[df_sector.Commodity.isin(heat)].Quantity_TWh.sum(), 4
                     )
-                    * snakemake.config["sector"]["space_heat_share"]
+                    * snakemake.params.space_heat_share
                 )
                 energy_totals_base.at[country, "total services water"] = round(
                     df_sector[df_sector.Commodity.isin(heat)].Quantity_TWh.sum(), 4
-                ) * (1 - snakemake.config["sector"]["space_heat_share"])
+                ) * (1 - snakemake.params.space_heat_share)
 
             elif sector == "road":
                 energy_totals_base.at[country, "total road"] = round(
@@ -273,7 +273,7 @@ def calc_sector(sector):
     df = df.to_dict("dict")
     d = df["Link"]
 
-    if snakemake.config["demand_data"]["update_data"]:
+    if snakemake.params.update_data:
         # Delete and existing files to avoid duplication and double counting
 
         files = glob.glob("data/demand/unsd/data/*.txt")
@@ -363,8 +363,8 @@ def calc_sector(sector):
     }
 
     # Fetch country list and demand base year from the config file
-    year = snakemake.config["demand_data"]["base_year"]
-    countries = snakemake.config["countries"]
+    year = snakemake.params.base_year
+    countries = snakemake.params.countries
     # countries = ["NG", "BJ"]
 
     # Filter for the year and country