Changeset 3251

Timestamp:

Sep 14, 2018 1:18:42 PM (6 years ago)

Author:

raasch

Message:

explicit kind settings

Location:

palm/trunk/SOURCE

Files:

• pmc_child_mod.f90 (modified) (3 diffs)
• pmc_parent_mod.f90 (modified) (5 diffs)

palm/trunk/SOURCE/pmc_child_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! explicit kind settings
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -359 +362 @@
           NULLIFY( ape%locind )
        ENDIF
-       winsize = MAX( nr, winsize )
+       winsize = MAX( INT( nr, MPI_ADDRESS_KIND ), winsize )
     ENDDO
 
@@ -612 +615 @@
 
           IF ( ar%nrdims == 3 )  THEN
-             bufsize = MAX( bufsize, ar%a_dim(1)*ar%a_dim(2)*ar%a_dim(3) )
+             bufsize = MAX( bufsize,                                           &
+                            INT( ar%a_dim(1)*ar%a_dim(2)*ar%a_dim(3),          &
+                                 MPI_ADDRESS_KIND ) )
           ELSE
-             bufsize = MAX( bufsize, ar%a_dim(1)*ar%a_dim(2) )
+             bufsize = MAX( bufsize,                                           &
+                            INT( ar%a_dim(1)*ar%a_dim(2), MPI_ADDRESS_KIND ) )
           ENDIF
        ENDDO

palm/trunk/SOURCE/pmc_parent_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! explicit kind settings
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -310 +313 @@
         ENDIF
      ENDIF
-     CALL set_pe_index_list( childid, children(childid),                       &
+     CALL set_pe_index_list( children(childid),                                &
                              indchildren(childid)%index_list_2d,               &
                              indchildren(childid)%nrpoints )
@@ -591 +594 @@
                          children(childid)%inter_comm, MPI_STATUS_IGNORE, ierr )
           IF ( ar%nrdims == 3 )  THEN
-             bufsize = MAX( bufsize, ape%nrele * ar%a_dim(4) )
+             bufsize = MAX( bufsize,                                           &
+                            INT( ape%nrele * ar%a_dim(4), MPI_ADDRESS_KIND ) )
           ELSE
-             bufsize = MAX( bufsize, ape%nrele )
+             bufsize = MAX( bufsize, INT( ape%nrele, MPI_ADDRESS_KIND ) )
           ENDIF
           ar%recvindex = myindex
@@ -954 +958 @@
 
 
- SUBROUTINE set_pe_index_list( childid, mychild, index_list, nrp )
-
-    IMPLICIT NONE
-
-    INTEGER(iwp), INTENT(IN)                 ::  childid     !<
+ SUBROUTINE set_pe_index_list( mychild, index_list, nrp )
+
+    IMPLICIT NONE
+
     INTEGER(iwp), INTENT(IN), DIMENSION(:,:) ::  index_list  !<
     INTEGER(iwp), INTENT(IN)                 ::  nrp         !<
@@ -1045 +1048 @@
 !
 !-- Make sure, MPI_ALLOC_MEM works
-    winsize = MAX( winsize, 1 )
+    winsize = MAX( winsize, INT( 1, MPI_ADDRESS_KIND ) )
 
     CALL pmc_alloc_mem( remindw, INT( winsize ) )