snapshot...

modules/util/infer_cloud_products.py

@@ -44,28 +44,20 @@ def infer_cloud_products(clvrx_path, output_dir, full_disk=True, satellite='GOES
         t0 = time.time()
         if full_disk:
             cld_frac = nn_cld_frac.run_inference_full_disk(pname, None)
-            cld_opd_1, opd = nn_cld_opd.run_inference_full_disk(pname, None)
+            cld_opd, opd = nn_cld_opd.run_inference_full_disk(pname, None)
         else:
             cld_frac = nn_cld_frac.run_inference(pname, None)
-            cld_opd_1, opd = nn_cld_opd.run_inference(pname, None)
+            cld_opd, opd = nn_cld_opd.run_inference(pname, None)
 
         clr_cat = cld_frac == 0
         cld_cat = cld_frac == 4
-        cld_opd_1[clr_cat] = opd[clr_cat]
-        cld_opd_1[cld_cat] = opd[cld_cat]
+        cld_opd[clr_cat] = opd[clr_cat]
+        cld_opd[cld_cat] = opd[cld_cat]
 
-        cld_opd_2 = cld_opd_1.copy()
-        cld_opd_2 = np.where(cld_frac == 1, cld_opd_2 / 0.25, cld_opd_2)
-        cld_opd_2 = np.where(cld_frac == 2, cld_opd_2 / 0.50, cld_opd_2)
-        cld_opd_2 = np.where(cld_frac == 3, cld_opd_2 / 0.75, cld_opd_2)
+        cld_opd[np.logical_and(cld_opd < 0.0, cld_opd > 160.0)] = -1.0
+        cld_opd[np.isnan(opd)] = -1.0
 
-        cld_opd_1[np.logical_and(cld_opd_1 < 0.0, cld_opd_1 > 160.0)] = -1.0
-        cld_opd_1[np.isnan(opd)] = -1.0
-
-        cld_opd_2[np.logical_and(cld_opd_2 < 0.0, cld_opd_2 > 160.0)] = -1.0
-        cld_opd_2[np.isnan(opd)] = -1.0
-
-        write_cld_prods_file_nc4(clvrx_str_time, out_file, cld_frac, cld_opd_1, cld_opd_2, x_rad, y_rad, None, None,
+        write_cld_prods_file_nc4(clvrx_str_time, out_file, cld_frac, cld_opd, x_rad, y_rad, None, None,
                                 satellite=satellite, domain=domain, has_time=True)
         t1 = time.time()
         print('total time: ', (t1 - t0))