Changeset 805 for palm/trunk

Timestamp:

Jan 17, 2012 3:53:28 PM (13 years ago)

Author:

franke

Message:

Bugfix: moved collective_wait from parallel branch

File:

• palm/trunk/SOURCE/modules.f90 (modified) (4 diffs)

palm/trunk/SOURCE/modules.f90

@@ -5 +5 @@
 ! Current revisions:
 ! -----------------
-! particle arrays (particles, parrticles_temp) implemented as pointers,
-! +particles_1, particles_2, sort_count
+! Bugfix collective_wait must be out of parallel branch for runs in serial mode
 !
 ! Former revisions:
@@ -16 +15 @@
 ! sums_ws2_ws_l, sums_wspts_ws_l, sums_wsqs_ws_l, sums_wssas_ws_l increased.
 ! for thread-safe summation in advec_ws.
+!
+! 792 2011-12-01 01:23:23Z raasch
+! particle arrays (particles, parrticles_temp) implemented as pointers,
+! +particles_1, particles_2, sort_count
 !
 ! 790 2011-11-29 03:11:20Z raasch
@@ -1265 +1268 @@
                                              hor_index_bounds_previous_run
 
+    LOGICAL ::  collective_wait = .FALSE.
+
 #if defined( __parallel )
 #if defined( __mpi2 )
@@ -1281 +1286 @@
     INTEGER, DIMENSION(:), ALLOCATABLE ::  ngp_yz, type_xz, type_yz
 
-    LOGICAL ::  collective_wait = .FALSE., left_border_pe  = .FALSE.,  &
-                north_border_pe = .FALSE., reorder = .TRUE.,           &
-                right_border_pe = .FALSE., south_border_pe = .FALSE.
+    LOGICAL ::  left_border_pe  = .FALSE., north_border_pe = .FALSE., &
+                reorder = .TRUE., right_border_pe = .FALSE.,          &
+                south_border_pe = .FALSE.
 
     LOGICAL, DIMENSION(2) ::  cyclic = (/ .TRUE. , .TRUE. /), &