From 319633b3747ea17d9aef790de22cc28b12758c20 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Mon, 20 Dec 2021 15:48:37 +0100
Subject: [PATCH] Rename d to date and i to `eddy_i`
To search those names more easily.
---
Common/read_snapshot.f90 | 22 +++++++++++-----------
Overlap/report_graph.py | 10 +++++-----
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Common/read_snapshot.f90 b/Common/read_snapshot.f90
index f2e8142f..9069e4b1 100644
--- a/Common/read_snapshot.f90
+++ b/Common/read_snapshot.f90
@@ -35,8 +35,8 @@ contains
! Local:
integer ishape, ishape_first
- integer d ! date
- integer i ! eddy index
+ integer date
+ integer eddy_i ! eddy index
type(eddy) e
!---------------------------------------------------------------------
@@ -52,25 +52,25 @@ contains
allocate(s%list(s%number_extr))
do ishape = ishape_first, ishape_last(k + 1)
- call read_eddy(e, d, i, hshp, ishape)
+ call read_eddy(e, date, eddy_i, hshp, ishape)
! Check that all the eddies have the same date index:
- if (d - d_init /= k) then
+ if (date - d_init /= k) then
print *, "read_snapshot: bad date index"
- print *, "d = ", d
+ print *, "date = ", date
print *, "d_init = ", d_init
print *, "k = ", k
print *, "ishape = ", ishape
- print *, "i = ", i
+ print *, "eddy_i = ", eddy_i
stop 1
end if
- s%list(i) = e
+ s%list(eddy_i) = e
end do
allocate(s%ind_extr(2, s%number_extr))
- forall (i = 1:s%number_extr) s%ind_extr(:, i) &
- = nint(convert_to_ind(s%list(i)%coord_extr, corner, step))
+ forall (eddy_i = 1:s%number_extr) s%ind_extr(:, eddy_i) &
+ = nint(convert_to_ind(s%list(eddy_i)%coord_extr, corner, step))
! Define s%extr_map from s%ind_extr:
@@ -79,8 +79,8 @@ contains
! Since we are not sure that there is no duplicate tuple in
! s%ind_extr, we must use a do construct and not a forall:
- do i = 1, s%number_extr
- s%extr_map(s%ind_extr(1, i), s%ind_extr(2, i)) = i
+ do eddy_i = 1, s%number_extr
+ s%extr_map(s%ind_extr(1, eddy_i), s%ind_extr(2, eddy_i)) = eddy_i
end do
call assert(count(s%extr_map(1:nlon, :) /= 0) == s%number_extr, &
diff --git a/Overlap/report_graph.py b/Overlap/report_graph.py
index 4c4c9bf6..4003d52a 100755
--- a/Overlap/report_graph.py
+++ b/Overlap/report_graph.py
@@ -18,16 +18,16 @@ def node_to_date_eddy(node_index, e_overestim, d_init):
"""
k = (node_index - 1) // e_overestim
- d = d_init + k
+ date = d_init + k
return {"eddy_index": node_index - k * e_overestim, "date_index": k,
- "date": d}
+ "date": date}
-def date_eddy_to_node(d, eddy_index, e_overestim, d_init):
+def date_eddy_to_node(date, eddy_index, e_overestim, d_init):
"""Convert from eddy identification in shapefiles to node
identification in graph.
"""
- return (d - d_init) * e_overestim + eddy_index
+ return (date - d_init) * e_overestim + eddy_index
def read_eddy_graph(edgelist, shpc_dir = None):
if os.access(edgelist, os.R_OK):
@@ -75,7 +75,7 @@ def to_eddy_agraph(G):
A = nx_agraph.to_agraph(G)
- for d, s in my_subgraphs.items():
+ for date, s in my_subgraphs.items():
A.add_subgraph(s, rank = "same")
return A
--
GitLab