Skip to content
Snippets Groups Projects
Commit aad5913f authored by Lionel GUEZ's avatar Lionel GUEZ
Browse files

Test more contours in `set_max_speed`

Complete the SSH sampling between `innermost_level_2` and
`outermost_contour`, and find associated contours in `set_max_speed`.
parent 06279aaa
No related branches found
No related tags found
No related merge requests found
......@@ -3,7 +3,7 @@ add_executable(inst_eddies inst_eddies.f90 local_extrema.f90 set_max_speed.f90
get_1_outerm.f90 max_speed_contour_ssh.f90 good_contour.f90 mean_speed.f90
inside_4.f90 set_all_contours.f90 nearby_extr.f90 get_var.f90 config.f90
input_ssh.f90 shpc_create.f90 write_snapshot.f90 ccw_orient.f90
write_eddy.f90 set_all_extr.f90)
write_eddy.f90 set_all_extr.f90 complete_ssh.f90)
target_link_libraries(inst_eddies PRIVATE Contour_531::contour_531
Geometry::geometry NetCDF95::netcdf95 Shapelib_03::shapelib_03
Numer_Rec_95::numer_rec_95 Jumble::jumble NetCDF_Fortran::netcdff)
......@@ -30,6 +30,6 @@ target_sources(test_nearby_extr PRIVATE nearby_extr.f90)
target_sources(test_local_extrema PRIVATE local_extrema.f90)
target_sources(test_set_max_speed PRIVATE set_max_speed.f90 good_contour.f90
max_speed_contour_ssh.f90 mean_speed.f90 inside_4.f90 get_var.f90 config.f90
input_ssh.f90 shpc_create.f90 ccw_orient.f90 write_eddy.f90)
input_ssh.f90 shpc_create.f90 ccw_orient.f90 write_eddy.f90 complete_ssh.f90)
target_sources(test_write_null PRIVATE shpc_create.f90)
target_sources(test_complete_ssh PRIVATE complete_ssh.f90)
......@@ -19,7 +19,9 @@ contains
use, intrinsic:: IEEE_ARITHMETIC, only: IEEE_IS_NAN
use ccw_orient_m, only: ccw_orient
use complete_ssh_m, only: complete_ssh
use derived_types, only: eddy, null_ssh_contour, ssh_contour, missing_speed
use good_contour_m, only: good_contour
use mean_speed_m, only: mean_speed
use spher_polyline_area_m, only: spher_polyline_area
......@@ -53,9 +55,20 @@ contains
real, allocatable:: speed(:) ! (n_cont) speed on the contour
integer i, i_outer
integer sort_ssh(size(cont_list)) ! (n_max_cont)
! Sorts cont_list%ssh in ascending order.
!---------------------------------------------------------------
i_outer = n_cont
if (n_cont >= 2) call complete_ssh(sort_ssh, cont_list%ssh, n_cont)
! Now find the contours associated to the new values of SSH:
do i = i_outer + 1, n_cont
cont_list(i)%polyline = good_contour(corner, step, ssh, &
cont_list(i)%ssh, e%extr%coord)
end do
allocate(speed(n_cont))
do i = 1, n_cont
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment