From d04bda4120798c91786a9fe0445071d732d45c3f Mon Sep 17 00:00:00 2001
From: tomrink <rink@ssec.wisc.edu>
Date: Mon, 20 Jun 2022 10:45:42 -0500
Subject: [PATCH] minor...
---
modules/aeolus/aeolus_amv.py | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/modules/aeolus/aeolus_amv.py b/modules/aeolus/aeolus_amv.py
index 60b30138..d14746db 100644
--- a/modules/aeolus/aeolus_amv.py
+++ b/modules/aeolus/aeolus_amv.py
@@ -67,10 +67,10 @@ def get_amvs(amv_ds, timestamp, filepath=None):
# For each raob position in raob_dct, find all AMVs in time/space window
# raob_dict: (lat,lon) -> profiles
-# raob_time: nominal time
+# raob_time: nominal time of raob_dict
# amv_ds: AMV data source
# time_window: (minutes) to search for AMVs around raob_time
-# filepath (RAOB)
+# filepath: AMV filepath for RAOB match. If None (default), determined from raob_time and AMV data source
# return dict: raob (lat, lon) -> tuple (amv_lon, amv_lat, elem, line, amv_pres, amv_spd, amv_dir), amv file
def match_amvs_to_raobs(raob_dict, raob_time, amv_ds, time_window=10, filepath=None):
nav = amv_ds.get_navigation()
@@ -78,19 +78,19 @@ def match_amvs_to_raobs(raob_dict, raob_time, amv_ds, time_window=10, filepath=N
match_dict = {}
if filepath is None:
- filepath, ftime, f_idx = amv_ds.get_file(raob_time, window=time_window)
+ filepath, _, _ = amv_ds.get_file(raob_time, window=time_window)
if filepath is None:
return None, None
- ds = Dataset(filepath)
+ nc4f = Dataset(filepath)
- amv_lons = ds[amv_ds.lon_name][:].data
- amv_lats = ds[amv_ds.lat_name][:].data
+ amv_lons = nc4f[amv_ds.lon_name][:].data
+ amv_lats = nc4f[amv_ds.lat_name][:].data
if amv_ds.elem_name is None or amv_ds.line_name is None:
cc, ll = nav.earth_to_lc_s(amv_lons, amv_lats)
else:
- cc = ds[amv_ds.elem_name][:].data
- ll = ds[amv_ds.line_name][:].data
+ cc = nc4f[amv_ds.elem_name][:].data
+ ll = nc4f[amv_ds.line_name][:].data
param_s = []
param_s.append(amv_lons)
@@ -100,7 +100,7 @@ def match_amvs_to_raobs(raob_dict, raob_time, amv_ds, time_window=10, filepath=N
vld = None
for param in amv_params:
- data = ds[param][:]
+ data = nc4f[param][:]
if vld is None:
vld = np.invert(data.mask)
else:
@@ -114,7 +114,7 @@ def match_amvs_to_raobs(raob_dict, raob_time, amv_ds, time_window=10, filepath=N
# filter
qc_name = amv_ds.get_qc_params()
if qc_name is not None:
- qc_param = ds[qc_name][:].data
+ qc_param = nc4f[qc_name][:].data
good = amv_ds.filter(qc_param)
vld = np.logical_and(vld, good)
@@ -123,7 +123,7 @@ def match_amvs_to_raobs(raob_dict, raob_time, amv_ds, time_window=10, filepath=N
cc = param_nd[2, :]
ll = param_nd[3, :]
- ds.close()
+ nc4f.close()
keys = list(raob_dict.keys())
--
GitLab