From dff65f0900b95675cd4ed4303b50ca5d7619018b Mon Sep 17 00:00:00 2001 From: Lionel GUEZ <guez@lmd.ens.fr> Date: Tue, 23 Mar 2021 22:24:03 +0100 Subject: [PATCH] Rename extremum to `extr_file` --- Analysis/report_graph.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Analysis/report_graph.py b/Analysis/report_graph.py index bc7a05e6..33dd796b 100755 --- a/Analysis/report_graph.py +++ b/Analysis/report_graph.py @@ -37,26 +37,26 @@ def read_eddy_graph(edgelist, shp_tr_dir = None, read_interp = True): # Assuming that the directory containing the interpolated # eddies is in the same location as edgelist: - extremum = path.join(path.dirname(edgelist), "SHP_triplet", + extr_file = path.join(path.dirname(edgelist), "SHP_triplet", "extremum.shp") - if os.access(extremum, os.R_OK): - set_attribute(G, extremum) + if os.access(extr_file, os.R_OK): + set_attribute(G, extr_file) else: print("Trying to read data on interpolated eddies but ", - f"{extremum} is not readable") + f"{extr_file} is not readable") if shp_tr_dir is not None: # Read and set attributes of Visible eddies: - extremum = path.join(shp_tr_dir, "extremum") - set_attribute(G, extremum) + extr_file = path.join(shp_tr_dir, "extremum") + set_attribute(G, extr_file) else: print(edgelist, "not readable") return G -def set_attribute(G, extremum): - with shapefile.Reader(extremum) as s_read: +def set_attribute(G, extr_file): + with shapefile.Reader(extr_file) as s_read: for shape_rec in s_read: n = (shape_rec.record.days_1950, shape_rec.record.eddy_index) if (shape_rec.record.valid == 1 -- GitLab