diff --git a/modules/util/viirs_surfrad.py b/modules/util/viirs_surfrad.py index 6ad6ae6e314bc7c9ca783c5003997c2aa5c5db01..aeb3601c227ef0bfdceabbd02cca21d679cebf39 100644 --- a/modules/util/viirs_surfrad.py +++ b/modules/util/viirs_surfrad.py @@ -25,18 +25,18 @@ keep_out_opd = ['/ships19/cloud/scratch/cphillips/clavrx/run_viirs_superres/site keep_out = keep_out_opd -target_param = 'cloud_probability' -# target_param = 'cld_opd_dcomp' +# target_param = 'cloud_probability' +target_param = 'cld_opd_dcomp' group_name_i = 'super/' group_name_m = 'orig/' solzen_name = group_name_m + 'solar_zenith' -# params_i = [group_name_i+'temp_11_0um', group_name_i+'refl_0_65um', group_name_i+target_param] -# params_m = [group_name_m+'temp_11_0um', group_name_m+'refl_0_65um', group_name_m+target_param] -params_i = [group_name_i+'temp_ch38', group_name_i+'refl_ch01', group_name_i+target_param] -params_m = [group_name_m+'temp_ch38', group_name_m+'refl_ch01', group_name_m+target_param] +params_i = [group_name_i+'temp_11_0um', group_name_i+'refl_0_65um', group_name_i+target_param] +params_m = [group_name_m+'temp_11_0um', group_name_m+'refl_0_65um', group_name_m+target_param] +# params_i = [group_name_i+'temp_ch38', group_name_i+'refl_ch01', group_name_i+target_param] +# params_m = [group_name_m+'temp_ch38', group_name_m+'refl_ch01', group_name_m+target_param] param_idx_m = params_m.index(group_name_m + target_param) param_idx_i = params_i.index(group_name_i + target_param) @@ -81,7 +81,7 @@ def process_cld_opd(grd_k): num_keep = np.sum(keep) keep_cld = np.where(keep, np.logical_and(0.1 < grd_k, grd_k < 158.0), False) frac_cld = np.sum(keep_cld)/num_keep - if not (0.15 < frac_cld < 0.85): + if not (0.10 < frac_cld < 0.90): return None grd_k = np.where(np.invert(keep), 0, grd_k) # Convert NaN to 0 return grd_k @@ -91,13 +91,13 @@ def run_all(directory, out_directory, day_night='ANY', pattern='clavrx_*.nc', st cnt = start total_num_train_samples = 0 total_num_valid_samples = 0 - num_keep_x_tiles = 4 + num_keep_x_tiles = 14 path = directory + '**' + '/' + pattern - # all_files = glob.glob(path, recursive=True) - # data_files = [f for f in all_files if f not in keep_out] - data_files = glob.glob(path, recursive=True) + all_files = glob.glob(path, recursive=True) + data_files = [f for f in all_files if f not in keep_out] + # data_files = glob.glob(path, recursive=True) valid_tiles_i = [] train_tiles_i = [] @@ -122,7 +122,7 @@ def run_all(directory, out_directory, day_night='ANY', pattern='clavrx_*.nc', st try: num_not_missing = run(h5f, params_m, train_tiles_m, valid_tiles_m, params_i, train_tiles_i, valid_tiles_i, - num_keep_x_tiles=num_keep_x_tiles, tile_width=16, kernel_size=3, factor=4, day_night=day_night) + num_keep_x_tiles=num_keep_x_tiles, tile_width=64, kernel_size=7, factor=2, day_night=day_night) except Exception as e: print(e) h5f.close() @@ -234,10 +234,10 @@ def run(h5f, params_m, train_tiles_m, valid_tiles_m, params_i, train_tiles_i, va i_skip = tile_width j_skip = tile_width - # i_start = int(num_pixels / 2) - int((num_keep_x_tiles * tile_width) / 2) - # j_start = 0 - i_start = border - 1 # zero-based - j_start = border - 1 # zero-based + i_start = int(num_pixels / 2) - int((num_keep_x_tiles * tile_width) / 2) + j_start = 0 + # i_start = border - 1 # zero-based + # j_start = border - 1 # zero-based num_y_tiles = int(num_lines / tile_width) - 1