Merge branch 'merge-pypsa-eur-sec' into sec-subset-countries

.github/workflows/ci.yaml

@@ -20,7 +20,7 @@ on:
 
 env:
   CONDA_CACHE_NUMBER: 1 # Change this value to manually reset the environment cache
-  DATA_CACHE_NUMBER: 1
+  DATA_CACHE_NUMBER: 2
 
 jobs:
   build:
@@ -50,7 +50,7 @@ jobs:
         shell: bash -l {0}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Setup secrets
       run: |

scripts/add_brownfield.py

@@ -131,7 +131,7 @@ if __name__ == "__main__":
             simpl="",
             clusters="37",
             opts="",
-            ll='v1.0',
+            ll="v1.0",
             sector_opts="168H-T-H-B-I-solar+p3-dist1",
             planning_horizons=2030,
         )

scripts/add_existing_baseyear.py

@@ -13,10 +13,10 @@ idx = pd.IndexSlice
 
 from types import SimpleNamespace
 
+import country_converter as coco
 import numpy as np
 import pypsa
 import xarray as xr
-import country_converter as coco
 from _helpers import override_component_attrs, update_config_with_sector_opts
 from prepare_sector_network import cluster_heat_buses, define_spatial, prepare_costs
 
@@ -65,7 +65,7 @@ def add_existing_renewables(df_agg):
 
         df = pd.read_csv(snakemake.input[f"existing_{tech}"], index_col=0).fillna(0.0)
         df.columns = df.columns.astype(int)
-        df.index = cc.convert(df.index, to='iso2')
+        df.index = cc.convert(df.index, to="iso2")
 
         # calculate yearly differences
         df.insert(loc=0, value=0.0, column="1999")
@@ -413,7 +413,7 @@ def add_heating_capacities_installed_before_baseyear(
     # convert GW to MW
     df *= 1e3
 
-    df.index = cc.convert(df.index, to='iso2')
+    df.index = cc.convert(df.index, to="iso2")
 
     # coal and oil boilers are assimilated to oil boilers
     df["oil boiler"] = df["oil boiler"] + df["coal boiler"]
@@ -600,7 +600,7 @@ if __name__ == "__main__":
             "add_existing_baseyear",
             simpl="",
             clusters="45",
-            ll='v1.0',
+            ll="v1.0",
             opts="",
             sector_opts="8760H-T-H-B-I-A-solar+p3-dist1",
             planning_horizons=2020,

scripts/build_retro_cost.py

@@ -1038,7 +1038,7 @@ if __name__ == "__main__":
             "build_retro_cost",
             simpl="",
             clusters=48,
-            ll='v1.0',
+            ll="v1.0",
             sector_opts="Co2L0-168H-T-H-B-I-solar3-dist1",
         )
 

scripts/prepare_sector_network.py

@@ -3234,7 +3234,7 @@ if __name__ == "__main__":
             simpl="",
             opts="",
             clusters="37",
-            ll='v1.5',
+            ll="v1.5",
             sector_opts="cb40ex0-365H-T-H-B-I-A-solar+p3-dist1",
             planning_horizons="2020",
         )

scripts/solve_sector_network.py

@@ -325,7 +325,7 @@ if __name__ == "__main__":
             simpl="",
             opts="",
             clusters="45",
-            ll='v1.0',
+            ll="v1.0",
             sector_opts="8760H-T-H-B-I-A-solar+p3-dist1",
             planning_horizons="2020",
         )