Changeset 1847 for LMDZ5/trunk

Timestamp:

Aug 23, 2013, 2:15:54 PM (11 years ago)

Author:

yann meurdesoif

Message:

Improved memory management of buffer for MPi request

YM

File:

• LMDZ5/trunk/libf/dyn3dmem/mod_hallo.F90 (modified) (10 diffs)

LMDZ5/trunk/libf/dyn3dmem/mod_hallo.F90

@@ -3 +3 @@
 implicit none
   logical,save :: use_mpi_alloc
-  integer, parameter :: MaxRequest=200
   integer, parameter :: MaxProc=512
-  integer, parameter :: MaxBufferSize=1024*1024*100
+  integer, parameter :: DefaultMaxBufferSize=1024*1024*100
+  integer, SAVE :: MaxBufferSize=0
   integer, parameter :: ListSize=1000
   
@@ -28 +28 @@
   type request_SR
     integer :: NbRequest=0
+    integer :: NbRequestMax=0
     integer :: BufferSize
     integer :: Pos
     integer :: Index 
-    type(Hallo),dimension(MaxRequest) :: Hallo
+    type(Hallo), POINTER :: Hallo(:)
     integer :: MSG_Request
   end type request_SR
@@ -64 +65 @@
   subroutine Init_mod_hallo
   USE dimensions_mod
+  USE IOIPSL
     implicit none
     integer :: jj_nb_gather(0:mpi_size-1)
@@ -70 +72 @@
     Buffer_Pos(Index_Pos)=1
     MaxBufferSize_Used=0
-
+!$OMP MASTER     
+    MaxBufferSize=DefaultMaxBufferSize
+    CALL getin("mpi_buffer_size",MaxBufferSize)
+!$OMP END MASTER
+!$OMP BARRIER
+    
     IF (use_mpi_alloc .AND. using_mpi) THEN
       CALL create_global_mpi_buffer
@@ -84 +91 @@
 !$OMP END MASTER
 !$OMP BARRIER
+
   end subroutine init_mod_hallo
 
@@ -178 +186 @@
   
   
-  subroutine Init_Hallo(Field,Stride,NbLevel,offset,size,NewHallo)
+  subroutine New_Hallo(Field,Stride,NbLevel,offset,size,Ptr_request)
     integer :: Stride
     integer :: NbLevel
@@ -184 +192 @@
     integer :: offset
     real, dimension(Stride,NbLevel),target :: Field
-    type(Hallo) :: NewHallo
-    
+    type(request_SR),pointer :: Ptr_request
+    type(Hallo),POINTER :: NewHallos(:),HalloSwitch(:), NewHallo
+    
+    Ptr_Request%NbRequest=Ptr_Request%NbRequest+1
+    IF(Ptr_Request%NbRequestMax==0) THEN
+       Ptr_Request%NbRequestMax=10
+       ALLOCATE(Ptr_Request%Hallo(Ptr_Request%NbRequestMax))
+    ELSE IF ( Ptr_Request%NbRequest > Ptr_Request%NbRequestMax) THEN
+      Ptr_Request%NbRequestMax=INT(Ptr_Request%NbRequestMax*1.2)
+      ALLOCATE(NewHallos(Ptr_Request%NbRequestMax))
+      NewHallos(1:Ptr_Request%NbRequest-1)=Ptr_Request%hallo(1:Ptr_Request%NbRequest-1)
+      HalloSwitch=>Ptr_Request%hallo
+      Ptr_Request%hallo=>NewHallos
+      DEALLOCATE(HalloSwitch)
+    ENDIF
+    
+    NewHallo=>Ptr_Request%hallo(Ptr_Request%NbRequest)
+          
     NewHallo%Field=>Field
     NewHallo%Stride=Stride
@@ -192 +216 @@
     NewHallo%offset=offset
     
-    
-  end subroutine Init_Hallo
+  end subroutine New_Hallo
   
   subroutine Register_SendField(Field,ij,ll,offset,size,target,a_request)
@@ -206 +229 @@
 
       Ptr_Request=>a_request%RequestSend(target)
-      Ptr_Request%NbRequest=Ptr_Request%NbRequest+1
-      if (Ptr_Request%NbRequest>=MaxRequest) then
-        print *,'STOP :: La taille de MaxRequest dans mod_hallo.F90 est trop petite !!!!'
-        stop
-      endif      
-      call Init_Hallo(Field,ij,ll,offset,size,Ptr_request%Hallo(Ptr_Request%NbRequest))
+
+      call New_Hallo(Field,ij,ll,offset,size,Ptr_request)
       
    end subroutine Register_SendField      
@@ -226 +245 @@
 
       Ptr_Request=>a_request%RequestRecv(target)
-      Ptr_Request%NbRequest=Ptr_Request%NbRequest+1
-      
-      if (Ptr_Request%NbRequest>=MaxRequest) then
-        print *,'STOP :: La taille de MaxRequest dans mod_hallo.F90 est trop petite !!!!'
-        stop
-      endif   
             
-      call Init_Hallo(Field,ij,ll,offset,size,Ptr_request%Hallo(Ptr_Request%NbRequest))
+      call New_Hallo(Field,ij,ll,offset,size,Ptr_request)