From 9aa9a59bb03cdaac1d45fde0b23813589e483ed1 Mon Sep 17 00:00:00 2001 From: Toni Seibold <153275395+toniseibold@users.noreply.github.com> Date: Mon, 9 Sep 2024 19:35:15 +0200 Subject: [PATCH 1/3] removing scripts. (#1267) --- scripts/definitions/heat_system.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/definitions/heat_system.py b/scripts/definitions/heat_system.py index b907b0fe..2806f6bf 100644 --- a/scripts/definitions/heat_system.py +++ b/scripts/definitions/heat_system.py @@ -5,8 +5,8 @@ from enum import Enum -from scripts.definitions.heat_sector import HeatSector -from scripts.definitions.heat_system_type import HeatSystemType +from definitions.heat_sector import HeatSector +from definitions.heat_system_type import HeatSystemType class HeatSystem(Enum): From 5f45a1be8404836f1f1445b78c996d3046715758 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 10 Sep 2024 12:32:42 +0200 Subject: [PATCH 2/3] build_biomass_transport_costs: do not rename XK to KO --- scripts/build_biomass_transport_costs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build_biomass_transport_costs.py b/scripts/build_biomass_transport_costs.py index d5650902..db369542 100644 --- a/scripts/build_biomass_transport_costs.py +++ b/scripts/build_biomass_transport_costs.py @@ -79,7 +79,7 @@ def build_biomass_transport_costs(): transport_costs.name = "EUR/km/MWh" # rename country names - to_rename = {"UK": "GB", "XK": "KO", "EL": "GR"} + to_rename = {"UK": "GB", "EL": "GR"} transport_costs.rename(to_rename, inplace=True) # add missing Norway with data from Sweden From 8a0b6ba9114b020ad9677ea5218366f28f647d8f Mon Sep 17 00:00:00 2001 From: cpschau <124347782+cpschau@users.noreply.github.com> Date: Tue, 10 Sep 2024 16:21:14 +0200 Subject: [PATCH 3/3] Hot fix: Rename reindex transport costs for unsustainable biomass (#1271) * reindex transport costs for unsus biomass * change index of potential dataframe for unsustainable solid potentials --- scripts/prepare_sector_network.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 7f744874..6ef86cc4 100755 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -2332,7 +2332,7 @@ def add_biomass(n, costs): ].rename(index=lambda x: x + " municipal solid waste") unsustainable_solid_biomass_potentials_spatial = biomass_potentials[ "unsustainable solid biomass" - ].rename(index=lambda x: x + " solid biomass") + ].rename(index=lambda x: x + " unsustainable solid biomass") else: solid_biomass_potentials_spatial = biomass_potentials["solid biomass"].sum() @@ -2693,7 +2693,12 @@ def add_biomass(n, costs): carrier="unsustainable solid biomass", p_nom=10000, marginal_cost=costs.at["fuelwood", "fuel"] - + bus_transport_costs * average_distance, + + bus_transport_costs.rename( + dict( + zip(spatial.biomass.nodes, spatial.biomass.nodes_unsustainable) + ) + ) + * average_distance, ) # Set last snapshot of e_max_pu for unsustainable solid biomass to 1 to make operational limit work unsus_stores_idx = n.stores.query(