From cd4bfe7113c14e02ddffcfc0e44e1aa75d3b30a8 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Thu, 13 Jul 2023 14:07:07 +0200
Subject: [PATCH] Give default value True to argument renumber
---
Inst_eddies/Analysis/filter.py | 6 +++---
Overlap/Tests/split_SHPC.py | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Inst_eddies/Analysis/filter.py b/Inst_eddies/Analysis/filter.py
index b496f4d7..bb4417dd 100755
--- a/Inst_eddies/Analysis/filter.py
+++ b/Inst_eddies/Analysis/filter.py
@@ -10,7 +10,7 @@ import shapefile
from os import path
import numpy as np
-def filter(input_dir, output_dir, renumber, accept_func):
+def filter(input_dir, output_dir, accept_func, renumber = True):
with shapefile.Reader(path.join(input_dir, "extremum")) as extremum, \
shapefile.Reader(path.join(input_dir, "outermost_contour")) \
as outermost_cont, \
@@ -79,5 +79,5 @@ if __name__ == "__main__":
help = "do not reset indices of eddies",
action = "store_true")
args = parser.parse_args()
- filter(args.input_dir, args.output_dir, not args.keep_indices,
- accept.accept)
+ filter(args.input_dir, args.output_dir, accept.accept,
+ not args.keep_indices)
diff --git a/Overlap/Tests/split_SHPC.py b/Overlap/Tests/split_SHPC.py
index 3c0333d7..02e3e837 100755
--- a/Overlap/Tests/split_SHPC.py
+++ b/Overlap/Tests/split_SHPC.py
@@ -15,8 +15,7 @@ my_dir = path.join(sys.argv[1], "Slice_0/Anticyclones")
for n in range(3):
date_1 = 20454 + n * 5
accept = functools.partial(in_date_range, date_1 = date_1)
- filter.filter(my_dir, f"SHPC/Slice_{n}/Anticyclones",
- renumber = True, accept_func= accept)
+ filter.filter(my_dir, f"SHPC/Slice_{n}/Anticyclones", accept_func= accept)
with open("SHPC/n_slices.txt", "w") as f: f.write("3\n")
fname = path.join(sys.argv[1], "grid_nml.txt")
--
GitLab