Changeset 557 for palm/trunk/SOURCE/data_output_2d.f90

Timestamp:

Sep 7, 2010 2:50:07 PM (14 years ago)

Author:

weinreis

Message:

bugfix message string in set_mask_locations

File:

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

palm/trunk/SOURCE/data_output_2d.f90

@@ -77 +77 @@
     CHARACTER (LEN=50) ::  rtext
     INTEGER ::  av, ngp, file_id, i, if, is, iis, j, k, l, layer_xy, n, psi, &
-                s, sender, &
+                rbs, s, sender, &
                 ind(4)
     LOGICAL ::  found, resorted, two_d
@@ -720 +720 @@
                          ENDIF
 #endif
-                         WRITE ( 21 )  nxl-1, nxr+1, nys-1, nyn+1
-                         WRITE ( 21 )  local_2d
-
+                         DO rbs = 0, numprocs/binary_io_blocksize-1       
+                            IF ( mod_numprocs_size == rbs ) THEN 
+                               WRITE ( 21 )  nxl-1, nxr+1, nys-1, nyn+1
+                               WRITE ( 21 )  local_2d
+                            ENDIF      
+                            CALL MPI_BARRIER(comm2d, ierr )
+                         ENDDO
+                      
                       ELSE
 !
@@ -1013 +1018 @@
                          ENDIF
 #endif
-                         IF ( ( section(is,s) >= nys  .AND.                  &
-                                section(is,s) <= nyn )  .OR.                 &
-                              ( section(is,s) == -1  .AND.  nys-1 == -1 ) )  &
-                         THEN
-                            WRITE (22)  nxl-1, nxr+1, nzb, nzt+1
-                            WRITE (22)  local_2d
-                         ELSE
-                            WRITE (22)  -1, -1, -1, -1
-                         ENDIF
+                         DO rbs = 0, numprocs/binary_io_blocksize-1       
+                            IF ( mod_numprocs_size == rbs ) THEN 
+                               IF ( ( section(is,s) >= nys  .AND.            &
+                                      section(is,s) <= nyn )  .OR.           &
+                                    ( section(is,s) == -1  .AND.             &
+                                      nys-1 == -1 ) )                        &
+                               THEN
+                                  WRITE (22)  nxl-1, nxr+1, nzb, nzt+1
+                                  WRITE (22)  local_2d
+                               ELSE
+                                  WRITE (22)  -1, -1, -1, -1
+                               ENDIF
+                            ENDIF      
+                            CALL MPI_BARRIER(comm2d, ierr )
+                         ENDDO
 
                       ELSE
@@ -1312 +1323 @@
                          ENDIF
 #endif
-                         IF ( ( section(is,s) >= nxl  .AND.                  &
-                                section(is,s) <= nxr )  .OR.                 &
-                              ( section(is,s) == -1  .AND.  nxl-1 == -1 ) )  &
-                         THEN
-                            WRITE (23)  nys-1, nyn+1, nzb, nzt+1
-                            WRITE (23)  local_2d
-                         ELSE
-                            WRITE (23)  -1, -1, -1, -1
-                         ENDIF
+                         DO rbs = 0, numprocs/binary_io_blocksize-1       
+                            IF ( mod_numprocs_size == rbs ) THEN
+                               IF ( ( section(is,s) >= nxl  .AND.            &
+                                      section(is,s) <= nxr )  .OR.           &
+                                    ( section(is,s) == -1  .AND.             &
+                                      nxl-1 == -1 ) )                        &
+                               THEN
+                                  WRITE (23)  nys-1, nyn+1, nzb, nzt+1
+                                  WRITE (23)  local_2d
+                               ELSE
+                                  WRITE (23)  -1, -1, -1, -1
+                               ENDIF
+                            ENDIF      
+                            CALL MPI_BARRIER(comm2d, ierr )
+                         ENDDO
 
                       ELSE