Changeset 1328 for XIOS/dev/branch_openmp/src/test

Timestamp:

11/15/17 12:14:34 (6 years ago)

Author:

yushan

Message:

dev_omp

Location:

XIOS/dev/branch_openmp/src/test

Files:

• test_client.f90 (modified) (4 diffs)
• test_complete.f90 (modified) (4 diffs)
• test_remap.f90 (modified) (2 diffs)

XIOS/dev/branch_openmp/src/test/test_client.f90

@@ -35 +35 @@
 
   CALL MPI_INIT(ierr)
+
   CALL init_wait
-
-  CALL MPI_COMM_RANK(MPI_COMM_WORLD,rank,ierr)
-  if(rank < 2) then
 
 !!! XIOS Initialization (get the local communicator)
@@ -74 +72 @@
 
   CALL xios_context_initialize("test",comm)
-
   CALL xios_get_handle("test",ctx_hdl)
   CALL xios_set_current_context(ctx_hdl)
@@ -128 +125 @@
   CALL xios_is_defined_field_attr("field_A",enabled=ok)
   PRINT *,"field_A : attribute enabled is defined ? ",ok
-  
   CALL xios_close_context_definition()
 
   PRINT*,"field field_A is active ? ",xios_field_is_active("field_A")
-
-  call MPI_Barrier(comm, ierr)
-
   DO ts=1,24*10
     CALL xios_update_calendar(ts)
     CALL xios_send_field("field_A",field_A)
-    CALL wait_us(5000)
+    CALL wait_us(5000) ;
   ENDDO
 
@@ -148 +141 @@
 
   CALL xios_finalize()
-  print *, "Client : xios_finalize "
-
-    else
-
-    CALL xios_init_server
-    print *, "Server : xios_finalize "
-  
-    endif
-    
 
   CALL MPI_FINALIZE(ierr)

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

@@ -5 +5 @@
   IMPLICIT NONE
   INCLUDE "mpif.h"
-  INTEGER :: rank, size
+  INTEGER :: rank
   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, provided
+  INTEGER :: i,j,l,ts,n, nb_pt
 
 !!! MPI Initialization
 
-  CALL MPI_INIT_THREAD(3, provided, ierr)
-    if(provided .NE. 3) then
-      print*, "provided thread level = ", provided
-      call MPI_Abort()
-    endif 
-
-  
+  CALL MPI_INIT(ierr)
 
   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)
@@ -230 +220 @@
 !####################################################################################
 
-    DO ts=1,24*2
-    !DO ts=1,24
+    DO ts=1,24*10
 
       CALL xios_get_handle("atmosphere",ctx_hdl)
@@ -266 +255 @@
 !!! Fin des contextes
 
-
-    CALL xios_get_handle("surface",ctx_hdl) 
-
+    CALL xios_context_finalize()
+    CALL xios_get_handle("atmosphere",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)
 
-     print *, "Client : xios_finalize "
+!!! Fin de XIOS
 
     CALL MPI_COMM_FREE(comm, ierr)
 
-  else
-
-    CALL xios_init_server
-    print *, "Server : xios_finalize "
-  
-    endif
-
+    CALL xios_finalize()
 
     CALL MPI_FINALIZE(ierr)

XIOS/dev/branch_openmp/src/test/test_remap.f90

@@ -42 +42 @@
   CALL MPI_INIT(ierr)
   CALL init_wait
-  
-  CALL MPI_COMM_RANK(MPI_COMM_WORLD,rank,ierr)
-  CALL MPI_COMM_SIZE(MPI_COMM_WORLD,size,ierr)
-  if(rank < size-2) then
 
 !!! XIOS Initialization (get the local communicator)
@@ -232 +228 @@
 
   CALL xios_finalize()
-  
-  print *, "Client : xios_finalize "
-
-    else
-
-    CALL xios_init_server
-    print *, "Server : xios_finalize "
-  
-    endif
 
   CALL MPI_FINALIZE(ierr)