biomass_transport: improve spatial biomass potential handling

This commit is contained in:
Fabian Neumann 2021-08-09 18:03:20 +02:00
parent edf3a5f5fe
commit 928d1f23ed

View File

@ -1616,9 +1616,10 @@ def add_biomass(n, costs):
# potential per node distributed within country by population # potential per node distributed within country by population
biomass_potentials_spatial = (biomass_potentials.loc[pop_layout.ct] biomass_potentials_spatial = (biomass_potentials.loc[pop_layout.ct]
.set_index(pop_layout.index) .set_index(pop_layout.index)
.mul(pop_layout.fraction, axis="index")) .mul(pop_layout.fraction, axis="index")
.rename(index=lambda x: x + " solid biomass"))
else: else:
biomass_potentials_spatial = pd.DataFrame(biomass_potentials.sum()).T biomass_potentials_spatial = biomass_potentials.sum()
n.add("Carrier", "biogas") n.add("Carrier", "biogas")
n.add("Carrier", "solid biomass") n.add("Carrier", "solid biomass")
@ -1648,9 +1649,9 @@ def add_biomass(n, costs):
spatial.biomass.nodes, spatial.biomass.nodes,
bus=spatial.biomass.nodes, bus=spatial.biomass.nodes,
carrier="solid biomass", carrier="solid biomass",
e_nom=biomass_potentials_spatial["solid biomass"].values, e_nom=biomass_potentials_spatial["solid biomass"],
marginal_cost=costs.at['solid biomass', 'fuel'], marginal_cost=costs.at['solid biomass', 'fuel'],
e_initial=biomass_potentials_spatial["solid biomass"].values e_initial=biomass_potentials_spatial["solid biomass"]
) )
n.add("Link", n.add("Link",