diff --git a/Overlap/Analysis/tests.json b/Overlap/Analysis/tests.json
index 02c08e21c918b57a3128082e1afbce1766c28efd..c8e05155098b723e027a6621f0e17fbdf39d6396 100644
--- a/Overlap/Analysis/tests.json
+++ b/Overlap/Analysis/tests.json
@@ -30,7 +30,8 @@
"command":
[
"$src_dir/Overlap/Analysis/plot_traj.py",
- "$src_dir/Overlap/Tests/Input/Region_2_SHPC", "--save=png"
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC_anti_all_dates",
+ "--save=png"
],
"required":
[
diff --git a/Overlap/Tests/Input/Region_2_SHPC/extremum.dbf b/Overlap/Tests/Input/Region_2_SHPC/extremum.dbf
deleted file mode 100644
index 5f08e340ba5fed4df18383c5ae94f61c3ce6bd35..0000000000000000000000000000000000000000
Binary files a/Overlap/Tests/Input/Region_2_SHPC/extremum.dbf and /dev/null differ
diff --git a/Overlap/Tests/Input/Region_2_SHPC/extremum.shp b/Overlap/Tests/Input/Region_2_SHPC/extremum.shp
deleted file mode 100644
index 9a216011083e130d170873333b2591e27cde5590..0000000000000000000000000000000000000000
Binary files a/Overlap/Tests/Input/Region_2_SHPC/extremum.shp and /dev/null differ
diff --git a/Overlap/Tests/Input/Region_2_SHPC/extremum.shx b/Overlap/Tests/Input/Region_2_SHPC/extremum.shx
deleted file mode 100644
index 037810fc26d66e5483f3566678e97d38770fa16b..0000000000000000000000000000000000000000
Binary files a/Overlap/Tests/Input/Region_2_SHPC/extremum.shx and /dev/null differ
diff --git a/Overlap/Tests/Input/Region_2_SHPC/grid_nml.txt b/Overlap/Tests/Input/Region_2_SHPC/grid_nml.txt
deleted file mode 100644
index f3e97f096b8d8a1ea637e57e9bd2f151b7ee96f0..0000000000000000000000000000000000000000
--- a/Overlap/Tests/Input/Region_2_SHPC/grid_nml.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-&GRID_NML
- CORNER_DEG= 1.62500000 , -38.3750000 ,
- STEP_DEG= 2*0.250000000 ,
- NLON=57 ,
- NLAT=33 ,
- /
diff --git a/Overlap/Tests/Input/Region_2_SHPC/ishape_last.txt b/Overlap/Tests/Input/Region_2_SHPC/ishape_last.txt
deleted file mode 100644
index 8e04ff370aae05c8ff649c499619ea90ad17edf9..0000000000000000000000000000000000000000
--- a/Overlap/Tests/Input/Region_2_SHPC/ishape_last.txt
+++ /dev/null
@@ -1,15 +0,0 @@
- 25
-51
-77
-107
-135
-164
-195
-224
-255
-285
-315
-345
-381
-414
-448
diff --git a/Overlap/Tests/Input/Region_2_SHPC/max_speed_contour.dbf b/Overlap/Tests/Input/Region_2_SHPC/max_speed_contour.dbf
deleted file mode 100644
index bd2062189d4c913f13868994cc4e8ad42e518fa5..0000000000000000000000000000000000000000
Binary files a/Overlap/Tests/Input/Region_2_SHPC/max_speed_contour.dbf and /dev/null differ
diff --git a/Overlap/Tests/Input/Region_2_SHPC/max_speed_contour.shp b/Overlap/Tests/Input/Region_2_SHPC/max_speed_contour.shp
deleted file mode 100644
index 414039f1b7c6aea75dee281f612782063c584228..0000000000000000000000000000000000000000
Binary files a/Overlap/Tests/Input/Region_2_SHPC/max_speed_contour.shp and /dev/null differ
diff --git a/Overlap/Tests/Input/Region_2_SHPC/max_speed_contour.shx b/Overlap/Tests/Input/Region_2_SHPC/max_speed_contour.shx
deleted file mode 100644
index b1d282bc82ac250781163da856b868e9f432adde..0000000000000000000000000000000000000000
Binary files a/Overlap/Tests/Input/Region_2_SHPC/max_speed_contour.shx and /dev/null differ
diff --git a/Overlap/Tests/Input/Region_2_SHPC/outermost_contour.dbf b/Overlap/Tests/Input/Region_2_SHPC/outermost_contour.dbf
deleted file mode 100644
index 88ed60ae8a672329f53932752b9c3c6a8271b25f..0000000000000000000000000000000000000000
Binary files a/Overlap/Tests/Input/Region_2_SHPC/outermost_contour.dbf and /dev/null differ
diff --git a/Overlap/Tests/Input/Region_2_SHPC/outermost_contour.shp b/Overlap/Tests/Input/Region_2_SHPC/outermost_contour.shp
deleted file mode 100644
index 52be8cccb8fc011734a31e242fb7267755551632..0000000000000000000000000000000000000000
Binary files a/Overlap/Tests/Input/Region_2_SHPC/outermost_contour.shp and /dev/null differ
diff --git a/Overlap/Tests/Input/Region_2_SHPC/outermost_contour.shx b/Overlap/Tests/Input/Region_2_SHPC/outermost_contour.shx
deleted file mode 100644
index ddda6c30e352836d58db8b36e676b3714c0e56fc..0000000000000000000000000000000000000000
Binary files a/Overlap/Tests/Input/Region_2_SHPC/outermost_contour.shx and /dev/null differ
diff --git a/Overlap/Tests/Input/Region_2_SHPC/used_nml.txt b/Overlap/Tests/Input/Region_2_SHPC/used_nml.txt
deleted file mode 100644
index 867b2b0e889f16368a47d921b8d32c524e852aa4..0000000000000000000000000000000000000000
--- a/Overlap/Tests/Input/Region_2_SHPC/used_nml.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-&MAIN_NML
- MIN_AMP= 1.00000005E-03,
- MAX_RADIUS= 2*20 ,
- MIN_RADIUS= 25.0000000 ,
- /
diff --git a/Overlap/Tests/short_tests.json b/Overlap/Tests/short_tests.json
index 60bd6f2e00b335dd0311cd5aea099317fe7eea77..0e222a67436afed12992b6956f1085f8a238aa59 100644
--- a/Overlap/Tests/short_tests.json
+++ b/Overlap/Tests/short_tests.json
@@ -151,7 +151,7 @@
"-n",
"1",
"$build_dir/Overlap/test_overlap",
- "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC_anti_all_dates"
]
]
},
@@ -454,7 +454,7 @@
"mpiexec=$mpiexec",
"$build_dir/Overlap/eddy_graph.sh",
"1",
- "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC_anti_all_dates"
]
},
{
@@ -467,7 +467,7 @@
"mpiexec=$mpiexec",
"$build_dir/Overlap/eddy_graph.sh",
"2",
- "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC_anti_all_dates"
]
},
{
@@ -480,7 +480,7 @@
"mpiexec=$mpiexec",
"$build_dir/Overlap/eddy_graph.sh",
"1",
- "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC_anti_all_dates"
]
},
{
@@ -493,7 +493,7 @@
"mpiexec=$mpiexec",
"$build_dir/Overlap/eddy_graph.sh",
"1",
- "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC_anti_all_dates"
]
},
{
@@ -506,7 +506,7 @@
"mpiexec=$mpiexec",
"$build_dir/Overlap/eddy_graph.sh",
"1",
- "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC_anti_all_dates"
]
},
{
@@ -519,7 +519,7 @@
"mpiexec=$mpiexec",
"$build_dir/Overlap/eddy_graph.sh",
"1",
- "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC_anti_all_dates"
]
},
{
@@ -532,7 +532,7 @@
"mpiexec=$mpiexec",
"$build_dir/Overlap/eddy_graph.sh",
"1",
- "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC_anti_all_dates"
]
},
{
@@ -545,7 +545,7 @@
"mpiexec=$mpiexec",
"$build_dir/Overlap/eddy_graph.sh",
"1",
- "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC_anti_all_dates"
]
},
{
@@ -558,7 +558,7 @@
"mpiexec=$mpiexec",
"$build_dir/Overlap/eddy_graph.sh",
"2",
- "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC_anti_all_dates"
]
},
{
@@ -571,7 +571,7 @@
"mpiexec=$mpiexec",
"$build_dir/Overlap/eddy_graph.sh",
"3",
- "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC_anti_all_dates"
]
},
{
@@ -584,7 +584,7 @@
"mpiexec=$mpiexec",
"$build_dir/Overlap/eddy_graph.sh",
"1",
- "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC_anti_all_dates"
]
},
{
@@ -597,7 +597,7 @@
"mpiexec=$mpiexec",
"$build_dir/Overlap/eddy_graph.sh",
"1",
- "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC_anti_all_dates"
]
},
{
@@ -610,7 +610,7 @@
"mpiexec=$mpiexec",
"$build_dir/Overlap/eddy_graph.sh",
"1",
- "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC_anti_all_dates"
]
},
{
@@ -623,7 +623,7 @@
"mpiexec=$mpiexec",
"$build_dir/Overlap/eddy_graph.sh",
"1",
- "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC_anti_all_dates"
]
},
{
@@ -636,7 +636,7 @@
"mpiexec=$mpiexec",
"$build_dir/Overlap/eddy_graph.sh",
"2",
- "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC_anti_all_dates"
]
},
{
@@ -649,7 +649,7 @@
"mpiexec=$mpiexec",
"$build_dir/Overlap/eddy_graph.sh",
"3",
- "$src_dir/Overlap/Tests/Input/Region_2_SHPC"
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC_anti_all_dates"
]
},
{