Computation of radius will depend on noise_around, and use different

input depending on noise_around. So it is clearer to compute radius
outside of max_speed_contour_ssh. Thus, we simplify
max_speed_contour_ssh. radius is an input argument. The case where
radius == 1 must now be processed also outside of
max_speed_contour_ssh.

GNUmakefile

@@ -9,8 +9,6 @@ src_test_local_extrema = test_local_extrema.f local_extrema.f
 
 src_test_set_outermost_contour = good_contour.f test_set_outermost_contour.f derived_types.f set_outermost_contour.f outermost_possible_level.f spherical_polygon_area.f
 
-src_test_max_speed_contour_ssh = test_max_speed_contour_ssh.f max_speed_contour_ssh.f inside.f
-
 ##src_test_get_snapshot = test_get_snapshot.f get_snapshot.f dispatch_snapshot.f write_eddy.f send_snapshot.f receive_snapshot.f local_extrema.f get_eddy.f outermost_possible_level.f set_outermost_contour.f max_speed_contour_ssh.f good_contour.f spherical_polygon_area.f mean_speed.f inside.f
 
 sources := $(shell cat ${makefile_dir}/file_list)
@@ -21,7 +19,6 @@ lib_list = contour_531 numer_rec_95 shapelib_03 netcdf95 geometry jumble netcdff
 
 obj_test_local_extrema := $(src_test_local_extrema:.f=.o)
 obj_test_set_outermost_contour := $(src_test_set_outermost_contour:.f=.o)
-obj_test_max_speed_contour_ssh := $(src_test_max_speed_contour_ssh:.f=.o)
 ##obj_test_get_snapshot := $(src_test_get_snapshot:.f=.o)
 objects := $(sources:.f=.o)
 
@@ -41,7 +38,7 @@ LINK.o = $(FC) $(LDFLAGS) $(TARGET_ARCH)
 .PHONY: all clean clobber depend
 all: ${execut} log
 test_set_outermost_contour: ${obj_test_set_outermost_contour}
-test_max_speed_contour_ssh: ${obj_test_max_speed_contour_ssh}
+test_max_speed_contour_ssh: max_speed_contour_ssh.o
 test_good_contour: good_contour.o
 test_local_extrema: ${obj_test_local_extrema}
 test_inside: inside.o

Sources/Tests/test_max_speed_contour_ssh.f

@@ -20,12 +20,9 @@ program test_max_speed_contour_ssh
   real, allocatable:: u(:, :), v(:, :) ! (n_lon, n_lat) wind, in m s-1
   integer:: ind_extr(2) = [19, 11] ! indices in the two dimensions of
                                    ! the extremum
-  real:: ssh_outermost = 0.460744 ! in m
-  logical:: cyclone = .true.
-  real level
+  integer:: radius = 3
 
-  namelist /main_nml/ ilon_llc, ilat_llc, ilon_urc, ilat_urc, ind_extr, &
-       ssh_outermost, cyclone
+  namelist /main_nml/ ilon_llc, ilat_llc, ilon_urc, ilat_urc, ind_extr, radius
 
   !----------------------------------------------------------------
 
@@ -70,13 +67,6 @@ program test_max_speed_contour_ssh
 
   call nf95_close(ncid)
 
-  level = max_speed_contour_ssh(ssh, u, v, ind_extr, ssh_outermost, cyclone)
-
-  if (level == ssh(ind_extr(1), ind_extr(2))) then
-     print *, "No max speed contour because outermost contour is within " &
-          // "one grid point of extremum."
-  else
-     print *, "level = ", level
-  end if
+  print *, "level = ", max_speed_contour_ssh(ssh, u, v, ind_extr, radius)
 
 end program test_max_speed_contour_ssh

Sources/Tests/tests_detection_eddies.sh

@@ -7,28 +7,34 @@ src_tests_dir=`dirname $0`
 # From low-level to high-level tests, minding that some tests use
 # output from previous tests:
 
