Add option to foce field unit

Author: AntSimi

src/py_eddy_tracker/dataset/grid.py

@@ -440,7 +440,8 @@ def bounds(self):
         return self.x_bounds.min(), self.x_bounds.max(), self.y_bounds.min(), self.y_bounds.max()
 
     def eddy_identification(self, grid_height, uname, vname, date, step=0.005, shape_error=55,
-                            array_sampling=50, pixel_limit=None, precision=None):
+                            array_sampling=50, pixel_limit=None, precision=None, force_height_unit=None,
+                            force_speed_unit=None):
         """
 
         Args:
@@ -467,7 +468,8 @@ def eddy_identification(self, grid_height, uname, vname, date, step=0.005, shape
         self.init_speed_coef(uname, vname)
 
         # Get unit of h grid
-        h_units = self.units(grid_height)
+
+        h_units = self.units(grid_height) if force_height_unit is None else force_height_unit
         units = UnitRegistry()
         in_h_unit = units.parse_expression(h_units)
         if in_h_unit is not None:
@@ -653,7 +655,8 @@ def eddy_identification(self, grid_height, uname, vname, date, step=0.005, shape
                 factor, _ = in_h_unit.to(out_unit).to_tuple()
                 a_and_c[0].obs[name] *= factor
                 a_and_c[1].obs[name] *= factor
-        in_u_units = units.parse_expression(self.units(uname))
+        u_units = self.units(uname) if force_speed_unit is None else force_speed_unit
+        in_u_units = units.parse_expression(u_units)
         if in_u_units is not None:
             for name in ['speed_average', 'uavg_profile']:
                 out_unit = units.parse_expression(VAR_DESCR[name]['nc_attr']['units'])

src/scripts/EddyId

@@ -26,6 +26,10 @@ def id_parser():
                         help='Step between 2 isoline in m')
     parser.add_argument('--fir_errmax', default=55, type=float,
                         help='Error max accepted to fit circle in percent')
+    parser.add_argument('--height_unit', default=None, type=str,
+                        help='Force height unit')
+    parser.add_argument('--speed_unit', default=None, type=str,
+                        help='Force speed unit')
     return parser
 
 
@@ -42,7 +46,8 @@ if __name__ == '__main__':
     if args.cut_wavelength != 0:
         h.bessel_high_filter(args.h, args.cut_wavelength, order=args.filter_order)
     a, c = h.eddy_identification(args.h, u, v, date, args.isoline_step, pixel_limit=(5, 2000),
-                                 shape_error=args.fir_errmax)
+                                 shape_error=args.fir_errmax, force_height_unit=args.height_unit,
+                                 force_speed_unit=args.speed_unit)
     with Dataset(args.path_out + date.strftime('/Anticyclonic_%Y%m%d.nc'), 'w') as h:
         a.to_netcdf(h)
     with Dataset(args.path_out + date.strftime('/Cyclonic_%Y%m%d.nc'), 'w') as h: