Fixed global mask for DT10

H: Enter commit message.  Lines beginning with 'HG:' are

Author: evanmason

make_eddy_track_AVISO.py

@@ -490,14 +490,15 @@ class AvisoGrid (PyEddyTracker):
     Class to satisfy the need of the eddy tracker
     to have a grid class
     """
-    def __init__(self, AVISO_FILE, THE_DOMAIN, LONMIN, LONMAX, LATMIN, LATMAX,
-                 with_pad=True):
+    def __init__(self, AVISO_FILE, THE_DOMAIN, PRODUCT,
+                       LONMIN, LONMAX, LATMIN, LATMAX, with_pad=True):
         """
         Initialise the grid object
         """
         super(AvisoGrid, self).__init__()
         print '\nInitialising the AVISO_grid'
         self.THE_DOMAIN = THE_DOMAIN
+        self.PRODUCT = PRODUCT
         self.LONMIN = LONMIN
         self.LONMAX = LONMAX
         self.LATMIN = LATMIN
@@ -595,14 +596,44 @@ def set_mask(self, sla):
                 # Close Drake Passage
                 minus70 = np.argmin(np.abs(self.lonpad()[0] + 70))
                 self.mask[:125, minus70] = 0
+                
+                # DT10 mask is open around Panama, so close it...
+                if 'AVISO_DT10' in self.PRODUCT:
+                    
+                    mask = 0
+                    self.mask[348, 92:110] = mask
+                    self.mask[348:356, 92] = mask
+                    self.mask[355, 71:92] = mask
+                    self.mask[355:363, 71] = mask
+                    self.mask[362, 66:71] = mask
+                    self.mask[362:380, 66] = mask
+                    self.mask[380, 47:67] = mask
+                    self.mask[380:389, 47] = mask
+                    self.mask[388, 13:47] = mask
+                    self.mask[388:393, 13] = mask
+                    self.mask[392, :13] = mask
+                    ind = 4 * 360
+                    self.mask[348, 92 + ind:110 + ind] = mask
+                    self.mask[348:356, 92 + ind] = mask
+                    self.mask[355, 71 + ind:92 + ind] = mask
+                    self.mask[355:363, 71 + ind] = mask
+                    self.mask[362, 66 + ind:71 + ind] = mask
+                    self.mask[362:380, 66 + ind] = mask
+                    self.mask[380, 47 + ind:67 + ind] = mask
+                    self.mask[380:389, 47 + ind] = mask
+                    self.mask[388, 13 + ind:47 + ind] = mask
+                    self.mask[388:393, 13 + ind] = mask
+                    self.mask[392,  ind:13 + ind] = mask
+                    
                 # Mask all unwanted regions (Caspian Sea, etc)
                 labels = ndimage.label(self.mask)[0]
-                plus200 = np.argmin(np.abs(self.lonpad()[0] - 200))
-                plus10 = np.argmin(np.abs(self.latpad()[:, 0] - 10))
+                
+                self.labels = labels
                 # Set to known sea point
-                good_lab = labels[plus10, plus200]
-                self.mask[labels != good_lab] = 0
-        
+                plus200 = np.argmin(np.abs(self.lonpad()[0] - 200))
+                plus9 = np.argmin(np.abs(self.latpad()[:, 0] - 9))
+                sea_label = labels[plus9, plus200]
+                np.place(self.mask, labels != sea_label, 0)
         return self
 
 
@@ -815,13 +846,17 @@ def set_interp_coeffs(self, sla, uspd):
     AVISO_DT14 = config['AVISO']['AVISO_DT14']
     AVISO_FILES = config['AVISO']['AVISO_FILES']
     if AVISO_DT14:
+        PRODUCT = 'AVISO_DT14'
         AVISO_DT14_SUBSAMP = config['AVISO']['AVISO_DT14_SUBSAMP']
         if AVISO_DT14_SUBSAMP:
             DAYS_BTWN_RECORDS = config['AVISO']['DAYS_BTWN_RECORDS']
         else:
             DAYS_BTWN_RECORDS = 1.
     else:
+        PRODUCT = 'AVISO_DT10'
         DAYS_BTWN_RECORDS = 7. # old seven day AVISO
+    
+    AVISO_FILES = config['AVISO']['AVISO_FILES']
 
     #TRACK_DURATION_MIN = config['TRACK_DURATION_MIN']
 
@@ -904,7 +939,7 @@ def set_interp_coeffs(self, sla, uspd):
         AVISO_FILES = AVISO_FILES[5:-5:np.int(DAYS_BTWN_RECORDS)]
 
     # Set up a grid object using first AVISO file in the list
-    sla_grd = AvisoGrid(AVISO_FILES[0], config['THE_DOMAIN'],
+    sla_grd = AvisoGrid(AVISO_FILES[0], config['THE_DOMAIN'], PRODUCT,
                         config['LONMIN'], config['LONMAX'],
                         config['LATMIN'], config['LATMAX'])
 
@@ -1010,6 +1045,7 @@ def set_interp_coeffs(self, sla, uspd):
             sla = sla_grd.get_AVISO_data(AVISO_FILE)
             sla_grd.set_mask(sla).uvmask()
 
+            
             if SMOOTHING:
 
                 if 'Gaussian' in SMOOTHING_TYPE:
@@ -1175,11 +1211,11 @@ def set_interp_coeffs(self, sla, uspd):
 
 
             # Test pickling
-            #with open("".join((SAVE_DIR, 'A_eddy_%s.pkl' % ymd_str)), 'wb') as save_pickle:
-                #pickle.dump(A_eddy, save_pickle)
+            with open("".join((SAVE_DIR, 'A_eddy_%s.pkl' % ymd_str)), 'wb') as save_pickle:
+                pickle.dump(A_eddy, save_pickle)
 
-            #with open("".join((SAVE_DIR, 'C_eddy_%s.pkl' % ymd_str)), 'wb') as save_pickle:
-                #pickle.dump(C_eddy, save_pickle)
+            with open("".join((SAVE_DIR, 'C_eddy_%s.pkl' % ymd_str)), 'wb') as save_pickle:
+                pickle.dump(C_eddy, save_pickle)
 
             ## Unpickle
             #with open('C_eddy.pkl', 'rb') as load_pickle:

make_eddy_tracker_list_obj.py

@@ -342,6 +342,7 @@ def __init__(self, DATATYPE, SIGN_TYPE, SAVE_DIR, grd, search_ellipse,
         self.i0, self.i1 = grd.i0, grd.i1
         self.j0, self.j1 = grd.j0, grd.j1
         self.FILLVAL = grd.FILLVAL
+        self.PRODUCT = grd.PRODUCT
 
         self.new_lon    = [] #np.array([])
         self.new_lat    = []
@@ -532,6 +533,7 @@ def create_netcdf(self, directory, savedir,
         nc = Dataset(self.savedir, 'w', format='NETCDF4')
         nc.title = ''.join((self.SIGN_TYPE, ' eddy tracks'))
         nc.directory = directory
+        nc.PRODUCT = self.PRODUCT
         nc.DAYS_BTWN_RECORDS = np.float64(self.DAYS_BTWN_RECORDS)
         nc.TRACK_DURATION_MIN = np.float64(self.TRACK_DURATION_MIN)
 

py_eddy_tracker_classes.py

@@ -696,8 +696,6 @@ def collection_loop(CS, grd, rtime, A_list_obj, C_list_obj,
                                     amp = Amplitude(contlon_e, contlat_e, Eddy, grd)
 
                                     if 'Anticyclonic' in sign_type:
-                                        amp.all_pixels_above_h0()
-                                        
                                         reset_centroid = amp.all_pixels_above_h0(
                                                               CS.levels[collind])
                                         #plt.figure(666)

py_eddy_tracker_property_classes.py

@@ -296,7 +296,7 @@ def debug_figure(self, grd):
         """
         Uncomment in py-eddy-tracker-classes.py
         """
-        if self.local_extrema and self.amplitude:
+        if self.local_extrema >= 1 and self.amplitude:
 
             plt.figure(587)
             cmin, cmax = -8, 8