Bugfix to SearchEllipse object

Author: evanmason

make_eddy_tracker_list_obj.py

@@ -1156,7 +1156,7 @@ def __init__(self, THE_DOMAIN, grd, DAYS_BTWN_RECORDS, RW_PATH=None):
         self.THE_DOMAIN = THE_DOMAIN
         self.DAYS_BTWN_RECORDS = DAYS_BTWN_RECORDS
         self.e_w_major = self.DAYS_BTWN_RECORDS * 3e5 / 7.
-        self.n_s_minor = self.DAYS_BTWN_RECORDS * 1. * 15e4 / 7.
+        self.n_s_minor = self.DAYS_BTWN_RECORDS * 15e4 / 7.
         self.semi_n_s_minor = 0.5 * self.n_s_minor
         self.rwv = RossbyWaveSpeed(THE_DOMAIN, grd, RW_PATH=RW_PATH)
         self.rw_c = np.empty(1)
@@ -1196,8 +1196,8 @@ def _set_global_ellipse(self):
         w_verts = self.west_ellipse.get_verts()
         w_size = w_verts[:, 0].size
         w_size *= 0.5
-        ew_x = np.hstack((e_verts[:e_size, 0], w_verts[w_size:, 0]))
-        ew_y = np.hstack((e_verts[:e_size, 1], w_verts[w_size:, 1]))
+        ew_x = np.hstack((e_verts[e_size:, 0], w_verts[:w_size, 0]))
+        ew_y = np.hstack((e_verts[e_size:, 1], w_verts[:w_size, 1]))
         self.ellipse_path = path.Path(np.array([ew_x, ew_y]).T)
         return self#.ellipse_path
 

py_eddy_tracker_classes.py

@@ -925,7 +925,7 @@ def track_eddies(Eddy, first_record):
         if 'ellipse' in Eddy.SEPARATION_METHOD:
             Eddy.search_ellipse.set_search_ellipse(old_x[old_ind],
                                                    old_y[old_ind])
-            
+            #Eddy.search_ellipse.view_search_ellipse(Eddy)
 
         # Loop over separation distances between old and new
         for new_ind, new_dist in enumerate(dist_mat[old_ind]):
@@ -1047,6 +1047,7 @@ def track_eddies(Eddy, first_record):
                     delta_salt = np.r_[delta_salt,
                         np.abs(np.diff([Eddy.old_salt[old_ind], new_st[i]]))]
 
+            #Eddy.search_ellipse.view_search_ellipse(Eddy)
             #print dist_arr, DIST0
             # This from Penven etal (2005)
             deltaX = np.sqrt((delta_area / AREA0)**2 +