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

Change type of `corner_proj` to integer

Avoiding conversion back and forth to real.
parent ab82573f
No related branches found
No related tags found
No related merge requests found
...@@ -189,8 +189,8 @@ program examine_eddy ...@@ -189,8 +189,8 @@ program examine_eddy
call create_cont_list call create_cont_list
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)), & u(llc(1):urc(1), llc(2):urc(2)), v(llc(1):urc(1), llc(2):urc(2)), llc, &
real(llc), outside_points) outside_points)
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.)
......
...@@ -172,7 +172,7 @@ program inst_eddies ...@@ -172,7 +172,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)), &
real(llc), outside_points) llc, outside_points)
end do end do
call cpu_time(t1) call cpu_time(t1)
......
...@@ -41,7 +41,7 @@ contains ...@@ -41,7 +41,7 @@ contains
real, intent(in), dimension(:, :):: ssh, u, v real, intent(in), dimension(:, :):: ssh, u, v
! sea-surface height, in m, and wind, in m s-1 ! sea-surface height, in m, and wind, in m s-1
real, intent(in):: corner_proj(:) ! (2) integer, intent(in):: corner_proj(:) ! (2)
! Coordinates in projection space of the corner of the grid, ! Coordinates in projection space of the corner of the grid,
! 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.
...@@ -95,7 +95,7 @@ contains ...@@ -95,7 +95,7 @@ contains
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, outside_points, ssh, & real(extr%coord_proj), innermost_level_2, outside_points, ssh, &
corner_proj, step) real(corner_proj), step)
! Done with outermost contour, now let us take care of the ! Done with outermost contour, now let us take care of the
! max-speed contour. ! max-speed contour.
...@@ -104,9 +104,9 @@ contains ...@@ -104,9 +104,9 @@ contains
! {begin} Restrict the field to the outermost contour: ! {begin} Restrict the field to the outermost contour:
corner_window = floor(minval(cont_list_proj(n_cont)%points, dim = 2)) corner_window = floor(minval(cont_list_proj(n_cont)%points, dim = 2))
llc = corner_window - nint(corner_proj) + 1 llc = corner_window - corner_proj + 1
urc = ceiling(maxval(cont_list_proj(n_cont)%points, dim = 2)) & urc = ceiling(maxval(cont_list_proj(n_cont)%points, dim = 2)) &
- nint(corner_proj) + 1 - corner_proj + 1
! Should have no effect except because of roundup error: ! Should have no effect except because of roundup error:
urc(2) = min(urc(2), size(ssh, 2)) urc(2) = min(urc(2), size(ssh, 2))
......
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