From 83f9fb3413672c9aeb4c8d781500a0fe13442b0f Mon Sep 17 00:00:00 2001 From: Lionel GUEZ <guez@lmd.ens.fr> Date: Tue, 28 Nov 2023 22:21:17 +0100 Subject: [PATCH] Follow PEP 8 - Code lay-out - Imports --- Inst_eddies/Analysis/eddy_dump.py | 8 +++++--- Overlap/plot_components.py | 6 ++++-- Trajectories/cost_function.py | 6 ++++-- Trajectories/draw_segments.py | 8 +++++--- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Inst_eddies/Analysis/eddy_dump.py b/Inst_eddies/Analysis/eddy_dump.py index a85ae691..23818482 100755 --- a/Inst_eddies/Analysis/eddy_dump.py +++ b/Inst_eddies/Analysis/eddy_dump.py @@ -6,13 +6,15 @@ specified by date and eddy_index, or by node index, or by shape index. """ import argparse -import shapefile -from os import path import pprint import sys -import util_eddies +from os import path import json +import shapefile + +import util_eddies + parser = argparse.ArgumentParser() parser.add_argument("directory", metavar = "SHPC-directory") parser.add_argument("orientation", choices = ["Anticyclones", "Cyclones"]) diff --git a/Overlap/plot_components.py b/Overlap/plot_components.py index d1b4c738..9d65e051 100755 --- a/Overlap/plot_components.py +++ b/Overlap/plot_components.py @@ -1,13 +1,15 @@ #!/usr/bin/env python3 +import itertools +import sys + import matplotlib.pyplot as plt import networkx as nx -import itertools import numpy as np from matplotlib import patches import cartopy.crs as ccrs + import report_graph -import sys import util_eddies color_iter = itertools.cycle(('#1f77b4', '#aec7e8', '#ff7f0e', diff --git a/Trajectories/cost_function.py b/Trajectories/cost_function.py index f4b5efd4..287122d9 100755 --- a/Trajectories/cost_function.py +++ b/Trajectories/cost_function.py @@ -18,12 +18,14 @@ script. """ -import graph_tool import time import math -import util_eddies import argparse +import graph_tool + +import util_eddies + Omega = 2 * math.pi / 86164. def calculate_radii_rossby(properties): diff --git a/Trajectories/draw_segments.py b/Trajectories/draw_segments.py index 7f6663e6..fc4701f5 100755 --- a/Trajectories/draw_segments.py +++ b/Trajectories/draw_segments.py @@ -8,14 +8,16 @@ belongs to. """ -import graph_tool -import pygraphviz as pgv import json import argparse -import report_graph import itertools +import graph_tool +import pygraphviz as pgv + +import report_graph import util_eddies + parser = argparse.ArgumentParser() parser.add_argument("input_file", help = "Graph-tool file") parser.add_argument("output_file", help = "Graphviz file") -- GitLab