diff --git a/Common/util_eddies.py b/Common/util_eddies.py index abf3a903acab48161b220295ad14300517b60ad2..8e6f01b4de76bb9b74343dfa42e81cbbdaf27e79 100644 --- a/Common/util_eddies.py +++ b/Common/util_eddies.py @@ -1,11 +1,12 @@ -import shapefile import math from os import path -import numpy as np import sys import bisect import os +import shapefile +import numpy as np + class SHPC_class: """We are assuming that eddies are indexed from 1, without jump, for each date. diff --git a/Overlap/report_graph.py b/Overlap/report_graph.py index a5ddb666c77b6e43703a8365e5ad177150fc6974..0797c026cf2bc2e282b3efcddfc2145c3676be92 100755 --- a/Overlap/report_graph.py +++ b/Overlap/report_graph.py @@ -1,13 +1,14 @@ #!/usr/bin/env python3 -import networkx as nx -import shapefile from os import path -from networkx import nx_agraph import os import json -import util_eddies +import networkx as nx +import shapefile +from networkx import nx_agraph + +import util_eddies def read_eddy_graph(edgelist, shpc_dir=None, orientation="Cyclones"): if os.access(edgelist, os.R_OK): diff --git a/Trajectories/filter_traj.py b/Trajectories/filter_traj.py index 7fcbdb198df64887c9e6ab2a3da28a7cdec0f2d2..5efb38e6fc9f79bdc51092f0f94d896d288df697 100755 --- a/Trajectories/filter_traj.py +++ b/Trajectories/filter_traj.py @@ -1,10 +1,11 @@ #!/usr/bin/env python3 import json -import util_eddies import bisect import sys +import util_eddies + if len(sys.argv) != 4: sys.exit("Required arguments: last-date input-file output-file") diff --git a/Trajectories/plot_traj.py b/Trajectories/plot_traj.py index 85842cc102ea0e516d9e28d2d0eba19cbf857ebc..4da5f1212d897144a58bda6958c037409f9461b2 100755 --- a/Trajectories/plot_traj.py +++ b/Trajectories/plot_traj.py @@ -1,9 +1,10 @@ #!/usr/bin/env python3 -import util_eddies import random + import numpy as np +import util_eddies def get_extr_coord(traj, e_overestim, SHPC, orientation): """Get the coordinates of the extrema of instantaneous eddies along a @@ -63,13 +64,15 @@ def get_duration(expanded_traj): if __name__ == "__main__": - import util_eddies - import matplotlib.pyplot as plt import json - import cartopy.crs as ccrs import argparse + + import matplotlib.pyplot as plt + import cartopy.crs as ccrs import cartopy.feature as cfeature + import util_eddies + parser = argparse.ArgumentParser() parser.add_argument("expanded_traj", help="JSon file") parser.add_argument("SHPC", help="directory") diff --git a/Trajectories/trajectories.py b/Trajectories/trajectories.py index 35e7cf5578198827a5a1ff5dca67806292f8ebb2..df67e37000e9957177fe500ad03ec38cfdaa900c 100755 --- a/Trajectories/trajectories.py +++ b/Trajectories/trajectories.py @@ -12,14 +12,16 @@ instantaneous eddies in each trajectory are in ascending order. """ -import graph_tool -from graph_tool import topology import json import sys -import util_eddies -import numpy as np import time +import graph_tool +from graph_tool import topology +import numpy as np + +import util_eddies + def new_traj(ind_traj, traj_prop, n, traj_vert_ind): """Assign new trajectory to vertex index n."""