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

Polish.

parent 8dff23d4
No related branches found
No related tags found
No related merge requests found
...@@ -12,7 +12,7 @@ contains ...@@ -12,7 +12,7 @@ contains
use contour_531, only: null_polyline use contour_531, only: null_polyline
use derived_types, only: eddy use derived_types, only: eddy
use gpc_f, only: shpobj2pol, polygon use gpc_f, only: shpobj2pol, polygon
use nr_util, only: pi use nr_util, only: pi, deg_to_rad
use shapelib, only: shpfileobject, shpobject, dbfreadattribute, & use shapelib, only: shpfileobject, shpobject, dbfreadattribute, &
shpdestroyobject shpdestroyobject
use shapelib_03, only: shp_read_object_03 use shapelib_03, only: shp_read_object_03
...@@ -40,8 +40,6 @@ contains ...@@ -40,8 +40,6 @@ contains
! We need this intermediary variable because the kind of the ! We need this intermediary variable because the kind of the
! argument to dbfreadattribute cannot be the default kind ! argument to dbfreadattribute cannot be the default kind
real, parameter:: deg_to_rad = pi / 180.
!--------------------------------------------------------------------- !---------------------------------------------------------------------
call dbfreadattribute(hshp_extremum, ishape, ifield = 0, attr = attr) call dbfreadattribute(hshp_extremum, ishape, ifield = 0, attr = attr)
......
...@@ -109,6 +109,7 @@ contains ...@@ -109,6 +109,7 @@ contains
[nlon, nlat]) [nlon, nlat])
! (min should have no effect except because of roundup error) ! (min should have no effect except because of roundup error)
! Define nearby_extr:
selection = abs(pack(s%extr_map(llc(1):urc(1), llc(2):urc(2)), & selection = abs(pack(s%extr_map(llc(1):urc(1), llc(2):urc(2)), &
s%extr_map(llc(1):urc(1), llc(2):urc(2)) > 0 & s%extr_map(llc(1):urc(1), llc(2):urc(2)) > 0 &
.and. s%extr_map(llc(1):urc(1), llc(2):urc(2)) /= i)) .and. s%extr_map(llc(1):urc(1), llc(2):urc(2)) /= i))
...@@ -116,6 +117,7 @@ contains ...@@ -116,6 +117,7 @@ contains
allocate(nearby_extr(2, n_select)) allocate(nearby_extr(2, n_select))
forall (l = 1:n_select) & forall (l = 1:n_select) &
nearby_extr(:, l) = s%list_vis(selection(l))%coord_extr nearby_extr(:, l) = s%list_vis(selection(l))%coord_extr
call set_max_speed(s%list_vis(i), s%ind_extr(:, i) - llc + 1, & call set_max_speed(s%list_vis(i), s%ind_extr(:, i) - llc + 1, &
nearby_extr, ssh(llc(1):urc(1), llc(2):urc(2)), & nearby_extr, ssh(llc(1):urc(1), llc(2):urc(2)), &
u(llc(1):urc(1), llc(2):urc(2)), & u(llc(1):urc(1), llc(2):urc(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