Changeset 4621 for palm/trunk

Timestamp:

Jul 23, 2020 8:15:59 AM (4 years ago)

Author:

raasch

Message:

further bugfix for r4618: mising preprocessor directives for serial mode added

File:

• palm/trunk/SOURCE/restart_data_mpi_io_mod.f90 (modified) (14 diffs)

palm/trunk/SOURCE/restart_data_mpi_io_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! bugfixes for serial (non-parallel) mode
+!
+! 4619 2020-07-22 13:21:28Z raasch
 ! unused variable removed
 !
@@ -751 +754 @@
        INTEGER(iwp) ::  i      !<
        INTEGER(iwp) ::  j      !<
+#if defined( __parallel )
        INTEGER(KIND=MPI_ADDRESS_KIND) ::  winsize  !< size of RMA window
+#else
+       INTEGER(idp) ::  winsize
+#endif
 
 !
@@ -800 +807 @@
           ENDDO
        ELSE
+#if defined( __parallel )
           color = MPI_UNDEFINED
+#endif
           pe_active_for_read = .FALSE.
        ENDIF
@@ -1075 +1084 @@
        INTEGER(iwp)    :: rem_pe    !<
 
+#if defined( __parallel )
        INTEGER(KIND=MPI_ADDRESS_KIND) ::  rem_offs  !<
+#else
+       INTEGER(idp) ::  rem_offs
+#endif
 
 
@@ -1085 +1098 @@
 
        IF ( pe_active_for_read )  THEN
-
+#if defined( __parallel )
           CALL MPI_FILE_SET_VIEW( fh, array_position, MPI_REAL, ft_2d, 'native', MPI_INFO_NULL,    &
                                   ierr )
           CALL MPI_FILE_READ_ALL( fh, array_2d, SIZE( array_2d ), MPI_REAL, status, ierr )
-
+#endif
           DO  i = nxl, nxr
              rmabuf_2d(nys:nyn,i) = array_2d(i,nys:nyn)
@@ -1293 +1306 @@
        INTEGER(iwp)    :: rem_pe    !<
 
+#if defined( __parallel )
        INTEGER(KIND=MPI_ADDRESS_KIND) ::  rem_offs  !<
+#else
+       INTEGER(idp) ::  rem_offs
+#endif
 
 
@@ -1299 +1316 @@
 
        IF ( pe_active_for_read )  THEN
+#if defined( __parallel )
           CALL MPI_FILE_SET_VIEW( fh, array_position, MPI_INTEGER, ft_2di_nb, 'native',            &
                                   MPI_INFO_NULL, ierr )
           CALL MPI_FILE_READ_ALL( fh, array_2di, SIZE( array_2di ), MPI_INTEGER, status, ierr )
-
+#endif
           DO  i = nxl, nxr
              rmabuf_2di(nys:nyn,i) = array_2di(i,nys:nyn)
@@ -1486 +1504 @@
        INTEGER(iwp)    :: rem_pe    !<
 
+#if defined( __parallel )
        INTEGER(KIND=MPI_ADDRESS_KIND) ::  rem_offs  !<
+#else
+       INTEGER(idp) ::  rem_offs
+#endif
 
 
@@ -1492 +1514 @@
 
        IF ( pe_active_for_read )  THEN
+#if defined( __parallel )
           CALL MPI_FILE_SET_VIEW( fh, array_position, MPI_REAL, ft_3d, 'native', MPI_INFO_NULL,    &
                                   ierr )
           CALL MPI_FILE_READ_ALL( fh, array_3d, SIZE( array_3d ), MPI_REAL, status, ierr )
-
+#endif
           DO  i = nxl, nxr
              rmabuf_3d(:,nys:nyn,i) = array_3d(:,i,nys:nyn)
@@ -2696 +2719 @@
        INTEGER(iwp) ::  rem_pe    !<
 
+#if defined( __parallel )
        INTEGER(KIND=MPI_ADDRESS_KIND) ::  rem_offs  !<
+#else
+       INTEGER(idp) ::  rem_offs
+#endif
 
        LOGICAL ::  write_done  !<
@@ -2757 +2784 @@
 #else
                    CALL posix_lseek( fh, disp_f )
-                   CALL posix_read( fh, rmabuf_2d(j_f,i_f), nr_bytes_f )
+                   CALL posix_read( fh, rmabuf_2d(j_f:,i_f:), nr_bytes_f )
 #endif
 
@@ -2835 +2862 @@
              ENDIF
 #else
-             data(m_tart_index(j,i)) = array_2d(i_remote,j_remote)
+             data(m_start_index(j,i)) = array_2d(i_remote,j_remote)
 #endif
           ENDDO
@@ -3150 +3177 @@
        CALL MPI_FILE_CLOSE( fhs, ierr )
     ENDIF
-#endif
 !
 !-- Free RMA windows
@@ -3158 +3184 @@
        CALL MPI_WIN_FREE( rmawin_3d, ierr )
     ENDIF
+#endif
 
     IF (.NOT. pe_active_for_read )  RETURN