From d2ef6213871347d2ffdbb9bab156859bf979d251 Mon Sep 17 00:00:00 2001 From: Hazem-IEG Date: Wed, 6 Sep 2023 12:52:45 +0200 Subject: [PATCH 1/2] fix minor bug --- scripts/prepare_energy_totals.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/prepare_energy_totals.py b/scripts/prepare_energy_totals.py index c4ba94bcb..e2ed866d9 100644 --- a/scripts/prepare_energy_totals.py +++ b/scripts/prepare_energy_totals.py @@ -81,7 +81,7 @@ def calculate_end_values(df): options["shipping_hydrogen_share"], demand_sc + "_" + str(investment_year) ) - energy_totals = base_energy_totals * efficiency_gains * growth_factors + energy_totals = base_energy_totals * efficiency_gains.loc[countries] * growth_factors.loc[countries] # Residential efficiency_heat_oil_to_elec = snakemake.config["sector"][ @@ -270,4 +270,4 @@ def calculate_end_values(df): energy_totals = energy_totals.dropna(axis=1, how="all") - energy_totals.to_csv(snakemake.output.energy_totals) + energy_totals.fillna(0).to_csv(snakemake.output.energy_totals) From c5a08bb19208d53fc04b712df7dcbe2b77b0395c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 10:35:57 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- scripts/prepare_energy_totals.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/prepare_energy_totals.py b/scripts/prepare_energy_totals.py index e2ed866d9..a6727c5ba 100644 --- a/scripts/prepare_energy_totals.py +++ b/scripts/prepare_energy_totals.py @@ -81,7 +81,11 @@ def calculate_end_values(df): options["shipping_hydrogen_share"], demand_sc + "_" + str(investment_year) ) - energy_totals = base_energy_totals * efficiency_gains.loc[countries] * growth_factors.loc[countries] + energy_totals = ( + base_energy_totals + * efficiency_gains.loc[countries] + * growth_factors.loc[countries] + ) # Residential efficiency_heat_oil_to_elec = snakemake.config["sector"][