diff --git a/config/config.default.yaml b/config/config.default.yaml index f0fdd8d9..7bae66d1 100644 --- a/config/config.default.yaml +++ b/config/config.default.yaml @@ -778,6 +778,7 @@ plotting: gas pipeline new: '#a87c62' # oil oil: '#c9c9c9' + imported oil: '#a3a3a3' oil boiler: '#adadad' residential rural oil boiler: '#a9a9a9' services rural oil boiler: '#a5a5a5' diff --git a/config/test/config.perfect.yaml b/config/test/config.perfect.yaml index 788ad326..f20586d0 100644 --- a/config/test/config.perfect.yaml +++ b/config/test/config.perfect.yaml @@ -41,6 +41,9 @@ electricity: renewable_carriers: [solar, onwind, offwind-ac, offwind-dc] +sector: + min_part_load_fischer_tropsch: 0 + min_part_load_methanolisation: 0 atlite: default_cutout: be-03-2013-era5 cutouts: diff --git a/scripts/plot_summary.py b/scripts/plot_summary.py index b297987a..c6f8eef9 100644 --- a/scripts/plot_summary.py +++ b/scripts/plot_summary.py @@ -464,10 +464,22 @@ def plot_carbon_budget_distribution(input_eurostat): plt.rcParams["ytick.direction"] = "in" plt.rcParams["xtick.labelsize"] = 20 plt.rcParams["ytick.labelsize"] = 20 + + emissions_scope = snakemake.params.emissions_scope + report_year = snakemake.params.eurostat_report_year + input_co2 = snakemake.input.co2 # historic emissions countries = snakemake.params.countries - e_1990 = co2_emissions_year(countries, input_eurostat, opts, snakemake, year=1990) + e_1990 = co2_emissions_year( + countries, + input_eurostat, + opts, + emissions_scope, + report_year, + input_co2, + year=1990, + ) emissions = historical_emissions(countries) # add other years https://sdi.eea.europa.eu/data/0569441f-2853-4664-a7cd-db969ef54de0 emissions.loc[2019] = 2.971372 diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index cea18fdf..0f9118f4 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -191,17 +191,15 @@ def get(item, investment_year=None): def co2_emissions_year( - countries, input_eurostat, opts, emissions_scope, report_year, year + countries, input_eurostat, opts, emissions_scope, report_year, input_co2, year ): """ Calculate CO2 emissions in one specific year (e.g. 1990 or 2018). """ - emissions_scope = snakemake.params.energy["emissions"] - eea_co2 = build_eea_co2(snakemake.input.co2, year, emissions_scope) + eea_co2 = build_eea_co2(input_co2, year, emissions_scope) # TODO: read Eurostat data from year > 2014 # this only affects the estimation of CO2 emissions for BA, RS, AL, ME, MK - report_year = snakemake.params.energy["eurostat_report_year"] if year > 2014: eurostat_co2 = build_eurostat_co2( input_eurostat, countries, report_year, year=2014