From 4746100b0a3d3c15333140459e0aa9f159cb1f9b Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Tue, 15 Jun 2021 14:58:09 +0200
Subject: [PATCH] Bug fix: correct names of input directories
---
Inst_eddies/Analysis/tests.json | 6 +++---
Inst_eddies/Tests/short_tests.json | 4 ++--
Overlap/Analysis/report_graph.py | 2 +-
Overlap/Analysis/tests.json | 8 ++++----
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Inst_eddies/Analysis/tests.json b/Inst_eddies/Analysis/tests.json
index 6282b706..29ba4b8a 100644
--- a/Inst_eddies/Analysis/tests.json
+++ b/Inst_eddies/Analysis/tests.json
@@ -4,7 +4,7 @@
"command":
[
"$src_dir/Inst_eddies/Analysis/plot_eddy_contours.py",
- "$src_dir/Overlap/Tests/Input/Region_6_SHP_triplet", "--save=png"
+ "$src_dir/Overlap/Tests/Input/Region_6_SHPC", "--save=png"
]
},
{
@@ -12,7 +12,7 @@
"command":
[
"$src_dir/Inst_eddies/Analysis/anim_eddy_contours.py",
- "$src_dir/Overlap/Tests/Input/Region_6_SHP_triplet", "20454",
+ "$src_dir/Overlap/Tests/Input/Region_6_SHPC", "20454",
"20455", "--light"
]
},
@@ -31,7 +31,7 @@
"command":
[
"$src_dir/Inst_eddies/Analysis/eddy_dump.py",
- "$src_dir/Tests/Region_1_SHP_triplet_noise"
+ "$src_dir/Tests/Region_1_SHPC_noise"
],
"input": "20455, 3\n"
},
diff --git a/Inst_eddies/Tests/short_tests.json b/Inst_eddies/Tests/short_tests.json
index 3d574d04..e817b217 100644
--- a/Inst_eddies/Tests/short_tests.json
+++ b/Inst_eddies/Tests/short_tests.json
@@ -316,8 +316,8 @@
},
{
"required": [
- "$src_dir/Tests/Region_1_SHP_triplet_noise/extremum.*",
- "$src_dir/Tests/Region_1_SHP_triplet_noise/ishape_last.txt",
+ "$src_dir/Tests/Region_1_SHPC_noise/extremum.*",
+ "$src_dir/Tests/Region_1_SHPC_noise/ishape_last.txt",
"$PWD/Local_extrema/extr_map.nc"
],
"title": "Nearby_extr",
diff --git a/Overlap/Analysis/report_graph.py b/Overlap/Analysis/report_graph.py
index 38de2e5b..da0c6d0b 100755
--- a/Overlap/Analysis/report_graph.py
+++ b/Overlap/Analysis/report_graph.py
@@ -40,7 +40,7 @@ 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:
dir_edgelist = path.dirname(edgelist)
- extr_file = path.join(dir_edgelist, "SHP_triplet", "extremum.shp")
+ extr_file = path.join(dir_edgelist, "SHPC", "extremum.shp")
if os.access(extr_file, os.R_OK):
set_attribute(G, extr_file)
diff --git a/Overlap/Analysis/tests.json b/Overlap/Analysis/tests.json
index 82f32357..02c08e21 100644
--- a/Overlap/Analysis/tests.json
+++ b/Overlap/Analysis/tests.json
@@ -9,7 +9,7 @@
"required":
[
"$tests_old_dir/EGr2nd15md4np3/edgelist_cyclo.csv",
- "$tests_old_dir/EGr2nd15md4np3/SHP_triplet"
+ "$tests_old_dir/EGr2nd15md4np3/SHPC"
]
},
{
@@ -22,7 +22,7 @@
"required":
[
"$tests_old_dir/EGr2nd15md4np3/edgelist_anti.csv",
- "$tests_old_dir/EGr2nd15md4np3/SHP_triplet"
+ "$tests_old_dir/EGr2nd15md4np3/SHPC"
]
},
{
@@ -30,13 +30,13 @@
"command":
[
"$src_dir/Overlap/Analysis/plot_traj.py",
- "$src_dir/Overlap/Tests/Input/Region_2_SHP_triplet", "--save=png"
+ "$src_dir/Overlap/Tests/Input/Region_2_SHPC", "--save=png"
],
"required":
[
"$tests_old_dir/EGr2nd15md4np3/edgelist_anti.csv",
"$tests_old_dir/EGr2nd15md4np3/edgelist_cyclo.csv",
- "$tests_old_dir/EGr2nd15md4np3/SHP_triplet"
+ "$tests_old_dir/EGr2nd15md4np3/SHPC"
]
},
{
--
GitLab