modified spatial namespaces and removed suffixes

PyPSA · Sep 6, 2024 · c875ba7 · c875ba7
1 parent 004572b
commit c875ba7
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py
@@ -63,14 +63,16 @@ def define_spatial(nodes, options):
 
     if options.get("biomass_spatial", options["biomass_transport"]):
         spatial.biomass.nodes = nodes + " solid biomass"
-        spatial.biomass.bioliquids = nodes + " bioliquids"
+        spatial.biomass.nodes_unsustainable = nodes + " unsustainable solid biomass"
+        spatial.biomass.bioliquids = nodes + " unsustainable bioliquids"
         spatial.biomass.locations = nodes
         spatial.biomass.industry = nodes + " solid biomass for industry"
         spatial.biomass.industry_cc = nodes + " solid biomass for industry CC"
         spatial.msw.nodes = nodes + " municipal solid waste"
         spatial.msw.locations = nodes
     else:
         spatial.biomass.nodes = ["EU solid biomass"]
+        spatial.biomass.nodes_unsustainable = ["EU unsustainable solid biomass"]
         spatial.biomass.bioliquids = ["EU unsustainable bioliquids"]
         spatial.biomass.locations = ["EU"]
         spatial.biomass.industry = ["solid biomass for industry"]
@@ -2467,8 +2469,7 @@ def add_biomass(n, costs):
 
         n.madd(
             "Bus",
-            spatial.biomass.nodes,
-            suffix=" unsustainable",
+            spatial.biomass.nodes_unsustainable,
             location=spatial.biomass.locations,
             carrier="unsustainable solid biomass",
             unit="MWh_LHV",
@@ -2479,9 +2480,8 @@ def add_biomass(n, costs):
 
         n.madd(
             "Store",
-            spatial.biomass.nodes,
-            suffix=" unsustainable",
-            bus=spatial.biomass.nodes + " unsustainable",
+            spatial.biomass.nodes_unsustainable,
+            bus=spatial.biomass.nodes_unsustainable,
             carrier="unsustainable solid biomass",
             e_nom=unsustainable_solid_biomass_potentials_spatial,
             marginal_cost=costs.at["fuelwood", "fuel"],
@@ -2492,9 +2492,8 @@ def add_biomass(n, costs):
 
         n.madd(
             "Link",
-            spatial.biomass.nodes,
-            suffix=" unsustainable",
-            bus0=spatial.biomass.nodes + " unsustainable",
+            spatial.biomass.nodes_unsustainable,
+            bus0=spatial.biomass.nodes_unsustainable,
             bus1=spatial.biomass.nodes,
             carrier="unsustainable solid biomass",
             efficiency=1,
@@ -2517,7 +2516,6 @@ def add_biomass(n, costs):
         n.madd(
             "Store",
             spatial.biomass.bioliquids,
-            suffix=" unsustainable",
             bus=spatial.biomass.bioliquids,
             carrier="unsustainable bioliquids",
             e_nom=unsustainable_liquid_biofuel_potentials_spatial,
@@ -2658,9 +2656,8 @@ def add_biomass(n, costs):
         if biomass_potentials["unsustainable solid biomass"].sum() > 0:
             n.madd(
                 "Generator",
-                spatial.biomass.nodes,
-                suffix=" unsustainable",
-                bus=spatial.biomass.nodes + " unsustainable",
+                spatial.biomass.nodes_unsustainable,
+                bus=spatial.biomass.nodes_unsustainable,
                 carrier="unsustainable solid biomass",
                 p_nom=10000,
                 marginal_cost=costs.at["fuelwood", "fuel"]