cleanning action

Author: adelepoulle

src/py_eddy_tracker/grid/__init__.py

@@ -8,6 +8,47 @@
     concatenate
 import logging
 from ..tracking_objects import nearest
+from re import compile as re_compile
+from os.path import join as join_path
+from datetime import datetime
+from glob import glob
+
+
+def browse_dataset_in(data_dir, files_model, date_regexp, date_model,
+        start_date=None, end_date=None, sub_sampling_step=1):
+    pattern_regexp = re_compile('.*/' + date_regexp)
+    full_path = join_path(data_dir, files_model)
+    logging.info('Search files : %s', full_path)
+
+    dataset_list = array(glob(full_path),
+                         dtype=[('filename', 'S256'),
+                                ('date', 'datetime64[D]'),
+                                ])
+
+    logging.info('%s grids available', dataset_list.shape[0])
+    for item in dataset_list:
+        result = pattern_regexp.match(item['filename'])
+        if result:
+            str_date = result.groups()[0]
+            item['date'] = datetime.strptime(str_date, date_model).date()
+
+    dataset_list.sort(order=['date', 'filename'])
+
+    steps = unique(dataset_list['date'][1:] - dataset_list['date'][:-1])
+    if len(steps) > 1:
+        raise Exception('Several days steps in grid dataset %s' % steps)
+
+    if sub_sampling_step != 1:
+        logging.info('Grid subsampling %d', sub_sampling_step)
+        dataset_list = dataset_list[::sub_sampling_step]
+
+    if start_date is not None or end_date is not None:
+        logging.info('Filtering grid by time %s, %s', start_date, end_date)
+        mask = (dataset_list['date'] >= start_date) * (
+            dataset_list['date'] <= end_date)
+
+        dataset_list = dataset_list[mask]
+    return dataset_list
 
 
 class BaseData(object):

src/py_eddy_tracker/grid/aviso.py

@@ -150,32 +150,6 @@ def set_mask(self, sla):
                 minus70 = argmin(abs(self.lonpad[0] + 70))
                 self.mask[:125, minus70] = True
 
-                # DT10 mask is open around Panama, so close it...
-                #~ if 'AVISO_DT10' in self.product:
-                    #~ self.mask[348, 92:110] = True
-                    #~ self.mask[348:356, 92] = True
-                    #~ self.mask[355, 71:92] = True
-                    #~ self.mask[355:363, 71] = True
-                    #~ self.mask[362, 66:71] = True
-                    #~ self.mask[362:380, 66] = True
-                    #~ self.mask[380, 47:67] = True
-                    #~ self.mask[380:389, 47] = True
-                    #~ self.mask[388, 13:47] = True
-                    #~ self.mask[388:393, 13] = True
-                    #~ self.mask[392, :13] = True
-                    #~ ind = 4 * 360
-                    #~ self.mask[348, 92 + ind:110 + ind] = True
-                    #~ self.mask[348:356, 92 + ind] = True
-                    #~ self.mask[355, 71 + ind:92 + ind] = True
-                    #~ self.mask[355:363, 71 + ind] = True
-                    #~ self.mask[362, 66 + ind:71 + ind] = True
-                    #~ self.mask[362:380, 66 + ind] = True
-                    #~ self.mask[380, 47 + ind:67 + ind] = True
-                    #~ self.mask[380:389, 47 + ind] = True
-                    #~ self.mask[388, 13 + ind:47 + ind] = True
-                    #~ self.mask[388:393, 13 + ind] = True
-                    #~ self.mask[392,  ind:13 + ind] = True
-
                 # Mask all unwanted regions (Caspian Sea, etc)
                 self.labels = ndimage.label(-self.mask)[0]
 

src/py_eddy_tracker/observations.py

@@ -652,6 +652,56 @@ def elements(self):
         elements.extend(['track', 'segment_size', 'dlon', 'dlat'])
         return elements
 
+    @classmethod
+    def init_move_function(cls, obs_a, obs_b, out):
+        """Store information to init move function
+        """
+        out['dlon'] = obs_b['lon'] - obs_a['lon']
+        out['dlat'] = obs_b['lat'] - obs_a['lat']
+
+    @classmethod
+    def move_function(cls, obs_a, obs_b, out):
+        """Basic move on the previous one
+        Position N-2 : A
+        Position N-1 : B
+        Forecast Position : C
+
+        New position C = B + AB
+        """
+        out['lon'] = obs_b['lon'] + out['dlon']
+        out['lat'] = obs_b['lat'] + out['dlat']
+
+    @classmethod
+    def forecast_move(cls, obs_a, obs_b, out):
+        """Forecast move of an eddy
+        """
+        # New dead
+        for key in obs_b.dtype.fields.keys():
+            # Copy all parameters (which are not listed below)
+            # from the previous observations
+            if key in ['lon', 'lat', 'time', 'segment_size',
+                       'dlon', 'dlat'] or 'contour_' in key:
+                continue
+            out[key] = obs_b[key]
+        cls.init_move_function(obs_a, obs_b, out)
+        cls.move_function(obs_a, obs_b, out)
+
+        # Previous dead eddies
+        # Add previous virtual
+        if nb_virtual_extend > 0:
+            obs_to_extend = self.previous_virtual_obs.obs[i_virtual_dead_id
+                ][alive_virtual_obs]
+            for key in obs_b.dtype.fields.keys():
+                if key in ['lon', 'lat', 'time', 'track', 'segment_size',
+                           'dlon', 'dlat'] or 'contour_' in key:
+                    continue
+                out[key][nb_dead:] = obs_to_extend[key]
+            out['lon'][nb_dead:] = obs_to_extend['lon'] + obs_to_extend['dlon']
+            out['lat'][nb_dead:] = obs_to_extend['lat'] + obs_to_extend['dlat']
+            out['track'][nb_dead:] = obs_to_extend['track']
+            out['segment_size'][nb_dead:] = obs_to_extend['segment_size']
+        # Count
+        out['segment_size'][:] += 1
 
 class TrackEddiesObservations(EddiesObservations):
     """Class to practice Tracking on observations