diff --git a/Analysis/report_graph.py b/Analysis/report_graph.py index bc7a05e64571ae843d5ce64621dbd86dba8f8fd8..33dd796b4a61f6c781db2b58b539c1fcd4305dc2 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