Cleaning towards pep8

evanmason · evanmason · commit d2c54204570f · 2015-03-16T15:42:39.000+01:00
diff --git a/make_eddy_track_AVISO.py b/make_eddy_track_AVISO.py
@@ -1233,7 +1233,7 @@ def set_interp_coeffs(self, sla, uspd):
 
             # Track the eddies
             A_eddy = track_eddies(A_eddy, first_record)
-            #C_eddy = track_eddies(C_eddy, first_record)
+            C_eddy = track_eddies(C_eddy, first_record)
 
             if SAVE_FIGURES:  # Make figures for animations
 
@@ -1260,9 +1260,7 @@ def set_interp_coeffs(self, sla, uspd):
                     print '+++'
 
                 A_eddy.write2netcdf(rtime)
-                #print '______________________eddy.index', A_eddy.index
-                #print '______________________eddy.ncind', A_eddy.ncind
-                #C_eddy.write2netcdf(rtime)
+                C_eddy.write2netcdf(rtime)
 
         if str(DATE_END) in AVISO_FILE:
             active = False
diff --git a/make_eddy_tracker_list_obj.py b/make_eddy_tracker_list_obj.py
@@ -130,38 +130,6 @@ def strcompare(str1, str2):
     return str1 in str2 and str2 in str1
 
 
-#def find_nearest_contour(contcoll, x, y):
-    #"""
-    #Finds contour that is closest to a point.
-
-    #Returns a tuple containing the contour & segment.
-
-    #Call signature::
-
-    #segmin = find_nearest_contour(contcoll, x, y)
-
-    #"""
-    #dmin = 1e10
-    #segmin = None
-    #linepathmin = None
-
-    #paths = contcoll.get_paths()
-    #for segNum, linepath in enumerate(paths):
-        #lc = linepath.vertices
-        #ds = lc[:,0] - x
-        #ds **= 2
-        #dss = lc[:,1] - y
-        #dss **= 2
-        #ds += dss
-        ##print 'ds', ds
-        #d = ds.min()
-        #if d < dmin:
-            #dmin = d
-            #segmin = segNum
-            #linepathmin = linepath
-    #return (segmin, linepathmin)
-
-
 class Track (object):
     """
     Class that holds eddy tracks and related info
@@ -265,7 +233,6 @@ class TrackList (object):
         old_lon, old_lat: old lon/lat centroids
         index:   index of eddy in track_list
     """
-    #def __init__(self, DATATYPE, TRACK_DURATION_MIN, TRACK_EXTRA_VARIABLES):
     def __init__(self, DATATYPE, SIGN_TYPE, SAVE_DIR, grd, search_ellipse,
                  **kwargs):
         """
@@ -318,7 +285,6 @@ def __init__(self, DATATYPE, SIGN_TYPE, SAVE_DIR, grd, search_ellipse,
         self.EVOLVE_AREA_MIN = np.float64(kwargs.get('EVOLVE_AREA_MIN', 0.0005))
         self.EVOLVE_AREA_MAX = np.float64(kwargs.get('EVOLVE_AREA_MAX', 500))
 
-
         self.AREA0 = np.pi * np.float64(kwargs.get('RAD0', 60000.))**2
         self.AMP0 = np.float64(kwargs.get('AMP0', 2.))
         self.DIST0 = np.float64(kwargs.get('DIST0', 25000.))
@@ -370,10 +336,10 @@ def __init__(self, DATATYPE, SIGN_TYPE, SAVE_DIR, grd, search_ellipse,
             self.old_contour_s = []
             self.old_uavg_profile = []
             self.old_shape_error = []
-        self.new_list = True # flag indicating new list
-        self.index = 0 # counter
-        self.ncind = 0 # index to write to nc files, will increase and increase
-        self.ch_index = 0 # index for Chelton style nc files
+        self.new_list = True  # flag indicating new list
+        self.index = 0  # counter
+        self.ncind = 0  # index to write to nc files, will increase and increase
+        self.ch_index = 0  # index for Chelton style nc files
         self.PAD = 2
         self.search_ellipse = None
         self.PIXEL_THRESHOLD = None
@@ -638,7 +604,6 @@ def create_netcdf(self, directory, savedir,
         nc.variables['cyc'].long_name = 'cyclonic'
         nc.variables['cyc'].description = 'cyclonic -1; anti-cyclonic +1'
 
-
         #nc.variables['eddy_duration'].units = 'days'
         nc.variables['lon'].units = 'deg. longitude'
         nc.variables['lon'].min_val = self.LONMIN
@@ -686,7 +651,6 @@ def create_netcdf(self, directory, savedir,
         nc.variables['radius_e'].long_name = 'effective radius scale'
         nc.variables['radius_e'].description = 'effective eddy radius'
 
-
         if 'Q' in self.DIAGNOSTIC_TYPE:
             nc.variables['qparameter'].units = 's^{-2}'
 
@@ -842,13 +806,9 @@ def write2netcdf(self, rtime):
                             self.ch_index += 1
                             nc.sync()
         
-        #print 'eddy.ncind', self.ncind
-        
         # Get index to first currently active track
         try:
             lasti = self.get_active_tracks(rtime)[0]
-            #print '__________________lasti', lasti
-            #print '__________________rtime', rtime
         except Exception:
             lasti = None
 
@@ -862,7 +822,6 @@ def write2netcdf(self, rtime):
 
         # Update old_lon and old_lat...
         self.old_lon = self.new_lon[lasti:]
-        #print '______________________self.old_lon', self.old_lon
         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:]
diff --git a/py_eddy_tracker_classes.py b/py_eddy_tracker_classes.py
@@ -45,7 +45,6 @@
 #import haversine_distmat as hav # needs compiling with f2py
 from haversine import haversine # needs compiling with f2py
 
-
 def datestr2datetime(datestr):
     """
     Take strings with format YYYYMMDD and convert to datetime instance
