Add component "interpolated" to derived type eddy. Null outermost

contour no longer means that the eddy is interpolated.

Sources/derived_types.f

@@ -20,6 +20,7 @@ module derived_types
      logical suff_amp ! outermost_contour found and sufficient
                       ! amplitude of ssh between extremum and
                       ! outermost contour
+     logical interpolated
      
      integer:: delta_in = huge(0)
      ! Maximum difference in time index where there is a direct

Sources/get_snapshot.f

@@ -97,6 +97,7 @@ contains
           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)%cyclone = cyclone(i)
+          s%list_vis(i)%interpolated = .false.
 
           ! Define the geographical window around each eddy extremum:
           llc(:, i) = max(s%ind_extr(:, i) - max_radius, 1)

Sources/write_eddy.f

@@ -31,27 +31,23 @@ contains
     ! index.
 
     ! Local:
-    logical interpolated
     integer ishape
     real, parameter:: rad_over_deg = 180. / pi
     
     !-------------------------------------------------------------
 
-    interpolated = e%outermost_contour%n_points == 0
-    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 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, 1, k)
     call dbf_write_attribute_03(hshp_extremum, ishape, 2, i)
     call dbf_write_attribute_03(hshp_extremum, ishape, 3, &
-         merge(1, 0, interpolated))
+         merge(1, 0, e%interpolated))
     call dbf_write_attribute_03(hshp_extremum, ishape, 4, &
          merge(1, 0, e%cyclone))
     call dbf_write_attribute_03(hshp_extremum, ishape, 5, &
          merge(1, 0, e%suff_amp))
 
-    if (interpolated) then
+    if (e%interpolated) then
        call shp_append_null_03(ishape, hshp_outermost)
        call shp_append_null_03(ishape, hshp_max_speed)
     else