Take advantage of new `comp_ishape` functionality

`comp_ishape` can now compute `i_slice`.

Inst_eddies/Analysis/eddy_dump.py

@@ -39,10 +39,7 @@ else:
         eddy_index = int(reply[1])
         assert eddy_index >= 1
 
-    i_slice = SHPC.get_slice(date)
-    i_slice, ishape = SHPC.comp_ishape(
-        date, eddy_index, args.orientation, i_slice
-    )
+    i_slice, ishape = SHPC.comp_ishape(date, eddy_index, args.orientation)
 
 print("ishape =", ishape)
 

Overlap/Analysis/plot_edge_contours.py

@@ -25,13 +25,11 @@ date_head, eddy_i_head = util_eddies.node_to_date_eddy(my_head, e_overestim)
 date_tail, eddy_i_tail = util_eddies.node_to_date_eddy(my_tail, e_overestim)
 print(f"{date_head=}")
 print(f"{date_tail=}")
-i_slice_head = SHPC.get_slice(date_head)
-i_slice_tail = SHPC.get_slice(date_tail)
 i_slice_head, ishape_head = SHPC.comp_ishape(
-    date_head, eddy_i_head, orientation, i_slice_head
+    date_head, eddy_i_head, orientation
 )
 i_slice_tail, ishape_tail = SHPC.comp_ishape(
-    date_tail, eddy_i_tail, orientation, i_slice_tail
+    date_tail, eddy_i_tail, orientation
 )
 fig = plt.figure()
 projection = ccrs.PlateCarree()

Overlap/Analysis/report_graph.py

@@ -45,9 +45,8 @@ def set_attribute(G, SHPC, orientation):
             date_index, eddy_index = util_eddies.node_to_date_eddy(
                 n, G.graph["e_overestim"]
             )
-            i_slice = SHPC.get_slice(date_index)
             i_slice, ishape = SHPC.comp_ishape(
-                date_index, eddy_index, orientation, i_slice
+                date_index, eddy_index, orientation
             )
             reader = SHPC.get_reader(i_slice, orientation, "extremum")
             shape_rec = reader.shapeRecord(ishape)

Trajectories/Analysis/plot_traj.py

@@ -25,10 +25,7 @@ def get_extr_coord(traj, e_overestim, SHPC, orientation):
         date_index, eddy_index = util_eddies.node_to_date_eddy(
             node, e_overestim
         )
-        i_slice = SHPC.get_slice(date_index)
-        i_slice, ishape = SHPC.comp_ishape(
-            date_index, eddy_index, orientation, i_slice
-        )
+        i_slice, ishape = SHPC.comp_ishape(date_index, eddy_index, orientation)
         shape = SHPC.get_reader(i_slice, orientation, layer="extremum").shape(
             ishape
         )

Trajectories/cost_function.py

@@ -77,10 +77,7 @@ def node_to_prop(node_list, e_overestim, SHPC, orientation):
 
     for n in node_list:
         date_index, eddy_index = util_eddies.node_to_date_eddy(n, e_overestim)
-        i_slice = SHPC.get_slice(date_index)
-        i_slice, ishape = SHPC.comp_ishape(
-            date_index, eddy_index, orientation, i_slice
-        )
+        i_slice, ishape = SHPC.comp_ishape(date_index, eddy_index, orientation)
         shapeRec = SHPC.get_reader(
             i_slice, orientation, "extremum"
         ).shapeRecord(ishape)