Harmonise wildcards

Makefile

@@ -11,7 +11,7 @@ test:
 	snakemake solve_all_networks -call --configfile config.tutorial.yaml configs/scenarios/config.NG.yaml
 	snakemake solve_all_networks_monte -call --configfile config.tutorial.yaml test/config.monte_carlo.yaml
 	snakemake solve_all_networks -call --configfile config.tutorial.yaml test/config.landlock.yaml
-	snakemake -c4 solve_sector_networks --configfile config.tutorial.yaml test/config.test1.yaml
+	snakemake -c4 solve_sector_networks --configfile config.tutorial.yaml test/config.sector.yaml
 	echo "All tests completed successfully."
 
 setup:
@@ -24,5 +24,5 @@ clean:
 	snakemake -j1 solve_all_networks --delete-all-output --configfile config.tutorial.yaml configs/scenarios/config.NG.yaml
 	snakemake -j1 solve_all_networks_monte --delete-all-output --configfile test/config.monte_carlo.yaml
 	snakemake -j1 run_all_scenarios --delete-all-output --configfile test/config.landlock.yaml
-	snakemake -j1 solve_sector_networks --delete-all-output --configfile test/config.test1.yaml
+	snakemake -j1 solve_sector_networks --delete-all-output --configfile test/config.sector.yaml
 	echo "Clean-up complete."

scripts/add_brownfield.py

