minor...

modules/amv/caliop_clavrx_amv.py

@@ -3,6 +3,7 @@ import numpy as np
 import xarray as xr
 from netCDF4 import Dataset
 from aeolus.datasource import get_datasource, CLAVRx_CALIPSO, get_parameters_caliop_clavrx
+from util.util import haversine_np
 
 amv_file_duration = 60  # minutes
 half_width = 30  # search box centered on CALIOP profile (FGF coordinates)
@@ -87,6 +88,8 @@ def match_calipso_clavrx_to_amvs(calipso_clavrx_ds, calipso_clavrx_file, amv_fil
     clvr_xy_s = zip(xs, ys)
 
     for idx, clvr_xy in enumerate(clvr_xy_s):
+        lon = lon_s[idx]
+        lat = lat_s[idx]
         cc, ll = clvr_xy
 
         c_rng, l_rng = get_search_box(cc, ll)
@@ -98,7 +101,7 @@ def match_calipso_clavrx_to_amvs(calipso_clavrx_ds, calipso_clavrx_file, amv_fil
         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])
         param_nd = np.vstack(param_s)
         param_nd = param_nd[:, in_box]
         amvs_da = xr.DataArray(param_nd, coords=coords, dims=dims)
@@ -106,7 +109,7 @@ def match_calipso_clavrx_to_amvs(calipso_clavrx_ds, calipso_clavrx_file, amv_fil
         data_nd = np.vstack(calipso_clavrx_data)
         data_da = xr.DataArray(data_nd[:, idx], coords=coords_a, dims=dims_a)
 
-        match_dict[nom_time].append((cc, ll, lon_s[idx], lat_s[idx], f_idx, data_da, amvs_da))
+        match_dict[nom_time].append((cc, ll, lon, lat, f_idx, data_da, amvs_da))
 
     return match_dict