merge

Author: adelepoulle

src/py_eddy_tracker/property_functions.py

@@ -345,6 +345,9 @@ def _fit_circle_path(self):
     c_x, c_y = proj(self.lon, self.lat)
     try:
         centlon_e, centlat_e, eddy_radius_e, aerr = fit_circle_c(c_x, c_y)
+        centlon_e, centlat_e = proj(centlon_e, centlat_e, inverse=True)
+        centlon_e = (centlon_e - lon_mean + 180) % 360 + lon_mean - 180
+        self._circle_params =  centlon_e, centlat_e, eddy_radius_e, aerr
     except ZeroDivisionError:
         # Some time, edge is only a dot of few coordinates
         if len(unique(self.lon)) == 1 and len(unique(self.lat)) == 1:
@@ -353,10 +356,6 @@ def _fit_circle_path(self):
                           self.lat)
             self._circle_params =  0, -90, nan, nan
 
-    centlon_e, centlat_e = proj(centlon_e, centlat_e, inverse=True)
-    centlon_e = (centlon_e - lon_mean + 180) % 360 + lon_mean - 180
-    self._circle_params =  centlon_e, centlat_e, eddy_radius_e, aerr
-
 BasePath.fit_circle = fit_circle_path
 BasePath._fit_circle_path = _fit_circle_path
 
@@ -369,8 +368,6 @@ def collection_loop(contours, grd, rtime, eddy,
     if eddy.diagnostic_type not in ['Q', 'SLA']:
         raise Exception('Unknown Diagnostic : %s' % eddy.diagnostic_type)
 
-    has_ts = False
-
     sign_type = eddy.sign_type
     anticyclonic_search = 'Anticyclonic' in sign_type
     iterator = 1 if anticyclonic_search else -1
@@ -547,8 +544,8 @@ def collection_loop(contours, grd, rtime, eddy,
                             contlon_s, contlat_s,
                             fixed_size=eddy.track_array_variables_sampling)
 
-                    if not has_ts:  # for AVISO
-                        eddy.update_eddy_properties(properties)
+                    # for AVISO
+                    eddy.update_eddy_properties(properties)
 
                     # Mask out already found eddies
                     eddy.sla[eddy.slice_j, eddy.slice_i][

src/scripts/EddyIdentification

@@ -43,13 +43,6 @@ from py_eddy_tracker.grid.aviso import AvisoGrid
 from py_eddy_tracker.tracking_objects import IdentificationList
 
 
-def circle_process(paths):
-    nb_proc = 4
-    def fit_circle_path(item):
-        item._fit_circle_path()
-    threads = Pool(nb_proc)
-    threads.map(fit_circle_path, paths)
-
 if __name__ == '__main__':
     # Run using:
     PARSER = EddyParser("Tool to detect eddies. "
@@ -67,9 +60,9 @@ if __name__ == '__main__':
 
     # Setup configuration
     SAVE_DIR = CONFIG['PATHS']['SAVE_DIR']
+    logging.info('Outputs saved to %(SAVE_DIR)s', CONFIG['PATHS'])
     if not exists(SAVE_DIR):
         mkdir(SAVE_DIR)
-    logging.info('Outputs saved to %(SAVE_DIR)s', CONFIG['PATHS'])
 
     DIAGNOSTIC_TYPE = CONFIG['DIAGNOSTIC_TYPE']
     if DIAGNOSTIC_TYPE not in ['SLA']:
@@ -126,7 +119,8 @@ if __name__ == '__main__':
     GRID_NAME = CONFIG['DATASET']['VAR_NAME']
     LAT_NAME = CONFIG['DATASET']['LAT_NAME']
     LON_NAME = CONFIG['DATASET']['LON_NAME']
-
+    
+    logging.info('Search files : %s', DATA_DIR + FILES_MODEL)
     DATASET_FILES = glob(DATA_DIR + FILES_MODEL)
 
     DATASET_LIST = array(DATASET_FILES,
@@ -142,6 +136,7 @@ if __name__ == '__main__':
             item['date'] = datetime.strptime(str_date, PATTERN_DATE).date()
 
     DATASET_LIST.sort(order=['date', 'filename'])
+    logging.info('Filtering grid by time %s, %s', START_DATE, END_DATE)
     MASK_DATE = (DATASET_LIST['date'] >= START_DATE) * (
         DATASET_LIST['date'] <= END_DATE)