Add option to subset, and modify adress of framework

Author: AntSimi

src/py_eddy_tracker/__init__.py

@@ -332,6 +332,17 @@ def parse_args(self, *args, **kwargs):
             description='Eddy identification number',
         )
     ),
+    sub_track=dict(
+        attr_name=None,
+        nc_name='sub_track',
+        nc_type='uint32',
+        nc_dims=('obs',),
+        nc_attr=dict(
+            longname='segment_number',
+            units='ordinal',
+            description='segment number inside a group',
+        )
+    ),
     n=dict(
         attr_name=None,
         nc_name='observation_number',

src/py_eddy_tracker/observations/observation.py

@@ -843,7 +843,7 @@ def write_netcdf(self, path="./", filename="%(path)s/%(sign_type)s.nc"):
     def set_global_attr_netcdf(self, h_nc):
         h_nc.Metadata_Conventions = "Unidata Dataset Discovery v1.0"
         h_nc.comment = "Surface product; mesoscale eddies"
-        h_nc.framework_used = "https://bitbucket.org/emason/py-eddy-tracker"
+        h_nc.framework_used = "https://github.com/AntSimi/py-eddy-tracker"
         h_nc.standard_name_vocabulary = (
             "NetCDF Climate and Forecast (CF) Metadata Convention Standard Name Table"
         )

src/py_eddy_tracker/observations/tracking.py

@@ -28,7 +28,7 @@
 
 """
 from numpy import empty, arange, where, unique, \
-    interp, ones, bool_, zeros
+    interp, ones, bool_, zeros, array
 from .. import VAR_DESCR_inv
 import logging
 from datetime import datetime, timedelta
@@ -111,7 +111,7 @@ def set_global_attr_netcdf(self, h_nc):
         h_nc.title = 'Cyclonic' if self.sign_type == -1 else 'Anticyclonic'
         h_nc.Metadata_Conventions = 'Unidata Dataset Discovery v1.0'
         h_nc.comment = 'Surface product; mesoscale eddies'
-        h_nc.framework_used = 'https://bitbucket.org/emason/py-eddy-tracker'
+        h_nc.framework_used = 'https://github.com/AntSimi/py-eddy-tracker'
         h_nc.standard_name_vocabulary = 'NetCDF Climate and Forecast (CF) Metadata Convention Standard Name Table'
         h_nc.date_created = datetime.now().strftime('%Y-%m-%dT%H:%M:%SZ')
         t = h_nc.variables[VAR_DESCR_inv['j1']]
@@ -194,6 +194,10 @@ def nb_obs_by_track(self):
         self.compute_index()
         return self.__obs_by_track
 
+    def extract_ids(self, tracks):
+        mask = self.get_mask_from_id(array(tracks))
+        return self.__extract_with_mask(mask)
+
     def __extract_with_mask(self, mask, full_path=False, remove_incomplete=False, compress_id=False):
         """
         Extract a subset of observations

src/scripts/EddySubSetter

@@ -22,13 +22,16 @@ def id_parser():
                         metavar=('llcrnrlon', 'llcrnrlat', 'urcrnrlon', 'urcrnrlat'),
                         help='Coordinates of bounding to extract'
                         )
+    parser.add_argument('-i', '--ids', nargs='+', type=int, help='List of tracks which will be extract')
     return parser
 
 
 if __name__ == '__main__':
     args = id_parser().parse_args()
 
     dataset = TrackEddiesObservations.load_from_netcdf(args.filename, raw_data=True)
+    if args.ids is not None:
+        dataset = dataset.extract_ids(args.ids)
     if args.period is not None:
         dataset = dataset.extract_with_period(args.period, full_path=args.full_path,
                                               remove_incomplete=args.remove_incomplete)