Changeset 27 for XMLIO_SERVER/trunk/src/IOSERVER/mod_ioclient_para.f90

Timestamp:

04/08/09 16:04:00 (15 years ago)

Author:

ymipsl

Message:

Correction : utilisation d'OASIS par le server

File:

• XMLIO_SERVER/trunk/src/IOSERVER/mod_ioclient_para.f90 (modified) (3 diffs)

XMLIO_SERVER/trunk/src/IOSERVER/mod_ioclient_para.f90

@@ -12 +12 @@
   SUBROUTINE Init_parallel
   USE mpitrace
+  USE mod_ioserver_namelist
+  USE mod_prism_get_comm  
   IMPLICIT NONE
     INCLUDE 'mpif.h'
@@ -25 +27 @@
     INTEGER :: div,remain
     INTEGER :: group_color
+    INTEGER :: Comm_client_server
+    CHARACTER(LEN=6) :: oasis_server_id
     
-!    PRINT *, "on rentre dans MPI_INIT"
-    CALL MPI_INIT(ierr)
-    CALL MPI_COMM_RANK(MPI_COMM_WORLD,global_rank,ierr)
-    CALL MPI_COMM_SIZE(MPI_COMM_WORLD,global_size,ierr)
-    
-    PRINT *,"MPI_init Ok, --> mpi_comm_split"
-    CALL MPI_COMM_SPLIT(MPI_COMM_WORLD,color_client,global_rank,intracomm,ierr)
+    IF (using_oasis) THEN
+      oasis_server_id=server_id
+      PRINT *,'prism_get_intracomm'
+      CALL prism_get_intracomm(Comm_client_server,oasis_server_id,ierr)
+    ELSE
+      CALL MPI_INIT(ierr)
+      Comm_client_server=MPI_COMM_WORLD
+    ENDIF
+
+    CALL MPI_COMM_RANK(Comm_client_server,global_rank,ierr)
+    CALL MPI_COMM_SIZE(Comm_client_server,global_size,ierr)
+
+    CALL MPI_COMM_SPLIT(Comm_client_server,color_client,global_rank,intracomm,ierr)
     CALL MPI_COMM_SIZE(intracomm,mpi_size,ierr)
     CALL MPI_COMM_RANK(intracomm,mpi_rank,ierr)
-    PRINT *,"MPI_mpi_comm_split ok --> intracomm" 
+
     nb_server_io=global_size-mpi_size
     div=mpi_size/nb_server_io
@@ -45 +55 @@
       group_color=(nb_server_io-1)-(mpi_size-1-mpi_rank)/div
     ENDIF
-    PRINT *,'group_color',group_color
 
-    CALL MPI_COMM_SPLIT(MPI_COMM_WORLD,group_color,global_rank,iocomm,ierr)
+    CALL MPI_COMM_SPLIT(Comm_client_server,group_color,global_rank,iocomm,ierr)
     
     CALL MPI_COMM_SIZE(iocomm,iosize,ierr)
     CALL MPI_COMM_RANK(iocomm,iorank,ierr)
-    PRINT *,"io_size-> ",iosize,"iorank-> ",iorank
+
     ALLOCATE(proc_color(0:iosize-1))
     CALL MPI_ALLGATHER(color_client,1,MPI_INTEGER,proc_color,1,MPI_INTEGER,iocomm,ierr)
-    print *,"proc_color -> ",proc_color
     
     DO i=0,iosize-1