-$compil_prod_dir/test_good_contour
-for suffix in dbf shp shx
+echo "test_good_contour..."
+$compil_prod_dir/test_good_contour >test_good_contour_stdout.txt
+for suffix in _stdout.txt .dbf .shp .shx
 do
-    diff Old/test_good_contour.$suffix test_good_contour.$suffix
+    diff Old/test_good_contour$suffix test_good_contour$suffix
 done
 
-$compil_prod_dir/test_local_extrema h_2006_01_01.nc <<EOF
+echo "test_local_extrema..."
+$compil_prod_dir/test_local_extrema h_2006_01_01.nc \
+				    >test_local_extrema_stdout.txt <<EOF
 &main_nml /
 EOF
-for suffix in nc csv
+for suffix in _stdout.txt .nc .csv
 do
-    diff Old/test_local_extrema.$suffix test_local_extrema.$suffix
+    diff Old/test_local_extrema$suffix test_local_extrema$suffix
 done
 ##$src_tests_dir/test_local_extrema.py h_2006_01_01.nc
 
+echo "test_inside..."
 $compil_prod_dir/test_inside >test_inside_stdout.txt
 diff Old/test_inside_stdout.txt test_inside_stdout.txt
 ##$src_tests_dir/test_inside.py
 
+echo "test_set_outermost_contour..."
 $compil_prod_dir/test_set_outermost_contour h_2006_01_01.nc \
 					    Old/test_local_extrema.nc \
-    >test_set_outermost_contour_stdout.txt <<EOF
+    >test_set_outermost_contour_stdout.txt \
+    2>test_set_outermost_contour_stderr.txt<<EOF
 &MAIN_NML /
 EOF
 for suffix in _stdout.txt .dbf .shp .shx
@@ -36,13 +42,16 @@ do
     diff Old/test_set_outermost_contour$suffix test_set_outermost_contour$suffix
 done
 
+echo "test_max_speed_contour_ssh..."
 $compil_prod_dir/test_max_speed_contour_ssh h_2006_01_01.nc uv_2006_01_01.nc \
-    >test_max_speed_contour_ssh_stdout.txt <<EOF
+    >test_max_speed_contour_ssh_stdout.txt \
+    2>test_max_speed_contour_ssh_stderr.txt<<EOF
 &MAIN_NML /
 EOF
 diff Old/test_max_speed_contour_ssh_stdout.txt \
      test_max_speed_contour_ssh_stdout.txt
 
+echo "test_mean_speed..."
 $compil_prod_dir/test_mean_speed >test_mean_speed_stdout.txt
 ##$src_tests_dir/test_mean_speed.py
 

Sources/max_speed_contour_ssh.f

@@ -4,28 +4,22 @@ module max_speed_contour_ssh_m
 
 contains
 
-  real function max_speed_contour_ssh(ssh, u, v, ind_extr, ssh_outermost, &
-       cyclone)
-
-    use inside_m, only: inside
+  pure real function max_speed_contour_ssh(ssh, u, v, ind_extr, radius)
 
     ! Choose an SSH level by examining the values of velocities inside
-    ! an outermost contour. If the outermost contour comes within one
-    ! grid point of the extremum then the function returns
-    ! ssh(ind_extr) (exactly).
+    ! radius.
 
     real, intent(in):: ssh(:, :), u(:, :), v(:, :)
     integer, intent(in):: ind_extr(:) ! (2) indices of the extremum in ssh
-    real, intent(in):: ssh_outermost ! ssh of the outermost contour
-    logical, intent(in):: cyclone
-
-    ! Local:
 
-    integer radius
+    integer, intent(in):: radius
     ! ind_extr + radius - 1 in all four directions is inside outermost
-    ! contour, ind_extr + radius is outside.
+    ! contour, ind_extr + radius may be outside. radius should be >=
+    ! 2.
+
+    ! Local:
 
