diff --git a/modules/util/gfs_reader.py b/modules/util/gfs_reader.py index d1f36a4f706ba5c9ca29b173088ace58f01aef00..a12ef90efdcca420f8f7b959b7a65a5dc5976c8f 100644 --- a/modules/util/gfs_reader.py +++ b/modules/util/gfs_reader.py @@ -43,16 +43,21 @@ def get_time_tuple_utc(timestamp): def get_bounding_gfs_files(timestamp): dt_obj, time_tup = get_time_tuple_utc(timestamp) + print(dt_obj) date_str = dt_obj.strftime(gfs_date_format) - dt_obj0 = datetime.datetime.strptime(date_str, gfs_date_format).replace(tzinfo=timezone.utc) - dt_obj1 = dt_obj0 + datetime.timedelta(days=1) - date_str_1 = dt_obj1.strftime(gfs_date_format) - - flist_0 = glob.glob(gfs_directory+'gfs.'+date_str+'??_F012.h5') - flist_1 = glob.glob(gfs_directory+'gfs.'+date_str_1+'00_F012.h5') - if (len(flist_0) == 0) or (len(flist_1) == 0): + dt_obj = datetime.datetime.strptime(date_str, gfs_date_format).replace(tzinfo=timezone.utc) + print(dt_obj) + dt_obj_r = dt_obj + datetime.timedelta(days=1) + date_str_r = dt_obj_r.strftime(gfs_date_format) + dt_obj_l = dt_obj - datetime.timedelta(days=1) + date_str_l = dt_obj_l.strftime(gfs_date_format) + + flist_l = glob.glob(gfs_directory+'gfs.'+date_str_l+'??_F012.h5') + flist = glob.glob(gfs_directory+'gfs.'+date_str+'??_F012.h5') + flist_r = glob.glob(gfs_directory+'gfs.'+date_str_r+'??_F012.h5') + filelist = flist_l + flist + flist_r + if len(filelist) == 0: return None, None, None, None - filelist = flist_0 + flist_1 ftimes = [] for pname in filelist: # TODO: make better with regular expressions (someday)