Replace argument `g` by necessary properties

Trajectories/create_traj_lists.py

@@ -4,7 +4,16 @@ import json
 import time
 
 
-def create_traj_list(my_sort, traj_prop, g, timings_file, t0):
+def create_traj_list(
+    my_sort,
+    traj_prop,
+    segm_name,
+    inst_eddies,
+    orientation,
+    e_overestim,
+    timings_file,
+    t0,
+):
     # Construct traj_vert_ind from traj_prop:
 
     traj_vert_ind = {}
@@ -38,10 +47,10 @@ def create_traj_list(my_sort, traj_prop, g, timings_file, t0):
         list_eddies_traj = []  # list of eddies in trajectory t
 
         for n in t:
-            list_segm.append(g.vp.name[n])
+            list_segm.append(segm_name[n])
 
             # List of eddies in segment n:
-            list_eddies_segm = list(g.vertex_properties.inst_eddies[n])
+            list_eddies_segm = list(inst_eddies[n])
 
             list_eddies_traj.extend(list_eddies_segm)
 
@@ -71,8 +80,8 @@ def create_traj_list(my_sort, traj_prop, g, timings_file, t0):
     with open("expanded_traj.json", "w") as outfile:
         json.dump(
             {
-                "orientation": g.gp.orientation,
-                "e_overestim": g.gp.e_overestim,
+                "orientation": orientation,
+                "e_overestim": e_overestim,
                 "traj": expanded_traj,
             },
             outfile,

Trajectories/trajectories.py

@@ -170,7 +170,16 @@ for n in my_sort:
 t1 = time.perf_counter()
 timings_file.write(f"traj_prop defined in {t1 - t0:.0f} s\n")
 t0 = t1
-t0 = create_traj_lists.create_traj_list(my_sort, traj_prop, g, timings_file, t0)
+t0 = create_traj_lists.create_traj_list(
+    my_sort,
+    traj_prop,
+    g.vp["name"],
+    g.vp["inst_eddies"],
+    g.gp["orientation"],
+    g.gp["e_overestim"],
+    timings_file,
+    t0,
+)
 g.save(sys.argv[2])
 print("Created", sys.argv[2])
 t1 = time.perf_counter()