Rename component ssh_extremum of type eddy to ssh_extr (shorter name).

Tests/test_set_all_outerm.f

@@ -119,7 +119,7 @@ program test_set_all_outerm
      call shp_append_point_03(ishape, hshp_extremum, &
           s%list_vis(i)%coord_extr * rad_over_deg)
      call dbf_write_attribute_03(hshp_extremum, ishape, 0, &
-          s%list_vis(i)%ssh_extremum)
+          s%list_vis(i)%ssh_extr)
      call dbf_write_attribute_03(hshp_extremum, ishape, 1, 1)
      call dbf_write_attribute_03(hshp_extremum, ishape, 2, i)
      call dbf_write_attribute_03(hshp_extremum, ishape, 3, &

Tests/test_set_max_speed.f

@@ -93,7 +93,7 @@ program test_set_max_speed
 
   e%out_cont%ssh = outermost_contour_ssh
   e%cyclone = cyclone
-  e%ssh_extremum = ssh_extremum
+  e%ssh_extr = ssh_extremum
   e%coord_extr = coord_extr * deg_over_rad
   e%out_cont%n_points = psobject%nvertices
   e%out_cont%closed = .true.

derived_types.f

@@ -13,7 +13,7 @@ module derived_types
 
   type eddy
      real coord_extr(2) ! longitude and latitude of the extremum, in rad
-     real ssh_extremum ! in m
+     real ssh_extr ! extremum value of ssh, in m
      logical cyclone
      type(ssh_contour) out_cont ! outermost contour
      type(ssh_contour) speed_cont ! contour with maximum average azimuthal speed

get_snapshot.f

@@ -103,7 +103,7 @@ contains
                   step)
           else
              s%list_vis(i)%speed_cont%polyline = null_polyline()
-             s%list_vis(i)%speed_cont%ssh = s%list_vis(i)%ssh_extremum
+             s%list_vis(i)%speed_cont%ssh = s%list_vis(i)%ssh_extr
              s%list_vis(i)%speed_cont%area = 0.
              s%list_vis(i)%max_speed = 0.
           end if

set_all_outerm.f

@@ -16,8 +16,7 @@ contains
 
     type(snapshot), intent(out):: s
     ! Specifically: define everything in s except
-    ! s%list_vis%speed_cont, s%list_vis%max_speed and
-    ! s%number_eddies.
+    ! s%list_vis%speed_cont, s%list_vis%max_speed and s%number_eddies.
 
     real, intent(in):: min_amp ! minimum amplitude of ssh, between
     ! extremum and outermost contour, in m
@@ -64,7 +63,7 @@ contains
 
     forall (i = 1:s%number_vis_eddies)
        s%list_vis(i)%coord_extr = corner + (s%ind_extr(:, i) - 1) * step
-       s%list_vis(i)%ssh_extremum = ssh(s%ind_extr(1, i), s%ind_extr(2, i))
+       s%list_vis(i)%ssh_extr = ssh(s%ind_extr(1, i), s%ind_extr(2, i))
        s%list_vis(i)%cyclone = cyclone(i)
        s%list_vis(i)%interpolated = .false.
     end forall
@@ -80,13 +79,12 @@ contains
     if (min_amp == 0.) then
        flat_extr = .false.
     else
-       flat_extr = abs(innermost_level - s%list_vis%ssh_extremum) < min_amp
+       flat_extr = abs(innermost_level - s%list_vis%ssh_extr) < min_amp
     end if
 
     do i = 1, s%number_vis_eddies
        if (flat_extr(i)) then
-          s%list_vis(i)%out_cont &
-               = get_1_outerm(s%list_vis(i)%ssh_extremum, &
+          s%list_vis(i)%out_cont = get_1_outerm(s%list_vis(i)%ssh_extr, &
                s%list_vis(i)%cyclone, s%list_vis(i)%coord_extr, i, &
                innermost_level(i), &
                s%extr_map(llc(1, i):urc(1, i), llc(2, i):urc(2, i)), &
@@ -95,9 +93,8 @@ contains
           if (s%list_vis(i)%out_cont%n_points == 0) then
              s%list_vis(i)%suff_amp = .false.
           else
-             s%list_vis(i)%suff_amp &
-                  = abs(s%list_vis(i)%out_cont%ssh &
-                  - s%list_vis(i)%ssh_extremum) >= min_amp
+             s%list_vis(i)%suff_amp = abs(s%list_vis(i)%out_cont%ssh &
+                  - s%list_vis(i)%ssh_extr) >= min_amp
           end if
        end if
     end do
@@ -126,7 +123,7 @@ contains
        if (s%list_vis(i)%suff_amp .and. noise_around(i) &
             .or. .not. flat_extr(i)) then
           s%list_vis(i)%out_cont &
-               = get_1_outerm(s%list_vis(i)%ssh_extremum, &
+               = get_1_outerm(s%list_vis(i)%ssh_extr, &
                s%list_vis(i)%cyclone, s%list_vis(i)%coord_extr, i, &
                innermost_level(i), &
                s%extr_map(llc(1, i):urc(1, i), llc(2, i):urc(2, i)), &

set_max_speed.f

@@ -21,7 +21,7 @@ contains
     use spherical_polygon_area_m, only: spherical_polygon_area
 
     type(eddy), intent(inout):: e
-    ! e%out_cont, e%cyclone, e%ssh_extremum and e%coord_extr
+    ! e%out_cont, e%cyclone, e%ssh_extr and e%coord_extr
     ! should be defined on input
 
     integer, intent(in):: ind_targ_extr(:) ! (2) indices of the target extremum
@@ -66,7 +66,7 @@ contains
 
     if (radius == 1) then
        ! We cannot find max_speed_contour.
-       e%speed_cont%ssh = e%ssh_extremum
+       e%speed_cont%ssh = e%ssh_extr
        e%speed_cont%polyline = null_polyline()
        e%speed_cont%area = 0.
        e%max_speed = 0.

write_eddy.f

@@ -37,7 +37,7 @@ contains
     !-------------------------------------------------------------
 
     call shp_append_point_03(ishape, hshp_extremum, e%coord_extr * rad_over_deg)
-    call dbf_write_attribute_03(hshp_extremum, ishape, 0, e%ssh_extremum)
+    call dbf_write_attribute_03(hshp_extremum, ishape, 0, e%ssh_extr)
     call dbf_write_attribute_03(hshp_extremum, ishape, 1, k)
     call dbf_write_attribute_03(hshp_extremum, ishape, 2, i)
     call dbf_write_attribute_03(hshp_extremum, ishape, 3, &