diff --git a/modules/aeolus/aeolus_amv.py b/modules/aeolus/aeolus_amv.py
index 7f1e1bb5042fe8b19ace4d7cf5667dbefb2cd396..5760ba644cb493216da3a4f0c2dc5f874f76e551 100644
--- a/modules/aeolus/aeolus_amv.py
+++ b/modules/aeolus/aeolus_amv.py
@@ -248,7 +248,8 @@ def create_file2(filename, raob_to_amv_dct, raob_dct, amv_files):
def run_best_fit_driver(amv_dir, source, raob_path, gfs_path, product_dir, product):
- amv_files = get_datasource(amv_dir, source)
+ amv_ds = get_datasource(amv_dir, source)
+ print(amv_ds.get_parameters())
gfs_files = get_datasource(gfs_path, 'GFS')
raob_ds = get_datasource(raob_path, 'RAOB')
raob_files = raob_ds.flist
@@ -267,7 +268,7 @@ def run_best_fit_driver(amv_dir, source, raob_path, gfs_path, product_dir, produ
raob_dct = get_raob_dict_cdf(file)
keys = list(raob_dct.keys())
ts = raob_ds.ftimes[k,0]
- m_d = match_amvs_to_raobs(raob_dct, ts, amv_files)
+ m_d = match_amvs_to_raobs(raob_dct, ts, amv_ds)
if m_d is None:
continue
@@ -277,7 +278,6 @@ def run_best_fit_driver(amv_dir, source, raob_path, gfs_path, product_dir, produ
if gfs_file is not None:
locs = np.array(keys)
- do_gfs_best_fit = True
xr_dataset = xr.open_dataset(gfs_file)
gfs_press = xr_dataset['pressure levels']
gfs_press = gfs_press.values
@@ -312,7 +312,7 @@ def run_best_fit_driver(amv_dir, source, raob_path, gfs_path, product_dir, produ
filename = None
raob_filename = None
amv_filename = None
- create_file_new2(filename, m_d, raob_dct, gfs_at_raob_dct, bf_dct, prd_dct, raob_filename, amv_filename)
+ #create_file_new2(filename, m_d, raob_dct, gfs_at_raob_dct, bf_dct, prd_dct, raob_filename, amv_filename)
# Skip this and below if writing an output file.
out_list.append((bf_dct, prd_dct))
@@ -2014,9 +2014,9 @@ def create_file(filename, aeolus_to_amv_dct, aeolus_dct, amv_files, cld_lyr=Fals
rootgrp.close()
+
def create_file_new2(filename, match_dct, raob_dct, gfs_at_raob_dct, bf_dct, prd_dct, raob_filename, amv_file_name):
num_aparams = 4
- num_aprofs = 0
max_num_alevels = 0
max_num_amvs = 0
@@ -2025,38 +2025,33 @@ def create_file_new2(filename, match_dct, raob_dct, gfs_at_raob_dct, bf_dct, prd
atimes = []
elems = []
lines = []
- fidxs = []
#amv_file_s = np.array(amv_file_s, dtype='object')
# scan to get max num levels, amvs
keys = list(match_dct.keys())
+ num_aprofs = len(keys)
for key in keys:
raob = raob_dct.get(key)
nlevs = raob.shape[0]
- lat = key[0]
- lon = key[1]
+ if nlevs > max_num_alevels:
+ max_num_alevels = nlevs
- alons.append(lon)
- alats.append(lat)
+ alons.append(key.lon)
+ alats.append(key.lat)
bf_tup = bf_dct.get(key)
amvs = bf_tup[0]
num_amvs = amvs.shape[0]
- if nlevs > max_num_alevels:
- max_num_alevels = nlevs
if num_amvs > max_num_amvs:
max_num_amvs = num_amvs
alons = np.array(alons)
alats = np.array(alats)
- # atimes = np.array(atimes)
# elems = np.array(elems)
# lines = np.array(lines)
- # fidxs = np.array(fidxs)
print(max_num_alevels, max_num_amvs)
- return
# Sample file to retrieve and copy variable attributes
rg_exmpl = Dataset('/ships19/cloud/scratch/4TH_AMV_INTERCOMPARISON/FMWK2_AMV/GOES16_ABI_2KM_FD_2019293_0020_34_WINDS_AMV_EN-14CT.nc', 'r')
@@ -2064,32 +2059,33 @@ def create_file_new2(filename, match_dct, raob_dct, gfs_at_raob_dct, bf_dct, prd
# the top level group for the output file
rootgrp = Dataset(filename, 'w', format='NETCDF4')
- dim_aparams = rootgrp.createDimension('num_aeolus_params', size=num_aparams)
- dim_alevs = rootgrp.createDimension('max_num_aeolus_levels', size=max_num_alevels)
+ dim_aparams = rootgrp.createDimension('num_raob_params', size=num_aparams)
+ dim_alevs = rootgrp.createDimension('max_num_raob_levels', size=max_num_alevels)
dim_amvs = rootgrp.createDimension('max_num_amvs', size=max_num_amvs)
- dim_num_aeolus_prof = rootgrp.createDimension('num_aeolus_profs', size=num_aprofs)
- dim_num_files = rootgrp.createDimension('num_amv_files', size=amv_file_s.shape[0])
+ dim_num_aeolus_prof = rootgrp.createDimension('num_raob_profs', size=num_aprofs)
+ #dim_num_files = rootgrp.createDimension('num_amv_files', size=amv_file_s.shape[0])
prf_time = rootgrp.createVariable('time', 'f4', ['num_aeolus_profs'])
amv_file_names = rootgrp.createVariable('amv_file_names', str, ['num_amv_files'])
# ---- Profile variables ---------------
- prf_lon = rootgrp.createVariable('prof_longitude', 'f4', ['num_aeolus_profs'])
+ prf_lon = rootgrp.createVariable('prof_longitude', 'f4', ['num_raob_profs'])
prf_lon.units = 'degrees east'
- prf_lat = rootgrp.createVariable('prof_latitude', 'f4', ['num_aeolus_profs'])
+ prf_lat = rootgrp.createVariable('prof_latitude', 'f4', ['num_raob_profs'])
prf_lat.units = 'degrees north'
prf_time.units = 'seconds since 1970-01-1 00:00:00'
- prf_elem = rootgrp.createVariable('FD_elem', 'f4', ['num_aeolus_profs'])
- prf_line = rootgrp.createVariable('FD_line', 'f4', ['num_aeolus_profs'])
- prf_fidx = rootgrp.createVariable('amv_file_index', 'i4', ['num_aeolus_profs'])
- prf_azm = rootgrp.createVariable('prof_azm', 'f4', ['num_aeolus_profs', 'max_num_aeolus_levels'])
- prf_azm.units = 'degree'
- prf_spd = rootgrp.createVariable('prof_spd', 'f4', ['num_aeolus_profs', 'max_num_aeolus_levels'])
+
+ #prf_elem = rootgrp.createVariable('FD_elem', 'f4', ['num_raob_profs'])
+ #prf_line = rootgrp.createVariable('FD_line', 'f4', ['num_raob_profs'])
+
+ prf_dir = rootgrp.createVariable('prof_dir', 'f4', ['num_raob_profs', 'max_num_raob_levels'])
+ prf_dir.units = 'degree'
+ prf_spd = rootgrp.createVariable('prof_spd', 'f4', ['num_raob_profs', 'max_num_raob_levels'])
prf_spd.units = 'm s-1'
- prf_hht = rootgrp.createVariable('prof_hht', 'f4', ['num_aeolus_profs', 'max_num_aeolus_levels'])
- prf_hht.units = 'meter'
- prf_hhb = rootgrp.createVariable('prof_hhb', 'f4', ['num_aeolus_profs', 'max_num_aeolus_levels'])
- prf_hhb.units = 'meter'
+ prf_lvl = rootgrp.createVariable('prof_lvl', 'f4', ['num_raob_profs', 'max_num_raob_levels'])
+ prf_lvl.units = 'millibar'
+ #prf_hhb = rootgrp.createVariable('prof_hhb', 'f4', ['num_raob_profs', 'max_num_raob_levels'])
+ #prf_hhb.units = 'meter'
# ----- Product variables ----------------
nc4_vars = []
@@ -2098,9 +2094,9 @@ def create_file_new2(filename, match_dct, raob_dct, gfs_at_raob_dct, bf_dct, prd
v = var_s[param]
attr_s = v.ncattrs()
if '_FillValue' in attr_s:
- var = rootgrp.createVariable(param, v.dtype, ['num_aeolus_profs', 'max_num_amvs'], fill_value=v.getncattr('_FillValue'))
+ var = rootgrp.createVariable(param, v.dtype, ['num_raob_profs', 'max_num_amvs'], fill_value=v.getncattr('_FillValue'))
else:
- var = rootgrp.createVariable(param, v.dtype, ['num_aeolus_profs', 'max_num_amvs'])
+ var = rootgrp.createVariable(param, v.dtype, ['num_raob_profs', 'max_num_amvs'])
# copy attributes from example to new output variable of the same name
for attr in attr_s:
if attr != '_FillValue':
@@ -2110,32 +2106,25 @@ def create_file_new2(filename, match_dct, raob_dct, gfs_at_raob_dct, bf_dct, prd
# Write data to file ---------------------
prf_lon[:] = alons
prf_lat[:] = alats
- prf_elem[:] = elems
- prf_line[:] = lines
- prf_time[:] = atimes
- prf_fidx[:] = fidxs
+ #prf_elem[:] = elems
+ #prf_line[:] = lines
- amv_file_names[:] = amv_file_s
+ #amv_file_names[:] = amv_file_s
idx = 0
- for key in keys:
- tup_s = match_dct.get(key)
- for tup in tup_s:
- prof = tup[3]
- param_nd = tup[4]
+ for idx, key in enumerate(keys):
+ raob = raob_dct.get(key)
+ nlevs = raob.shape[0]
+ bf_tup = bf_dct.get(key)
+ amvs = bf_tup[0]
+ num_amvs = amvs.shape[0]
- nlevs = prof.shape[0]
- for k in range(nlevs):
- prf_spd[idx,k] = prof[k,6]
- prf_azm[idx,k] = prof[k,5]
- prf_hht[idx,k] = prof[k,3]
- prf_hhb[idx,k] = prof[k,4]
+ prf_lvl[idx,0:nlevs] = raob[:,0]
+ prf_dir[idx,0:nlevs] = raob[:,2]
+ prf_spd[idx,0:nlevs] = raob[:,3]
- for pidx, param in enumerate(amv_params):
- nda = param_nd[pidx+4,]
- cnt = nda.shape[0]
- nc4_vars[pidx][idx, 0:cnt,] = nda
- idx += 1
+ for pidx, param in enumerate(amv_params):
+ nc4_vars[pidx][idx,0:num_amvs] = amvs[:, pidx]
rg_exmpl.close()
rootgrp.close()