Changeset 4004 for palm/trunk/SOURCE/virtual_flight_mod.f90

Timestamp:

May 24, 2019 11:32:38 AM (5 years ago)

Author:

suehring

Message:

chemistry: perform basic checks only when anthropenic emissions are switched on; virtual flights: allow arbitrary start/end positions also in return mode; bugfix in 2d data output

File:

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

palm/trunk/SOURCE/virtual_flight_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Allow variable start- and end locations also in return mode
+! 
+! 3885 2019-04-11 11:29:34Z kanani
 ! Changes related to global restructuring of location messages and introduction 
 ! of additional debug messages
@@ -601 +604 @@
 !--          Carry out horizontal reflection if required.
              IF ( .NOT. cyclic_leg(l) )  THEN
-!
-!--             Outward flight, i.e. from start to end
-                IF ( u_agl(l) >= 0.0_wp  .AND.  x_pos(l) > x_end(l)      )  THEN
-                   x_pos(l) = 2.0_wp * x_end(l)   - x_pos(l)
-                   u_agl(l) = - u_agl(l)
-!
-!--             Return flight, i.e. from end to start
-                ELSEIF ( u_agl(l) < 0.0_wp  .AND.  x_pos(l) < x_start(l) )  THEN 
-                   x_pos(l) = 2.0_wp * x_start(l) - x_pos(l)
-                   u_agl(l) = - u_agl(l)
+
+                IF ( x_start(l) <= x_end(l) )  THEN
+!
+!--                Outward flight, i.e. from start to end
+                   IF ( u_agl(l) >= 0.0_wp  .AND.  x_pos(l) > x_end(l)      )  THEN
+                      x_pos(l) = 2.0_wp * x_end(l)   - x_pos(l)
+                      u_agl(l) = - u_agl(l)
+!                  
+!--                Return flight, i.e. from end to start
+                   ELSEIF ( u_agl(l) < 0.0_wp  .AND.  x_pos(l) < x_start(l) )  THEN 
+                      x_pos(l) = 2.0_wp * x_start(l) - x_pos(l)
+                      u_agl(l) = - u_agl(l)
+                   ENDIF
+                ELSE
+!
+!--                Outward flight, i.e. from start to end
+                   IF ( u_agl(l) < 0.0_wp  .AND.  x_pos(l) < x_end(l)      )  THEN
+                      x_pos(l) = 2.0_wp * x_end(l)   - x_pos(l)
+                      u_agl(l) = - u_agl(l)
+!                  
+!--                Return flight, i.e. from end to start
+                   ELSEIF ( u_agl(l) >= 0.0_wp  .AND.  x_pos(l) > x_start(l) )  THEN 
+                      x_pos(l) = 2.0_wp * x_start(l) - x_pos(l)
+                      u_agl(l) = - u_agl(l)
+                   ENDIF
                 ENDIF
-!
-!--             Outward flight, i.e. from start to end
-                IF ( v_agl(l) >= 0.0_wp  .AND.  y_pos(l) > y_end(l)      )  THEN
-                   y_pos(l) = 2.0_wp * y_end(l)   - y_pos(l)
-                   v_agl(l) = - v_agl(l)
-!
-!--             Return flight, i.e. from end to start                  
-                ELSEIF ( v_agl(l) < 0.0_wp  .AND.  y_pos(l) < y_start(l) )  THEN 
-                   y_pos(l) = 2.0_wp * y_start(l) - y_pos(l)
-                   v_agl(l) = - v_agl(l)
+                
+                IF ( y_start(l) <= y_end(l) )  THEN
+!
+!--                Outward flight, i.e. from start to end
+                   IF ( v_agl(l) >= 0.0_wp  .AND.  y_pos(l) > y_end(l)      )  THEN
+                      y_pos(l) = 2.0_wp * y_end(l)   - y_pos(l)
+                      v_agl(l) = - v_agl(l)
+!                  
+!--                Return flight, i.e. from end to start                  
+                   ELSEIF ( v_agl(l) < 0.0_wp  .AND.  y_pos(l) < y_start(l) )  THEN 
+                      y_pos(l) = 2.0_wp * y_start(l) - y_pos(l)
+                      v_agl(l) = - v_agl(l)
+                   ENDIF
+                ELSE
+!
+!--                Outward flight, i.e. from start to end
+                   IF ( v_agl(l) < 0.0_wp  .AND.  y_pos(l) < y_end(l)      )  THEN
+                      y_pos(l) = 2.0_wp * y_end(l)   - y_pos(l)
+                      v_agl(l) = - v_agl(l)
+!                  
+!--                Return flight, i.e. from end to start                  
+                   ELSEIF ( v_agl(l) >= 0.0_wp  .AND.  y_pos(l) > y_start(l) )  THEN 
+                      y_pos(l) = 2.0_wp * y_start(l) - y_pos(l)
+                      v_agl(l) = - v_agl(l)
+                   ENDIF
                 ENDIF
 !
@@ -924 +957 @@
 
        ENDDO          
-!
-!--    Check if start and end positions are properly set in case of return legs.
-       DO l=1, num_leg
-
-          IF ( x_start(l) > x_end(l) .AND. leg_mode(l) == 'return' )  THEN
-             message_string = 'x_start position must be <= x_end ' //          &
-                              'position for return legs'
-             CALL message( 'flight_check_parameters', 'PA0436', 1, 2, 0, 6, 0 )
-          ENDIF 
-          IF ( y_start(l) > y_end(l) .AND. leg_mode(l) == 'return' )  THEN
-             message_string = 'y_start position must be <= y_end ' //          &
-                              'position for return legs'
-             CALL message( 'flight_check_parameters', 'PA0437', 1, 2, 0, 6, 0 )
-          ENDIF 
-       ENDDO
 !
 !--    Check if given flight object remains inside model domain if a rate of