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

Pass `corner_proj` to `set_max_speed`

Instead of corner.
parent 174679a8
No related branches found
No related tags found
No related merge requests found
......@@ -138,7 +138,8 @@ program test_set_max_speed
call set_max_speed(e%speed_cont, e%max_speed, cont_list, cont_list_proj, &
n_cont, e%extr%coord, real(e%extr%coord_proj), &
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)), corner_window, step)
v(llc(1):urc(1), llc(2):urc(2)), &
(corner_window - corner) / step + 1., step)
call close_cont_list
call shpc_create(hshpc, shpc_dir = "SHPC", cyclone = cyclone, slice = 0, &
grid_lon_lat = .true.)
......
......@@ -120,7 +120,8 @@ contains
n_cont, extr%coord, real(extr%coord_proj), &
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)), corner_window, step)
v(llc(1):urc(1), llc(2):urc(2)), &
(corner_window - corner_whole) / step + 1., step)
end if
end subroutine set_contours
......
......@@ -5,7 +5,7 @@ module set_max_speed_m
contains
subroutine set_max_speed(speed_cont, max_speed, cont_list, cont_list_proj, &
n_cont, extr_coord, extr_coord_proj, ssh, u, v, corner, step)
n_cont, extr_coord, extr_coord_proj, ssh, u, v, corner_proj, step)
! This procedure defines speed_cont and max_speed. On return,
! speed_cont may be a null ssh contour and max_speed may be set to
......@@ -79,9 +79,9 @@ contains
! The domain should be the bounding box of out_cont, because we do
! not exclude other extrema.
real, intent(in):: corner(:) ! (2)
! Longitude and latitude of the lower left corner of the grid,
! corresponding to ssh(1, 1), in rad. A priori, this is not the
real, intent(in):: corner_proj(:) ! (2)
! Coordinates in projection plane of the lower left corner of the
! grid, corresponding to ssh(1, 1). A priori, this is not the
! corner of the grid of the NetCDF file.
real, intent(in):: step(:) ! (2) longitude and latitude steps, in rad
......@@ -89,11 +89,9 @@ contains
! Local:
real, allocatable:: speed(:) ! (n_cont) speed on the contour
integer i, i_outer, ishape
real corner_proj(2)
!---------------------------------------------------------------
corner_proj = (corner - corner_whole) / step + 1.
i_outer = n_cont
if (n_cont >= 2) call complete_ssh(cont_list_proj%ssh, n_cont)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment