From 1212c7c23f0a1685e9a5fb59a2f3307be310b953 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Tue, 22 Jun 2021 00:29:31 +0200
Subject: [PATCH] Take handler as argument of function `comp_ishape`
Instead of several values of the handler dictionary. Clearer and more concise.
---
Common/util_eddies.py | 6 +++---
Inst_eddies/Analysis/eddy_dump.py | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Common/util_eddies.py b/Common/util_eddies.py
index 1d554c75..842ae657 100644
--- a/Common/util_eddies.py
+++ b/Common/util_eddies.py
@@ -3,13 +3,13 @@ import math
from os import path
import numpy as np
-def comp_ishape(d_init, ishape_last, days_1950, eddy_index):
- k = days_1950 - d_init
+def comp_ishape(handler, days_1950, eddy_index):
+ k = days_1950 - handler["d_init"]
if k == 0:
ishape = eddy_index - 1
else:
- ishape = ishape_last[k - 1] + eddy_index
+ ishape = handler["ishape_last"][k - 1] + eddy_index
return ishape
diff --git a/Inst_eddies/Analysis/eddy_dump.py b/Inst_eddies/Analysis/eddy_dump.py
index 8b0749bb..31cfcc49 100755
--- a/Inst_eddies/Analysis/eddy_dump.py
+++ b/Inst_eddies/Analysis/eddy_dump.py
@@ -33,8 +33,7 @@ if handler["ishape_last"] is None:
else:
sys.exit("Eddy with this date and index not found")
else:
- ishape = util_eddies.comp_ishape(handler["d_init"], handler["ishape_last"],
- days_1950, eddy_index)
+ ishape = util_eddies.comp_ishape(handler, days_1950, eddy_index)
for layer in ["extremum", "outermost_contour", "max_speed_contour"]:
shapeRec = handler["readers"][layer].shapeRecord(ishape)
--
GitLab