Manage extra variable

Author: adelepoulle

src/py_eddy_tracker/observations.py

@@ -67,8 +67,8 @@ class EddiesObservations(object):
         Time
     """
 
-    def __init__(self, size=0, track_extra_variables=False, track_array_variables=0, array_variables=None):
-        self.track_extra_variables = track_extra_variables
+    def __init__(self, size=0, track_extra_variables=None, track_array_variables=0, array_variables=None):
+        self.track_extra_variables = track_extra_variables if track_extra_variables is not None else []
         self.track_array_variables = track_array_variables
         self.array_variables = array_variables if array_variables is not None else []
         for elt in self.elements:
@@ -117,17 +117,14 @@ def elements(self):
         if self.track_array_variables > 0:
             elements += self.array_variables
 
-        if self.track_extra_variables:
-            elements += ['contour_e',
-                         'contour_s',
-                         'uavg_profile',
-                         'shape_error',
-                         ]
+        if len(self.track_extra_variables):
+            elements += self.track_extra_variables
         return elements
 
     def coherence(self, other):
         """Check coherence between two dataset
         """
+        test = self.track_extra_variables == other.track_extra_variables
         test = self.track_array_variables == other.track_array_variables
         test *= self.array_variables == other.array_variables
         return test
@@ -174,7 +171,8 @@ def insert_observations(self, other, index):
             return self
         if index < 0:
             index = self_size + index + 1
-        eddies = self.__class__(new_size, self.track_extra_variables,
+        eddies = self.__class__(new_size, 
+            track_extra_variables=self.track_extra_variables,
             track_array_variables=self.track_array_variables,
             array_variables=self.array_variables
             )

src/py_eddy_tracker/property_functions.py

@@ -441,6 +441,7 @@ def collection_loop(contours, grd, rtime, a_list_obj, c_list_obj,
             # Instantiate new EddyObservation object
             properties = EddiesObservations(
                 size=1,
+                track_extra_variables=eddy.track_extra_variables,
                 track_array_variables=eddy.track_array_variables_sampling,
                 array_variables=eddy.track_array_variables
                 )
@@ -495,17 +496,18 @@ def collection_loop(contours, grd, rtime, a_list_obj, c_list_obj,
 
                     #~ if eddy.track_array_variables > 0:
 
-                    if not eddy.track_extra_variables:
+                    #~ if not eddy.track_extra_variables:
+                    if True:
                         (uavg, contlon_s, contlat_s,
                          inner_contlon, inner_contlat,
                          any_inner_contours
                          ) = get_uavg(*args)
-                    else:
-                        (uavg, contlon_s, contlat_s,
-                         inner_contlon, inner_contlat,
-                         any_inner_contours, uavg_profile
-                         ) = get_uavg(
-                            *args, save_all_uavg=True)
+                    #~ else:
+                        #~ (uavg, contlon_s, contlat_s,
+                         #~ inner_contlon, inner_contlat,
+                         #~ any_inner_contours, uavg_profile
+                         #~ ) = get_uavg(
+                            #~ *args, save_all_uavg=True)
 
                     # Use azimuth equal projection for radius
                     proj = Proj('+proj=aeqd +lat_0=%s +lon_0=%s'
@@ -525,22 +527,26 @@ def collection_loop(contours, grd, rtime, a_list_obj, c_list_obj,
                     # sure it's that important ... Antoine?)
                     # A. : I dont think, the difference is tiny
                     c_x, c_y = proj(contlon_s, contlat_s)
-                    _, _, eddy_radius_s, _ = fit_circle_c(c_x, c_y)
+                    _, _, eddy_radius_s, aerr_s = fit_circle_c(c_x, c_y)
 
                 properties.obs['radius_s'] = eddy_radius_s
                 properties.obs['speed_radius'] = uavg
                 properties.obs['radius_e'] = eddy_radius_e
                 properties.obs['time'] = rtime
                 properties.obs['eke'] = teke
+                if 'shape_error' in eddy.track_extra_variables:
+                    properties.obs['shape_error'] = aerr
+                if 'shape_error_s' in eddy.track_extra_variables:
+                    properties.obs['shape_error_s'] = aerr_s
 
                 # Update SLA eddy properties
                 if 'SLA' in eddy.diagnostic_type:
 
                     # See CSS11 section B4
                     properties.obs['lon'] = centlon_s
                     properties.obs['lat'] = centlat_s
-                    if 'contour_lon' in eddy.track_array_variables:
-                        properties.obs['contour_lon'], properties.obs['contour_lat'] = uniform_resample(
+                    if 'contour_lon_e' in eddy.track_array_variables:
+                        properties.obs['contour_lon_e'], properties.obs['contour_lat_e'] = uniform_resample(
                             cont.lon, cont.lat,
                             fixed_size=eddy.track_array_variables_sampling)
                     if 'contour_lon_s' in eddy.track_array_variables:

src/py_eddy_tracker/tracking_objects.py

@@ -78,7 +78,7 @@ def __init__(self, sign_type, grd, date, **kwargs):
 
         self.diagnostic_type = kwargs.get('DIAGNOSTIC_TYPE', 'SLA')
         self.the_domain = kwargs.get('THE_DOMAIN', 'Regional')
-        self.track_extra_variables = kwargs.get('TRACK_EXTRA_VARIABLES', False)
+        self.track_extra_variables = kwargs.get('TRACK_EXTRA_VARIABLES', [])
         array_properties = kwargs.get('TRACK_ARRAY_VARIABLES', dict())
         self.track_array_variables_sampling = array_properties.get('NB_SAMPLES', 0)
         self.track_array_variables = array_properties.get('VARIABLES', [])
@@ -105,6 +105,7 @@ def __init__(self, sign_type, grd, date, **kwargs):
         self.sla = None
 
         self.observations = EddiesObservations(
+            track_extra_variables=self.track_extra_variables,
             track_array_variables=self.track_array_variables_sampling,
             array_variables=self.track_array_variables
             )