Changes in XMLIO_SERVER/trunk/src/IOSERVER/mod_ioserver_para.f90 [30:8]

File:

• XMLIO_SERVER/trunk/src/IOSERVER/mod_ioserver_para.f90 (modified) (4 diffs)

XMLIO_SERVER/trunk/src/IOSERVER/mod_ioserver_para.f90

@@ -20 +20 @@
   SUBROUTINE Init_parallel
   USE mpitrace
-  USE mod_ioserver_namelist
-#ifdef USE_OASIS
-  USE mod_prism_get_comm 
-#endif 
   IMPLICIT NONE
     INCLUDE 'mpif.h'
@@ -32 +28 @@
     INTEGER :: i
     INTEGER :: group_color
-    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
-#ifdef USE_OASIS
-       CALL prism_init_comp_proto (comp_id, oasis_server_id, ierr)
-       CALL prism_get_intracomm(Comm_client_server,oasis_client_id,ierr)
-#endif
-    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_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)
     CALL MPI_COMM_SIZE(intracomm,mpi_size,ierr)
     CALL MPI_COMM_RANK(intracomm,mpi_rank,ierr)
@@ -58 +40 @@
     PRINT *,'group_color',group_color
 
-    CALL MPI_COMM_SPLIT(Comm_client_server,group_color,global_rank,iocomm,ierr)    
+    CALL MPI_COMM_SPLIT(MPI_COMM_WORLD,group_color,global_rank,iocomm,ierr)    
     
     CALL MPI_COMM_SIZE(iocomm,iosize,ierr)
@@ -82 +64 @@
   
   SUBROUTINE Finalize_parallel
-  USE mod_ioserver_namelist
-#ifdef USE_OASIS
-  USE mod_prism_proto
-#endif
   IMPLICIT NONE
     include 'mpif.h'
     INTEGER :: ierr
     
-    IF (using_oasis) THEN
-#ifdef USE_OASIS
-      CALL prism_terminate_proto(ierr)
-#endif
-    ELSE
-      CALL MPI_FINALIZE(ierr)
-    ENDIF
-    
+    CALL MPI_FINALIZE(ierr)
+
   END SUBROUTINE Finalize_parallel