Merge pull request #35 from eb5194/master

Add OPSD VRE database to config for GB
PyPSA · Nov 24, 2020 · 27627b6 · 27627b6
2 parents 38b075d + 15dc380
commit 27627b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/powerplantmatching/data.py b/powerplantmatching/data.py
@@ -1114,15 +1114,15 @@ def OPSD_VRE_country(country, config=None, raw=False):
     """
     config = get_config() if config is None else config
 
-    df = parse_if_not_stored(f'OPSD_VRE_{country}', low_memory=False)
+    df = parse_if_not_stored(f'OPSD_VRE_{country}', engine='python')
     if raw:
         return df
 
     return (df.assign(Country=country)
               .rename(columns={'energy_source_level_2': 'Fueltype',
                                'technology': 'Technology',
                                'data_source': 'file',
-                               'country': 'Country',
+                               # 'country': 'Country', # (breaks code for GB if included)
                                'electrical_capacity': 'Capacity',
                                'municipality': 'Name'})
               .powerplant.convert_alpha2_to_country()

diff --git a/powerplantmatching/package_data/config.yaml b/powerplantmatching/package_data/config.yaml
@@ -105,6 +105,9 @@ OPSD_VRE_CZ:
 OPSD_VRE_SE:
   url: https://data.open-power-system-data.org/renewable_power_plants/2020-08-25/renewable_power_plants_SE.csv
   fn: renewable_power_plants_SE.csv
+OPSD_VRE_GB:
+  url: https://data.open-power-system-data.org/renewable_power_plants/2020-08-25/renewable_power_plants_UK.csv
+  fn: renewable_power_plants_UK.csv
 OPSD:
   reliability_score: 5
 Capacity_stats: