From 5b45fa303ccfc9dc1bbbde7effe28217081f9d2a Mon Sep 17 00:00:00 2001 From: martacki Date: Tue, 31 Oct 2023 17:11:06 +0100 Subject: [PATCH 1/3] madd oil generator to bus EU oil --- scripts/prepare_sector_network.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index ee2f0e3c..cc04bcbb 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1565,6 +1565,16 @@ def add_land_transport(n, costs): unit="MWh_LHV", ) + if "oil" not in n.generators.carrier.unique(): + n.madd( + "Generator", + spatial.oil.nodes, + bus=spatial.oil.nodes, + p_nom_extendable=True, + carrier="oil", + marginal_cost=costs.at["oil", "fuel"], + ) + ice_efficiency = options["transport_internal_combustion_efficiency"] n.madd( From b9128002bbdcd151fbbcb6c1e184aa384e2f66d7 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 31 Oct 2023 16:14:29 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- scripts/prepare_sector_network.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index cc04bcbb..47aeec50 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1567,13 +1567,13 @@ def add_land_transport(n, costs): if "oil" not in n.generators.carrier.unique(): n.madd( - "Generator", - spatial.oil.nodes, - bus=spatial.oil.nodes, - p_nom_extendable=True, - carrier="oil", - marginal_cost=costs.at["oil", "fuel"], - ) + "Generator", + spatial.oil.nodes, + bus=spatial.oil.nodes, + p_nom_extendable=True, + carrier="oil", + marginal_cost=costs.at["oil", "fuel"], + ) ice_efficiency = options["transport_internal_combustion_efficiency"] From c7a4ff7a4d9a66a1d22d63ccfbc2bfff03964b20 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Sun, 12 Nov 2023 18:22:22 +0100 Subject: [PATCH 3/3] use existing add_carrier_buses function --- scripts/prepare_sector_network.py | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 47aeec50..ee72042f 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1556,24 +1556,7 @@ def add_land_transport(n, costs): ) if ice_share > 0: - if "oil" not in n.buses.carrier.unique(): - n.madd( - "Bus", - spatial.oil.nodes, - location=spatial.oil.locations, - carrier="oil", - unit="MWh_LHV", - ) - - if "oil" not in n.generators.carrier.unique(): - n.madd( - "Generator", - spatial.oil.nodes, - bus=spatial.oil.nodes, - p_nom_extendable=True, - carrier="oil", - marginal_cost=costs.at["oil", "fuel"], - ) + add_carrier_buses(n, "oil") ice_efficiency = options["transport_internal_combustion_efficiency"]