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

Pass `outside_points_proj` to `set_contours`

Instead of `outside_points`.
parent 2c232b95
No related branches found
No related tags found
No related merge requests found
...@@ -190,7 +190,7 @@ program examine_eddy ...@@ -190,7 +190,7 @@ program examine_eddy
call set_contours(e%out_cont, e%speed_cont, e%max_speed, cyclone, e%extr, & call set_contours(e%out_cont, e%speed_cont, e%max_speed, cyclone, e%extr, &
e%innermost_level, step, ssh(llc(1):urc(1), llc(2):urc(2)), & e%innermost_level, step, ssh(llc(1):urc(1), llc(2):urc(2)), &
u(llc(1):urc(1), llc(2):urc(2)), v(llc(1):urc(1), llc(2):urc(2)), llc, & u(llc(1):urc(1), llc(2):urc(2)), v(llc(1):urc(1), llc(2):urc(2)), llc, &
outside_points) convert_to_ind(outside_points, corner, step))
call close_cont_list call close_cont_list
call shpc_create(hshpc, shpc_dir = "SHPC", cyclone = cyclone, slice = 0, & call shpc_create(hshpc, shpc_dir = "SHPC", cyclone = cyclone, slice = 0, &
grid_lon_lat = .true.) grid_lon_lat = .true.)
......
...@@ -7,6 +7,7 @@ program inst_eddies ...@@ -7,6 +7,7 @@ program inst_eddies
use, intrinsic:: ISO_FORTRAN_ENV, only: ERROR_UNIT use, intrinsic:: ISO_FORTRAN_ENV, only: ERROR_UNIT
! Libraries: ! Libraries:
use contour_531, only: convert_to_ind
use jumble, only: assert, new_unit, argwhere, twopi use jumble, only: assert, new_unit, argwhere, twopi
use numer_rec_95, only: indexx use numer_rec_95, only: indexx
...@@ -172,7 +173,7 @@ program inst_eddies ...@@ -172,7 +173,7 @@ program inst_eddies
s%list(i)%max_speed, s%list(i)%cyclone, s%list(i)%extr, & s%list(i)%max_speed, s%list(i)%cyclone, s%list(i)%extr, &
s%list(i)%innermost_level, step, ssh(llc(1):urc(1), llc(2):urc(2)), & s%list(i)%innermost_level, step, ssh(llc(1):urc(1), llc(2):urc(2)), &
u(llc(1):urc(1), llc(2):urc(2)), v(llc(1):urc(1), llc(2):urc(2)), & u(llc(1):urc(1), llc(2):urc(2)), v(llc(1):urc(1), llc(2):urc(2)), &
llc, outside_points) llc, convert_to_ind(outside_points, corner, step))
end do end do
call cpu_time(t1) call cpu_time(t1)
......
...@@ -5,17 +5,16 @@ module set_contours_m ...@@ -5,17 +5,16 @@ module set_contours_m
contains contains
subroutine set_contours(out_cont, speed_cont, max_speed, cyclone, extr, & subroutine set_contours(out_cont, speed_cont, max_speed, cyclone, extr, &
innermost_level, step, ssh, u, v, corner, outside_points) innermost_level, step, ssh, u, v, corner, outside_points_proj)
! This procedure sets contours in an eddy. ! This procedure sets contours in an eddy.
! Libraries: ! Libraries:
use contour_531, only: polyline, convert_to_ind use contour_531, only: polyline
use config_m, only: min_amp use config_m, only: min_amp
use derived_types, only: extremum, ssh_contour use derived_types, only: extremum, ssh_contour
use get_1_outerm_m, only: get_1_outerm use get_1_outerm_m, only: get_1_outerm
use input_ssh_m, only: corner_whole => corner
use set_max_speed_m, only: set_max_speed use set_max_speed_m, only: set_max_speed
type(ssh_contour), intent(out):: out_cont ! outermost contour type(ssh_contour), intent(out):: out_cont ! outermost contour
...@@ -47,9 +46,9 @@ contains ...@@ -47,9 +46,9 @@ contains
! corresponding to ssh(1, 1). A priori, this is not the corner of ! corresponding to ssh(1, 1). A priori, this is not the corner of
! the grid of the NetCDF file. ! the grid of the NetCDF file.
real, intent(in):: outside_points(:, :) ! (2, :) longitude and real, intent(in):: outside_points_proj(:, :) ! (2, :)
! latitude, in rad, of all the significant extrema, except the ! coordinates in projection space of all the significant extrema,
! target extremum ! except the target extremum
! Local: ! Local:
...@@ -95,8 +94,7 @@ contains ...@@ -95,8 +94,7 @@ contains
innermost_level, abs(extr%ssh - innermost_level) < min_amp) innermost_level, abs(extr%ssh - innermost_level) < min_amp)
call get_1_outerm(out_cont, cont_list, cont_list_proj, n_cont, cyclone, & call get_1_outerm(out_cont, cont_list, cont_list_proj, n_cont, cyclone, &
real(extr%coord_proj), innermost_level_2, & real(extr%coord_proj), innermost_level_2, outside_points_proj, ssh, &
convert_to_ind(outside_points, corner_whole, step), ssh, &
real(corner), step) real(corner), step)
! Done with outermost contour, now let us take care of the ! Done with outermost contour, now let us take care of the
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment