Changeset 36

Timestamp:

07/07/09 17:04:46 (15 years ago)

Author:

ymipsl

Message:

Les buffers MPI sont maintenant donnes en quantite de memoire totale par serveur et non par client.
La valeur par defaut peut etre redefinie dans la namelist.

YM

Location:

XMLIO_SERVER/trunk/src/IOSERVER

Files:

• mod_ioserver_namelist.f90 (modified) (3 diffs)
• mod_mpi_buffer_client.f90 (modified) (2 diffs)
• mod_mpi_buffer_parameters.f90 (modified) (1 diff)
• mod_mpi_buffer_server.f90 (modified) (2 diffs)

XMLIO_SERVER/trunk/src/IOSERVER/mod_ioserver_namelist.f90

@@ -1 +1 @@
 MODULE mod_ioserver_namelist
 
-  LOGICAL :: using_server
-  LOGICAL :: using_oasis
-  CHARACTER(LEN=100) :: client_id
-  CHARACTER(LEN=100) :: server_id
-  
+  LOGICAL,SAVE :: using_server
+  LOGICAL,SAVE :: using_oasis
+  CHARACTER(LEN=100),SAVE :: client_id
+  CHARACTER(LEN=100),SAVE :: server_id
   NAMELIST /coupling_param/ using_server,using_oasis,client_id,server_id  
+
+  INTEGER,SAVE :: global_mpi_buffer_size            
+  NAMELIST /mpi_param/ global_mpi_buffer_size  
 
   INTEGER,PARAMETER,PRIVATE :: starting_unit=356
@@ -19 +21 @@
     client_id='unknown'
     server_id='unknown'
+    global_mpi_buffer_size=512
+    
   END SUBROUTINE set_default_namelist
   
@@ -41 +45 @@
     IF (ierr==0) THEN
       READ(unit,nml=coupling_param)
+      READ(unit,nml=mpi_param)
+      global_mpi_buffer_size=global_mpi_buffer_size*1024*128  
       CLOSE(unit)
     ELSE

XMLIO_SERVER/trunk/src/IOSERVER/mod_mpi_buffer_client.f90

@@ -20 +20 @@
   INTEGER,SAVE :: start_pos
   LOGICAL,SAVE :: ok_new_request
-  
   LOGICAL,SAVE :: is_last_request
+
+  INTEGER      :: mpi_buffer_size
+
 CONTAINS
 
@@ -27 +29 @@
   USE mod_global_memory
   USE mod_pack
+  USE mod_ioclient_para
   IMPLICIT NONE
+
+  INTEGER  :: nb_client
   
+    nb_client=iosize-1  
+    mpi_buffer_size=global_mpi_buffer_size/nb_client
+    
     CALL allocate_global_memory(mpi_buffer_size,MPI_Buffer)
     buffer_begin=1

XMLIO_SERVER/trunk/src/IOSERVER/mod_mpi_buffer_parameters.f90

@@ -1 +1 @@
 MODULE mod_mpi_buffer_parameters
-  INTEGER,PARAMETER :: mpi_buffer_size = 1024*1024*64
+  USE mod_ioserver_namelist, ONLY : global_mpi_buffer_size
   INTEGER,PARAMETER :: max_request = 10000
   REAL, PARAMETER   :: frac_alert  = 0.9

XMLIO_SERVER/trunk/src/IOSERVER/mod_mpi_buffer_server.f90

@@ -24 +24 @@
   
   INTEGER,SAVE :: current_rank
-  
+  INTEGER,SAVE :: mpi_buffer_size
   
 CONTAINS
@@ -35 +35 @@
     
     ALLOCATE(buffers(nb_client))
-    
+    mpi_buffer_size=global_mpi_buffer_size/nb_client 
     DO n=1,nb_client
       CALL allocate_global_memory(mpi_buffer_size,buffers(n)%MPI_Buffer)