Changeset 1134 for XIOS/dev/branch_yushan_merged/src/test/test_complete.f90

Timestamp:

05/16/17 17:54:30 (7 years ago)

Author:

yushan

Message:

branch merged with trunk r1130

File:

• XIOS/dev/branch_yushan_merged/src/test/test_complete.f90 (modified) (4 diffs)

XIOS/dev/branch_yushan_merged/src/test/test_complete.f90

@@ -5 +5 @@
   IMPLICIT NONE
   INCLUDE "mpif.h"
-  INTEGER :: rank
+  INTEGER :: rank, size
   INTEGER :: size_loc
   INTEGER :: ierr
@@ -28 +28 @@
   INTEGER, ALLOCATABLE :: kindex(:)
   INTEGER :: ni,ibegin,iend,nj,jbegin,jend
-  INTEGER :: i,j,l,ts,n, nb_pt
+  INTEGER :: i,j,l,ts,n, nb_pt, provided
 
 !!! MPI Initialization
 
-  CALL MPI_INIT(ierr)
+  CALL MPI_INIT_THREAD(3, provided, ierr)
+    if(provided .NE. 3) then
+      print*, "provided thread level = ", provided
+      call MPI_Abort()
+    endif 
+
+  
 
   CALL init_wait
+
+  CALL MPI_COMM_RANK(MPI_COMM_WORLD,rank,ierr)
+  CALL MPI_COMM_SIZE(MPI_COMM_WORLD,size,ierr)
+  if(rank < size-1) then
 
 !!! XIOS Initialization (get the local communicator)
@@ -220 +230 @@
 !####################################################################################
 
-    DO ts=1,24*10
+    DO ts=1,24*2
+    !DO ts=1,24
 
       CALL xios_get_handle("atmosphere",ctx_hdl)
@@ -255 +266 @@
 !!! Fin des contextes
 
-    CALL xios_context_finalize()
-    CALL xios_get_handle("atmosphere",ctx_hdl)
+
+    CALL xios_get_handle("surface",ctx_hdl) 
+
     CALL xios_set_current_context(ctx_hdl)
     CALL xios_context_finalize()
 
+    print *, "xios_context_finalize(surface)" 
+
+     CALL xios_get_handle("atmosphere",ctx_hdl)
+
+     CALL xios_set_current_context(ctx_hdl)
+
+     CALL xios_context_finalize()
+
+     print *, "xios_context_finalize(atmosphere)"
+
+    
+
+!!! Fin de XIOS
+
+    
+
+    CALL xios_finalize()
+
     DEALLOCATE(lon, lat, field_A_atm, lonvalue)
     DEALLOCATE(kindex, field_A_srf)
 
-!!! Fin de XIOS
+     print *, "Client : xios_finalize "
 
     CALL MPI_COMM_FREE(comm, ierr)
 
-    CALL xios_finalize()
+  else
+
+    CALL xios_init_server
+    print *, "Server : xios_finalize "
+  
+    endif
+
 
     CALL MPI_FINALIZE(ierr)