diff --git a/Inst_eddies/get_1_outerm.f90 b/Inst_eddies/get_1_outerm.f90 index 8adb48cccba5ffdde9c386cf6335eef5095b3dea..3a0e35dcf03d69c0ee560855d5e42e4faf89adbd 100644 --- a/Inst_eddies/get_1_outerm.f90 +++ b/Inst_eddies/get_1_outerm.f90 @@ -5,7 +5,7 @@ module get_1_outerm_m contains subroutine get_1_outerm(out_cont, cont_list, cont_list_proj, n_cont, & - cyclone, extr_coord_proj, innermost_level_2, outside_points_proj, ssh, & + cyclone, extr_coord_proj, innermost_level_2, outside_points, ssh, & corner, step) ! This procedure gets one outermost good contour with sufficient @@ -90,7 +90,7 @@ contains ! extremum, in m. Assume: innermost_level_2 < extremum for a ! maximum, > extremum for a minimum. - real, intent(in):: outside_points_proj(:, :) ! (2, :) + real, intent(in):: outside_points(:, :) ! (2, :) ! coordinates in projection space of all the significant extrema, ! except the target extremum @@ -115,7 +115,7 @@ contains n_max_cont = size(cont_list_proj) n_cont = 0 cont_list_proj(1)%polyline = good_contour(corner, ssh, innermost_level_2, & - extr_coord_proj, outside_points_proj) + extr_coord_proj, outside_points) test_n_points: if (.not. cont_list_proj(1)%closed) then ! cont_list_proj(1)%n_points == 0 @@ -129,7 +129,7 @@ contains call assert(merge(level_try > level_good, level_try < level_good, & cyclone), "get_1_outerm level_try") cont_list_proj(2)%polyline = good_contour(corner, ssh, level_try, & - extr_coord_proj, outside_points_proj) + extr_coord_proj, outside_points) if (cont_list_proj(2)%closed) then ! cont_list_proj(2)%n_points /= 0 @@ -145,7 +145,7 @@ contains do while (abs(level_bad - level_good) > precision) level_try = (level_good + level_bad) / 2. cont_list_proj(n_cont + 1)%polyline = good_contour(corner, ssh, & - level_try, extr_coord_proj, outside_points_proj) + level_try, extr_coord_proj, outside_points) if (cont_list_proj(n_cont + 1)%closed) then ! cont_list_proj(n_cont + 1)%n_points /= 0 diff --git a/Inst_eddies/set_contours.f90 b/Inst_eddies/set_contours.f90 index 50b50746656ae9ff036aea3edbf8c1cd523aa901..b8ec687f62ca5fb0d39e51b57196d9634a99b2ce 100644 --- a/Inst_eddies/set_contours.f90 +++ b/Inst_eddies/set_contours.f90 @@ -5,7 +5,7 @@ module set_contours_m contains subroutine set_contours(out_cont, speed_cont, max_speed, cyclone, extr, & - innermost_level, step, ssh, u, v, corner, outside_points_proj) + innermost_level, step, ssh, u, v, corner, outside_points) ! This procedure sets contours in an eddy. @@ -46,7 +46,7 @@ contains ! corresponding to ssh(1, 1). A priori, this is not the corner of ! the grid of the NetCDF file. - integer, intent(in):: outside_points_proj(:, :) ! (2, :) + integer, intent(in):: outside_points(:, :) ! (2, :) ! coordinates in projection space of all the significant extrema, ! except the target extremum @@ -94,8 +94,8 @@ contains innermost_level, abs(extr%ssh - innermost_level) < min_amp) call get_1_outerm(out_cont, cont_list, cont_list_proj, n_cont, cyclone, & - real(extr%coord_proj), innermost_level_2, real(outside_points_proj), & - ssh, real(corner), step) + real(extr%coord_proj), innermost_level_2, real(outside_points), ssh, & + real(corner), step) ! Done with outermost contour, now let us take care of the ! max-speed contour.