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

Create intermediate variable `innermost_level_2`

Because we want to split `set_all_outerm` into `set_all_extr` and
`set_all_contours`. `innermost_level` will become an `intent(in)`
argument of `set_all_contours`.
parent 1a6e816d
No related branches found
No related tags found
No related merge requests found
...@@ -48,6 +48,7 @@ contains ...@@ -48,6 +48,7 @@ contains
! m. By construction, innermost_level < extremum for a maximum, > ! m. By construction, innermost_level < extremum for a maximum, >
! extremum for a minimum. ! extremum for a minimum.
real innermost_level_2
logical, allocatable:: cyclone(:) ! (s%number_extr) logical, allocatable:: cyclone(:) ! (s%number_extr)
integer i, l, copy integer i, l, copy
integer n_cycl ! number of cyclones integer n_cycl ! number of cyclones
...@@ -143,9 +144,9 @@ contains ...@@ -143,9 +144,9 @@ contains
corner_window = corner + (llc - 1) * step corner_window = corner + (llc - 1) * step
! No need to consider contours with amplitudes < min_amp: ! No need to consider contours with amplitudes < min_amp:
if (abs(s%list(i)%ssh_extr - innermost_level(i)) < min_amp) & innermost_level_2 = merge(s%list(i)%ssh_extr + merge(min_amp, &
innermost_level(i) = s%list(i)%ssh_extr & - min_amp, s%list(i)%cyclone), innermost_level(i), &
+ merge(min_amp, - min_amp, s%list(i)%cyclone) abs(s%list(i)%ssh_extr - innermost_level(i)) < min_amp)
outside_points = nearby_extr(s%extr_map(llc(1):urc(1), llc(2):urc(2)), & outside_points = nearby_extr(s%extr_map(llc(1):urc(1), llc(2):urc(2)), &
s%list, i) s%list, i)
...@@ -154,7 +155,7 @@ contains ...@@ -154,7 +155,7 @@ contains
! (Shift the longitude of each point to a value close to the ! (Shift the longitude of each point to a value close to the
! longitude of the target extremum.) ! longitude of the target extremum.)
s%list(i)%out_cont = get_1_outerm(s%list(i)%cyclone, & s%list(i)%out_cont = get_1_outerm(s%list(i)%cyclone, &
s%list(i)%coord_extr, innermost_level(i), outside_points, & s%list(i)%coord_extr, innermost_level_2, outside_points, &
ssh(llc(1):urc(1), llc(2):urc(2)), corner_window, step) ssh(llc(1):urc(1), llc(2):urc(2)), corner_window, step)
s%list(i)%valid = s%list(i)%out_cont%area >= min_area s%list(i)%valid = s%list(i)%out_cont%area >= min_area
end do end do
......
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