Merge branch 'multiyear' of github.com:PyPSA/pypsa-eur into multiyear

rules/collect.smk

@@ -34,9 +34,7 @@ rule extra_components_networks:
 rule prepare_elec_networks:
     input:
         expand(
-            resources(
+            resources("networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc"),
-                "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc"
-            ),
             **config["scenario"],
             run=config["run"]["name"],
         ),
@@ -55,8 +53,7 @@ rule prepare_sector_networks:
 rule solve_elec_networks:
     input:
         expand(
-            RESULTS
+            RESULTS + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc",
-            + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc",
             **config["scenario"],
             run=config["run"]["name"],
         ),

rules/solve_electricity.smk

@@ -13,13 +13,10 @@ rule solve_network:
         ),
         custom_extra_functionality=input_custom_extra_functionality,
     input:
-        network=resources(
+        network=resources("networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc"),
-            "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc"
-        ),
         config=RESULTS + "config.yaml",
     output:
-        network=RESULTS
+        network=RESULTS + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc",
-        + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc",
     log:
         solver=normpath(
             RESULTS
@@ -28,10 +25,7 @@ rule solve_network:
         python=RESULTS
         + "logs/solve_network/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}_python.log",
     benchmark:
-        (
+        (RESULTS + "benchmarks/solve_network/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}")
-            RESULTS
-            + "benchmarks/solve_network/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}"
-        )
     threads: solver_threads
     resources:
         mem_mb=memory,
@@ -48,11 +42,9 @@ rule solve_operations_network:
     params:
         options=config_provider("solving", "options"),
     input:
-        network=RESULTS
+        network=RESULTS + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc",
-        + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc",
     output:
-        network=RESULTS
+        network=RESULTS + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}_op.nc",
-        + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}_op.nc",
     log:
         solver=normpath(
             RESULTS

scripts/build_hydro_profile.py

@@ -65,8 +65,8 @@ import atlite
 import country_converter as coco
 import geopandas as gpd
 import pandas as pd
-from numpy.polynomial import Polynomial
 from _helpers import configure_logging, set_scenario_config
+from numpy.polynomial import Polynomial
 
 cc = coco.CountryConverter()