Merge pull request #131 from openclimatefix/jacob/solar-location

Add solar position for PV-sites

Author: jacobbieker

pvnet/models/base_model.py

@@ -62,8 +62,8 @@ def make_clean_data_config(input_path, output_path, placeholder="PLACEHOLDER"):
 
     if "nwp" in config["input_data"]:
         for source in config["input_data"]["nwp"]:
-            if config["input_data"]["nwp"][source][f"nwp_zarr_path"] != "":
-                config["input_data"]["nwp"][source][f"nwp_zarr_path"] = f"{placeholder}.zarr"
+            if config["input_data"]["nwp"][source]["nwp_zarr_path"] != "":
+                config["input_data"]["nwp"][source]["nwp_zarr_path"] = f"{placeholder}.zarr"
 
     if "pv" in config["input_data"]:
         for d in config["input_data"]["pv"]["pv_files_groups"]:

pvnet/models/multimodal/multimodal.py

@@ -343,7 +343,11 @@ def forward(self, x):
 
         if self.include_sun:
             sun = torch.cat(
-                (x[BatchKey.gsp_solar_azimuth], x[BatchKey.gsp_solar_elevation]), dim=1
+                (
+                    x[BatchKey[f"{self.target_key_name}_solar_azimuth"]],
+                    x[BatchKey[f"{self.target_key_name}_solar_elevation"]],
+                ),
+                dim=1,
             ).float()
             sun = self.sun_fc1(sun)
             modes["sun"] = sun