snapshot...

modules/aeolus/aeolus_amv.py

@@ -473,9 +473,9 @@ def run_best_fit_all():
         prd_dct = get_product_at_locs(m_d, ts, prd_files)
         out_list.append((bf_dct, prd_dct))
 
-        amvs = get_amvs(amv_files, ts)
-        bfs = run_best_fit_gfs(amvs, gfs_dir+gfs_files[k], amv_lat_idx=0, amv_lon_idx=1, amv_prs_idx=4, amv_spd_idx=5, amv_dir_idx=6)
-        out_list.append((amvs, np.array(bfs)))
+        # amvs = get_amvs(amv_files, ts)
+        # bfs = run_best_fit_gfs(amvs, gfs_dir+gfs_files[k], amv_lat_idx=0, amv_lon_idx=1, amv_prs_idx=4, amv_spd_idx=5, amv_dir_idx=6)
+        # out_list.append((amvs, np.array(bfs)))
 
     return out_list
 
@@ -1037,15 +1037,36 @@ def compare_amvs_bestfit_all(all_list, bin_size=200):
 
     amvs_list = []
     bfs_list = []
-    for dct in all_list:
-        keys = list(dct.keys())
+    prd_list = []
+    for tup in all_list:
+        ab_dct = tup[0]
+        pr_dct = tup[1]
+
+        keys = list(ab_dct.keys())
         for key in keys:
-            tup = dct.get(key)
+            tup = ab_dct.get(key)
             amvs_list.append(tup[0])
             bfs_list.append(tup[1])
 
+        keys = list(pr_dct.keys())
+        for key in keys:
+            prd_list.append(pr_dct.get(key))
+
+
+    # amvs_list = []
+    # bfs_list = []
+    # for dct in all_list:
+    #     keys = list(dct.keys())
+    #     for key in keys:
+    #         tup = dct.get(key)
+    #         amvs_list.append(tup[0])
+    #         bfs_list.append(tup[1])
+
     amvs = np.concatenate(amvs_list)
     bfs = np.concatenate(bfs_list)
+    prd = np.concatenate(prd_list)
+
+    print(amvs.shape, bfs.shape, prd.shape)
 
     # for tup in all_list:
     #     amvs_list.append(tup[0])