Version 1.4.1

Bugfix

Author: evanmason

haversine_distmat.f90

@@ -27,7 +27,7 @@
 !
 !    If you have ifort on your system, change 'gfortran' to 'intelem'
 !
-!   Version 1.4.0
+!   Version 1.4.1
 !
 !===========================================================================
 

make_eddy_track_AVISO.py

@@ -24,7 +24,7 @@
 
 make_eddy_track_AVISO.py
 
-Version 1.4.0
+Version 1.4.1
 
 
 Scroll down to line ~640 to get started
@@ -680,11 +680,14 @@ def pcol_2dxy(self, x, y):
     if new_AVISO:
         new_AVISO_SUBSAMP = True
         if new_AVISO_SUBSAMP:
-            days_btwn_recs = 7. # put sampling rate (days) here
+            days_btwn_recs = 3. # put sampling rate (days) here
         else:
             days_btwn_recs = 1.
     else: # old seven day AVISO
         days_btwn_recs = 7.
+    
+    # Save only tracks longer than...     
+    track_duration_min = 28. # days
 
     # Set path(s) to directory where SSH data are stored...
     if 'Global' in the_domain:
@@ -729,8 +732,8 @@ def pcol_2dxy(self, x, y):
     # Path to directory where outputs are to be saved...
     #savedir = directory
     #savedir = '/marula/emason/aviso_eddy_tracking/pablo_exp/'
-    #savedir = '/marula/emason/aviso_eddy_tracking/new_AVISO_test/'
-    savedir = '/marula/emason/aviso_eddy_tracking/junk/'
+    savedir = '/marula/emason/aviso_eddy_tracking/new_AVISO_test/'
+    #savedir = '/marula/emason/aviso_eddy_tracking/junk/'
     #savedir = '/marula/emason/aviso_eddy_tracking/new_AVISO_test/BlackSea/'
     #savedir = '/path/to/save/your/outputs/'
 
@@ -795,8 +798,6 @@ def pcol_2dxy(self, x, y):
     else:
         Exception
 
-    # Save only tracks longer than...     
-    track_duration_min = 28. # days
 
     subdomain = True
     if the_domain in 'Global':
@@ -905,6 +906,8 @@ def pcol_2dxy(self, x, y):
 
     # Use this for subsampling to get identical list as old_AVISO
     #AVISO_files = AVISO_files[5:-5:7]
+    if new_AVISO_SUBSAMP:
+        AVISO_files = AVISO_files[5:-5:np.int(days_btwn_recs)]
 
     # Set up a grid object using first AVISO file in the list
     sla_grd = AvisoGrid(AVISO_files[0], lonmin, lonmax, latmin, latmax)

make_eddy_track_ROMS.py

@@ -24,7 +24,7 @@
 
 make_eddy_track_ROMS.py
 
-Version 1.4.0
+Version 1.4.1
 
 
 

make_eddy_tracker_list_obj.py

@@ -25,7 +25,7 @@
 
 make_eddy_tracker_list_obj.py
 
-Version 1.4.0
+Version 1.4.1
 
 
 ===========================================================================
@@ -391,7 +391,7 @@ def create_netcdf(self, directory, savedir, title,
         nc.title = title + ' eddy tracks'
         nc.directory = directory
         nc.days_between_records = np.float64(self.days_btwn_recs)
-        nc.min_track_duration = np.float64(self.track_duration_min)
+        nc.track_duration_min = np.float64(self.track_duration_min)
 
         if 'Q' in self.diag_type:
             nc.Q_parameter_contours = self.qparameter

py_eddy_tracker_classes.py

@@ -24,7 +24,7 @@
 
 py_eddy_tracker_classes.py
 
-Version 1.4.0
+Version 1.4.1
 ===========================================================================
 
 
@@ -456,7 +456,7 @@ def calc_uavg(points, uspd, lon, lat):
         #conts_y = np.array([])
 
     # Unpack indices for convenience
-    istr, iend, jstr, jend = Eddy.i0, Eddy.i1, Eddy.j0, Eddy.j1
+    #istr, iend, jstr, jend = Eddy.i0, Eddy.i1, Eddy.j0, Eddy.j1
     imin, imax, jmin, jmax = Eddy.imin, Eddy.imax, Eddy.jmin, Eddy.jmax
 
     # TO DO: these would be passed in instead of grd if using Cython
@@ -505,7 +505,7 @@ def calc_uavg(points, uspd, lon, lat):
                     proceed = False
 
             else:
-                # Iterate until 1 pixels
+                # Iterate until 1 pixel
                 if np.all([poly_e.contains_path(poly_i),
                            poly_i.contains_point([centlon_e, centlat_e]),
                            np.logical_and(np.sum(mask_i) >= 1,