diff --git a/modules/util/viirs_surfrad.py b/modules/util/viirs_surfrad.py index db9aa86e5f857dd9c75d2e1c8f41ef0ac6b44740..273d5d69183a57168cab09745a67113894c87bd7 100644 --- a/modules/util/viirs_surfrad.py +++ b/modules/util/viirs_surfrad.py @@ -78,29 +78,28 @@ def process_cld_prob(grd_k): return grd_k -# def process_cld_opd(grd_k): -# keep = np.invert(np.isnan(grd_k)) -# num_keep = np.sum(keep) -# grd_k = np.where(np.invert(keep), 0, grd_k) -# keep = np.where(keep, np.logical_and(0.1 < grd_k, grd_k < 158.0), False) -# frac_keep = np.sum(keep)/num_keep -# if frac_keep < 0.50: -# return None -# return grd_k - def process_cld_opd(grd_k): keep = np.invert(np.isnan(grd_k)) num_keep = np.sum(keep) - keep_thin = np.where(keep, np.logical_and(grd_k > 0.1, grd_k < 4.0), False) - keep_thik = np.where(keep, np.logical_and(grd_k > 4.0, grd_k < 40.0), False) - frac_thin = np.sum(keep_thin) / num_keep - frac_thik = np.sum(keep_thik) / num_keep - if not (frac_thin >= 0.20 and frac_thik >= 0.20): - # if not (frac_thin >= 0.20): + 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 0.60 < frac_cld < 0.85: return None grd_k = np.where(np.invert(keep), 0, grd_k) return grd_k +# def process_cld_opd(grd_k): +# keep = np.invert(np.isnan(grd_k)) +# num_keep = np.sum(keep) +# keep_thin = np.where(keep, np.logical_and(grd_k > 0.1, grd_k < 4.0), False) +# keep_thik = np.where(keep, np.logical_and(grd_k > 4.0, grd_k < 40.0), False) +# frac_thin = np.sum(keep_thin) / num_keep +# frac_thik = np.sum(keep_thik) / num_keep +# if not (frac_thin >= 0.20 and frac_thik >= 0.20): +# return None +# grd_k = np.where(np.invert(keep), 0, grd_k) +# return grd_k + def run_all(directory, out_directory, day_night='ANY', pattern='clavrx_*.nc', start=10): cnt = start