Merge branch 'master' into fix_building_fec

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

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):

scripts/prepare_sector_network.py

@@ -2337,7 +2337,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()
@@ -2698,7 +2698,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(