Changeset 1069 for XIOS/dev/branch_yushan/src/test

Timestamp:

03/09/17 18:13:51 (7 years ago)

Author:

yushan

Message:

Clean Up

Location:

XIOS/dev/branch_yushan/src/test

Files:

• test_client.f90 (modified) (6 diffs)
• test_complete.f90 (modified) (9 diffs)

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

@@ -42 +42 @@
   CALL xios_initialize(id,return_comm=comm)
   
-  print*, "test_client xios_initialize OK"
-
   CALL MPI_COMM_RANK(comm,rank,ierr)
-  print*, "test_client MPI_COMM_RANK OK", rank
   CALL MPI_COMM_SIZE(comm,size,ierr)
-  print*, "test_client MPI_COMM_SIZE OK", size
   
 
@@ -79 +75 @@
 
   CALL xios_get_handle("test",ctx_hdl)
-  print*, "Client xios_get_handle OK"
   CALL xios_set_current_context(ctx_hdl)
-  print*, "Client xios_set_current_handle OK"  
-  
-  
   
   
   CALL xios_get_calendar_type(calendar_type)
-  PRINT *, "calendar_type = ", calendar_type
 
   CALL xios_set_axis_attr("axis_A",n_glo=llm ,value=lval) ;
@@ -105 +96 @@
   dtime%second = 3600
   CALL xios_set_timestep(dtime)
-  print*, "Client xios_set_timestep OK"  
 
   ! The calendar is created as soon as the calendar type is defined. This way
@@ -144 +134 @@
 
   call MPI_Barrier(comm, ierr)
-  PRINT*,"MPI_Barrier OK "
 
   !DO ts=1,24*10
   DO ts=1,6
     CALL xios_update_calendar(ts)
-    print*, "xios_update_calendar OK, ts = ", ts
     CALL xios_send_field("field_A",field_A)
-    print*, "xios_send_field OK, ts = ", ts
     CALL wait_us(5000)
   ENDDO
@@ -157 +144 @@
 
   CALL xios_context_finalize()
-  print*, "xios_context_finalize OK"  
 
   DEALLOCATE(lon, lat, field_A, lonvalue)
@@ -164 +150 @@
 
   CALL xios_finalize()
+  print *, "Client : xios_finalize "
 
    else
 
    CALL xios_init_server
+   print *, "Server : xios_finalize "
   
    endif

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

@@ -34 +34 @@
   CALL MPI_INIT(ierr)
 
+  CALL MPI_COMM_RANK(MPI_COMM_WORLD,rank,ierr)  
+
+  
+
   CALL init_wait
+
+  if (rank <2) then
 
 !!! XIOS Initialization (get the local communicator)
@@ -80 +86 @@
 
   CALL xios_context_initialize("atmosphere",comm)
-  print*, "init context atmosphere comm = ", comm
+!   print*, "init context atmosphere comm = ", comm
 
   CALL xios_get_handle("atmosphere",ctx_hdl)
@@ -137 +143 @@
   CALL xios_close_context_definition()
 
-  print *, "xios_close_context_definition(atmosphere)"
+!   print *, "xios_close_context_definition(atmosphere)"
 
 !!! Test des valeurs des champs/fichiers
@@ -174 +180 @@
 
   CALL xios_context_initialize("surface",comm)
-  print*, "init context surface comm = ", comm
+!   print*, "init context surface comm = ", comm
 
   CALL xios_get_handle("surface",ctx_hdl)
@@ -221 +227 @@
   CALL xios_close_context_definition()
 
- print *, "xios_close_context_definition(surface)" 
+!  print *, "xios_close_context_definition(surface)" 
 
 
@@ -260 +266 @@
     ENDDO
 
-    print *, "end temporal loop"
+!     print *, "end temporal loop"
 
 !####################################################################################
@@ -276 +282 @@
     CALL xios_context_finalize()
 
-    print *, "xios_context_finalize(surface)" 
+!     print *, "xios_context_finalize(surface)" 
 
      CALL xios_get_handle("atmosphere",ctx_hdl)
@@ -284 +290 @@
      CALL xios_context_finalize()
 
-    print *, "xios_context_finalize(atmosphere)"
+!     print *, "xios_context_finalize(atmosphere)"
 
     DEALLOCATE(lon, lat, field_A_atm, lonvalue)
@@ -295 +301 @@
     CALL xios_finalize()
 
-    print *, "xios_finalize"
+     print *, "Client : xios_finalize "
+
+  else 
+    CALL xios_init_server
+
+    print *, "Server : xios_finalize "
+  endif
 
     CALL MPI_FINALIZE(ierr)