added prebuilt functionality.

PyPSA · Jun 6, 2024 · a2ee16f · a2ee16f
1 parent b44d669
commit a2ee16f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/rules/build_electricity.smk b/rules/build_electricity.smk
@@ -115,11 +115,11 @@ if config["electricity_network"]["base_network"] == "osm":
             links=config_provider("links"),
             transformers=config_provider("transformers"),
         input:
-            eg_buses=resources("osm/buses.csv"),
-            eg_lines=resources("osm/lines.csv"),
-            eg_links=resources("osm/links.csv"),
-            eg_converters=resources("osm/converters.csv"),
-            eg_transformers=resources("osm/transformers.csv"),
+            eg_buses="data/osm/prebuilt/buses.csv" if config["electricity_network"]["osm_use_prebuilt"] == True else resources("osm/buses.csv"),
+            eg_lines="data/osm/prebuilt/lines.csv" if config["electricity_network"]["osm_use_prebuilt"] == True else resources("osm/lines.csv"),
+            eg_links="data/osm/prebuilt/links.csv" if config["electricity_network"]["osm_use_prebuilt"] == True else resources("osm/links.csv"),
+            eg_converters="data/osm/prebuilt/converters.csv" if config["electricity_network"]["osm_use_prebuilt"] == True else resources("osm/converters.csv"),
+            eg_transformers="data/osm/prebuilt/transformers.csv" if config["electricity_network"]["osm_use_prebuilt"] == True else resources("osm/transformers.csv"),
             country_shapes=resources("country_shapes.geojson"),
             offshore_shapes=resources("offshore_shapes.geojson"),
             europe_shape=resources("europe_shape.geojson"),

diff --git a/scripts/base_network_osm.py b/scripts/base_network_osm.py
@@ -145,11 +145,13 @@ def _load_buses_from_eg(eg_buses, europe_shape, config_elec):
             dtype=dict(bus_id="str"),
         )
         .set_index("bus_id")
-        .drop(["station_id"], axis=1)
         .rename(columns=dict(voltage="v_nom"))
     )
 
-    buses["carrier"] = buses.pop("dc").map({True: "DC", False: "AC"})
+    if "station_id" in buses.columns:
+        buses.drop("station_id", axis=1, inplace=True)
+
+    # buses["carrier"] = buses.pop("dc").map({True: "DC", False: "AC"})
     buses["under_construction"] = buses.under_construction.where(
         lambda s: s.notnull(), False
     ).astype(bool)