Changeset 4783 for palm/trunk/SOURCE/init_3d_model.f90

Timestamp:

Nov 13, 2020 1:58:45 PM (4 years ago)

Author:

raasch

Message:

bugfix for reading restart data with MPI-I/O (does not work with blockwise I/O); missed revision comments from previous commit added

File:

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

palm/trunk/SOURCE/init_3d_model.f90

@@ -24 +24 @@
 ! -----------------
 ! $Id$
+! bugfix for reading restart data with MPI-I/O (does not work with blockwise I/O)
+!
+! 4680 2020-09-16 10:20:34Z gronemeier
 ! Add option to fix date or time of the simulation
 !
@@ -1086 +1089 @@
        IF ( TRIM( initializing_actions ) == 'cyclic_fill' )  THEN
 
+!
+!--       Blockwise I/O does not work together with MPI-I/O
+          IF ( restart_data_format_input(1:3) == 'mpi' )  THEN
+             CALL rrd_read_parts_of_global
+          ELSE
+             DO  i = 0, io_blocks-1
+                IF ( i == io_group )  THEN
+                   CALL rrd_read_parts_of_global
+                ENDIF
+#if defined( __parallel )
+                CALL MPI_BARRIER( comm2d, ierr )
+#endif
+             ENDDO
+          ENDIF
+
+       ENDIF
+
+!
+!--    Read processor specific binary data from restart file.
+!--    Blockwise I/O does not work together with MPI-I/O
+       IF ( restart_data_format_input(1:3) == 'mpi' )  THEN
+          CALL rrd_local
+       ELSE
           DO  i = 0, io_blocks-1
              IF ( i == io_group )  THEN
-                CALL rrd_read_parts_of_global
+                CALL rrd_local
              ENDIF
 #if defined( __parallel )
@@ -1094 +1120 @@
 #endif
           ENDDO
-
-       ENDIF
-
-!
-!--    Read processor specific binary data from restart file
-       DO  i = 0, io_blocks-1
-          IF ( i == io_group )  THEN
-             CALL rrd_local
-          ENDIF
-#if defined( __parallel )
-          CALL MPI_BARRIER( comm2d, ierr )
-#endif
-       ENDDO
+       ENDIF