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

Timestamp:

05/02/17 16:20:47 (7 years ago)

Author:

yushan

Message:

test_omp OK

Location:

XIOS/dev/branch_yushan/src/test

Files:

• test_complete.f90 (modified) (11 diffs)
• test_complete_omp.f90 (added)
• test_omp.f90 (modified) (4 diffs)

XIOS/dev/branch_yushan/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_COMM_RANK(MPI_COMM_WORLD,rank,ierr)  
+  CALL MPI_INIT_THREAD(3, provided, ierr)
+    if(provided .NE. 3) then
+      print*, "provided thread level = ", provided
+      call MPI_Abort()
+    endif 
 
   
@@ -40 +42 @@
   CALL init_wait
 
-  if (rank <2) then
+  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)
@@ -86 +90 @@
 
   CALL xios_context_initialize("atmosphere",comm)
-!   print*, "init context atmosphere comm = ", comm
 
   CALL xios_get_handle("atmosphere",ctx_hdl)
@@ -96 +99 @@
 
   CALL xios_set_axis_attr("axis_atm",n_glo=llm ,value=lval) ;
-!  CALL xios_set_zoom_axis_attr("axis_atm_zoom",n=2);
 
   CALL xios_set_domain_attr("domain_atm",ni_glo=ni_glo, nj_glo=nj_glo, ibegin=ibegin, ni=ni,jbegin=jbegin,nj=nj, type='curvilinear')
@@ -105 +107 @@
   CALL xios_set_domain_attr("domain_atm_zoom",data_dim=2, data_ibegin=-1, data_ni=ni+2, data_jbegin=-2, data_nj=nj+4)
   CALL xios_set_domain_attr("domain_atm_zoom",lonvalue_2D=lon,latvalue_2D=lat)
-!  CALL xios_set_zoom_domain_attr("domain_atm_zoom",ibegin=39, ni=20, jbegin=39, nj=5)
+
 
 !!! Activation du groupe field_definition
@@ -143 +145 @@
   CALL xios_close_context_definition()
 
-!   print *, "xios_close_context_definition(atmosphere)"
+   print *, "xios_close_context_definition(atmosphere)"
 
 !!! Test des valeurs des champs/fichiers
@@ -180 +182 @@
 
   CALL xios_context_initialize("surface",comm)
-!   print*, "init context surface comm = ", comm
+
 
   CALL xios_get_handle("surface",ctx_hdl)
@@ -227 +229 @@
   CALL xios_close_context_definition()
 
-!  print *, "xios_close_context_definition(surface)" 
+  print *, "xios_close_context_definition(surface)" 
 
 
@@ -266 +268 @@
     ENDDO
 
-!     print *, "end temporal loop"
+     print *, "end temporal loop"
 
 !####################################################################################
@@ -274 +276 @@
 !!! Fin des contextes
 
-    !print *, "start : xios_context_finalize(surface)"
 
     CALL xios_get_handle("surface",ctx_hdl) 
-    !print *, "xios_get_handle (surface) OK"
+
     CALL xios_set_current_context(ctx_hdl)
-    !print *, "xios_set_current_context (surface) OK"
+
     CALL xios_context_finalize()
 
-!     print *, "xios_context_finalize(surface)" 
+    print *, "xios_context_finalize(surface)" 
 
      CALL xios_get_handle("atmosphere",ctx_hdl)
-!     !print *, "xios_get_handle (atmosphere) OK"
+
      CALL xios_set_current_context(ctx_hdl)
-!     !print *, "xios_set_current_context (atmosphere) OK"
+
      CALL xios_context_finalize()
 
-!     print *, "xios_context_finalize(atmosphere)"
+     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
+    DEALLOCATE(kindex, field_A_srf)
+
+     print *, "Client : xios_finalize "
 
     CALL MPI_COMM_FREE(comm, ierr)
 
-    CALL xios_finalize()
-
-     print *, "Client : xios_finalize "
-
-  else 
+  else
+
     CALL xios_init_server
-
     print *, "Server : xios_finalize "
-  endif
+  
+    endif
+
 
     CALL MPI_FINALIZE(ierr)

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

@@ -44 +44 @@
 
     CALL MPI_COMM_RANK(MPI_COMM_WORLD,rank,ierr)
-    if(rank < 2) then
+    CALL MPI_COMM_SIZE(MPI_COMM_WORLD,size,ierr)
+    if(rank < size-1) then
 
     !$omp parallel default(private)
@@ -100 +101 @@
     CALL xios_set_domain_attr("domain_A",lonvalue_2D=lon,latvalue_2D=lat)
     CALL xios_set_fieldgroup_attr("field_definition",enabled=.TRUE.)
-!     print*, "test block OK", rank, size
+     print*, "test block OK", rank, size
 
-!   CALL xios_get_handle("field_definition",fieldgroup_hdl)
-!   CALL xios_add_child(fieldgroup_hdl,field_hdl,"field_B")
-!   CALL xios_set_attr(field_hdl,field_ref="field_A",name="field_B")
+    CALL xios_get_handle("field_definition",fieldgroup_hdl)
+    CALL xios_add_child(fieldgroup_hdl,field_hdl,"field_B")
+    CALL xios_set_attr(field_hdl,field_ref="field_A",name="field_B")
 
-!   CALL xios_get_handle("output",file_hdl)
-!   CALL xios_add_child(file_hdl,field_hdl)
-!   CALL xios_set_attr(field_hdl,field_ref="field_A",name="field_C")
+    CALL xios_get_handle("output",file_hdl)
+    CALL xios_add_child(file_hdl,field_hdl)
+    CALL xios_set_attr(field_hdl,field_ref="field_A_zoom",name="field_C")
 
     dtime%second = 3600
@@ -158 +159 @@
     print*, "xios_context_finalize OK", rank, size
 
+    CALL xios_finalize()
+    print*, "xios finalize OK", rank, size
+
+    DEALLOCATE(lon, lat, field_A, lonvalue)
     !$omp master 
     !call MPI_Barrier(comm)
@@ -167 +172 @@
      print*, "MPI_COMM_FREE OK", rank, size
 
-    CALL xios_finalize()
-    print*, "xios finalize OK", rank, size
-
-    DEALLOCATE(lon, lat, field_A, lonvalue)