Changeset 557 for palm/trunk/SOURCE/init_3d_model.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/init_3d_model.f90 (modified) (4 diffs)

palm/trunk/SOURCE/init_3d_model.f90

@@ -113 +113 @@
     IMPLICIT NONE
 
-    INTEGER ::  i, ind_array(1), j, k, sr
+    INTEGER ::  i, ind_array(1), j, k, rbs, sr
 
     INTEGER, DIMENSION(:), ALLOCATABLE ::  ngp_2dh_l
@@ -969 +969 @@
 !--    some of the global variables from restart file
        IF ( TRIM( initializing_actions ) == 'cyclic_fill' )  THEN
-
           WRITE (9,*) 'before read_parts_of_var_list'
           CALL local_flush( 9 )
-          CALL read_parts_of_var_list
+          DO rbs = 0, numprocs/binary_io_blocksize-1     
+             IF ( mod_numprocs_size == rbs ) THEN 
+                CALL read_parts_of_var_list
+             ENDIF
+             CALL MPI_BARRIER(comm2d, ierr )
+          ENDDO
           WRITE (9,*) 'after read_parts_of_var_list'
           CALL local_flush( 9 )
@@ -1056 +1060 @@
 !
 !--    Read binary data from restart file
-          WRITE (9,*) 'before read_3d_binary'
-          CALL local_flush( 9 )
-       CALL read_3d_binary
-          WRITE (9,*) 'after read_3d_binary'
-          CALL local_flush( 9 )
+       WRITE (9,*) 'before read_3d_binary'
+       CALL local_flush( 9 )
+       DO rbs = 0, numprocs/binary_io_blocksize-1       
+          IF ( mod_numprocs_size == rbs ) THEN  
+             CALL read_3d_binary
+          ENDIF      
+          CALL MPI_BARRIER(comm2d, ierr )
+       ENDDO  
+       WRITE (9,*) 'after read_3d_binary'
+       CALL local_flush( 9 )
 
 !
@@ -1573 +1582 @@
 #endif
 
-    ngp_3d = INT( ngp_2dh * ( nz + 2 ), KIND = SELECTED_INT_KIND( 18 ) )
+    ngp_3d = INT ( ngp_2dh, KIND = SELECTED_INT_KIND( 18 ) ) * &
+             INT ( (nz + 2 ), KIND = SELECTED_INT_KIND( 18 ) )
 
 !