Changeset 4496

Timestamp:

Apr 15, 2020 8:37:26 AM (4 years ago)

Author:

raasch

Message:

bugfixes for restart with MPI-IO: problem with posix read arguments for surface data fixed, MPI barrier removed, coupling character added to restart input and output filename

Location:

palm/trunk/SOURCE

Files:

• palm.f90 (modified) (2 diffs)
• read_restart_data_mod.f90 (modified) (3 diffs)
• restart_data_mpi_io_mod.f90 (modified) (4 diffs)

palm/trunk/SOURCE/palm.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! bugfix: coupling character added to restart output filename
+! 
+! 4495 2020-04-13 20:11:20Z raasch
 ! restart data handling with MPI-IO added
 ! 
@@ -432 +435 @@
 !
 !--       Open MPI-IO restart file
-          CALL rd_mpi_io_open( 'write', 'BINOUT' )
+          CALL rd_mpi_io_open( 'write', 'BINOUT' // TRIM( coupling_char ) )
 !
 !--       Write control parameters and other global variables for restart.

palm/trunk/SOURCE/read_restart_data_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! bugfix: MPI barrier removed, coupling character added to input filename
+! 
+! 4495 2020-04-13 20:11:20Z raasch
 ! restart data handling with MPI-IO added
 ! 
@@ -842 +845 @@
 !
 !--    Open the MPI-IO restart file.
-       CALL rd_mpi_io_open( 'read', 'BININ', only_global = .TRUE. )
+       CALL rd_mpi_io_open( 'read', 'BININ' // TRIM( coupling_char ), only_global = .TRUE. )
 
 !
@@ -1141 +1144 @@
        CALL rd_mpi_io_close
 
-#if defined( __parallel )
-       CALL MPI_BARRIER( MPI_COMM_WORLD, ierr )
-#endif
-
     ENDIF
 

palm/trunk/SOURCE/restart_data_mpi_io_mod.f90

@@ -24 +24 @@
 ! -----------------
 ! $Id$
-! Initial version (K. Ketelsen)
+! problem with posix read arguments for surface data fixed
+! 
+! 4495 2020-04-13 20:11:20Z raasch
+! Initial version (K. Ketelsen), adjusted to PALM formatting standards (s. Raasch)
 !
 ! 
@@ -1770 +1773 @@
 #else
                 CALL posix_lseek( fh, disp_f )
-!ATTENTION: next line needs to be fixed because of: There is no specific subroutine for the generic ‘posix_read’
-!                CALL posix_read( fh, data(m_start_index(j_f,i_f)), nr_bytes_f )
+                CALL posix_read( fh, data(m_start_index(j_f:,i_f:)), nr_bytes_f )
 #endif
                 disp_f     = disp
@@ -2306 +2308 @@
 !> This subroutine creates file types to access 3d-soil arrays
 !> distributed in blocks among processes to a single file that contains the global arrays.
+!> It is not required for the serial mode.
 !--------------------------------------------------------------------------------------------------!
 #if defined( __parallel )
@@ -2334 +2337 @@
     start3(3) = lb%nys
 
-    CALL MPI_TYPE_CREATE_SUBARRAY( 3, dims3, lize3, start3, MPI_ORDER_FORTRAN, MPI_REAL, ft_3dsoil, ierr )
+    CALL MPI_TYPE_CREATE_SUBARRAY( 3, dims3, lize3, start3, MPI_ORDER_FORTRAN, MPI_REAL,           &
+                                   ft_3dsoil, ierr )
     CALL MPI_TYPE_COMMIT( ft_3dsoil, ierr )