diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 7b72803b..1bb70cd0 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", @@ -2058,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", @@ -2212,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"]