Last commit before handover

Author: evanmason

make_eddy_track_AVISO.py

@@ -799,7 +799,7 @@ def pcol_2dxy(self, x, y):
     #date_str, date_end = 19980107, 19991110 # 
     #date_str, date_end = 20081107, 20100110 # 
     #date_str, date_end = 19921014, 20120718 # 
-    date_str, date_end = 20020101, 20020110 # 
+    #date_str, date_end = 20020101, 20020131 # 
     date_str, date_end = 20020101, 20020630 # 
 
     # Choose type of diagnostic: either q-parameter ('Q') or sea level anomaly ('sla')
@@ -921,10 +921,10 @@ def pcol_2dxy(self, x, y):
         latmin = 30.
         latmax = 38.
 
-        #lonmin = .15     # big test
-        #lonmax = 359.15
-        #latmin = -70.
-        #latmax = 70.
+        lonmin = .15     # big test
+        lonmax = 359.15
+        latmin = -70.
+        latmax = 70.
 
 
     elif the_domain in 'MedSea':

make_eddy_tracker_list_obj.py

@@ -48,7 +48,7 @@ def haversine_distance_vector(lon1, lat1, lon2, lat2):
     lat1 = np.asfortranarray(lat1.copy())
     lon2 = np.asfortranarray(lon2.copy())
     lat2 = np.asfortranarray(lat2.copy())
-    dist = np.asfortranarray(np.empty(lon1.shape))
+    dist = np.asfortranarray(np.empty_like(lon1))
     hav.haversine_distvec(lon1, lat1, lon2, lat2, dist)
     return dist
 
@@ -958,25 +958,25 @@ def write2netcdf(self, rtime):
         # Update old_lon and old_lat...
         #print '0000000000000000000000000000000000000000000000000000'
         #print 'self.new_lon[lasti:]',self.new_lon[lasti:]
-        self.old_lon     = list(self.new_lon[lasti:])
+        self.old_lon = list(self.new_lon[lasti:])
         #print 'self.old_lon',self.old_lon
         #print '0000000000000000000000000000000000000000000000000000'
-        self.old_lat     = self.new_lat[lasti:]
+        self.old_lat = self.new_lat[lasti:]
         self.old_radii_s = self.new_radii_s[lasti:]
         self.old_radii_e = self.new_radii_e[lasti:]
-        self.old_amp     = self.new_amp[lasti:]
-        self.old_Uavg    = self.new_Uavg[lasti:]
-        self.old_teke    = self.new_teke[lasti:]
+        self.old_amp = self.new_amp[lasti:]
+        self.old_Uavg = self.new_Uavg[lasti:]
+        self.old_teke = self.new_teke[lasti:]
         #self.old_bounds  = self.new_bounds[lasti:]
 
-        self.new_lon     = [] #np.array([])
-        self.new_lat     = []
+        self.new_lon = [] #np.array([])
+        self.new_lat = []
         self.new_radii_s = []
         self.new_radii_e = []
-        self.new_amp     = []
-        self.new_Uavg    = []
-        self.new_teke    = []
-        self.new_time    = []
+        self.new_amp = []
+        self.new_Uavg = []
+        self.new_teke = []
+        self.new_time = []
         #self.new_bounds  = np.atleast_2d(np.empty(4, dtype=np.int16))
 
         if 'ROMS' in self.datatype:

py_eddy_tracker_classes.py

@@ -401,10 +401,11 @@ def fit_circle(xvec, yvec):
     npts = xvec.size
     xmean = xvec.mean()
     ymean = yvec.mean()
-    xsc = ne.evaluate('xvec - xmean')
-    ysc = ne.evaluate('yvec - ymean')
+    xsc = xvec - xmean
+    ysc = yvec - ymean
 
-    scale = np.max((np.sqrt(xsc**2 + ysc**2).max(), np.finfo(float).eps))
+    scale = np.array([np.sqrt(xsc**2 + ysc**2).max(),
+		                np.finfo(float).eps]).max()
     xsc /= scale
     ysc /= scale
 
@@ -422,19 +423,18 @@ def fit_circle(xvec, yvec):
     ccx = p[0] # center X-position of fitted circle
     ccy = p[1] # center Y-position of fitted circle
     r = p[2] # radius of fitted circle
-    carea = np.pi       
-    carea = ne.evaluate('carea * r**2') # area of fitted circle
+    carea = r**2 * np.pi # area of fitted circle
 
     # Shape test
     # Area and centroid of closed contour/polygon
     xvec1 = xvec[:npts-1]
     yvec1 = yvec[1:npts]
     xvec2 = xvec[1:npts]
     yvec2 = yvec[:npts-1]
-    tmp = ne.evaluate('(xvec1 * yvec1) - (xvec2 * yvec2)')
+    tmp = (xvec1 * yvec1) - (xvec2 * yvec2)
     polar = ne.evaluate('sum(tmp, axis=None)')
-    polar = ne.evaluate('0.5 * polar')
-    parea = ne.evaluate('abs(polar)')
+    polar *= 0.5
+    parea = np.abs(polar)
 
     # Find distance between circle center and contour points_inside_poly
     dist_poly = np.sqrt((xvec - ccx)**2 + (yvec - ccy)**2)
@@ -1763,4 +1763,4 @@ def get_circle(x0, y0, r, npts):
     cx = x0 + r * np.cos(theta)
     cy = y0 + r * np.sin(theta)
     return cx, cy
-      
+