bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove remaining references of eurostat report year

Browse Source
This commit is contained in:
Fabian Neumann 2024-03-05 18:55:59 +01:00
parent bf60da973b
commit c13e0b83cf
4 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rules/build_sector.smk
View File

@ -834,7 +834,6 @@ rule prepare_sector_network:
countries=config_provider("countries"), countries=config_provider("countries"),
adjustments=config_provider("adjustments", "sector"), adjustments=config_provider("adjustments", "sector"),
emissions_scope=config_provider("energy", "emissions"), emissions_scope=config_provider("energy", "emissions"),
eurostat_report_year=config_provider("energy", "eurostat_report_year"),
RDIR=RDIR, RDIR=RDIR,
input: input:
unpack(input_profile_offwind), unpack(input_profile_offwind),

1
rules/postprocess.smk
View File

@ -237,7 +237,6 @@ rule plot_summary:
countries=config_provider("countries"), countries=config_provider("countries"),
planning_horizons=config_provider("scenario", "planning_horizons"), planning_horizons=config_provider("scenario", "planning_horizons"),
emissions_scope=config_provider("energy", "emissions"), emissions_scope=config_provider("energy", "emissions"),
eurostat_report_year=config_provider("energy", "eurostat_report_year"),
plotting=config_provider("plotting"), plotting=config_provider("plotting"),
foresight=config_provider("foresight"), foresight=config_provider("foresight"),
co2_budget=config_provider("co2_budget"), co2_budget=config_provider("co2_budget"),

2
scripts/plot_summary.py
View File

@ -462,7 +462,6 @@ def plot_carbon_budget_distribution(input_eurostat, options):
plt.rcParams["ytick.labelsize"] = 20 plt.rcParams["ytick.labelsize"] = 20
emissions_scope = snakemake.params.emissions_scope emissions_scope = snakemake.params.emissions_scope
report_year = snakemake.params.eurostat_report_year
input_co2 = snakemake.input.co2 input_co2 = snakemake.input.co2
# historic emissions # historic emissions
@ -472,7 +471,6 @@ def plot_carbon_budget_distribution(input_eurostat, options):
input_eurostat, input_eurostat,
options, options,
emissions_scope, emissions_scope,
report_year,
input_co2, input_co2,
year=1990, year=1990,
) )

14
scripts/prepare_sector_network.py
View File

@ -248,7 +248,7 @@ def get(item, investment_year=None):
def co2_emissions_year( def co2_emissions_year(
countries, input_eurostat, options, emissions_scope, report_year, input_co2, year countries, input_eurostat, options, emissions_scope, input_co2, year
): ):
""" """
Calculate CO2 emissions in one specific year (e.g. 1990 or 2018). Calculate CO2 emissions in one specific year (e.g. 1990 or 2018).
@ -258,11 +258,9 @@ def co2_emissions_year(
# TODO: read Eurostat data from year > 2014 # TODO: read Eurostat data from year > 2014
# this only affects the estimation of CO2 emissions for BA, RS, AL, ME, MK # this only affects the estimation of CO2 emissions for BA, RS, AL, ME, MK
if year > 2014: if year > 2014:
eurostat_co2 = build_eurostat_co2( eurostat_co2 = build_eurostat_co2(input_eurostat, countries, 2014)
input_eurostat, countries, report_year, year=2014
)
else: else:
eurostat_co2 = build_eurostat_co2(input_eurostat, countries, report_year, year) eurostat_co2 = build_eurostat_co2(input_eurostat, countries, year)
co2_totals = build_co2_totals(countries, eea_co2, eurostat_co2) co2_totals = build_co2_totals(countries, eea_co2, eurostat_co2)
@ -278,7 +276,7 @@ def co2_emissions_year(
# TODO: move to own rule with sector-opts wildcard? # TODO: move to own rule with sector-opts wildcard?
def build_carbon_budget( def build_carbon_budget(
o, input_eurostat, fn, emissions_scope, report_year, input_co2, options o, input_eurostat, fn, emissions_scope, input_co2, options
): ):
""" """
Distribute carbon budget following beta or exponential transition path. Distribute carbon budget following beta or exponential transition path.
@ -300,7 +298,6 @@ def build_carbon_budget(
input_eurostat, input_eurostat,
options, options,
emissions_scope, emissions_scope,
report_year,
input_co2, input_co2,
year=1990, year=1990,
) )
@ -311,7 +308,6 @@ def build_carbon_budget(
input_eurostat, input_eurostat,
options, options,
emissions_scope, emissions_scope,
report_year,
input_co2, input_co2,
year=2018, year=2018,
) )
@ -3669,14 +3665,12 @@ if __name__ == "__main__":
fn = "results/" + snakemake.params.RDIR + "/csvs/carbon_budget_distribution.csv" fn = "results/" + snakemake.params.RDIR + "/csvs/carbon_budget_distribution.csv"
if not os.path.exists(fn): if not os.path.exists(fn):
emissions_scope = snakemake.params.emissions_scope emissions_scope = snakemake.params.emissions_scope
report_year = snakemake.params.eurostat_report_year
input_co2 = snakemake.input.co2 input_co2 = snakemake.input.co2
build_carbon_budget( build_carbon_budget(
co2_budget, co2_budget,
snakemake.input.eurostat, snakemake.input.eurostat,
fn, fn,
emissions_scope, emissions_scope,
report_year,
input_co2, input_co2,
options, options,
) )