@@ -232,9 +232,9 @@ def disable_grid_expansion_if_limit_hit(n):
         snakemake = mock_snakemake(
             "add_brownfield",
             simpl="",
-            clusters="10",
-            ll="c1.0",
-            opts="Co2L",
+            clusters="4",
+            ll="c1",
+            opts="Co2L-4H",
             planning_horizons="2030",
             sopts="144H",
             discountrate=0.071,

scripts/add_existing_baseyear.py

@@ -586,11 +586,11 @@ def add_heating_capacities_installed_before_baseyear(
             simpl="",
             clusters="4",
             ll="c1",
-            opts="Co2L",
+            opts="Co2L-4H",
             planning_horizons="2030",
             sopts="144H",
             discountrate=0.071,
-            demand="DF",
+            demand="AB",
             h2export="120",
         )
 

scripts/add_export.py

@@ -211,9 +211,9 @@ def create_export_profile():
         snakemake = mock_snakemake(
             "add_export",
             simpl="",
-            clusters="10",
-            ll="c1.0",
-            opts="Co2L",
+            clusters="4",
+            ll="c1",
+            opts="Co2L-4H",
             planning_horizons="2030",
             sopts="144H",
             discountrate="0.071",

scripts/augmented_line_connections.py

@@ -55,7 +55,7 @@ def haversine(p):
         from _helpers import mock_snakemake
 
         snakemake = mock_snakemake(
-            "augmented_line_connections", network="elec", simpl="", clusters="54"
+            "augmented_line_connections", network="elec", simpl="", clusters="4"
         )
 
     configure_logging(snakemake)

scripts/build_base_energy_totals.py

@@ -357,7 +357,7 @@ def calc_sector(sector):
         snakemake = mock_snakemake(
             "build_base_energy_totals",
             simpl="",
-            clusters=19,
+            clusters=4,
             demand="AB",
             planning_horizons=2030,
         )

scripts/build_base_industry_totals.py

@@ -94,7 +94,7 @@ def create_industry_base_totals(df):
         snakemake = mock_snakemake(
             "build_base_industry_totals",
             planning_horizons=2030,
-            demand="EG",
+            demand="AB",
         )
 
     # Loading config file and wild cards

scripts/build_clustered_population_layouts.py

@@ -20,7 +20,7 @@
         snakemake = mock_snakemake(
             "build_clustered_population_layouts",
             simpl="",
-            clusters=38,
+            clusters=4,
         )
 
     cutout_path = (

scripts/build_cop_profiles.py

@@ -31,7 +31,7 @@ def coefficient_of_performance(delta_T, source="air"):
         snakemake = mock_snakemake(
             "build_cop_profiles",
             simpl="",
-            clusters=15,
+            clusters=4,
         )
 
     for area in ["total", "urban", "rural"]:

scripts/build_existing_heating_distribution.py

@@ -170,9 +170,9 @@ def build_existing_heating():
         snakemake = mock_snakemake(
             "build_existing_heating_distribution",
             simpl="",
-            clusters=4,
+            clusters="4",
             planning_horizons=2030,
-            demand="DF",
+            demand="AB",
         )
 
     build_existing_heating()

scripts/build_heat_demand.py

@@ -18,7 +18,7 @@
     if "snakemake" not in globals():
         from _helpers import mock_snakemake
 
-        snakemake = mock_snakemake("build_heat_demand", simpl="", clusters="10")
+        snakemake = mock_snakemake("build_heat_demand", simpl="", clusters="4")
 
     time = pd.date_range(freq="h", **snakemake.params.snapshots)
     cutout_config = snakemake.input.cutout

scripts/build_industrial_database.py

@@ -499,12 +499,12 @@ def create_paper_df():
             "build_industrial_database",
             simpl="",
             clusters="4",
-            ll="c1.0",
-            opts="Co2L",
+            ll="c1",
+            opts="Co2L-4H",
             planning_horizons="2030",
             sopts="144H",
-            discountrate="0.071",
-            demand="DF",
+            discountrate=0.071,
+            demand="AB",
         )
 
     industrial_database_steel = create_steel_db()

scripts/build_industrial_distribution_key.py

@@ -123,9 +123,9 @@ def match_technology(df):
         snakemake = mock_snakemake(
             "build_industrial_distribution_key",
             simpl="",
-            clusters=12,
-            demand="AB",
+            clusters="4",
             planning_horizons=2050,
+            demand="AB",
         )
 
     regions = gpd.read_file(snakemake.input.regions_onshore)

scripts/build_industry_demand.py

@@ -54,7 +54,7 @@ def country_to_nodal(industrial_production, keys):
         snakemake = mock_snakemake(
             "build_industry_demand",
             simpl="",
-            clusters=10,
+            clusters="4",
             planning_horizons=2030,
             demand="AB",
         )

scripts/build_solar_thermal_profiles.py

@@ -21,7 +21,7 @@
         snakemake = mock_snakemake(
             "build_solar_thermal_profiles",
             simpl="",
-            clusters=15,
+            clusters="4",
         )
 
     config = snakemake.params.solar_thermal_config

scripts/build_temperature_profiles.py

@@ -20,7 +20,7 @@
         snakemake = mock_snakemake(
             "build_temperature_profiles",
             simpl="",
-            clusters=900,
+            clusters="4",
         )
 
     time = pd.date_range(freq="h", **snakemake.params.snapshots)

scripts/cluster_network.py

@@ -657,7 +657,7 @@ def cluster_regions(busmaps, inputs, output):
         from _helpers import mock_snakemake
 
         snakemake = mock_snakemake(
-            "cluster_network", network="elec", simpl="", clusters="min"
+            "cluster_network", network="elec", simpl="", clusters="4"
         )
     configure_logging(snakemake)
 

scripts/make_summary.py

@@ -539,9 +539,9 @@ def to_csv(dfs, dir):
         snakemake = mock_snakemake(
             "make_summary",
             simpl="",
-            clusters="5",
+            clusters="4",
             ll="copt",
-            opts="Co2L-3H",
+            opts="Co2L-4H",
             country="all",
         )
         network_dir = ".."

scripts/monte_carlo.py

@@ -353,9 +353,9 @@ def validate_parameters(
         snakemake = mock_snakemake(
             "monte_carlo",
             simpl="",
-            clusters="10",
+            clusters="4",
             ll="copt",
-            opts="Co2L-24H",
+            opts="Co2L-4H",
             unc="m0",
         )
     configure_logging(snakemake)

scripts/override_respot.py

@@ -73,13 +73,13 @@ def override_values(tech, year, dr):
         snakemake = mock_snakemake(
             "override_respot",
             simpl="",
-            clusters="16",
-            ll="c1.0",
-            opts="Co2L",
+            clusters="4",
+            ll="c1",
+            opts="Co2L-4H",
             planning_horizons="2030",
-            sopts="3H",
-            demand="AP",
+            sopts="144H",
             discountrate=0.071,
+            demand="AB",
         )
 
     overrides = override_component_attrs(snakemake.input.overrides)

scripts/plot_network.py

@@ -1077,9 +1077,9 @@ def plot_sector_map(
             "plot_network",
             network="elec",
             simpl="",
-            clusters="100",
-            ll="copt",
-            opts="Co2L-3H",
+            clusters="4",
+            ll="c1",
+            opts="Co2L-4H",
             attr="p_nom",
             ext="pdf",
         )

scripts/plot_summary.py

@@ -224,9 +224,9 @@ def plot_energy(infn, snmk, fn=None):
             summary="energy",
             network="elec",
             simpl="",
-            clusters=10,
-            ll="copt",
-            opts="Co2L-24H",
+            clusters="4",
+            ll="c1",
+            opts="Co2L-4H",
             attr="",
             ext="pdf",
             country="all",

scripts/prepare_db.py

@@ -36,14 +36,14 @@
         snakemake = mock_snakemake(
             "prepare_db",
             simpl="",
-            clusters="244",
-            ll="c1.0",
-            opts="Co2L1",
+            clusters="4",
+            ll="c1",
+            opts="Co2L-4H",
             planning_horizons="2030",
-            sopts="720H",
+            sopts="144H",
             discountrate=0.071,
-            demand="AP",
-            h2export="0",
+            demand="AB",
+            h2export="120",
         )
 
     n0 = pypsa.Network(snakemake.input.network)

scripts/prepare_energy_totals.py

@@ -43,8 +43,8 @@ def calculate_end_values(df):
         snakemake = mock_snakemake(
             "prepare_energy_totals",
             simpl="",
-            clusters=32,
-            demand="EG",
+            clusters="4",
+            demand="AB",
             planning_horizons=2030,
         )
 

scripts/prepare_gas_network.py

@@ -41,7 +41,7 @@
         snakemake = mock_snakemake(
             "prepare_gas_network",
             simpl="",
-            clusters="10",
+            clusters="4",
         )
 
     # configure_logging(snakemake)

scripts/prepare_heat_data.py

@@ -137,9 +137,9 @@ def prepare_heat_data(n):
         snakemake = mock_snakemake(
             "prepare_heat_data",
             simpl="",
-            clusters="10",
+            clusters="4",
             planning_horizons=2030,
-            demand="DF",
+            demand="AB",
         )
 
     n = pypsa.Network(snakemake.input.network)

scripts/prepare_network.py

@@ -322,9 +322,9 @@ def set_line_nom_max(n, s_nom_max_set=np.inf, p_nom_max_set=np.inf):
         snakemake = mock_snakemake(
             "prepare_network",
             simpl="",
-            clusters="10",
-            ll="v0.3",
-            opts="Co2L-24H",
+            clusters="4",
+            ll="c1",
+            opts="Co2L-4H",
         )
 
     configure_logging(snakemake)

scripts/prepare_sector_network.py

@@ -2916,12 +2916,12 @@ def remove_carrier_related_components(n, carriers_to_drop):
         snakemake = mock_snakemake(
             "prepare_sector_network",
             simpl="",
-            clusters="19",
-            ll="c1.0",
-            opts="Co2L",
+            clusters="4",
+            ll="c1",
+            opts="Co2L-4H",
             planning_horizons="2030",
-            sopts="72H",
-            discountrate="0.071",
+            sopts="144H",
+            discountrate=0.071,
             demand="AB",
         )
 

scripts/prepare_transport_data.py

@@ -209,9 +209,9 @@ def prepare_transport_data(n):
         snakemake = mock_snakemake(
             "prepare_transport_data",
             simpl="",
-            clusters="74",
+            clusters="4",
+            planning_horizons="2030",
             demand="AB",
-            planning_horizons=2030,
         )
 
     n = pypsa.Network(snakemake.input.network)

scripts/solve_network.py

@@ -971,9 +971,9 @@ def solve_network(n, config, solving={}, opts="", **kwargs):
         snakemake = mock_snakemake(
             "solve_network",
             simpl="",
-            clusters="54",
-            ll="copt",
-            opts="Co2L-1H",
+            clusters="4",
+            ll="c1",
+            opts="Co2L-4H",
         )
 
     configure_logging(snakemake)

test/config.test1.yaml → test/config.sector.yaml

@@ -6,11 +6,11 @@ version: 0.5.0
 tutorial: true
 
 run:
-  name: test1
+  name: sector
   shared_cutouts: true
 
 scenario:
-  clusters: # number of nodes in Europe, any integer between 37 (1 node per country-zone) and several hundred
+  clusters: # number of nodes
   - 4
   ll:
   - "c1"