Deduct electric heating from electricity load profile
Otherwise it is double-counted in both the heating and the electricity load profiles. This removes 454 TWh/a from electricity.
This commit is contained in:
parent
d3a0f7e67d
commit
eebac1bfa3
@ -304,6 +304,7 @@ def prepare_data(network):
|
|||||||
uses = ["water","space"]
|
uses = ["water","space"]
|
||||||
|
|
||||||
heat_demand = {}
|
heat_demand = {}
|
||||||
|
electric_heat_supply = {}
|
||||||
for sector in sectors:
|
for sector in sectors:
|
||||||
for use in uses:
|
for use in uses:
|
||||||
intraday_year_profile = generate_periodic_profiles(daily_space_heat_demand.index.tz_localize("UTC"),
|
intraday_year_profile = generate_periodic_profiles(daily_space_heat_demand.index.tz_localize("UTC"),
|
||||||
@ -318,9 +319,14 @@ def prepare_data(network):
|
|||||||
factor = 1.
|
factor = 1.
|
||||||
|
|
||||||
heat_demand["{} {}".format(sector,use)] = factor*(heat_demand_shape/heat_demand_shape.sum()).multiply(nodal_energy_totals["total {} {}".format(sector,use)])*1e6
|
heat_demand["{} {}".format(sector,use)] = factor*(heat_demand_shape/heat_demand_shape.sum()).multiply(nodal_energy_totals["total {} {}".format(sector,use)])*1e6
|
||||||
|
electric_heat_supply["{} {}".format(sector,use)] = (heat_demand_shape/heat_demand_shape.sum()).multiply(nodal_energy_totals["electricity {} {}".format(sector,use)])*1e6
|
||||||
|
|
||||||
heat_demand = pd.concat(heat_demand,axis=1)
|
heat_demand = pd.concat(heat_demand,axis=1)
|
||||||
|
electric_heat_supply = pd.concat(electric_heat_supply,axis=1)
|
||||||
|
|
||||||
|
#subtract from electricity load since heat demand already in heat_demand
|
||||||
|
electric_nodes = n.loads.index[n.loads.carrier == "electricity"]
|
||||||
|
n.loads_t.p_set[electric_nodes] = n.loads_t.p_set[electric_nodes] - electric_heat_supply.groupby(level=1,axis=1).sum()[electric_nodes]
|
||||||
|
|
||||||
##############
|
##############
|
||||||
#Transport
|
#Transport
|
||||||
|
Loading…
Reference in New Issue
Block a user