diff --git a/Inst_eddies/Analysis/tests.json b/Inst_eddies/Analysis/tests.json index 3e975ad0bda04d3b0b334e75adee61cf34bfd20c..a530c4990ac7b4752ab07230cfa994ece7d3d827 100644 --- a/Inst_eddies/Analysis/tests.json +++ b/Inst_eddies/Analysis/tests.json @@ -30,7 +30,7 @@ "command": [ "$src_dir/Inst_eddies/Analysis/eddy_dump.py", - "$src_dir/Tests/Region_1_SHPC_noise" + "$tests_old_dir/Inst_eddies_loop/SHPC_cyclo_all_dates" ], "input": "20455, 3\n" }, diff --git a/Inst_eddies/Tests/short_tests.json b/Inst_eddies/Tests/short_tests.json index e85947d854562263697f8bfbdf24da1e43c8e26f..b726046e6a2fcaa3b1c5c8c5bb87a1b50095238f 100644 --- a/Inst_eddies/Tests/short_tests.json +++ b/Inst_eddies/Tests/short_tests.json @@ -326,8 +326,8 @@ }, { "required": [ - "$src_dir/Tests/Region_1_SHPC_noise/extremum.*", - "$src_dir/Tests/Region_1_SHPC_noise/ishape_last.txt", + "$tests_old_dir/Inst_eddies_loop/SHPC_cyclo_all_dates/extremum.*", + "$tests_old_dir/Inst_eddies_loop/SHPC_cyclo_all_dates/ishape_last.txt", "$PWD/Local_extrema/extr_map.nc" ], "title": "Nearby_extr", diff --git a/Overlap/Tests/short_tests.json b/Overlap/Tests/short_tests.json index 2f8f27d7e30ad36b0843fd329b2cd4311dceced6..d7835a6a3b48b9bebf94050e5db1d7f5de22bc4d 100644 --- a/Overlap/Tests/short_tests.json +++ b/Overlap/Tests/short_tests.json @@ -383,7 +383,7 @@ "-n", "1", "$build_dir/Overlap/test_get_dispatch_snap", - "$src_dir/Tests/Region_1_SHPC_noise" + "$tests_old_dir/Inst_eddies_loop/SHPC_cyclo_all_dates" ] ] }, @@ -402,7 +402,7 @@ "-n", "2", "$build_dir/Overlap/test_get_dispatch_snap", - "$src_dir/Tests/Region_1_SHPC_noise" + "$tests_old_dir/Inst_eddies_loop/SHPC_cyclo_all_dates" ] ] }, @@ -415,7 +415,7 @@ "mpiexec=$mpiexec", "$build_dir/Overlap/eddy_graph.sh", "1", - "$src_dir/Tests/Region_1_SHPC_noise" + "$tests_old_dir/Inst_eddies_loop/SHPC_cyclo_all_dates" ] }, { @@ -428,7 +428,7 @@ "mpiexec=$mpiexec", "$build_dir/Overlap/eddy_graph.sh", "2", - "$src_dir/Tests/Region_1_SHPC_noise" + "$tests_old_dir/Inst_eddies_loop/SHPC_cyclo_all_dates" ] }, { @@ -441,7 +441,7 @@ "mpiexec=$mpiexec", "$build_dir/Overlap/eddy_graph.sh", "1", - "$src_dir/Tests/Region_1_SHPC_noise" + "$tests_old_dir/Inst_eddies_loop/SHPC_cyclo_all_dates" ] }, { diff --git a/Tests/Region_1_SHPC_noise/extremum.dbf b/Tests/Region_1_SHPC_noise/extremum.dbf deleted file mode 100644 index c848e321fb4e0327cc493636c80d4042a666e536..0000000000000000000000000000000000000000 Binary files a/Tests/Region_1_SHPC_noise/extremum.dbf and /dev/null differ diff --git a/Tests/Region_1_SHPC_noise/extremum.shp b/Tests/Region_1_SHPC_noise/extremum.shp deleted file mode 100644 index eb3d33c70b29a410e9a6f3b771ffd858c818e261..0000000000000000000000000000000000000000 Binary files a/Tests/Region_1_SHPC_noise/extremum.shp and /dev/null differ diff --git a/Tests/Region_1_SHPC_noise/extremum.shx b/Tests/Region_1_SHPC_noise/extremum.shx deleted file mode 100644 index d439e70e970804c2ec7f1b71a9c1a97279dd7f82..0000000000000000000000000000000000000000 Binary files a/Tests/Region_1_SHPC_noise/extremum.shx and /dev/null differ diff --git a/Tests/Region_1_SHPC_noise/grid_nml.txt b/Tests/Region_1_SHPC_noise/grid_nml.txt deleted file mode 100644 index fb3a2b2e33e3e25e0cc48427bbd848e17d8fe2b1..0000000000000000000000000000000000000000 --- a/Tests/Region_1_SHPC_noise/grid_nml.txt +++ /dev/null @@ -1,6 +0,0 @@ -&GRID_NML - CORNER_DEG= 5.12500000 , -36.3750000 , - STEP_DEG= 2*0.250000000 , - NLON=29 , - NLAT=17 , - / diff --git a/Tests/Region_1_SHPC_noise/ishape_last.txt b/Tests/Region_1_SHPC_noise/ishape_last.txt deleted file mode 100644 index 38a8075046cb0db3ac25734c7927240d69675699..0000000000000000000000000000000000000000 --- a/Tests/Region_1_SHPC_noise/ishape_last.txt +++ /dev/null @@ -1,4 +0,0 @@ - 7 -15 -23 -31 diff --git a/Tests/Region_1_SHPC_noise/max_speed_contour.dbf b/Tests/Region_1_SHPC_noise/max_speed_contour.dbf deleted file mode 100644 index f511b11cf2a24a87ad075bff933dba9318b92a3a..0000000000000000000000000000000000000000 Binary files a/Tests/Region_1_SHPC_noise/max_speed_contour.dbf and /dev/null differ diff --git a/Tests/Region_1_SHPC_noise/max_speed_contour.shp b/Tests/Region_1_SHPC_noise/max_speed_contour.shp deleted file mode 100644 index 7aa8834f6302c7b41164a926597bd547cff90845..0000000000000000000000000000000000000000 Binary files a/Tests/Region_1_SHPC_noise/max_speed_contour.shp and /dev/null differ diff --git a/Tests/Region_1_SHPC_noise/max_speed_contour.shx b/Tests/Region_1_SHPC_noise/max_speed_contour.shx deleted file mode 100644 index 19eb4f83f629691381439d36127d2b88804b6cba..0000000000000000000000000000000000000000 Binary files a/Tests/Region_1_SHPC_noise/max_speed_contour.shx and /dev/null differ diff --git a/Tests/Region_1_SHPC_noise/outermost_contour.dbf b/Tests/Region_1_SHPC_noise/outermost_contour.dbf deleted file mode 100644 index 8242e0806351937f08c4abd3bbbacd3ebfa2a02b..0000000000000000000000000000000000000000 Binary files a/Tests/Region_1_SHPC_noise/outermost_contour.dbf and /dev/null differ diff --git a/Tests/Region_1_SHPC_noise/outermost_contour.shp b/Tests/Region_1_SHPC_noise/outermost_contour.shp deleted file mode 100644 index 0afa14e1be333be640322ca14b3f85163a68ebc4..0000000000000000000000000000000000000000 Binary files a/Tests/Region_1_SHPC_noise/outermost_contour.shp and /dev/null differ diff --git a/Tests/Region_1_SHPC_noise/outermost_contour.shx b/Tests/Region_1_SHPC_noise/outermost_contour.shx deleted file mode 100644 index 353bc10d66bd0aa63cc50bb6b5901c028310eb0c..0000000000000000000000000000000000000000 Binary files a/Tests/Region_1_SHPC_noise/outermost_contour.shx and /dev/null differ diff --git a/Tests/Region_1_SHPC_noise/used_nml.txt b/Tests/Region_1_SHPC_noise/used_nml.txt deleted file mode 100644 index 867b2b0e889f16368a47d921b8d32c524e852aa4..0000000000000000000000000000000000000000 --- a/Tests/Region_1_SHPC_noise/used_nml.txt +++ /dev/null @@ -1,5 +0,0 @@ -&MAIN_NML - MIN_AMP= 1.00000005E-03, - MAX_RADIUS= 2*20 , - MIN_RADIUS= 25.0000000 , - /