Merge branch 'pv_inputs' of https://github.com/openclimatefix/PVNet i…

…nto pv_inputs
openclimatefix · Oct 24, 2023 · 8147954 · 8147954
2 parents 73d2f2d + ec922df
commit 8147954
Show file tree

Hide file tree

Showing 6 changed files with 486 additions and 165 deletions.
diff --git a/configs/datamodule/configuration/gcp_configuration.yaml b/configs/datamodule/configuration/gcp_configuration.yaml
@@ -12,28 +12,364 @@ input_data:
     forecast_minutes: 480
     time_resolution_minutes: 30
     metadata_only: false
-    
+
   pv:
     pv_files_groups:
       - label: solar_sheffield_passiv
         pv_filename: /mnt/disks/nwp/passive/v0/passiv.netcdf
         pv_metadata_filename: /mnt/disks/nwp/passive/v0/system_metadata_OCF_ONLY.csv
-    pv_ml_ids: [154,155,156,158,159,160,162,164,165,166,167,168,169,171,173,177,178,179,181,182,185,
-        186,187,188,189,190,191,192,193,197,198,199,200,202,204,205,206,208,209,211,214,215,216,217,
-        218,219,220,221,225,229,230,232,233,234,236,242,243,245,252,254,255,256,257,258,260,261,262,
-        265,267,268,272,273,275,276,277,280,281,282,283,287,289,291,292,293,294,295,296,297,298,301,
-        302,303,304,306,307,309,310,311,317,318,319,320,321,322,323,325,326,329,332,333,335,336,338,
-        340,342,344,345,346,348,349,352,354,355,356,357,360,362,363,368,369,370,371,372,374,375,376,
-        378,380,382,384,385,388,390,391,393,396,397,398,399,400,401,403,404,405,406,407,409,411,412,
-        413,414,415,416,417,418,419,420,421,422,423,424,425,426,427,429,431,435,437,438,440,441,444,
-        447,450,451,453,456,457,458,459,464,465,466,467,468,470,471,473,474,476,477,479,480,481,482,
-        485,486,488,490,491,492,493,496,498,501,503,506,507,508,509,510,511,512,513,515,516,517,519,
-        520,521,522,524,526,527,528,531,532,536,537,538,540,541,542,543,544,545,549,550,551,552,553,
-        554,556,557,560,561,563,566,568,571,572,575,576,577,579,580,581,582,584,585,588,590,594,595,
-        597,600,602,603,604,606,611,613,614,616,618,620,622,623,624,625,626,628,629,630,631,636,637,
-        638,640,641,642,644,645,646,650,651,652,653,654,655,657,660,661,662,663,666,667,668,670,675,
-        676,679,681,683,684,685,687,696,698,701,702,703,704,706,710,722,723,724,725,727,728,729,730,
-        732,733,734,735,736,737]
+    pv_ml_ids:
+      [
+        154,
+        155,
+        156,
+        158,
+        159,
+        160,
+        162,
+        164,
+        165,
+        166,
+        167,
+        168,
+        169,
+        171,
+        173,
+        177,
+        178,
+        179,
+        181,
+        182,
+        185,
+        186,
+        187,
+        188,
+        189,
+        190,
+        191,
+        192,
+        193,
+        197,
+        198,
+        199,
+        200,
+        202,
+        204,
+        205,
+        206,
+        208,
+        209,
+        211,
+        214,
+        215,
+        216,
+        217,
+        218,
+        219,
+        220,
+        221,
+        225,
+        229,
+        230,
+        232,
+        233,
+        234,
+        236,
+        242,
+        243,
+        245,
+        252,
+        254,
+        255,
+        256,
+        257,
+        258,
+        260,
+        261,
+        262,
+        265,
+        267,
+        268,
+        272,
+        273,
+        275,
+        276,
+        277,
+        280,
+        281,
+        282,
+        283,
+        287,
+        289,
+        291,
+        292,
+        293,
+        294,
+        295,
+        296,
+        297,
+        298,
+        301,
+        302,
+        303,
+        304,
+        306,
+        307,
+        309,
+        310,
+        311,
+        317,
+        318,
+        319,
+        320,
+        321,
+        322,
+        323,
+        325,
+        326,
+        329,
+        332,
+        333,
+        335,
+        336,
+        338,
+        340,
+        342,
+        344,
+        345,
+        346,
+        348,
+        349,
+        352,
+        354,
+        355,
+        356,
+        357,
+        360,
+        362,
+        363,
+        368,
+        369,
+        370,
+        371,
+        372,
+        374,
+        375,
+        376,
+        378,
+        380,
+        382,
+        384,
+        385,
+        388,
+        390,
+        391,
+        393,
+        396,
+        397,
+        398,
+        399,
+        400,
+        401,
+        403,
+        404,
+        405,
+        406,
+        407,
+        409,
+        411,
+        412,
+        413,
+        414,
+        415,
+        416,
+        417,
+        418,
+        419,
+        420,
+        421,
+        422,
+        423,
+        424,
+        425,
+        426,
+        427,
+        429,
+        431,
+        435,
+        437,
+        438,
+        440,
+        441,
+        444,
+        447,
+        450,
+        451,
+        453,
+        456,
+        457,
+        458,
+        459,
+        464,
+        465,
+        466,
+        467,
+        468,
+        470,
+        471,
+        473,
+        474,
+        476,
+        477,
+        479,
+        480,
+        481,
+        482,
+        485,
+        486,
+        488,
+        490,
+        491,
+        492,
+        493,
+        496,
+        498,
+        501,
+        503,
+        506,
+        507,
+        508,
+        509,
+        510,
+        511,
+        512,
+        513,
+        515,
+        516,
+        517,
+        519,
+        520,
+        521,
+        522,
+        524,
+        526,
+        527,
+        528,
+        531,
+        532,
+        536,
+        537,
+        538,
+        540,
+        541,
+        542,
+        543,
+        544,
+        545,
+        549,
+        550,
+        551,
+        552,
+        553,
+        554,
+        556,
+        557,
+        560,
+        561,
+        563,
+        566,
+        568,
+        571,
+        572,
+        575,
+        576,
+        577,
+        579,
+        580,
+        581,
+        582,
+        584,
+        585,
+        588,
+        590,
+        594,
+        595,
+        597,
+        600,
+        602,
+        603,
+        604,
+        606,
+        611,
+        613,
+        614,
+        616,
+        618,
+        620,
+        622,
+        623,
+        624,
+        625,
+        626,
+        628,
+        629,
+        630,
+        631,
+        636,
+        637,
+        638,
+        640,
+        641,
+        642,
+        644,
+        645,
+        646,
+        650,
+        651,
+        652,
+        653,
+        654,
+        655,
+        657,
+        660,
+        661,
+        662,
+        663,
+        666,
+        667,
+        668,
+        670,
+        675,
+        676,
+        679,
+        681,
+        683,
+        684,
+        685,
+        687,
+        696,
+        698,
+        701,
+        702,
+        703,
+        704,
+        706,
+        710,
+        722,
+        723,
+        724,
+        725,
+        727,
+        728,
+        729,
+        730,
+        732,
+        733,
+        734,
+        735,
+        736,
+        737,
+      ]
     history_minutes: 180
     forecast_minutes: 0
     time_resolution_minutes: 5

diff --git a/configs/model/multimodal.yaml b/configs/model/multimodal.yaml
@@ -6,7 +6,7 @@ output_quantiles: [0.02, 0.1, 0.25, 0.5, 0.75, 0.9, 0.98]
 # NWP encoder
 #--------------------------------------------
 
-nwp_encoder: 
+nwp_encoder:
   _target_: pvnet.models.multimodal.encoders.encoders3d.DefaultPVNet
   _partial_: True
   in_channels: 2
@@ -85,4 +85,4 @@ optimizer:
   amsgrad: True
   patience: 5
   factor: 0.1
-  threshold: 0.002
+  threshold: 0.002