diff --git a/modules/icing/util.py b/modules/icing/util.py index 66a7000df2d7b3c7e028bdb68f53a9892fe9e3f1..2b9ef39d0a4b38c858e682a865ef405f847f7f4c 100644 --- a/modules/icing/util.py +++ b/modules/icing/util.py @@ -3,7 +3,8 @@ import deeplearning.icing_fcn as icing_fcn import deeplearning.icing_cnn as icing_cnn from icing.pirep_goes import setup, time_filter_3 from util.util import get_time_tuple_utc, is_day, check_oblique, get_average, homedir, write_icing_file_nc4,\ - make_for_full_domain_predict, prepare_evaluate + write_icing_file_nc4_viirs,\ + make_for_full_domain_predict, make_for_full_domain_predict_viirs_clavrx, prepare_evaluate from util.plot import make_icing_image from util.geos_nav import get_navigation, get_lon_lat_2d_mesh from util.setup import model_path_day, model_path_night @@ -184,8 +185,13 @@ def run_icing_predict(clvrx_dir='/Users/tomrink/data/clavrx/RadC/', output_dir=h avg_bt = np.array(avg_bt) bt_10_4_2d = avg_bt.reshape((num_lines, num_elems)) - write_icing_file_nc4(clvrx_str_time, output_dir, preds_2d_dct, probs_2d_dct, - x_rad, y_rad, lons_2d, lats_2d, cc, ll, + # write_icing_file_nc4(clvrx_str_time, output_dir, preds_2d_dct, probs_2d_dct, + # x_rad, y_rad, lons_2d, lats_2d, cc, ll, + # satellite=satellite, domain=domain, use_nan=use_nan, has_time=has_time, + # prob_thresh=prob_thresh, bt_10_4=bt_10_4_2d) + + write_icing_file_nc4_viirs(clvrx_str_time, output_dir, preds_2d_dct, probs_2d_dct, + lons_2d, lats_2d, satellite=satellite, domain=domain, use_nan=use_nan, has_time=has_time, prob_thresh=prob_thresh, bt_10_4=bt_10_4_2d)