Changeset 2583 for palm/trunk

Timestamp:

Oct 26, 2017 1:58:38 PM (7 years ago)

Author:

knoop

Message:

Bugfix: reverted MPI_Win_allocate_cptr introduction in last commit

File:

• palm/trunk/SOURCE/urban_surface_mod.f90 (modified) (2 diffs)

palm/trunk/SOURCE/urban_surface_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
-! Workaround for gnufortran compiler added in usm_calc_svf. CALL MPI_Win_allocate is
-! replaced by CALL MPI_Win_allocate_cptr if defined ( __gnufortran ). 
-! 
-! 2544 2017-10-13 18:09:32Z maronga
 ! Date and time quantities are now read from date_and_time_mod. Solar constant is
 ! read from radiation_model_mod
@@ -1927 +1923 @@
 !--             Argument X of function c_sizeof(X) needs arbitrary REAL(wp) value, set to 1.0_wp for now
                 size_lad_rma = c_sizeof(1.0_wp)*nnx*nny*nzu
-
-#if defined( __gfortran )
-!
-!--             Workaround for the gfortran compiler.
-                CALL MPI_Win_allocate_cptr( size_lad_rma, wp, minfo, comm2d,    &
-                     lad_s_rma_p, win_lad, ierr )
-#else                
-                CALL MPI_Win_allocate( size_lad_rma, c_sizeof(1.0_wp), minfo,   &
-                     comm2d, lad_s_rma_p, win_lad, ierr )
-#endif
+                CALL MPI_Win_allocate(size_lad_rma, c_sizeof(1.0_wp), minfo, comm2d, &
+                                        lad_s_rma_p, win_lad, ierr)
                 CALL c_f_pointer(lad_s_rma_p, lad_s_rma, (/ nzu, nny, nnx /))
                 usm_lad(nzub:, nys:, nxl:) => lad_s_rma(:,:,:)