From a04ed127d76dfef7e4d21a821bca036ffe6383e7 Mon Sep 17 00:00:00 2001 From: energyls Date: Mon, 27 Nov 2023 11:31:05 +0100 Subject: [PATCH 1/3] fix: remove oil share to avoid double accounting --- scripts/prepare_sector_network.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 7b72803b..2df885a9 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1049,9 +1049,7 @@ def add_shipping(n, costs): p_set=ports["p_set"], ) - co2 = ( - shipping_oil_share * ports["p_set"].sum() * costs.at["oil", "CO2 intensity"] - ) + co2 = ports["p_set"].sum() * costs.at["oil", "CO2 intensity"] n.add( "Load", From 9b4031901d6553fa6c0d08058e16eb291c78fb28 Mon Sep 17 00:00:00 2001 From: energyls Date: Mon, 27 Nov 2023 11:56:33 +0100 Subject: [PATCH 2/3] fix: sum over nodes and calc hourly value --- scripts/prepare_sector_network.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 2df885a9..7f347dda 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -2056,8 +2056,9 @@ def add_agriculture(n, costs): co2 = ( nodal_energy_totals.loc[nodes, "agriculture oil"] * 1e6 + / 8760 * costs.at["oil", "CO2 intensity"] - ) + ).sum() n.add( "Load", From 086e235beaf1583eb4dbb5059e6ef148910dd6b2 Mon Sep 17 00:00:00 2001 From: energyls Date: Mon, 27 Nov 2023 17:14:17 +0100 Subject: [PATCH 3/3] fix: remove residential biomass emissions --- scripts/prepare_sector_network.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 7f347dda..1bb70cd0 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -2211,16 +2211,6 @@ def add_residential(n, costs): p_set=-co2, ) - co2 = (p_set_oil.sum().sum() * costs.at["solid biomass", "CO2 intensity"]) / 8760 - - n.add( - "Load", - "residential biomass emissions", - bus="co2 atmosphere", - carrier="biomass emissions", - p_set=-co2, - ) - for country in countries: rem_heat_demand = ( energy_totals.loc[country, "total residential space"]