Changeset 26 for XMLIO_SERVER/trunk/src/IOSERVER/mod_ioclient.f90

Timestamp:

03/27/09 18:02:59 (15 years ago)

Author:

ymipsl

Message:

Mise à jour importante :

• ajout de la grille type LMDZ
• ajout des context
• ajout de namelist pour parametrer l'utilisation du server : avec/sans MPI, en utlisant ou pas OASIS

File:

• XMLIO_SERVER/trunk/src/IOSERVER/mod_ioclient.f90 (modified) (1 diff)

XMLIO_SERVER/trunk/src/IOSERVER/mod_ioclient.f90

@@ -8 +8 @@
   USE mod_mpi_buffer_client
   USE mod_wait
+  USE mod_ioserver_namelist
+  USE mod_event_client
+  USE iomanager
+
   IMPLICIT NONE
-    INTEGER, INTENT(OUT) :: NEW_COMM
-    
-    CALL Init_parallel
-    CALL Init_mpi_buffer
-    CALL Init_wait
-    
-    NEW_COMM=intracomm
+    INTEGER, INTENT(INOUT),OPTIONAL :: NEW_COMM
+
+    INTEGER :: Comm
+    INTEGER :: nb_server
+    INTEGER :: rank
+    INTEGER :: ierr
+    LOGICAL :: init
+    INCLUDE 'mpif.h'
+ 
+    CALL read_namelist
+
+    IF (using_server) THEN
+      IF (using_oasis) THEN
+      ELSE
+        CALL Init_parallel
+        CALL Init_mpi_buffer
+        CALL Init_wait
+        NEW_COMM=intracomm
+      ENDIF
+    ELSE
+      IF (using_oasis) THEN
+      
+      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)
+        
+      ENDIF
+    ENDIF
     
   END SUBROUTINE init_ioclient