openclimatefix-archives · jacobbieker · Aug 8, 2022 · Aug 8, 2022 · Aug 8, 2022 · Aug 8, 2022
diff --git a/nowcasting_dataset/data_sources/gsp/gsp_data_source.py b/nowcasting_dataset/data_sources/gsp/gsp_data_source.py
@@ -550,6 +550,10 @@ def drop_gsp_by_threshold(
     if len(gsp_power) == 0:
         return gsp_power, meta_data
 
+    # There is an extra GSP in the new data, GSP ID 0 for the national forecast,
+    # which is not in the metadata, so dropping here
+    gsp_power = gsp_power.drop(columns=0)
+
     maximum_gsp = gsp_power.max()
 
     keep_index = maximum_gsp >= threshold_mw

diff --git a/tests/data/gsp/test.zarr/.zmetadata b/tests/data/gsp/test.zarr/.zmetadata
@@ -6,7 +6,7 @@
         },
         "datetime_gmt/.zarray": {
             "chunks": [
-                25201
+                37657
             ],
             "compressor": {
                 "blocksize": 0,
@@ -29,7 +29,7 @@
                 "datetime_gmt"
             ],
             "calendar": "proleptic_gregorian",
-            "units": "minutes since 2016-01-01"
+            "units": "minutes since 2014-01-01"
         },
         "generation_mw/.zarray": {
             "chunks": [
@@ -70,7 +70,7 @@
                 "id": "blosc",
                 "shuffle": 1
             },
-            "dtype": "<U2",
+            "dtype": "<U21",
             "fill_value": null,
             "filters": null,
             "order": "C",

diff --git a/tests/data/gsp/test.zarr/datetime_gmt/.zarray b/tests/data/gsp/test.zarr/datetime_gmt/.zarray
@@ -1,6 +1,6 @@
 {
     "chunks": [
-        25201
+        37657
     ],
     "compressor": {
         "blocksize": 0,

diff --git a/tests/data/gsp/test.zarr/datetime_gmt/.zattrs b/tests/data/gsp/test.zarr/datetime_gmt/.zattrs
@@ -3,5 +3,5 @@
         "datetime_gmt"
     ],
     "calendar": "proleptic_gregorian",
-    "units": "minutes since 2016-01-01"
+    "units": "minutes since 2014-01-01"
 }
diff --git a/tests/data/gsp/test.zarr/datetime_gmt/0 b/tests/data/gsp/test.zarr/datetime_gmt/0
diff --git a/tests/data/gsp/test.zarr/generation_mw/0.0 b/tests/data/gsp/test.zarr/generation_mw/0.0
diff --git a/tests/data/gsp/test.zarr/gsp_id/.zarray b/tests/data/gsp/test.zarr/gsp_id/.zarray
@@ -9,7 +9,7 @@
         "id": "blosc",
         "shuffle": 1
     },
-    "dtype": "<U2",
+    "dtype": "<U21",
     "fill_value": null,
     "filters": null,
     "order": "C",

diff --git a/tests/data/gsp/test.zarr/gsp_id/0 b/tests/data/gsp/test.zarr/gsp_id/0
diff --git a/tests/data/gsp/test.zarr/installedcapacity_mwp/0.0 b/tests/data/gsp/test.zarr/installedcapacity_mwp/0.0