diff --git a/data/demand/fuel_shares.csv b/data/demand/fuel_shares.csv index a3a4fa76..a380b12e 100644 --- a/data/demand/fuel_shares.csv +++ b/data/demand/fuel_shares.csv @@ -2,4 +2,3 @@ country,oil residential heat share,biomass residential heat share,biomass to ele MA, 0.6667, 0.75,0.0, 0.5, 0.0, 0.5,0.6,0,0,0.75 NG, 0.6667, 0.75,0.0, 0.5, 0.0, 0.5,0.6,0,0,0.75 BJ, 0.6667, 0.75,0.0, 0.5, 0.0, 0.5,0.6,0,0,0.75 - diff --git a/scripts/build_base_energy_totals.py b/scripts/build_base_energy_totals.py index a09b79d2..35794ee8 100644 --- a/scripts/build_base_energy_totals.py +++ b/scripts/build_base_energy_totals.py @@ -338,7 +338,7 @@ 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"] - #countries = ["NG", "BJ"] + # countries = ["NG", "BJ"] # Filter for the year and country df_yr = df[df.Year == year] diff --git a/scripts/prepare_energy_totals.py b/scripts/prepare_energy_totals.py index ce9bf72e..d820b11b 100644 --- a/scripts/prepare_energy_totals.py +++ b/scripts/prepare_energy_totals.py @@ -40,7 +40,7 @@ def get(item, investment_year=None): sets_path_to_root("pypsa-earth-sec") countries = snakemake.config["countries"] - #countries = ["NG", "BJ"] + # countries = ["NG", "BJ"] investment_year = int(snakemake.wildcards.planning_horizons) demand_sc = snakemake.wildcards.demand # loading the demand scenrario wildcard @@ -57,8 +57,6 @@ def get(item, investment_year=None): options = snakemake.config["sector"] - - fuel_cell_share = get( options["land_transport_fuel_cell_share"], demand_sc + "_" + str(investment_year),