Changeset 1329

Timestamp:

11/15/17 12:51:25 (7 years ago)

Author:

yushan

Message:

dev_omp

Location:

XIOS/dev/branch_openmp

Files:

• bld.cfg (modified) (1 diff)
• src/test/test_remap_omp.f90 (modified) (15 diffs)
• src/test/test_remap_ref.f90 (added)

XIOS/dev/branch_openmp/bld.cfg

@@ -42 +42 @@
 bld::target test_remap.exe 
 bld::target test_remap_ref.exe 
+bld::target test_remap_omp.exe 
 #bld::target test_unstruct_omp.exe
 #bld::target test_netcdf_omp.exe

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

@@ -3 +3 @@
   USE xios
   USE mod_wait
-  use omp_lib
+  USE omp_lib
   USE netcdf
 
@@ -37 +37 @@
   INTEGER :: varid
   INTEGER :: ts
-  INTEGER :: i,j, provided
+  INTEGER :: i,j
   INTEGER,PARAMETER :: llm=5, interpolatedLlm = 4, llm2 = 6
   DOUBLE PRECISION, PARAMETER :: missing_value = 100000
-
-    CALL MPI_INIT_THREAD(3, provided, ierr)
+  INTEGER :: provided
+
+  CALL MPI_INIT_THREAD(3, provided, ierr)
     if(provided .NE. 3) then
       print*, "provided thread level = ", provided
@@ -47 +48 @@
     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-2) then
-
-  !$omp parallel default(firstprivate) firstprivate(dtime)
+ 
+  !$omp parallel default(firstprivate) 
 
 !!! XIOS Initialization (get the local communicator)
@@ -63 +64 @@
   size = size*omp_get_num_threads()
 
-  
+  print*, "rank = ", rank, " size = ", size
+
   !$omp critical (open_file)
   ierr=NF90_OPEN(src_file, NF90_NOWRITE, ncid)
-  !$omp end critical (open_file)
-
-  ierr=NF90_INQ_VARID(ncid,"bounds_lon",varid)
-  ierr=NF90_INQUIRE_VARIABLE(ncid, varid, dimids=dimids)
+  ierr=NF90_INQ_VARID(ncid,"bounds_lon",varid)
+  ierr=NF90_INQUIRE_VARIABLE(ncid, varid,dimids=dimids)
   ierr=NF90_INQUIRE_DIMENSION(ncid, dimids(1), len=src_nvertex)
   ierr=NF90_INQUIRE_DIMENSION(ncid, dimids(2), len=src_ni_glo)
@@ -82 +82 @@
     src_ibegin= remain * (div+1) + (rank-remain) * div ;
   ENDIF
-
-  if(src_ni .LE. 0) CALL MPI_ABORT()
-
 
   ALLOCATE(src_lon(src_ni), src_lon_tmp(src_ni))
@@ -98 +95 @@
   ALLOCATE(lval1(interpolatedLlm))
   ALLOCATE(lval2(llm2))
-  lval2 = 0
-  lval=0
-  lval1=0
 
   ierr=NF90_INQ_VARID(ncid,"lon",varid)
@@ -147 +141 @@
   ENDDO
 
-  !$omp critical (open_file)
+  print*, "ID = ", rank, "src_ni = ", "src_nvertex = ", src_nvertex, "src_ni_glo = ", src_ni_glo
+
   ierr=NF90_OPEN(dst_file, NF90_NOWRITE, ncid)
-  !$omp end critical (open_file)
-
-  
   ierr=NF90_INQ_VARID(ncid,"bounds_lon",varid)
   ierr=NF90_INQUIRE_VARIABLE(ncid, varid,dimids=dimids)
@@ -167 +159 @@
   ENDIF
 
-  if(dst_ni .LE. 0) CALL MPI_ABORT()
-
   ALLOCATE(dst_lon(dst_ni))
   ALLOCATE(dst_lat(dst_ni))
@@ -182 +172 @@
   ierr=NF90_INQ_VARID(ncid,"bounds_lat",varid)
   ierr=NF90_GET_VAR(ncid,varid, dst_boundslat, start=(/1,dst_ibegin+1/),count=(/dst_nvertex,dst_ni/))
-
-   !$omp barrier
+  
+  !$omp end critical (open_file)
+  
+  !$omp barrier
 
   !$omp master 
@@ -191 +183 @@
   !$omp barrier
 
-  
   CALL xios_context_initialize("test",comm)
   CALL xios_get_handle("test",ctx_hdl)
   CALL xios_set_current_context(ctx_hdl)
-  
+
   CALL xios_set_domain_attr("src_domain", ni_glo=src_ni_glo, ibegin=src_ibegin, ni=src_ni, type="unstructured")
   CALL xios_set_domain_attr("src_domain", lonvalue_1D=src_lon, latvalue_1D=src_lat, &
@@ -216 +207 @@
                             bounds_lon_1D=src_boundslon, bounds_lat_1D=src_boundslat, nvertex=src_nvertex)
 
+
   dtime%second = 3600
-  
   CALL xios_set_timestep(dtime)
 
   CALL xios_close_context_definition()
-
+  print *, "xios_close_context_definition OK "
+  
   CALL xios_get_domain_attr("src_domain_regular_read", ni=src_tmp_ni, nj=src_tmp_nj)
   ALLOCATE(tmp_field_0(src_tmp_ni*src_tmp_nj))
@@ -257 +249 @@
     CALL wait_us(5000) ;
    ENDDO
-  
+
   CALL xios_context_finalize()
 
@@ -263 +255 @@
   DEALLOCATE(dst_lon, dst_lat, dst_boundslon,dst_boundslat)
   DEALLOCATE(tmp_field_0, tmp_field_1, tmp_field_2)
-  
+
   CALL xios_finalize()
   
@@ -277 +269 @@
 
   !$omp end parallel
-
-
-    else
+  else
 
     CALL xios_init_server
-    print *, "Server : xios_finalize "
-  
-    endif
+    print *, "Server : xios_finalize ", rank
+  
+  endif
+
+  
 
   CALL MPI_FINALIZE(ierr)
@@ -293 +285 @@
 
 
+