From e5b3d92d3860e094f2e990483f1fccc417842326 Mon Sep 17 00:00:00 2001
From: tomrink <rink@ssec.wisc.edu>
Date: Wed, 15 Jun 2022 10:51:00 -0500
Subject: [PATCH] snapshot...
---
modules/amv/caliop_clavrx_amv.py | 50 ++++++++++++++++++++++----------
1 file changed, 35 insertions(+), 15 deletions(-)
diff --git a/modules/amv/caliop_clavrx_amv.py b/modules/amv/caliop_clavrx_amv.py
index 1685c56a..ddf5bba9 100644
--- a/modules/amv/caliop_clavrx_amv.py
+++ b/modules/amv/caliop_clavrx_amv.py
@@ -6,6 +6,7 @@ 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
+from amv.intercompare import *
amv_file_duration = 60 # minutes
half_width = 30 # search box centered on CALIOP profile (FGF coordinates)
@@ -54,28 +55,47 @@ def match_calipso_clavrx_to_amvs(calipso_clavrx_ds, calipso_clavrx_file, amv_fil
match_dict[nom_time] = []
- amv_ds = Dataset(amv_fname)
- amv_lons = amv_ds[amv_files.lon_name][:]
- amv_lats = amv_ds[amv_files.lat_name][:]
- if amv_files.elem_name is not None:
- amv_cc = amv_ds[amv_files.elem_name][:]
- amv_ll = amv_ds[amv_files.line_name][:]
- else:
- amv_cc, amv_ll = nav.earth_to_lc_s(amv_lons, amv_lats)
+ # amv_ds = Dataset(amv_fname)
+ # amv_lons = amv_ds[amv_files.lon_name][:]
+ # amv_lats = amv_ds[amv_files.lat_name][:]
+ # if amv_files.elem_name is not None:
+ # amv_cc = amv_ds[amv_files.elem_name][:]
+ # amv_ll = amv_ds[amv_files.line_name][:]
+ # else:
+ # amv_cc, amv_ll = nav.earth_to_lc_s(amv_lons, amv_lats)
+ #
+ # param_s = []
+ # param_s.append(amv_lons)
+ # param_s.append(amv_lats)
+ # param_s.append(amv_cc)
+ # param_s.append(amv_ll)
+ # for param in amv_params:
+ # if param == 'V_3D':
+ # param_s.append(amv_ds[param][:, 0])
+ # param_s.append(amv_ds[param][:, 1])
+ # else:
+ # param_s.append(amv_ds[param][:])
+ #
+ # amv_ds.close()
+
+ # --------------------------------------------------------------
+ amvs_nd = get_amv_nd(amv_fname, delimiter=',')
+ amvs_nd = filter_amvs(amvs_nd)
+ amv_lons = amvs_nd[:, amv_lon_idx]
+ amv_lats = amvs_nd[:, amv_lat_idx]
+ amv_cc, amv_ll = nav.earth_to_lc_s(amv_lons, amv_lats)
param_s = []
param_s.append(amv_lons)
param_s.append(amv_lats)
param_s.append(amv_cc)
param_s.append(amv_ll)
- for param in amv_params:
- if param == 'V_3D':
- param_s.append(amv_ds[param][:, 0])
- param_s.append(amv_ds[param][:, 1])
- else:
- param_s.append(amv_ds[param][:])
- amv_ds.close()
+ param_s.append(amvs_nd[:, amv_pres_idx])
+ param_s.append(amvs_nd[:, amv_spd_idx])
+ param_s.append(amvs_nd[:, amv_dir_idx])
+
+ # -----------------------------------------------------------------
calipso_clavrx_params = get_parameters_caliop_clavrx()
coords_a = {'num_calipso_clavrx_params': calipso_clavrx_params}
--
GitLab