From 928d1f23edf3d21a9ee943188fd00ee06ad862b1 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 9 Aug 2021 18:03:20 +0200 Subject: [PATCH] biomass_transport: improve spatial biomass potential handling --- scripts/prepare_sector_network.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index baddcc81..c2fec14f 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1616,9 +1616,10 @@ def add_biomass(n, costs): # potential per node distributed within country by population biomass_potentials_spatial = (biomass_potentials.loc[pop_layout.ct] .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: - biomass_potentials_spatial = pd.DataFrame(biomass_potentials.sum()).T + biomass_potentials_spatial = biomass_potentials.sum() n.add("Carrier", "biogas") n.add("Carrier", "solid biomass") @@ -1648,9 +1649,9 @@ def add_biomass(n, costs): spatial.biomass.nodes, bus=spatial.biomass.nodes, 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'], - e_initial=biomass_potentials_spatial["solid biomass"].values + e_initial=biomass_potentials_spatial["solid biomass"] ) n.add("Link",