Merge pull request #846 from PyPSA/smpl-build-sector-smk

`build_sector.smk`: simplify gas infrastructure rules

rules/build_sector.smk

@@ -67,8 +67,6 @@ rule build_simplified_population_layouts:
         "../scripts/build_clustered_population_layouts.py"
 
 
-if config["sector"]["gas_network"] or config["sector"]["H2_retrofit"]:
-
 rule build_gas_network:
     input:
         gas_network="data/gas_network/scigrid-gas/data/IGGIELGN_PipeSegments.geojson",
@@ -83,6 +81,7 @@ if config["sector"]["gas_network"] or config["sector"]["H2_retrofit"]:
     script:
         "../scripts/build_gas_network.py"
 
+
 rule build_gas_input_locations:
     input:
         gem=HTTP.remote(
@@ -91,13 +90,10 @@ if config["sector"]["gas_network"] or config["sector"]["H2_retrofit"]:
         ),
         entry="data/gas_network/scigrid-gas/data/IGGIELGN_BorderPoints.geojson",
         storage="data/gas_network/scigrid-gas/data/IGGIELGN_Storages.geojson",
-            regions_onshore=RESOURCES
+        regions_onshore=RESOURCES + "regions_onshore_elec_s{simpl}_{clusters}.geojson",
-            + "regions_onshore_elec_s{simpl}_{clusters}.geojson",
+        regions_offshore=RESOURCES + "regions_offshore_elec_s{simpl}_{clusters}.geojson",
-            regions_offshore=RESOURCES
-            + "regions_offshore_elec_s{simpl}_{clusters}.geojson",
     output:
-            gas_input_nodes=RESOURCES
+        gas_input_nodes=RESOURCES + "gas_input_locations_s{simpl}_{clusters}.geojson",
-            + "gas_input_locations_s{simpl}_{clusters}.geojson",
         gas_input_nodes_simplified=RESOURCES
         + "gas_input_locations_s{simpl}_{clusters}_simplified.csv",
     resources:
@@ -109,13 +105,12 @@ if config["sector"]["gas_network"] or config["sector"]["H2_retrofit"]:
     script:
         "../scripts/build_gas_input_locations.py"
 
+
 rule cluster_gas_network:
     input:
         cleaned_gas_network=RESOURCES + "gas_network.csv",
-            regions_onshore=RESOURCES
+        regions_onshore=RESOURCES + "regions_onshore_elec_s{simpl}_{clusters}.geojson",
-            + "regions_onshore_elec_s{simpl}_{clusters}.geojson",
+        regions_offshore=RESOURCES + "regions_offshore_elec_s{simpl}_{clusters}.geojson",
-            regions_offshore=RESOURCES
-            + "regions_offshore_elec_s{simpl}_{clusters}.geojson",
     output:
         clustered_gas_network=RESOURCES + "gas_network_elec_s{simpl}_{clusters}.csv",
     resources:
@@ -127,17 +122,6 @@ if config["sector"]["gas_network"] or config["sector"]["H2_retrofit"]:
     script:
         "../scripts/cluster_gas_network.py"
 
-    gas_infrastructure = {
-        **rules.cluster_gas_network.output,
-        **rules.build_gas_input_locations.output,
-    }
-
-
-if not (config["sector"]["gas_network"] or config["sector"]["H2_retrofit"]):
-    # this is effecively an `else` statement which is however not liked by snakefmt
-
-    gas_infrastructure = {}
-
 
 rule build_heat_demands:
     params:
@@ -722,7 +706,8 @@ rule prepare_sector_network:
     input:
         **build_retro_cost_output,
         **build_biomass_transport_costs_output,
-        **gas_infrastructure,
+        **rules.cluster_gas_network.output,
+        **rules.build_gas_input_locations.output,
         **build_sequestration_potentials_output,
         network=RESOURCES + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc",
         energy_totals_name=RESOURCES + "energy_totals.csv",

rules/retrieve.smk

@@ -162,9 +162,7 @@ if config["enable"]["retrieve"] and config["enable"].get(
             "../scripts/retrieve_sector_databundle.py"
 
 
-if config["enable"]["retrieve"] and (
+if config["enable"]["retrieve"]:
-    config["sector"]["gas_network"] or config["sector"]["H2_retrofit"]
-):
     datafiles = [
         "IGGIELGN_LNGs.geojson",
         "IGGIELGN_BorderPoints.geojson",