Changeset 1141 for XIOS/dev

Timestamp:

05/22/17 14:52:44 (7 years ago)

Author:

yushan

Message:

adding test_remap_omp

Location:

XIOS/dev/branch_yushan_merged

Files:

• bld.cfg (modified) (1 diff)
• extern/remap/src/mapper.cpp (modified) (1 diff)
• src/server.cpp (modified) (1 diff)
• src/test/test_remap.f90 (modified) (1 diff)
• src/test/test_remap_omp.f90 (added)

XIOS/dev/branch_yushan_merged/bld.cfg

@@ -33 +33 @@
 #bld::target libxios.a 
 #bld::target generate_fortran_interface.exe 
-bld::target xios_server.exe 
+#bld::target xios_server.exe 
 bld::target test_remap.exe
 #bld::target test_regular.exe
 #bld::target test_expand_domain.exe
 #bld::target test_new_features.exe test_unstruct_complete.exe 
-bld::target test_omp.exe test_complete_omp.exe
-bld::target test_client.exe test_complete.exe #test_xios2_cmip6.exe
+bld::target test_omp.exe test_complete_omp.exe test_remap_omp.exe
+#bld::target test_client.exe test_complete.exe #test_xios2_cmip6.exe
 #bld::target test_connectivity_expand.exe
 #bld::target toy_cmip6.exe

XIOS/dev/branch_yushan_merged/extern/remap/src/mapper.cpp

@@ -347 +347 @@
     MPI_Waitall(nbSendRequest, sendRequest, status);
     MPI_Waitall(nbRecvRequest, recvRequest, status);
+    
 
     /* now that all values and gradients are available use them to computed interpolated values on target

XIOS/dev/branch_yushan_merged/src/server.cpp

@@ -49 +49 @@
 
         MPI_Comm_size(CXios::globalComm,&size) ;
+        
+        //size = CXios::globalComm.ep_comm_ptr->size_rank_info[0].second;
+        printf("global size = %d, size= %d\n", CXios::globalComm.ep_comm_ptr->size_rank_info[0].second, size);
+        
         MPI_Comm_rank(CXios::globalComm,&rank);
         hashAll=new unsigned long[size] ;

XIOS/dev/branch_yushan_merged/src/test/test_remap.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-2) then
 
 !!! XIOS Initialization (get the local communicator)