diff --git a/Overlap/Analysis/plot_traj.py b/Overlap/Analysis/plot_traj.py index 42c9d41afe2b96b115334ec7027d9d12b75f4617..a031df27ce2479432696210b21174af44f736776 100755 --- a/Overlap/Analysis/plot_traj.py +++ b/Overlap/Analysis/plot_traj.py @@ -1,9 +1,6 @@ #!/usr/bin/env python3 -"""Must be run from directory containing edgelist.csv and SHPC -directory for interpolated eddies. - -""" +"""Must be run from directory containing edgelist.csv.""" import matplotlib.pyplot as plt import networkx as nx diff --git a/Overlap/Analysis/report_graph.py b/Overlap/Analysis/report_graph.py index 7890368f31e48b85694db832ae460c12147f8d7b..28d1c53d1931e3b03d496eac7d5d1fe16745d4be 100755 --- a/Overlap/Analysis/report_graph.py +++ b/Overlap/Analysis/report_graph.py @@ -140,8 +140,7 @@ if __name__ == "__main__": len_H = len(H) print("Number of nodes:", len_H) print("(This should be the number of valid eddies (outermost contour found " - "with sufficient area), plus the number of interpolated eddies, " - "minus the number of isolated nodes.)") + "with sufficient area), minus the number of isolated nodes.)") print("Number of edges:", H.number_of_edges()) print("Number of weakly connected components:", nx.number_weakly_connected_components(H)) diff --git a/Overlap/Analysis/report_graph_int.py b/Overlap/Analysis/report_graph_int.py index 9c273ce19d17687264084411cc008d6597304880..94a45c36e0acb46d363a42f8eeb253dd2fbd9a37 100755 --- a/Overlap/Analysis/report_graph_int.py +++ b/Overlap/Analysis/report_graph_int.py @@ -153,8 +153,7 @@ if __name__ == "__main__": len_H = len(H) print("Number of nodes:", len_H) print("(This should be the number of valid eddies (outermost contour found " - "with sufficient area), plus the number of interpolated eddies, " - "minus the number of isolated nodes.)") + "with sufficient area), minus the number of isolated nodes.)") print("Number of edges:", H.number_of_edges()) print("Number of weakly connected components:", nx.number_weakly_connected_components(H)) diff --git a/Overlap/Tests/short_tests.json b/Overlap/Tests/short_tests.json index 3e7309c4c2b6b3eed84888530d686d70683bb37f..721186fe0c71eebb9a8d4ee12ce219bed15f3cff 100644 --- a/Overlap/Tests/short_tests.json +++ b/Overlap/Tests/short_tests.json @@ -64,13 +64,10 @@ "title": "Successive_overlap", "stdout": "test_overlap_stdout.txt", "command": - [ - "$mpiexec", - "-n", - "1", - "$build_dir/Overlap/test_overlap", - "$tests_old_dir/Extraction_eddies_region_4/SHPC_anti_all_dates" - ] + [ + "$mpiexec", "-n", "1", "$build_dir/Overlap/test_overlap", + "$tests_old_dir/Extraction_eddies_region_4/SHPC_anti_all_dates" + ] }, { "stdin_filename": "$src_dir/Overlap/Tests/Input/region_5_SOR5OD_in.txt",