Use higher level shpobj2pol in `test_mean_speed`

Inst_eddies/Tests/CMakeLists.txt

@@ -57,7 +57,7 @@ add_executable(test_mean_speed mean_speed.f90
   ${CMAKE_CURRENT_LIST_DIR}/test_mean_speed.f90)
 
 target_link_libraries(test_mean_speed numer_rec_95 NetCDF95::netcdf95
-  shapelib_03 contour_531 nr_util NetCDF_Fortran::NetCDF_Fortran)
+  shapelib_03 contour_531 nr_util NetCDF_Fortran::NetCDF_Fortran gpc_f)
 
 target_include_directories(test_mean_speed PRIVATE
   ${fortrangis_INCLUDE_DIR})

Inst_eddies/Tests/test_mean_speed.f90

@@ -3,12 +3,12 @@ program test_mean_speed
   use, intrinsic:: ISO_FORTRAN_ENV
 
   ! Libraries:
-  use contour_531, only: polyline
+  use gpc_f, only: shpobj2pol, polygon
   use netcdf, only: nf90_nowrite
   use netcdf95, only: nf95_open, nf95_close, nf95_inq_varid, nf95_get_var, &
        find_coord, nf95_inquire_dimension
   use nr_util, only: pi
-  use shapelib, only: shpclose, shpfileobject, shpobject
+  use shapelib, only: shpclose, shpfileobject, shpobject, shpdestroyobject
   use shapelib_03, only: shp_open_03, shp_read_object_03
   
   use mean_speed_m, only: mean_speed
@@ -22,8 +22,8 @@ program test_mean_speed
   real, allocatable:: u(:, :), v(:, :) ! (nlon, nlat) wind, in m s-1
   TYPE(shpfileobject) hshp
   TYPE(shpobject) psobject
-  type(polyline) p
   real, parameter:: deg_over_rad = pi / 180.
+  type(polygon) p
 
   namelist /main_nml/ center
 
@@ -57,14 +57,10 @@ program test_mean_speed
   call shp_open_03(hshp, "contour", "rb")
   call shp_read_object_03(hshp, 0, psobject)
   CALL shpclose(hshp)
-
-  p%n_points = psobject%nvertices
-  p%closed = .true.
-  allocate(p%points(2, p%n_points))
-  p%points(1, :) = psobject%padfx * deg_over_rad
-  p%points(2, :) = psobject%padfy * deg_over_rad
-  
-  m = mean_speed(u, v, p, center * deg_over_rad, &
+  p = shpobj2pol(psobject)
+  call shpdestroyobject(psobject)
+  p%part(1)%points = p%part(1)%points * deg_over_rad
+  m = mean_speed(u, v, p%part(1), center * deg_over_rad, &
        corner * deg_over_rad, step = [0.25, 0.25]  * deg_over_rad)
   print *, "mean azimuthal speed = ", m, "m s-1"