diff --git a/modules/icing/pirep_goes.py b/modules/icing/pirep_goes.py index d11b017f00886d9dddba8ab83210a721e4db95b0..c464a4aae98dd6c98a90fa9ee1e1cad6c919e0b2 100644 --- a/modules/icing/pirep_goes.py +++ b/modules/icing/pirep_goes.py @@ -1467,8 +1467,8 @@ def apply_qc_icing_pireps_v3(icing_alt, cld_top_hgt, cld_geo_dz, cld_phase, cld_ closeness_top = 100.0 # meters max_cld_depth = 800.0 - max_altitude = 4500.0 - max_cld_altitude = 4500.0 + max_altitude = 4800.0 + max_cld_altitude = 4800.0 num_obs = len(icing_alt) cld_mask = cld_mask.reshape((num_obs, -1)) @@ -1493,10 +1493,10 @@ def apply_qc_icing_pireps_v3(icing_alt, cld_top_hgt, cld_geo_dz, cld_phase, cld_ # keep_0 = cld_mask[i, ] == 3 # Confident cloudy 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_geo_dz[i,])) + keep_2 = np.invert(np.isnan(cld_geo_dz[i,])) + # keep_3 = np.invert(np.isnan(bt_11um[i,])) # keep = keep_0 & keep_1 & keep_2 & keep_3 - keep = keep_0 & keep_1 + keep = keep_0 & keep_1 & keep_2 num_keep = np.sum(keep) if num_keep == 0: continue @@ -1517,7 +1517,7 @@ def apply_qc_icing_pireps_v3(icing_alt, cld_top_hgt, cld_geo_dz, cld_phase, cld_ keep = np.where(keep, cld_top_hgt[i,] < max_cld_altitude, False) keep = np.where(keep, np.logical_and((cld_top_hgt[i,] + closeness_top) > icing_alt[i,], - (cld_top_hgt[i,] - max_cld_depth) < icing_alt[i,]), False) + (cld_top_hgt[i,] - cld_geo_dz[i,]) < icing_alt[i,]), False) # keep = np.where(keep, np.logical_and(cld_top_temp[i,] > 228.0, cld_top_temp[i,] < 274.0), False)