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

Timestamp:

01/23/19 10:31:44 (5 years ago)

Author:

yushan

Message:

dev on ADA. add flag switch _usingEP/_usingMPI

Location:

XIOS/dev/branch_openmp/src/test

Files:

• parse_xml.f90 (modified) (1 diff)
• test_client.f90 (modified) (2 diffs)
• test_omp.f90 (modified) (6 diffs)

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

@@ -9 +9 @@
 
   CALL xios_init() ! This will parse the XML file and report any parsing error
+  WRITE (*,*) 'Parsing finished successfully.'
 
 END PROGRAM parse_xml

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

@@ -37 +37 @@
 
   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)
@@ -143 +139 @@
     CALL xios_send_field("field_Domain",field_domain)
     CALL xios_send_field("field_Scalar",scalar)
-    CALL wait_us(5000)
+    CALL wait_us(5000) ;
   ENDDO
 
   CALL xios_context_finalize()
-  CALL xios_finalize()
 
-  DEALLOCATE(lon, lat, field_A, lonvalue, axisValue, field_domain)
+  DEALLOCATE(lon, lat, field_A, lonvalue)
 
   CALL MPI_COMM_FREE(comm, ierr)
 
-  else  !!server
-
-    CALL xios_init_server
-    print *, "Server : xios_finalize "
-  
-  endif
-    
+  CALL xios_finalize()
 
   CALL MPI_FINALIZE(ierr)

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

@@ -3 +3 @@
   USE xios
   USE mod_wait
-  use omp_lib
+  USE omp_lib
   IMPLICIT NONE
   INCLUDE "mpif.h"
@@ -34 +34 @@
 
 !!! MPI Initialization   
-
     CALL MPI_INIT_THREAD(3, provided, ierr)
-    if(provided .NE. 3) then
+    if(provided .LT. 3) then
       print*, "provided thread level = ", provided
       call MPI_Abort()
     endif
-
+    !CALL VTINIT(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
+    if(rank < size-4) then
 
-    !$omp parallel default(firstprivate)
   
     CALL xios_initialize(id,return_comm=comm)
-  
+    print*, "comm = ", comm
     CALL MPI_COMM_RANK(comm,rank,ierr)
     CALL MPI_COMM_SIZE(comm,size,ierr)
 
-    size = size*omp_get_num_threads()
-    rank = rank*omp_get_num_threads() + omp_get_thread_num()
 
     DO j=1,nj_glo
@@ -142 +138 @@
    ni=0 ; lonvalue(:,:)=0;
    CALL xios_get_domain_attr("domain_A",ni=ni,lonvalue_2D=lonvalue)
-   print *,"ni",ni
-   print *,"lonvalue",lonvalue;
+   !print *,"ni",ni
+   !print *,"lonvalue",lonvalue;
 
    CALL xios_is_defined_field_attr("field_A",enabled=ok)
@@ -154 +150 @@
     CALL xios_update_calendar(ts)
     CALL xios_send_field("field_A",field_A)
-    CALL xios_send_field("field_Axis",axisValue)
+    !CALL xios_send_field("field_Axis",axisValue)
     ! CALL xios_send_field("field_Axis",lval)
-    CALL xios_send_field("field_Domain",field_domain)
-    CALL xios_send_field("field_Scalar",scalar)
+    !CALL xios_send_field("field_Domain",field_domain)
+    !CALL xios_send_field("field_Scalar",scalar)
     CALL wait_us(5000)
    ENDDO
@@ -165 +161 @@
 
     CALL xios_finalize()
-    print*, "xios finalize OK", rank, size
+    print*, "xios_finalize OK", rank, size
 
     DEALLOCATE(lon, lat, field_A, lonvalue, axisValue, field_domain)
-    !$omp master 
-    !call MPI_Barrier(comm)
+    print*, "deallocate OK", rank, size
     CALL MPI_COMM_FREE(comm, ierr)
-    !$omp end master
-
-    !$omp barrier
 
 
 
-  !$omp end parallel
+
 
 
@@ -183 +175 @@
 
     CALL xios_init_server
-    print *, "Server : xios_finalize "
+    
+    print*, "server ready to end ", rank, size
   
     endif
     
-
+  CALL MPI_BARRIER(MPI_COMM_WORLD, ierr)
+  CALL MPI_BARRIER(MPI_COMM_WORLD, ierr)
+  CALL MPI_COMM_RANK(MPI_COMM_WORLD, rank, ierr)
+  CALL MPI_COMM_SIZE(MPI_COMM_WORLD, size, ierr)
+  print*, "before MPI_Finalize : rank = ", rank, size
   CALL MPI_FINALIZE(ierr)
+  !CALL VTFINI(ierr)
+  print*, "after MPI_Finalize : rank = ", rank, size
 
 END PROGRAM test_omp