Changeset 27 for XMLIO_SERVER/trunk/src/IOSERVER

Timestamp:

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

Author:

ymipsl

Message:

Correction : utilisation d'OASIS par le server

Location:

XMLIO_SERVER/trunk/src/IOSERVER

Files:

• mod_ioclient.f90 (modified) (2 diffs)
• mod_ioclient_para.f90 (modified) (3 diffs)
• mod_ioserver_para.f90 (modified) (4 diffs)

XMLIO_SERVER/trunk/src/IOSERVER/mod_ioclient.f90

@@ -11 +11 @@
   USE mod_event_client
   USE iomanager
-
   IMPLICIT NONE
     INTEGER, INTENT(INOUT),OPTIONAL :: NEW_COMM
@@ -25 +24 @@
 
     IF (using_server) THEN
-      IF (using_oasis) THEN
-      ELSE
-        CALL Init_parallel
-        CALL Init_mpi_buffer
-        CALL Init_wait
+      CALL Init_parallel
+      CALL Init_mpi_buffer
+      CALL Init_wait
+      IF (PRESENT(NEW_COMM)) THEN
         NEW_COMM=intracomm
       ENDIF
     ELSE
-      IF (using_oasis) THEN
-      
+      CALL MPI_INITIALIZED(init,ierr)
+      IF (init) THEN
+        IF (.NOT. PRESENT(NEW_COMM)) THEN
+           Comm=MPI_COMM_WORLD
+        ELSE
+          Comm=New_Comm
+        ENDIF
       ELSE
-        CALL MPI_INITIALIZED(init,ierr)
-        IF (init) THEN
-          IF (.NOT. PRESENT(NEW_COMM)) THEN
-             Comm=MPI_COMM_WORLD
-          ELSE
-            Comm=New_Comm
-          ENDIF
-        ELSE
-          CALL MPI_INIT(ierr)
-          Comm=MPI_COMM_WORLD
-          
-          IF (PRESENT(NEW_COMM)) THEN
-            New_Comm=MPI_COMM_WORLD
-          ENDIF
-        ENDIF  
-        CALL MPI_COMM_SIZE(Comm,nb_server,ierr)     
-        CALL MPI_COMM_RANK(Comm,rank,ierr)
-        CALL iom__init(1,nb_server,rank)
-        CALL iom__set_current_rank(1)
+        CALL MPI_INIT(ierr)
+        Comm=MPI_COMM_WORLD
         
-      ENDIF
+        IF (PRESENT(NEW_COMM)) THEN
+          New_Comm=MPI_COMM_WORLD
+        ENDIF
+      ENDIF  
+      CALL MPI_COMM_SIZE(Comm,nb_server,ierr)     
+      CALL MPI_COMM_RANK(Comm,rank,ierr)
+      CALL iom__init(1,nb_server,rank)
+      CALL iom__set_current_rank(1)
     ENDIF
     

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

XMLIO_SERVER/trunk/src/IOSERVER/mod_ioserver_para.f90

@@ -20 +20 @@
   SUBROUTINE Init_parallel
   USE mpitrace
+  USE mod_ioserver_namelist
+  USE mod_prism_get_comm  
   IMPLICIT NONE
     INCLUDE 'mpif.h'
@@ -28 +30 @@
     INTEGER :: i
     INTEGER :: group_color
-    
-    CALL MPI_INIT(ierr)
-    CALL MPI_COMM_RANK(MPI_COMM_WORLD,global_rank,ierr)
-    CALL MPI_COMM_SIZE(MPI_COMM_WORLD,global_size,ierr)
-   
-    CALL MPI_COMM_SPLIT(MPI_COMM_WORLD,color_server,global_rank,intracomm,ierr)
+    INTEGER :: Comm_client_server
+    INTEGER :: comp_id
+    CHARACTER(LEN=6) :: oasis_server_id, oasis_client_id
+
+    IF (using_oasis) THEN
+       oasis_server_id=server_id
+       oasis_client_id=client_id
+       CALL prism_init_comp_proto (comp_id, oasis_server_id, ierr)
+       CALL prism_get_intracomm(Comm_client_server,oasis_client_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_server,global_rank,intracomm,ierr)
     CALL MPI_COMM_SIZE(intracomm,mpi_size,ierr)
     CALL MPI_COMM_RANK(intracomm,mpi_rank,ierr)
@@ -40 +54 @@
     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)
@@ -64 +78 @@
   
   SUBROUTINE Finalize_parallel
+  USE mod_ioserver_namelist
+  USE mod_prism_proto
   IMPLICIT NONE
     include 'mpif.h'
     INTEGER :: ierr
     
-    CALL MPI_FINALIZE(ierr)
-
+    IF (using_oasis) THEN
+      CALL prism_terminate_proto(ierr)
+    ELSE
+      CALL MPI_FINALIZE(ierr)
+    ENDIF
+    
   END SUBROUTINE Finalize_parallel