solve conflict between speed_radius and speed_average

Author: AntSimi

src/py_eddy_tracker/__init__.py

@@ -234,8 +234,8 @@ def parse_args(self, *args, **kwargs):
                         'the eddy and the ADT around the contour defining the eddy perimeter',
         )
     ),
-    speed_radius=dict(
-        attr_name='speed_radius',
+    speed_average=dict(
+        attr_name='speed_average',
         scale_factor=.0001,
         nc_name='speed_average',
         old_nc_name=['U'],

src/py_eddy_tracker/dataset/grid.py

@@ -611,7 +611,7 @@ def eddy_identification(self, grid_height, uname, vname, date, step=0.005, shape
                         properties.obs['uavg_profile'] = raw_resample(speed_array, array_sampling)
                     properties.obs['amplitude'] = amp.amplitude
                     properties.obs['radius_s'] = eddy_radius_s
-                    properties.obs['speed_radius'] = max_average_speed
+                    properties.obs['speed_average'] = max_average_speed
                     properties.obs['radius_e'] = eddy_radius_e
                     properties.obs['shape_error_e'] = aerr
                     properties.obs['shape_error_s'] = aerr_s
@@ -655,7 +655,7 @@ def eddy_identification(self, grid_height, uname, vname, date, step=0.005, shape
                 a_and_c[1].obs[name] *= factor
         in_u_units = units.parse_expression(self.units(uname))
         if in_u_units is not None:
-            for name in ['speed_radius', 'uavg_profile']:
+            for name in ['speed_average', 'uavg_profile']:
                 out_unit = units.parse_expression(VAR_DESCR[name]['nc_attr']['units'])
                 factor, _ = in_u_units.to(out_unit).to_tuple()
                 a_and_c[0].obs[name] *= factor

src/py_eddy_tracker/observations/observation.py

@@ -147,7 +147,7 @@ class EddiesObservations(object):
         "radius_s",
         "radius_e",
         "amplitude",
-        "speed_radius",
+        "speed_average",
         "time",
         "shape_error_e",
         "shape_error_s",

src/py_eddy_tracker/observations/tracking.py

@@ -47,7 +47,7 @@ class TrackEddiesObservations(EddiesObservations):
         "radius_s",
         "radius_e",
         "amplitude",
-        "speed_radius",
+        "speed_average",
         "time",
         "shape_error_e",
         "shape_error_s",