Manage rotation type with global attr and not with a variable

Author: AntSimi

setup.py

@@ -51,6 +51,7 @@
         'pyyaml',
         'pyproj',
         'pint',
+        'polygon3',
         'numba',
         ],
     )

src/py_eddy_tracker/observations.py

@@ -274,6 +274,7 @@ def load_from_netcdf(cls, filename, raw_data=False):
                 var_inv = VAR_DESCR_inv[variable]
                 if var_inv == 'type_cyc':
                     eddies.sign_type = h_nc.variables[variable][0]
+            eddies.sign_type = getattr(h_nc, 'rotation_type', 0)
             if eddies.sign_type == 0:
                 logging.debug('File come from another algorithm of identification')
                 eddies.sign_type = -1
@@ -301,8 +302,7 @@ def from_netcdf(cls, handler):
                 eddies.obs[VAR_DESCR_inv[variable]] = handler.variables[variable][:]
         return eddies
 
-    @staticmethod
-    def propagate(previous_obs, current_obs, obs_to_extend, dead_track, nb_next, model):
+    def propagate(self, previous_obs, current_obs, obs_to_extend, dead_track, nb_next, model):
         """
         Filled virtual obs (C)
         Args:
@@ -321,6 +321,7 @@ def propagate(previous_obs, current_obs, obs_to_extend, dead_track, nb_next, mod
             track_extra_variables=model.track_extra_variables,
             track_array_variables=model.track_array_variables,
             array_variables=model.array_variables)
+        next_obs.sign_type = self.sign_type
         nb_dead = len(previous_obs)
         nb_virtual_extend = nb_next - nb_dead
 
@@ -349,9 +350,6 @@ def propagate(previous_obs, current_obs, obs_to_extend, dead_track, nb_next, mod
         return next_obs
 
 
-
-
-
     @staticmethod
     def cost_function_common_area(xy_in, xy_out, distance, intern=False):
         """ How does it work on x bound ?
@@ -695,6 +693,7 @@ def set_global_attr_netcdf(self, h_nc):
         h_nc.comment = 'Surface product; mesoscale eddies'
         h_nc.framework_used = 'https://bitbucket.org/emason/py-eddy-tracker'
         h_nc.standard_name_vocabulary ='NetCDF Climate and Forecast (CF) Metadata Convention Standard Name Table'
+        h_nc.rotation_type = self.sign_type
 
     def display(self, ax, ref=None, **kwargs):
         if ref is None:

src/py_eddy_tracker/tracking.py

@@ -263,6 +263,7 @@ def recense_dead_id_to_extend(self):
         logging.debug('%d death of real obs in this step', nb_dead)
         if not self.virtual:
             return
+
         # get id already dead from few time
         nb_virtual_extend = 0
         if self.virtual_obs is not None:
@@ -305,6 +306,7 @@ def load_state(self):
                     # Load last virtual obs
                     self.virtual_obs = VirtualEddiesObservations.from_netcdf(general_handler.groups['LastVirtualObs'])
                     # Load and last previous virtual obs to be merge with current => will be previous2_obs
+                    # TODO : Need to rethink this line ??
                     self.current_obs = self.current_obs.merge(
                         VirtualEddiesObservations.from_netcdf(general_handler.groups['LastPreviousVirtualObs']))
             return first_dataset, flg_virtual