From e7c7cd6581202dda4453bd05cc486d5f6bf1c262 Mon Sep 17 00:00:00 2001
From: rink <rink@ssec.wisc.edu>
Date: Mon, 12 Oct 2020 19:48:14 -0500
Subject: [PATCH] snapshot..

---
 modules/aeolus/aeolus_amv.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/aeolus/aeolus_amv.py b/modules/aeolus/aeolus_amv.py
index 923f02ee..6bd55743 100644
--- a/modules/aeolus/aeolus_amv.py
+++ b/modules/aeolus/aeolus_amv.py
@@ -421,8 +421,8 @@ def match_amvs_to_aeolus(aeolus_dict, amv_files_path, amv_source='OPS', band='14
             # cc = ds[amv_files.elem_name][:]
             # ll = ds[amv_files.line_name][:]
 
-            amv_lons = ds[amv_lon_name][:]
-            amv_lats = ds[amv_lat_name][:]
+            amv_lons = ds[amv_files.lon_name][:]
+            amv_lats = ds[amv_files.lat_name][:]
             cc = ds[amv_files.elem_name][:]
             ll = ds[amv_files.line_name][:]
             # cc, ll = nav.earth_to_lc_s(amv_lons, amv_lats)
@@ -433,7 +433,11 @@ def match_amvs_to_aeolus(aeolus_dict, amv_files_path, amv_source='OPS', band='14
             param_s.append(cc)
             param_s.append(ll)
             for param in amv_params:
-                param_s.append(ds[param][:])
+                if param == 'V_3D':
+                    param_s.append(ds[param][:, 0])
+                    param_s.append(ds[param][:, 1])
+                else:
+                    param_s.append(ds[param][:])
 
             ds.close()
 
@@ -444,10 +448,9 @@ def match_amvs_to_aeolus(aeolus_dict, amv_files_path, amv_source='OPS', band='14
         num_amvs = np.sum(in_box)
         if num_amvs == 0:
             continue
-        dist = haversine_np(lon, lat, amv_lons[in_box], amv_lats[in_box])
+        # dist = haversine_np(lon, lat, amv_lons[in_box], amv_lats[in_box])
         params_nd = np.vstack(param_s)
         params_nd = params_nd[:, in_box]
-        print(params_nd.shape)
         #match_dict[key] = (amv_lons[in_box], amv_lats[in_box], amv_pres[in_box], amv_spd[in_box], amv_dir[in_box], dist)
 
     return match_dict
-- 
GitLab