@@ -484,14 +483,10 @@ def get_uavg(Eddy, CS, collind, centlon_e, centlat_e, poly_eff,
                         elif 'griddata' in Eddy.INTERP_METHOD:
                             uavgseg = interpolate.griddata(points, uspd1d,
                                       (seglon[1:], seglat[1:]), 'linear')
-                            #print 'rrrrrrrrrrrr', uavgseg
                             uavgseg = uavgseg[np.isfinite(uavgseg)].mean()
                         else:
                             Exception
-
-
-                        #if np.any(np.isinf(uavgseg)): YYYYYYYYYYYYYYYY
-
+                        
                         if save_all_uavg:
                             all_uavg.append(uavgseg)
 
@@ -503,8 +498,6 @@ def get_uavg(Eddy, CS, collind, centlon_e, centlat_e, poly_eff,
 
         citer.iternext()
 
-    #print 'ggggggg', uavg
-
     if any_inner_contours:  # set speed based contour parameters
         cx, cy = Eddy.M(theseglon, theseglat)
         centx_s, centy_s, eddy_radius_s, junk = fit_circle(cx, cy)
@@ -878,8 +871,6 @@ def track_eddies(Eddy, first_record):
     haversine.distance_matrix(X_old, X_new, dist_mat)
     dist_mat = np.ascontiguousarray(dist_mat)
     
-    #print '+++++++++++++ X_old.mean()', X_old.mean()
-    
     dist_mat_copy = dist_mat.copy()
 
     # *new_eddy_inds* contains indices to every newly identified eddy
@@ -927,6 +918,7 @@ def track_eddies(Eddy, first_record):
         dist_mat[old_ind][non_unique_inds] = far_away  # km
 
         if debug_dist:
+            
             debug_distmax = 5e6
             debug_cmap = plt.cm.Set3
 
@@ -1018,9 +1010,8 @@ def track_eddies(Eddy, first_record):
                     # corresponding new_eddy_inds set to False
                     new_eddy_inds[np.nonzero(Eddy.new_lon_tmp ==
                                              Eddy.new_lon_tmp[new_ind])] = False
-                    #print 'aa', new_eddy_inds
+
                     dist_mat[:, new_ind] = far_away # km
-                    #print '*********************************************'
 
         if Eddy.TRACK_EXTRA_VARIABLES:
             kwargs = {'contour_e': new_cntr_e, 'contour_s': new_cntr_s,
diff --git a/py_eddy_tracker_property_classes.py b/py_eddy_tracker_property_classes.py
@@ -147,13 +147,6 @@ def __init__(self, contlon, contlat, eddy, grd):
             h0 = grd.sla_coeffs.ev(self.contlat[1:], self.contlon[1:])
         
         elif 'griddata' in eddy.INTERP_METHOD:
-            
-            #plt.figure()
-            #plt.pcolormesh(grd.lon()[self.jslice, self.islice],
-                           #grd.lat()[self.jslice, self.islice], self.sla)
-            #plt.plot(self.contlon[1:], self.contlat[1:],'.-')
-            #plt.show()
-            
             points = np.array([grd.lon()[self.jslice, self.islice].ravel(),
                                grd.lat()[self.jslice, self.islice].ravel()]).T
             h0 = interpolate.griddata(points, self.sla.ravel(), (self.contlon[1:],
