feat: restructure and improve transmission topology + config for all carriers

Snakefile

@@ -129,7 +129,7 @@ rule all:
             (
                 RESULTS
                 + "maps/static/base_s_{clusters}_{opts}_{sector_opts}-h2_network_{planning_horizons}.pdf"
-                if config_provider("sector", "H2_network")(w)
+                if config_provider("transmission", "hydrogen", "enable")(w)
                 else []
             ),
             run=config["run"]["name"],
@@ -139,7 +139,7 @@ rule all:
             (
                 RESULTS
                 + "maps/static/base_s_{clusters}_{opts}_{sector_opts}-ch4_network_{planning_horizons}.pdf"
-                if config_provider("sector", "gas_network")(w)
+                if config_provider("transmission", "gas", "enable")(w)
                 else []
             ),
             run=config["run"]["name"],

config/config.default.yaml

@@ -112,7 +112,6 @@ electricity:
   - 400.0
   - 500.0
   - 750.0
-  base_network: osm
   gaslimit_enable: false
   gaslimit: false
   co2limit_enable: false
@@ -182,7 +181,101 @@ electricity:
   autarky:
     enable: false
     by_country: false
-  transmission_limit: vopt
+
+# docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#transmission
+transmission:
+  electricity:
+    enable: true
+    base_network: osm
+    transmission_limit: vopt
+    lines:
+      types:
+        63.0: "94-AL1/15-ST1A 20.0"
+        66.0: "94-AL1/15-ST1A 20.0"
+        90.0: "184-AL1/30-ST1A 110.0"
+        110.0: "184-AL1/30-ST1A 110.0"
+        132.0: "243-AL1/39-ST1A 110.0"
+        150.0: "243-AL1/39-ST1A 110.0"
+        220.0: "Al/St 240/40 2-bundle 220.0"
+        300.0: "Al/St 240/40 3-bundle 300.0"
+        330.0: "Al/St 240/40 3-bundle 300.0"
+        380.0: "Al/St 240/40 4-bundle 380.0"
+        400.0: "Al/St 240/40 4-bundle 380.0"
+        500.0: "Al/St 240/40 4-bundle 380.0"
+        750.0: "Al/St 560/50 4-bundle 750.0"
+      s_max_pu: 0.7
+      s_nom_max: .inf
+      max_extension: 20000
+      length_factor: 1.25
+      reconnect_crimea: true
+      under_construction: keep
+      dynamic_line_rating:
+        activate: false
+        cutout: default
+        correction_factor: 0.95
+        max_voltage_difference: false
+        max_line_rating: false
+    links:
+      p_max_pu: 1.0
+      p_min_pu: -1.0
+      p_nom_max: .inf
+      max_extension: 30000
+      length_factor: 1.25
+      under_construction: keep
+      efficiency:
+        enable: true
+        efficiency_static: 0.98
+        efficiency_per_1000km: 0.977
+    transformers:
+      x: 0.1
+      s_nom: 2000.0
+      type: ""
+    projects:
+      enable: true
+      include:
+        tyndp2020: true
+        nep: true
+        manual: true
+      skip:
+      - upgraded_lines
+      - upgraded_links
+      status:
+      - under_construction
+      - in_permitting
+      - confirmed
+      new_link_capacity: zero
+  electricity_distribution:
+    enable: true
+    cost_factor: 1.0
+    efficiency:
+      enable: true
+      efficiency_static: 0.97
+  hydrogen:
+    enable: true
+    gabriel_filter_min_degree: 1
+    max_offshore_haversine_distance: .inf
+    length_factor: 1.25
+    cost_factor: 1
+    retrofit:
+      enable: false
+      capacity_per_ch4: 0.6
+    efficiency:
+      enable: true
+      efficiency_per_1000km: 1.0
+      compression_per_1000km: 0.018
+  carbon_dioxide:
+    enable: true
+    gabriel_filter_min_degree: 1
+    max_offshore_haversine_distance: .inf
+    length_factor: 1.25
+    cost_factor: 1
+  gas:
+    enable: true
+    connectivity_upgrade: 1
+    efficiency:
+      enable: true
+      efficiency_per_1000km: 1.0
+      compression_per_1000km: 0.01
 
 # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#atlite
 atlite:
@@ -427,66 +520,6 @@ conventional:
   nuclear:
     p_max_pu: data/nuclear_p_max_pu.csv
 
-# docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#lines
-lines:
-  types:
-    63.0: "94-AL1/15-ST1A 20.0"
-    66.0: "94-AL1/15-ST1A 20.0"
-    90.0: "184-AL1/30-ST1A 110.0"
-    110.0: "184-AL1/30-ST1A 110.0"
-    132.0: "243-AL1/39-ST1A 110.0"
-    150.0: "243-AL1/39-ST1A 110.0"
-    220.0: "Al/St 240/40 2-bundle 220.0"
-    300.0: "Al/St 240/40 3-bundle 300.0"
-    330.0: "Al/St 240/40 3-bundle 300.0"
-    380.0: "Al/St 240/40 4-bundle 380.0"
-    400.0: "Al/St 240/40 4-bundle 380.0"
-    500.0: "Al/St 240/40 4-bundle 380.0"
-    750.0: "Al/St 560/50 4-bundle 750.0"
-  s_max_pu: 0.7
-  s_nom_max: .inf
-  max_extension: 20000
-  length_factor: 1.25
-  reconnect_crimea: true
-  under_construction: keep
-  dynamic_line_rating:
-    activate: false
-    cutout: default
-    correction_factor: 0.95
-    max_voltage_difference: false
-    max_line_rating: false
-
-# docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#links
-links:
-  p_max_pu: 1.0
-  p_min_pu: -1.0
-  p_nom_max: .inf
-  max_extension: 30000
-  length_factor: 1.25
-  under_construction: keep
-
-# docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#transmission_projects
-transmission_projects:
-  enable: true
-  include:
-    tyndp2020: true
-    nep: true
-    manual: true
-  skip:
-  - upgraded_lines
-  - upgraded_links
-  status:
-  - under_construction
-  - in_permitting
-  - confirmed
-  new_link_capacity: zero
-
-# docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#transformers
-transformers:
-  x: 0.1
-  s_nom: 2000.0
-  type: ""
-
 # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#load
 load:
   fill_gaps:
@@ -870,8 +903,6 @@ sector:
   co2_sequestration_cost: 30
   co2_sequestration_lifetime: 50
   co2_spatial: true
-  co2_network: true
-  co2_network_cost_factor: 1
   cc_fraction: 0.9
   hydrogen_underground_storage: true
   hydrogen_underground_storage_locations:
@@ -900,33 +931,8 @@ sector:
   use_methanation_waste_heat: 0.25
   use_fuel_cell_waste_heat: 1
   use_electrolysis_waste_heat: 0.25
-  electricity_transmission_grid: true
-  electricity_distribution_grid: true
-  electricity_distribution_grid_cost_factor: 1.0
-  electricity_grid_connection: true
-  transmission_efficiency:
-    enable:
-    - DC
-    - H2 pipeline
-    - gas pipeline
-    - electricity distribution grid
-    DC:
-      efficiency_static: 0.98
-      efficiency_per_1000km: 0.977
-    H2 pipeline:
-      efficiency_per_1000km: 1
-      compression_per_1000km: 0.018
-    gas pipeline:
-      efficiency_per_1000km: 1
-      compression_per_1000km: 0.01
-    electricity distribution grid:
-      efficiency_static: 0.97
-  H2_network: true
-  gas_network: true
-  H2_retrofit: false
-  H2_retrofit_capacity_per_CH4: 0.6
-  gas_network_connectivity_upgrade: 1
-  gas_distribution_grid: true
+  electricity_grid_connection_cost: true
+  gas_distribution_grid_cost: true
   gas_distribution_grid_cost_factor: 1.0
   biomass_spatial: true
   biomass_transport: false

config/examples/config.distribution-grid-experimental.yaml

@@ -45,10 +45,13 @@ countries:
 
 electricity:
   voltages: [63., 66., 90., 110., 132., 150., 220., 300., 330., 380., 400., 500., 750.]
-  base_network: osm
 
-transmission_projects:
-  enable: false
+transmission:
+  electricity:
+    enable: true
+    base_network: osm
+    projects:
+      enable: false
 
 data:
   osm:

config/examples/config.entsoe-all.yaml

@@ -31,5 +31,7 @@ electricity:
   co2limit: 9.59e+7
   co2base: 1.918e+9
 
-lines:
-  reconnect_crimea: true
+transmission:
+  electricity:
+    lines:
+      reconnect_crimea: true

config/examples/config.iterative.yaml

@@ -28,7 +28,6 @@ snapshots:
   end: "2013-03-08"
 
 electricity:
-
   extendable_carriers:
     Generator: [OCGT]
     StorageUnit: [battery]
@@ -37,6 +36,15 @@ electricity:
 
   renewable_carriers: [solar, solar-hsat, onwind, offwind-ac, offwind-dc, offwind-float]
 
+transmission:
+  hydrogen:
+    retrofit:
+      enable: true
+  carbon_dioxide:
+    enable: false
+  gas:
+    enable: true
+
 atlite:
   default_cutout: be-03-2013-era5
   cutouts:
@@ -60,8 +68,6 @@ clustering:
     resolution_sector: 24h
 
 sector:
-  gas_network: true
-  H2_retrofit: true
   district_heating:
     ptes:
       supplemental_heating:
@@ -85,7 +91,6 @@ sector:
   regional_co2_sequestration_potential:
     enable: false
   co2_spatial: false
-  co2_network: false
   methanol:
     methanol_to_power:
       ocgt: false

config/examples/config.osm-release.yaml

@@ -52,10 +52,13 @@ electricity:
   - 400.0
   - 500.0
   - 750.0
-  base_network: osm
 
-transmission_projects:
-  enable: false
+transmission:
+  electricity:
+    enable: true
+    base_network: osm
+    projects:
+      enable: false
 
 data:
   osm:

config/examples/config.validation.yaml

@@ -61,12 +61,13 @@ conventional:
   biomass:
     p_max_pu: 0.65
 
-lines:
-  s_max_pu: 0.23
-  under_construction: 'remove'
-
-links:
-  include_tyndp: false
+transmission:
+  electricity:
+    lines:
+      s_max_pu: 0.23
+      under_construction: 'remove'
+    projects:
+      enable: false
 
 costs:
   year: 2020