Changeset 4623 for palm/trunk

Timestamp:

Jul 24, 2020 8:42:02 AM (4 years ago)

Author:

raasch

Message:

some switches calculated explicitly to avoid compiler warnings

File:

• palm/trunk/SOURCE/multi_agent_system_mod.f90 (modified) (3 diffs)

palm/trunk/SOURCE/multi_agent_system_mod.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
-! 
+!
+!
 ! Former revisions:
 ! -----------------
 ! $Id$
+! some switches calculated explicitly to avoid compiler warnings
+! 
+! 4481 2020-03-31 18:55:54Z maronga
 ! bugfix: cpp-directives for serial mode added
 ! 
@@ -3524 +3527 @@
        INTEGER(iwp) ::  in_id !< vertex id of tested mesh point
 
+       LOGICAL ::  is_left_n  !< local switch
+       LOGICAL ::  is_left_p  !< local switch
+       LOGICAL ::  is_right_n !< local switch
+       LOGICAL ::  is_right_p !< local switch
+
        REAL(wp) ::  v1x !< x-coordinate of test vertex 1 for intersection test
        REAL(wp) ::  v1y !< y-coordinate of test vertex 1 for intersection test
@@ -3553 +3561 @@
 !--       into the mesh point's polygon, no connection will be 
 !--       established between the two points. This is the case if the 
-!--       previous (next) vertex of the polygon is right of the connecting
-!--       line and the next (previous) vertex of the polygon is left of the
+!--       previous (next, n) vertex of the polygon is right of the connecting
+!--       line and the next (previous, p) vertex of the polygon is left of the
 !--       connecting line.
-          IF ( pid_t > 0 .AND. pid_t <= SIZE(polygons) ) THEN
-             IF ( (((is_left(x,y,x_t,y_t,polygons(pid_t)%vertices(vid_t-1)%x,  &
-                                       polygons(pid_t)%vertices(vid_t-1)%y)    &
-                  .AND. is_right(x,y,x_t,y_t,                                  &
-                                       polygons(pid_t)%vertices(vid_t+1)%x,    &
-                                       polygons(pid_t)%vertices(vid_t+1)%y) )  &
-                  .OR. (is_right(x,y,x_t,y_t,                                  &
-                                       polygons(pid_t)%vertices(vid_t-1)%x,    &
-                                       polygons(pid_t)%vertices(vid_t-1)%y)    &
-                  .AND. is_left(x,y,x_t,y_t,                                   &
-                                       polygons(pid_t)%vertices(vid_t+1)%x,    &
-                                       polygons(pid_t)%vertices(vid_t+1)%y)))))&
-             THEN
-                CYCLE
-             ENDIF
+          IF ( pid_t > 0  .AND.  pid_t <= SIZE( polygons ) )  THEN
+             is_left_p  = is_left(  x, y, x_t, y_t, polygons(pid_t)%vertices(vid_t-1)%x,           &
+                                    polygons(pid_t)%vertices(vid_t-1)%y )
+             is_left_n  = is_left(  x, y, x_t, y_t, polygons(pid_t)%vertices(vid_t+1)%x,           &
+                                    polygons(pid_t)%vertices(vid_t+1)%y )
+             is_right_p = is_right( x, y, x_t, y_t, polygons(pid_t)%vertices(vid_t-1)%x,           &
+                                    polygons(pid_t)%vertices(vid_t-1)%y )
+             is_right_n = is_right( x, y, x_t, y_t, polygons(pid_t)%vertices(vid_t+1)%x,           &
+                                    polygons(pid_t)%vertices(vid_t+1)%y )
+             IF ( ( is_left_p .AND. is_right_n )  .OR.  ( is_right_p .AND. is_left_n ) )  CYCLE
           ENDIF
 !