Label oil and biomass buses also as MWh_LHV

This commit is contained in:
Irieo 2022-06-30 17:37:40 +02:00
parent 53ad90095a
commit 5d60e8c6e6

View File

@ -1285,7 +1285,7 @@ def add_land_transport(n, costs):
spatial.oil.nodes, spatial.oil.nodes,
location=spatial.oil.locations, location=spatial.oil.locations,
carrier="oil", carrier="oil",
unit="MWh_th" unit="MWh_LHV"
) )
ice_efficiency = options['transport_internal_combustion_efficiency'] ice_efficiency = options['transport_internal_combustion_efficiency']
@ -1758,14 +1758,14 @@ def add_biomass(n, costs):
spatial.gas.biogas, spatial.gas.biogas,
location=spatial.gas.locations, location=spatial.gas.locations,
carrier="biogas", carrier="biogas",
unit="MWh_th" unit="MWh_LHV"
) )
n.madd("Bus", n.madd("Bus",
spatial.biomass.nodes, spatial.biomass.nodes,
location=spatial.biomass.locations, location=spatial.biomass.locations,
carrier="solid biomass", carrier="solid biomass",
unit="MWh_th" unit="MWh_LHV"
) )
n.madd("Store", n.madd("Store",
@ -1877,7 +1877,7 @@ def add_industry(n, costs):
spatial.biomass.industry, spatial.biomass.industry,
location=spatial.biomass.locations, location=spatial.biomass.locations,
carrier="solid biomass for industry", carrier="solid biomass for industry",
unit="MWh_th" unit="MWh_LHV"
) )
if options["biomass_transport"]: if options["biomass_transport"]:
@ -2036,7 +2036,7 @@ def add_industry(n, costs):
spatial.oil.nodes, spatial.oil.nodes,
location=spatial.oil.locations, location=spatial.oil.locations,
carrier="oil", carrier="oil",
unit="MWh_th" unit="MWh_LHV"
) )
if "oil" not in n.stores.carrier.unique(): if "oil" not in n.stores.carrier.unique():