Skip to content

Commit 2fd3b0b

Browse files
committed
fix: disinguish base and clustered regions
1 parent e872f02 commit 2fd3b0b

2 files changed

Lines changed: 185 additions & 166 deletions

File tree

rules/build_electricity.smk

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ rule base_network:
9191
europe_shape=resources("europe_shape.geojson"),
9292
output:
9393
base_network=resources("networks/base.nc"),
94-
regions_onshore=resources("regions_onshore.geojson"),
95-
regions_offshore=resources("regions_offshore.geojson"),
94+
regions_onshore=resources("regions_onshore_base.geojson"),
95+
regions_offshore=resources("regions_offshore_base.geojson"),
9696
admin_shapes=resources("admin_shapes.geojson"),
9797
log:
9898
logs("base_network.log"),
@@ -585,8 +585,8 @@ rule simplify_network:
585585
p_min_pu=config_provider("links", "p_min_pu", default=-1.0),
586586
input:
587587
network=resources("networks/base_extended.nc"),
588-
regions_onshore=resources("regions_onshore.geojson"),
589-
regions_offshore=resources("regions_offshore.geojson"),
588+
regions_onshore=resources("regions_onshore_base.geojson"),
589+
regions_offshore=resources("regions_offshore_base.geojson"),
590590
admin_shapes=resources("admin_shapes.geojson"),
591591
output:
592592
network=resources("networks/base_s.nc"),
@@ -655,8 +655,8 @@ rule cluster_network:
655655
if config_provider("clustering", "mode")(w) == "administrative"
656656
else []
657657
),
658-
regions_onshore=resources("regions_onshore_base_s.geojson"),
659-
regions_offshore=resources("regions_offshore_base_s.geojson"),
658+
regions_onshore=resources("regions_onshore_base.geojson"),
659+
regions_offshore=resources("regions_offshore_base.geojson"),
660660
hac_features=lambda w: (
661661
resources("hac_features.nc")
662662
if config_provider("clustering", "cluster_network", "algorithm")(w)
@@ -666,8 +666,8 @@ rule cluster_network:
666666
load=resources("electricity_demand_base_s.nc"),
667667
output:
668668
network=resources("networks/clustered.nc"),
669-
regions_onshore=resources("regions_onshore_clustered.geojson"),
670-
regions_offshore=resources("regions_offshore_clustered.geojson"),
669+
regions_onshore=resources("regions_onshore.geojson"),
670+
regions_offshore=resources("regions_offshore.geojson"),
671671
busmap=resources("busmap.csv"),
672672
linemap=resources("linemap.csv"),
673673
log:

0 commit comments

Comments
 (0)