Changeset 3372 for palm

Timestamp:

Oct 18, 2018 2:03:19 PM (6 years ago)

Author:

raasch

Message:

bugfix: kind type of 2nd argument of mpi_win_allocate changed, misplaced parallel directive

File:

• palm/trunk/SOURCE/radiation_model_mod.f90 (modified) (4 diffs)

palm/trunk/SOURCE/radiation_model_mod.f90

@@ -28 +28 @@
 ! -----------------
 ! $Id$
+! bugfix: kind type of 2nd argument of mpi_win_allocate changed, misplaced
+!         __parallel directive
+! 
+! 3351 2018-10-15 18:40:42Z suehring
 ! Do not overwrite values of spectral and broadband albedo during initialization
 ! if they are already initialized in the urban-surface model via ASCII input.
@@ -5663 +5667 @@
 
           CALL MPI_Win_allocate(INT(STORAGE_SIZE(1_iwp)/8*nsurf_type_u*nzu*nny*nnx, &
-                                    kind=MPI_ADDRESS_KIND),                         &
-                                INT(STORAGE_SIZE(1_iwp)/8, kind=MPI_ADDRESS_KIND),  &
+                                    kind=MPI_ADDRESS_KIND), STORAGE_SIZE(1_iwp)/8,  &
                                 minfo, comm2d, gridsurf_rma_p, win_gridsurf, ierr)
           IF ( ierr /= 0 ) THEN
               WRITE(9,*) 'Error MPI_Win_allocate1:', ierr, &
                  INT(STORAGE_SIZE(1_iwp)/8*nsurf_type_u*nzu*nny*nnx,kind=MPI_ADDRESS_KIND), &
-                 INT(STORAGE_SIZE(1_iwp)/8, kind=MPI_ADDRESS_KIND), win_gridsurf
+                 STORAGE_SIZE(1_iwp)/8, win_gridsurf
               FLUSH(9)
           ENDIF
@@ -7617 +7620 @@
 
    CONTAINS
-      SUBROUTINE request_itarget(d, z, y, x, isurfl, iproc)
+
+      SUBROUTINE request_itarget( d, z, y, x, isurfl, iproc )
+
          INTEGER(iwp), INTENT(in)            ::  d, z, y, x
          INTEGER(iwp), TARGET, INTENT(out)   ::  isurfl
          INTEGER(iwp), INTENT(out)           ::  iproc
-         INTEGER(kind=MPI_ADDRESS_KIND)      ::  target_displ  !< index of the grid in the local gridsurf array
          INTEGER(iwp)                        ::  px, py        !< number of processors in x and y direction
                                                                !< before the processor in the question
-
-!--      calculate target processor and index in the remote local target gridsurf array
-         px = x/nnx
-         py = y/nny
-         iproc = px*pdims(2)+py
-         target_displ = ((x-px*nnx)*nny + y-py*nny)*nzu*nsurf_type_u + (z-nzub)*nsurf_type_u + d
-
 #if defined( __parallel )
-!--      send MPI_Get request to obtain index target_surfl(i)
-         CALL MPI_Get(isurfl, 1, MPI_INTEGER, iproc, target_displ, &
-                        1, MPI_INTEGER, win_gridsurf, ierr)
+         INTEGER(KIND=MPI_ADDRESS_KIND)      ::  target_displ  !< index of the grid in the local gridsurf array
+
+!
+!--      Calculate target processor and index in the remote local target gridsurf array
+         px = x / nnx
+         py = y / nny
+         iproc = px * pdims(2) + py
+         target_displ = ((x-px*nnx) * nny + y - py*nny ) * nzu * nsurf_type_u +&
+                        ( z-nzub ) * nsurf_type_u + d
+!
+!--      Send MPI_Get request to obtain index target_surfl(i)
+         CALL MPI_GET( isurfl, 1, MPI_INTEGER, iproc, target_displ,            &
+                       1, MPI_INTEGER, win_gridsurf, ierr)
          IF ( ierr /= 0 )  THEN
-            WRITE(9,*) 'Error MPI_Get3:', ierr, isurfl, iproc, target_displ, win_gridsurf
-            FLUSH(9)
+            WRITE( 9,* ) 'Error MPI_Get3:', ierr, isurfl, iproc, target_displ, &
+                         win_gridsurf
+            FLUSH( 9 )
          ENDIF
 #else
@@ -7643 +7651 @@
          isurfl = gridsurf(d,z,y,x)
 #endif
+
       END SUBROUTINE request_itarget