adapt build_base_energy and build_base_industry to params

pypsa-meets-earth · Jul 17, 2024 · 3233fa7 · 3233fa7
1 parent c812db1
commit 3233fa7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/scripts/build_base_energy_totals.py b/scripts/build_base_energy_totals.py
@@ -132,7 +132,7 @@ def calc_sector(sector):
             sectors_dfs[sector] = df_sector.copy()
 
             if sector == "consumption by households":
-                if snakemake.config["sector"]["coal"]["shift_to_elec"]:
+                if snakemake.params.shift_coal_to_elec:
                     condition = (df_sector.Commodity == "Electricity") | (
                         df_sector.Commodity.isin(coal_fuels)
                     )
@@ -165,7 +165,7 @@ def calc_sector(sector):
                 ) * (1 - snakemake.params.space_heat_share)
 
             elif sector == "services":
-                if snakemake.config["sector"]["coal"]["shift_to_elec"]:
+                if snakemake.params.shift_coal_to_elec:
                     condition = (df_sector.Commodity == "Electricity") | (
                         df_sector.Commodity.isin(coal_fuels)
                     )
@@ -289,7 +289,7 @@ def calc_sector(sector):
                     4,
                 )
             elif sector == "other energy":
-                if snakemake.config["sector"]["coal"]["shift_to_elec"]:
+                if snakemake.params.shift_coal_to_elec:
                     condition = (df_sector.Commodity == "Electricity") | (
                         df_sector.Commodity.isin(coal_fuels)
                     )
@@ -318,7 +318,7 @@ def calc_sector(sector):
                     4,
                 )
             elif sector == "non energy use":
-                if snakemake.config["sector"]["coal"]["shift_to_elec"]:
+                if snakemake.params.shift_coal_to_elec:
                     condition = (df_sector.Commodity == "Electricity") | (
                         df_sector.Commodity.isin(coal_fuels)
                     )

diff --git a/scripts/build_base_industry_totals.py b/scripts/build_base_industry_totals.py
@@ -103,8 +103,6 @@ def create_industry_base_totals(df):
     year = snakemake.params.base_year
     countries = snakemake.params.countries
 
-    transactions_from_list = snakemake.config["industry"]
-
     investment_year = int(snakemake.wildcards.planning_horizons)
     demand_sc = snakemake.wildcards.demand
     no_years = int(snakemake.wildcards.planning_horizons) - int(