Preparing to move the computation of nearby_extr out of procedure

set_max_speed. Abandon the computation with pack_indices, this was
supposed to give the same result than the computation with argwhere
but be faster if not any(extr_map) < 0. I was not sure of that. I
abandon that because I want to eventually remove the coding of
sufficient amplitude in extr_map.

set_max_speed.f

@@ -10,12 +10,14 @@ contains
 
     use, intrinsic:: IEEE_ARITHMETIC, only: IEEE_IS_NAN
 
+    ! Lbraries:
     use contour_531, only: convert_to_reg_coord, convert_to_ind, null_polyline
-    use derived_types, only: eddy, null_ssh_contour
     use geometry, only: polygon_point_dist_2d
+    use jumble, only: argwhere
+    
+    use derived_types, only: eddy, null_ssh_contour
     use good_contour_m, only: good_contour
     use inside_4_m, only: inside_4
-    use jumble, only: pack_indices, argwhere
     use max_speed_contour_ssh_m, only: max_speed_contour_ssh
     use mean_speed_m, only: mean_speed
     use spherical_polyline_area_m, only: spherical_polyline_area
@@ -73,16 +75,8 @@ contains
        e%speed_cont%ssh = max_speed_contour_ssh(ssh, u, v, ind_targ_extr, &
             e%radius4)
        i = extr_map(ind_targ_extr(1), ind_targ_extr(2))
-
-       if (any(extr_map < 0)) then
-          ! Noise around
-          nearby_extr = convert_to_reg_coord(argwhere(extr_map > 0 &
-               .and. extr_map /= i), corner, step)
-       else
-          nearby_extr = convert_to_reg_coord(pack_indices(extr_map, &
-               excluded = [0, i]), corner, step)
-       end if
-
+       nearby_extr = convert_to_reg_coord(argwhere(extr_map > 0 &
+            .and. extr_map /= i), corner, step)
        e%speed_cont%polyline = good_contour(corner, step, ssh, &
             e%speed_cont%ssh, e%coord_extr, nearby_extr)
        e%max_speed = mean_speed(u, v, e%speed_cont%polyline, e%coord_extr, &