From 99f44a9e8ec21ec1e771ad16bc31a8a23ff7a2f4 Mon Sep 17 00:00:00 2001 From: tomrink <rink@ssec.wisc.edu> Date: Mon, 2 Aug 2021 12:14:53 -0500 Subject: [PATCH] minor --- modules/icing/pirep_goes.py | 47 ++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/modules/icing/pirep_goes.py b/modules/icing/pirep_goes.py index 5f61e4f2..60276967 100644 --- a/modules/icing/pirep_goes.py +++ b/modules/icing/pirep_goes.py @@ -792,28 +792,29 @@ def apply_qc_icing_pireps(icing_alt, cld_top_hgt, cld_phase, cld_opd, cld_mask, continue keep_0 = np.logical_or(cld_mask[i,] == 2, cld_mask[i,] == 3) # cloudy - keep_1 = np.invert(np.isnan(cld_top_hgt[i,])) - keep_2 = np.invert(np.isnan(bt_11um[i,])) - keep_3 = np.invert(np.isnan(cld_opd[i,])) - keep = keep_0 & keep_1 & keep_2 & keep_3 + # keep_1 = np.invert(np.isnan(cld_top_hgt[i,])) + # keep_2 = np.invert(np.isnan(bt_11um[i,])) + # keep_3 = np.invert(np.isnan(cld_opd[i,])) + # keep = keep_0 & keep_1 & keep_2 & keep_3 + keep = keep_0 num_keep = np.sum(keep) if num_keep == 0: continue - keep = np.where(keep, cld_top_hgt[i,] > icing_alt[i], False) - - keep = np.where(keep, - np.invert((cld_phase[i,] == 4) & - np.logical_and(cld_top_hgt[i,]+closeness > icing_alt[i], cld_top_hgt[i,]-closeness < icing_alt[i])), - False) - - keep = np.where(keep, (cld_opd[i,] >= opd_thick_threshold) & (cld_phase[i,] == 4) & (cld_top_hgt[i,] > icing_alt[i]), False) - - keep = np.where(keep, np.invert((cld_phase[i,] == 4) & (cld_opd[i,] < 0.1) & (cld_top_hgt[i,] > icing_alt[i])), False) - - keep = np.where(keep, np.invert(bt_11um[i,] > 270.0), False) - - keep = np.where(keep, np.invert(bt_11um[i,] < 228.0), False) + # keep = np.where(keep, cld_top_hgt[i,] > icing_alt[i], False) + # + # keep = np.where(keep, + # np.invert((cld_phase[i,] == 4) & + # np.logical_and(cld_top_hgt[i,]+closeness > icing_alt[i], cld_top_hgt[i,]-closeness < icing_alt[i])), + # False) + # + # keep = np.where(keep, (cld_opd[i,] >= opd_thick_threshold) & (cld_phase[i,] == 4) & (cld_top_hgt[i,] > icing_alt[i]), False) + # + # keep = np.where(keep, np.invert((cld_phase[i,] == 4) & (cld_opd[i,] < 0.1) & (cld_top_hgt[i,] > icing_alt[i])), False) + # + # keep = np.where(keep, np.invert(bt_11um[i,] > 270.0), False) + # + # keep = np.where(keep, np.invert(bt_11um[i,] < 228.0), False) mask.append(keep) idxs.append(i) @@ -848,10 +849,12 @@ def apply_qc_no_icing_pireps(icing_alt, cld_top_hgt, cld_phase, cld_opd, cld_mas continue keep_0 = np.logical_or(cld_mask[i,] == 2, cld_mask[i,] == 3) # cloudy - keep_1 = np.invert(np.isnan(cld_top_hgt[i,])) - keep_2 = np.invert(np.isnan(bt_11um[i,])) - keep_3 = np.invert(np.isnan(cld_opd[i,])) - keep = keep_0 & keep_1 & keep_2 & keep_3 + # keep_1 = np.invert(np.isnan(cld_top_hgt[i,])) + # keep_2 = np.invert(np.isnan(bt_11um[i,])) + # keep_3 = np.invert(np.isnan(cld_opd[i,])) + # keep = keep_0 & keep_1 & keep_2 & keep_3 + # num_keep = np.sum(keep) + keep = keep_0 num_keep = np.sum(keep) if num_keep == 0: continue -- GitLab