Bug fix: correct names of input directories

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"
     },

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",

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)

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"
 	]
     },
     {