Merge branch 'master' into master

This commit is contained in:
Lukas Franken 2023-11-14 09:41:37 +00:00 committed by GitHub
commit 06d435d217
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1561,14 +1561,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",
)
add_carrier_buses(n, "oil")
ice_efficiency = options["transport_internal_combustion_efficiency"]