diff --git a/Overlap/Tests/test_overlap.f90 b/Overlap/Tests/test_overlap.f90 index 4bb562a1604785c222f090df8c42a9bb625e49f5..eb86a87e0995ab7ec08cc659e180544dd0023aaf 100644 --- a/Overlap/Tests/test_overlap.f90 +++ b/Overlap/Tests/test_overlap.f90 @@ -88,8 +88,8 @@ program test_overlap flow(max_delta + 1)%number_extr, " values)):" read *, flow(max_delta + 1)%list%delta_in call open_edge_file(rank = 0) - call overlap(flow, nlon, nlat, periodic, dist_lim, e_overestim, & - k = k_test_2, delta = max_delta, j = max_delta + 1) + call overlap(flow, e_overestim, k = k_test_2, delta = max_delta, & + j = max_delta + 1) close(unit_edge) print *, 'Created file "edgelist.csv".' diff --git a/Overlap/eddy_graph.f90 b/Overlap/eddy_graph.f90 index baa5a78f6d21f1349360e61a8f09aa5fd5ab49ae..a757efa363434f63f6603d70bd22962bdceeba27 100644 --- a/Overlap/eddy_graph.f90 +++ b/Overlap/eddy_graph.f90 @@ -133,8 +133,7 @@ program eddy_graph do delta = 1, max_delta do k = k_begin + delta, k_begin + max_delta - call overlap(flow, nlon, nlat, periodic, dist_lim, e_overestim, k, & - delta, j = k - k_begin + 1) + call overlap(flow, e_overestim, k, delta, j = k - k_begin + 1) end do end do @@ -147,8 +146,7 @@ program eddy_graph call get_snapshot(flow(max_delta + 1), hshpc, ssm, k, k_end, rank, n_proc) do delta = 1, max_delta - call overlap(flow, nlon, nlat, periodic, dist_lim, e_overestim, k, & - delta, j = max_delta + 1) + call overlap(flow, e_overestim, k, delta, j = max_delta + 1) end do end do @@ -164,8 +162,7 @@ program eddy_graph ! Stitching: do delta = k - k_end + max_delta, max_delta - call overlap(flow, nlon, nlat, periodic, dist_lim, e_overestim, k, & - delta, j = max_delta + 1) + call overlap(flow, e_overestim, k, delta, j = max_delta + 1) end do end do diff --git a/Overlap/overlap.f90 b/Overlap/overlap.f90 index 3597e5f7bcc9236e72f97fb22ccc23cb7f332458..2986d2714ce099cfd58935b3ca11dc55ba86187c 100644 --- a/Overlap/overlap.f90 +++ b/Overlap/overlap.f90 @@ -4,8 +4,7 @@ module overlap_m contains - subroutine overlap(flow, nlon, nlat, periodic, dist_lim, e_overestim, k, & - delta, j) + subroutine overlap(flow, e_overestim, k, delta, j) ! This procedure finds edges between flow(j - delta) and flow(j), ! corresponding to date indices k - delta and k. It writes these @@ -18,19 +17,14 @@ contains use jumble, only: twopi use candidate_overlap_m, only: candidate_overlap + use config_graph_m, only: dist_lim use derived_types, only: snapshot + use read_grid_m, only: nlon, nlat, periodic use spher_polygon_area_m, only: spher_polygon_area use spher_polyline_area_m, only: spher_polyline_area use unit_edge_m, only: unit_edge type(snapshot), intent(inout):: flow(:) ! (max_delta + 1) - integer, intent(in):: nlon, nlat - logical, intent(in):: periodic ! grid is periodic in longitude - - integer, intent(in):: dist_lim - ! We look for an overlapping eddy at dist_lim (in grid points) of - ! the extremum of a given eddy. - integer, intent(in):: e_overestim ! over-estimation of the number of eddies at each date