From 7054b187ae98491e130bf9cccf38adfa5d7336d9 Mon Sep 17 00:00:00 2001
From: tomrink <rink@ssec.wisc.edu>
Date: Thu, 10 Dec 2020 19:52:05 -0600
Subject: [PATCH] snapshot...
---
modules/aeolus/aeolus_amv.py | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/modules/aeolus/aeolus_amv.py b/modules/aeolus/aeolus_amv.py
index c34060bc..fa008ae6 100644
--- a/modules/aeolus/aeolus_amv.py
+++ b/modules/aeolus/aeolus_amv.py
@@ -477,12 +477,18 @@ def run_best_fit_all():
'gfs.19112812_F012.h5',
'gfs.19112912_F012.h5']
+ amvs_list = []
+ bf_list = []
+ raob_match_list = []
+ bf_gfs_list = []
for k, file in enumerate(raob_files):
raob_dct, ts = get_raob_dict_cdf(raob_dir+file, raob_dtsts[k])
m_d = match_amvs_to_raobs(raob_dct, ts, amv_files=amv_files)
- amvs_list, bf_list, raob_match_list, bf_gfs_list = run_best_fit(m_d, raob_dct, gfs_dir+gfs_files[k])
- analyze2(amvs_list, bf_list, raob_match_list, bf_gfs_list)
+ amvs_list, bf_list, raob_match_list, bf_gfs_list = run_best_fit(m_d, raob_dct, gfs_dir+gfs_files[k],
+ amvs_list=amvs_list, bf_list=bf_list, raob_match_list=raob_match_list, bf_gfs_list=bf_gfs_list)
+ # analyze2(amvs_list, bf_list, raob_match_list, bf_gfs_list)
prd_dct = get_product_at_locs(m_d, ts, prd_files)
+ analyze2(amvs_list, bf_list, raob_match_list, bf_gfs_list)
def get_product_at_locs(raob_to_amv_dct, ts, files, filepath=None):
@@ -560,19 +566,19 @@ def get_product_at_locs1x1(raob_to_amv_dct, ts, files, filepath=None):
return m_dct
-def run_best_fit(raob_to_amv_dct, raob_dct, gfs_filename=None):
+def run_best_fit(raob_to_amv_dct, raob_dct, gfs_filename=None, amvs_list=[], bf_list=[], raob_match_list=[], bf_gfs_list=[]):
keys = list(raob_to_amv_dct.keys())
do_gfs_best_fit = False
gfs_press = None
gfs_spd = None
gfs_dir = None
- bf_gfs_list = None
+ #bf_gfs_list = None
if gfs_filename is not None:
locs = np.array(keys)
do_gfs_best_fit = True
xr_dataset = xr.open_dataset(gfs_filename)
- bf_gfs_list = []
+ #bf_gfs_list = []
gfs_press = xr_dataset['pressure levels']
gfs_press = gfs_press.values
gfs_press = gfs_press[::-1]
@@ -585,9 +591,9 @@ def run_best_fit(raob_to_amv_dct, raob_dct, gfs_filename=None):
gfs_spd = wspd[:, ::-1]
gfs_dir = wdir[:, ::-1]
- amvs_list = []
- bf_list = []
- raob_match_list = []
+ #amvs_list = []
+ #bf_list = []
+ #raob_match_list = []
for key_idx, key in enumerate(keys):
raob = raob_dct.get(key)
nlevs = raob.shape[0]
--
GitLab