Changeset 27 for XMLIO_SERVER/trunk/src/IOSERVER/mod_ioclient.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.f90 (modified) (2 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