diff --git a/modules/util/abi_surfrad.py b/modules/util/abi_surfrad.py index 7f0bb52351608d8e2ffdd6722be42b6918d70cf3..a3c200b7b478f638b9851d0d95486d727e557aaf 100644 --- a/modules/util/abi_surfrad.py +++ b/modules/util/abi_surfrad.py @@ -99,9 +99,10 @@ def run_all(directory, out_directory, day_night='ANY', pattern='clavrx_*.nc', st continue try: - num_not_missing = run(h5f, params_m, data_tiles_m, params_i, data_tiles_i, - num_keep_x_tiles=num_keep_x_tiles, tile_width=16, kernel_size=4, factor=4, - day_night=day_night, is_snow_covered=is_snow_covered) + num_not_missing, num_snow_covered = \ + run(h5f, params_m, data_tiles_m, params_i, data_tiles_i, + num_keep_x_tiles=num_keep_x_tiles, tile_width=16, kernel_size=4, factor=4, + day_night=day_night, is_snow_covered=is_snow_covered) except Exception as e: print(e) h5f.close() @@ -163,8 +164,10 @@ def run_all(directory, out_directory, day_night='ANY', pattern='clavrx_*.nc', st continue try: - num_not_missing = run(h5f, params_m, data_tiles_m, params_i, data_tiles_i, - num_keep_x_tiles=num_keep_x_tiles, tile_width=16, kernel_size=4, factor=4, day_night=day_night) + num_not_missing, num_snow_covered = \ + run(h5f, params_m, data_tiles_m, params_i, data_tiles_i, + num_keep_x_tiles=num_keep_x_tiles, tile_width=16, kernel_size=4, factor=4, + day_night=day_night, is_snow_covered=is_snow_covered) except Exception as e: print(e) h5f.close() @@ -260,6 +263,7 @@ def run(h5f, params_m, data_tiles_m, params_i, data_tiles_i, num_keep_x_tiles=8, num_y_tiles = int(num_lines / tile_width) - 1 num_not_missing = 0 + num_snow_covered = 0 for j in range(num_y_tiles): j_a = j_start + j * j_skip @@ -273,8 +277,10 @@ def run(h5f, params_m, data_tiles_m, params_i, data_tiles_i, num_keep_x_tiles=8, if is_snow_covered: if not snow_covered(snow[j_a:j_b, i_a:i_b]): continue + num_snow_covered += 1 else: if snow_covered(snow[j_a:j_b, i_a:i_b]): + num_snow_covered += 1 continue if day_night == 'DAY' and not is_day(solzen[j_a:j_b, i_a:i_b]): @@ -293,4 +299,4 @@ def run(h5f, params_m, data_tiles_m, params_i, data_tiles_i, num_keep_x_tiles=8, data_tiles_m.append(nda_m) data_tiles_i.append(nda_i) - return num_not_missing + return num_not_missing, num_snow_covered