diff --git a/modules/icing/pirep_goes.py b/modules/icing/pirep_goes.py index 0c3ba10fa3186b78f90974cb9a5dd27343767b52..8602cf378bd8206607cd1efd5ce1d7f8e2c91afe 100644 --- a/modules/icing/pirep_goes.py +++ b/modules/icing/pirep_goes.py @@ -1204,8 +1204,8 @@ def apply_qc_icing_pireps(icing_alt, cld_top_hgt, cld_geo_dz, cld_phase, cld_opd closeness_top = 200.0 # meters max_cld_depth = 1500.0 - max_altitude = 5000.0 - max_cld_altitude = 5000.0 + max_altitude = 4000.0 + max_cld_altitude = 4000.0 num_obs = len(icing_alt) cld_mask = cld_mask.reshape((num_obs, -1)) @@ -1229,8 +1229,8 @@ def apply_qc_icing_pireps(icing_alt, cld_top_hgt, cld_geo_dz, cld_phase, cld_opd # if not (is_day(solzen[i,]) or is_night(solzen[i,])): # continue - # if not (icing_alt[i] < max_altitude): - # continue + if not (icing_alt[i] < max_altitude): + 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,])) @@ -1244,12 +1244,12 @@ def apply_qc_icing_pireps(icing_alt, cld_top_hgt, cld_geo_dz, cld_phase, cld_opd continue ##keep = np.where(keep, (cld_top_hgt[i,] + closeness_top) > icing_alt[i], False) - # keep = np.where(keep, cld_top_hgt[i,] < max_cld_altitude, False) + keep = np.where(keep, cld_top_hgt[i,] < max_cld_altitude, False) ##keep = np.where(keep, (cld_top_hgt[i,] - max_cld_depth) < icing_alt[i], False) # keep = np.where(keep, np.logical_and(bt_11um[i,] > 228.0, bt_11um[i,] < 270.0), False) # keep = np.where(keep, bt_11um[i,] < 275.0, False) - ##keep = np.where(keep, cld_top_temp[i,] < 275.0, False) + keep = np.where(keep, cld_top_temp[i,] < 275.0, False) # cld_hgt = cld_top_hgt[i, ].flatten() # med_cld_hgt = np.median(cld_hgt[keep]) @@ -1307,8 +1307,8 @@ def apply_qc_no_icing_pireps(icing_alt, cld_top_hgt, cld_geo_dz, cld_phase, cld_ # if not (is_day(solzen[i,]) or is_night(solzen[i,])): # continue - # if not (icing_alt[i] < max_altitude): - # continue + if not (icing_alt[i] < max_altitude): + 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,])) @@ -1322,12 +1322,12 @@ def apply_qc_no_icing_pireps(icing_alt, cld_top_hgt, cld_geo_dz, cld_phase, cld_ continue ##keep = np.where(keep, (cld_top_hgt[i,] + closeness_top) > icing_alt[i], False) - # keep = np.where(keep, cld_top_hgt[i,] < max_cld_altitude, False) + keep = np.where(keep, cld_top_hgt[i,] < max_cld_altitude, False) ##keep = np.where(keep, (cld_top_hgt[i,] - max_cld_depth) < icing_alt[i], False) # keep = np.where(keep, np.logical_and(bt_11um[i,] > 228.0, bt_11um[i,] < 270.0), False) # keep = np.where(keep, bt_11um[i,] < 275.0, False) - ##keep = np.where(keep, cld_top_temp[i,] < 275.0, False) + keep = np.where(keep, cld_top_temp[i,] < 275.0, False) # cld_hgt = cld_top_hgt[i, ].flatten() # med_cld_hgt = np.median(cld_hgt[keep])