From 3e1abfed2f628597e10d4b64aebaabfea099db60 Mon Sep 17 00:00:00 2001
From: tomrink <rink@ssec.wisc.edu>
Date: Fri, 1 Oct 2021 10:20:18 -0500
Subject: [PATCH] minor stuff
---
modules/deeplearning/icing_cnn.py | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/modules/deeplearning/icing_cnn.py b/modules/deeplearning/icing_cnn.py
index 3faeae62..6d83694b 100644
--- a/modules/deeplearning/icing_cnn.py
+++ b/modules/deeplearning/icing_cnn.py
@@ -2,7 +2,7 @@ import tensorflow as tf
import tensorflow_addons as tfa
from util.setup import logdir, modeldir, cachepath, now
from util.util import homedir, EarlyStop, normalize, make_for_full_domain_predict
-from util.geos_nav import GEOSNavigation
+from util.geos_nav import GEOSNavigation, get_navigation
import os, datetime
import numpy as np
@@ -958,7 +958,7 @@ def run_restore_static(filename_l1b, filename_l2, ckpt_dir_s_path):
return cm_avg
-def run_evaluate_static(filename, ckpt_dir_s_path, prob_thresh=0.5, domain='FD'):
+def run_evaluate_static(filename, ckpt_dir_s_path, prob_thresh=0.5, satellite='GOES16', domain='FD'):
data_dct, ll, cc = make_for_full_domain_predict(filename, name_list=train_params, domain=domain)
ckpt_dir_s = os.listdir(ckpt_dir_s_path)
prob_s = []
@@ -992,10 +992,11 @@ def run_evaluate_static(filename, ckpt_dir_s_path, prob_thresh=0.5, domain='FD')
ice_cc = cc[ice_mask]
ice_ll = ll[ice_mask]
- if domain == 'CONUS':
- nav = GEOSNavigation(sub_lon=-75.0, CFAC=5.6E-05, COFF=-0.101332, LFAC=-5.6E-05, LOFF=0.128212, num_elems=2500, num_lines=1500)
- elif domain == 'FD':
- nav = GEOSNavigation(sub_lon=-75.0, CFAC=5.6E-05, COFF=-0.151844, LFAC=-5.6E-05, LOFF=0.151844, num_elems=5424, num_lines=5424)
+ # if domain == 'CONUS':
+ # nav = GEOSNavigation(sub_lon=-75.0, CFAC=5.6E-05, COFF=-0.101332, LFAC=-5.6E-05, LOFF=0.128212, num_elems=2500, num_lines=1500)
+ # elif domain == 'FD':
+ # nav = GEOSNavigation(sub_lon=-75.0, CFAC=5.6E-05, COFF=-0.151844, LFAC=-5.6E-05, LOFF=0.151844, num_elems=5424, num_lines=5424)
+ nav = get_navigation(satellite, domain)
ice_lons = []
ice_lats = []
for k in range(ice_cc.shape[0]):
--
GitLab