Changeset 807 for LMDZ4/trunk/libf

Timestamp:

Jul 5, 2007, 2:11:45 PM (17 years ago)

Author:

lsce

Message:

ACo + YM : amelioration de la gestion du buffer mpi

Location:

LMDZ4/trunk/libf/dyn3dpar

Files:

• gcm.F (modified) (6 diffs)
• mod_hallo.F90 (modified) (4 diffs)

LMDZ4/trunk/libf/dyn3dpar/gcm.F

@@ -18 +18 @@
       USE mod_hallo
       USE Bands
+      USE Write_Field
+      USE Write_Field_phy
       IMPLICIT NONE
 
@@ -141 +143 @@
       SAVE latfi, lonfi, airefi
       
-c varaiable pour l'allocation du Buffer MPI (sur NEC)      
-      pointer (Pbuffer,MPI_Buffer(MaxBufferSize))
-      REAL :: MPI_Buffer
-      INTEGER(KIND=MPI_ADDRESS_KIND) :: BS 
       INTEGER :: ierr
 
@@ -215 +213 @@
 c   Initialisation partie parallele
 c------------------------------------
+      CALL init_const_mpi
+
       call init_parallel
       call Read_Distrib
-      CALL init_const_mpi
       CALL Init_Phys_lmdz(iim,jjp1,llm,nqmx-2,mpi_size,distrib_phys)
       CALL set_bands
@@ -224 +223 @@
       if (mpi_rank==0) call WriteBands
       call SetDistrib(jj_Nb_Caldyn)
-c  Allocation du buffer MPI
-      Bs=8*MaxBufferSize
-      call MPI_ALLOC_MEM(BS,MPI_INFO_NULL,Pbuffer,ierr)
-      print *,'ierr',ierr
-      do i=1,MaxBufferSize
-        MPI_Buffer(i)=i
-      enddo
-      call Init_Mod_hallo(MPI_Buffer)
+      call Init_Mod_hallo
+
 c$OMP PARALLEL
       call InitComgeomphy
@@ -379 +372 @@
          zcvfi(ngridmx) = cv(ip1jm-iim)
          CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,aire,airefi)
+
          WRITE(lunout,*)
      .           'WARNING!!! vitesse verticale nulle dans la physique'
@@ -386 +380 @@
 
          call_iniphys=.false.
+
       ENDIF
 #endif

LMDZ4/trunk/libf/dyn3dpar/mod_hallo.F90

@@ -2 +2 @@
 USE parallel
 implicit none
-!  include 'mpif.h'
+
   integer, parameter :: MaxRequest=200
   integer, parameter :: MaxProc=80
@@ -11 +11 @@
  
     real,save,pointer,dimension(:) :: Buffer
-!   pointer (Pbuffer,Buffer)
-!   real,dimension(:) :: Buffer
+
    integer,dimension(Listsize) :: Buffer_Pos
    integer :: Index_Pos
@@ -26 +25 @@
   type request_SR
     integer :: NbRequest=0
-!    real,dimension(:),allocatable :: Buffer
-!    real,dimension(:),pointer :: Buffer
     integer :: Pos
     integer :: Index 
@@ -43 +40 @@
   contains
 
-  subroutine Init_mod_hallo(MPI_Buffer)
+  subroutine Init_mod_hallo
     implicit none
-    real,dimension(:),target :: MPI_BUFFER   
-    integer i
+
     Index_Pos=1
     Buffer_Pos(Index_Pos)=1
-    
-    Buffer=>MPI_Buffer
     MaxBufferSize_Used=0
+
+    CALL create_global_mpi_buffer
+    
   end subroutine init_mod_hallo
+
+
+  SUBROUTINE create_standard_mpi_buffer
+  IMPLICIT NONE
+    
+    ALLOCATE(Buffer(MaxBufferSize))
+    
+  END SUBROUTINE create_standard_mpi_buffer
+  
+
+  SUBROUTINE create_global_mpi_buffer
+  IMPLICIT NONE
+  INCLUDE 'mpif.h'  
+    POINTER (Pbuffer,MPI_Buffer(MaxBufferSize))
+    REAL :: MPI_Buffer
+    INTEGER(KIND=MPI_ADDRESS_KIND) :: BS 
+    INTEGER :: i,ierr
+
+
+      Bs=8*MaxBufferSize
+      CALL MPI_ALLOC_MEM(BS,MPI_INFO_NULL,Pbuffer,ierr)
+      DO i=1,MaxBufferSize
+        MPI_Buffer(i)=i
+      ENDDO
+     
+      CALL  Associate_buffer(MPI_Buffer)
+      
+  CONTAINS
+     
+     SUBROUTINE Associate_buffer(MPI_Buffer)
+     IMPLICIT NONE
+       REAL,DIMENSION(:),target :: MPI_Buffer  
+
+         Buffer=>MPI_Buffer
+ 
+      END SUBROUTINE  Associate_buffer
+                                      
+  END SUBROUTINE create_global_mpi_buffer
+
+
       
   subroutine allocate_buffer(Size,Index,Pos)