-    real, allocatable:: v_azim(:, :) ! (4, radius - 1)
+    real v_azim(4, radius - 1)
     ! azimuthal velocity
     ! First dimension: direction, index 1 for east, 2 for north, etc.
     ! Second dimension: grid index, starting one point away from the extremum
@@ -35,43 +29,30 @@ contains
 
     !----------------------------------------------------------------------
 
-    radius = 1
-
-    do while (inside(ssh, radius, ind_extr, ssh_outermost, cyclone))
-       radius = radius + 1
-    end do
-
-    if (radius == 1) then
-       max_speed_contour_ssh = ssh(ind_extr(1), ind_extr(2))
-    else
-       ! radius >= 2
-       allocate(v_azim(4, radius - 1))
-
-       ! Assuming that ascending indices in u and v mean correspond to
-       ! ascending longitude and latitude:
-       v_azim(east, :) = v(ind_extr(1) + 1:ind_extr(1) + radius - 1, &
-            ind_extr(2))
-       v_azim(north, :) = - u(ind_extr(1), ind_extr(2) + 1:ind_extr(2) &
-            + radius - 1)
-       v_azim(west, :) = - v(ind_extr(1) - 1:ind_extr(1) - radius + 1:- 1, &
-            ind_extr(2))
-       v_azim(south, :) = u(ind_extr(1), ind_extr(2) - 1:ind_extr(2) - radius &
-            + 1:- 1)
-
-       l = maxloc(abs(sum(v_azim, dim = 1) / 4.), dim = 1)
-       direction = maxloc(abs(v_azim(:, l)), dim = 1)
-
-       select case (direction)
-       case(east)
-          max_speed_contour_ssh = ssh(ind_extr(1) + l, ind_extr(2))
-       case(north)
-          max_speed_contour_ssh = ssh(ind_extr(1), ind_extr(2) + l)
-       case(west)
-          max_speed_contour_ssh = ssh(ind_extr(1) - l, ind_extr(2))
-       case(south)
-          max_speed_contour_ssh = ssh(ind_extr(1), ind_extr(2) - l)
-       end select
-    end if
+    ! Assuming that ascending indices in u and v mean correspond to
+    ! ascending longitude and latitude:
+    v_azim(east, :) = v(ind_extr(1) + 1:ind_extr(1) + radius - 1, &
+         ind_extr(2))
+    v_azim(north, :) = - u(ind_extr(1), ind_extr(2) + 1:ind_extr(2) &
+         + radius - 1)
+    v_azim(west, :) = - v(ind_extr(1) - 1:ind_extr(1) - radius + 1:- 1, &
+         ind_extr(2))
+    v_azim(south, :) = u(ind_extr(1), ind_extr(2) - 1:ind_extr(2) - radius &
+         + 1:- 1)
+
+    l = maxloc(abs(sum(v_azim, dim = 1) / 4.), dim = 1)
+    direction = maxloc(abs(v_azim(:, l)), dim = 1)
+
+    select case (direction)
+    case(east)
+       max_speed_contour_ssh = ssh(ind_extr(1) + l, ind_extr(2))
+    case(north)
+       max_speed_contour_ssh = ssh(ind_extr(1), ind_extr(2) + l)
+    case(west)
+       max_speed_contour_ssh = ssh(ind_extr(1) - l, ind_extr(2))
+    case(south)
+       max_speed_contour_ssh = ssh(ind_extr(1), ind_extr(2) - l)
+    end select
 
   end function max_speed_contour_ssh
   

depend.mk

 dispatch_snapshot.o : write_eddy.o send_snapshot.o derived_types.o 
-max_speed_contour_ssh.o : inside.o 
 receive_snapshot.o : derived_types.o 
 set_outermost_contour.o : spherical_polygon_area.o outermost_possible_level.o good_contour.o derived_types.o 
 send_snapshot.o : derived_types.o