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

Timestamp:

Sep 15, 2011 1:58:31 PM (13 years ago)

Author:

raasch

Message:

New:
---

The number of parallel I/O operations can be limited with new mrun-option -w.
(advec_particles, data_output_2d, data_output_3d, header, init_grid, init_pegrid, init_3d_model, modules, palm, parin, write_3d_binary)

Changed:

---

mrun option -T is obligatory

Errors:

---

Bugfix: No zero assignments to volume_flow_initial and volume_flow_area in
case of normal restart runs. (init_3d_model)

initialization of u_0, v_0. This is just to avoid access of uninitialized
memory in exchange_horiz_2d, which causes respective error messages
when the Intel thread checker (inspector) is used. (production_e)

Bugfix for ts limitation (prandtl_fluxes)

File:

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

palm/trunk/SOURCE/data_output_2d.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
+! Splitting of parallel I/O
 !
 ! Former revisions:
@@ -737 +738 @@
                          ENDIF
 #endif
-                         WRITE ( 21 )  nxlg, nxrg, nysg, nyng
-                         WRITE ( 21 )  local_2d
+                         DO  i = 0, io_blocks-1
+                            IF ( i == io_group )  THEN
+                               WRITE ( 21 )  nxlg, nxrg, nysg, nyng
+                               WRITE ( 21 )  local_2d
+                            ENDIF
+#if defined( __parallel )
+                            CALL MPI_BARRIER( comm2d, ierr )
+#endif
+                         ENDDO
 
                       ELSE
@@ -1033 +1041 @@
                          ENDIF
 #endif
-                         IF ( ( section(is,s) >= nys  .AND.                  &
-                                section(is,s) <= nyn )  .OR.                 &
-                              ( section(is,s) == -1  .AND.  nys-1 == -1 ) )  &
-                         THEN
-                            WRITE (22)  nxlg, nxrg, nzb, nzt+1
-                            WRITE (22)  local_2d
-                         ELSE
-                            WRITE (22)  -1, -1, -1, -1
-                         ENDIF
+                         DO  i = 0, io_blocks-1
+                            IF ( i == io_group )  THEN
+                               IF ( ( section(is,s) >= nys  .AND.   &
+                                      section(is,s) <= nyn )  .OR.  &
+                                    ( section(is,s) == -1  .AND.    &
+                                      nys-1 == -1 ) )               &
+                               THEN
+                                  WRITE (22)  nxlg, nxrg, nzb, nzt+1
+                                  WRITE (22)  local_2d
+                               ELSE
+                                  WRITE (22)  -1, -1, -1, -1
+                               ENDIF
+                            ENDIF
+#if defined( __parallel )
+                            CALL MPI_BARRIER( comm2d, ierr )
+#endif
+                         ENDDO
 
                       ELSE
@@ -1334 +1350 @@
                          ENDIF
 #endif
-                         IF ( ( section(is,s) >= nxl  .AND.                  &
-                                section(is,s) <= nxr )  .OR.                 &
-                              ( section(is,s) == -1  .AND.  nxl-1 == -1 ) )  &
-                         THEN
-                            WRITE (23)  nysg, nyng, nzb, nzt+1
-                            WRITE (23)  local_2d
-                         ELSE
-                            WRITE (23)  -1, -1, -1, -1
-                         ENDIF
+                         DO  i = 0, io_blocks-1
+                            IF ( i == io_group )  THEN
+                               IF ( ( section(is,s) >= nxl  .AND.   &
+                                      section(is,s) <= nxr )  .OR.  &
+                                    ( section(is,s) == -1  .AND.    &
+                                      nxl-1 == -1 ) )               &
+                               THEN
+                                  WRITE (23)  nysg, nyng, nzb, nzt+1
+                                  WRITE (23)  local_2d
+                               ELSE
+                                  WRITE (23)  -1, -1, -1, -1
+                               ENDIF
+                            ENDIF
+#if defined( __parallel )
+                            CALL MPI_BARRIER( comm2d, ierr )
+#endif
+                         ENDDO
 
                       ELSE
@@ -1504 +1528 @@
 
     IF ( data_output_2d_on_each_pe )  THEN
-       CALL close_file( file_id )
+       DO  i = 0, io_blocks-1
+          IF ( i == io_group )  THEN
+             CALL close_file( file_id )
+          ENDIF
+#if defined( __parallel )
+          CALL MPI_BARRIER( comm2d, ierr )
+#endif
+       ENDDO
     ELSE
        IF ( myid == 0 )  CALL close_file( file_id )