Changeset 1220 for XIOS/dev/branch_openmp/src

Timestamp:

07/20/17 09:18:34 (7 years ago)

Author:

yushan

Message:

test_remap_omp tested on ADA except two fields

Location:

XIOS/dev/branch_openmp/src

Files:

• client_server_mapping.cpp (modified) (2 diffs)
• filter/spatial_transform_filter.cpp (modified) (4 diffs)
• test/test_remap_omp.f90 (modified) (4 diffs)

XIOS/dev/branch_openmp/src/client_server_mapping.cpp

@@ -64 +64 @@
   MPI_Allgather(&nbConnectedServer,1,MPI_INT,recvCount,1,MPI_INT,clientIntraComm) ;
 
+  
+  for(int i=0; i<nbClient; i++)
+    printf("MPI_Allgather : recvCount[%d] = %d\n", i, recvCount[i]);
+
   displ[0]=0 ;
   for(int n=1;n<nbClient;n++) displ[n]=displ[n-1]+recvCount[n-1] ;
@@ -71 +75 @@
 
   MPI_Allgatherv(sendBuff,nbConnectedServer,MPI_INT,recvBuff,recvCount,displ,MPI_INT,clientIntraComm) ;
+
+  for(int i=0; i<recvSize; i++)
+    printf("MPI_Allgatherv : recvBuff[%d] = %d\n", i, recvBuff[i]);
+
+
   for(int n=0;n<recvSize;n++) clientRes[recvBuff[n]]++ ;
 

XIOS/dev/branch_openmp/src/filter/spatial_transform_filter.cpp

@@ -53 +53 @@
     CSpatialTransformFilterEngine* spaceFilter = static_cast<CSpatialTransformFilterEngine*>(engine);
     CDataPacketPtr outputPacket = spaceFilter->applyFilter(data, outputDefaultValue);
+    printf("spalceFilter applied\n");
     if (outputPacket)
       onOutputReady(outputPacket);
@@ -122 +123 @@
     double defaultValue = std::numeric_limits<double>::quiet_NaN();
     if (0 != dataDest.numElements()) ignoreMissingValue = NumTraits<double>::isnan(dataDest(0));
-
+    
+    const std::list<CGridTransformation::SendingIndexGridSourceMap> *listLocalIndexSend_ptr = & (gridTransformation->getLocalIndexToSendFromGridSource());
+    
     const std::list<CGridTransformation::SendingIndexGridSourceMap>& listLocalIndexSend = gridTransformation->getLocalIndexToSendFromGridSource();
     const std::list<CGridTransformation::RecvIndexGridDestinationMap>& listLocalIndexToReceive = gridTransformation->getLocalIndexToReceiveOnGridDest();
@@ -131 +134 @@
     CArray<double,1> dataCurrentDest(dataSrc.copy());
 
-    std::list<CGridTransformation::SendingIndexGridSourceMap>::const_iterator itListSend  = listLocalIndexSend.begin(),
-                                                                              iteListSend = listLocalIndexSend.end();
+    std::list<CGridTransformation::SendingIndexGridSourceMap>::const_iterator itListSend  = listLocalIndexSend_ptr->begin(),
+                                                                              iteListSend = listLocalIndexSend_ptr->end();
     std::list<CGridTransformation::RecvIndexGridDestinationMap>::const_iterator itListRecv = listLocalIndexToReceive.begin();
     std::list<size_t>::const_iterator itNbListRecv = listNbLocalIndexToReceive.begin();
@@ -186 +189 @@
         int srcRank = itRecv->first;
         int countSize = itRecv->second.size();
-        
         MPI_Irecv(recvBuff + currentBuff, countSize, MPI_DOUBLE, srcRank, 12, client->intraComm, &sendRecvRequest[position]);
         position++;

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

@@ -222 +222 @@
   CALL xios_close_context_definition()
 
-!  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))
-
-!  CALL xios_get_axis_attr("src_axis_curvilinear_read", n=src_tmp_n)
-!  CALL xios_get_domain_attr("src_domain_curvilinear_read", ni=src_tmp_ni, nj=src_tmp_nj)
-!  ALLOCATE(tmp_field_1(src_tmp_ni*src_tmp_nj*src_tmp_n))
-
-!  CALL xios_get_domain_attr("src_domain_unstructured_read", ni=src_tmp_ni, nj=src_tmp_nj)
-!  ALLOCATE(tmp_field_2(src_tmp_ni*src_tmp_nj))
-  
-!  CALL xios_recv_field("src_field_regular", tmp_field_0)
-!  CALL xios_recv_field("src_field_curvilinear", tmp_field_1)
-!  CALL xios_recv_field("src_field_unstructured", tmp_field_2)
+  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))
+
+  CALL xios_get_axis_attr("src_axis_curvilinear_read", n=src_tmp_n)
+  CALL xios_get_domain_attr("src_domain_curvilinear_read", ni=src_tmp_ni, nj=src_tmp_nj)
+  ALLOCATE(tmp_field_1(src_tmp_ni*src_tmp_nj*src_tmp_n))
+
+  CALL xios_get_domain_attr("src_domain_unstructured_read", ni=src_tmp_ni, nj=src_tmp_nj)
+  ALLOCATE(tmp_field_2(src_tmp_ni*src_tmp_nj))
+  
+  CALL xios_recv_field("src_field_regular", tmp_field_0)
+  CALL xios_recv_field("src_field_curvilinear", tmp_field_1)
+  CALL xios_recv_field("src_field_unstructured", tmp_field_2)
 
   DO ts=1,10
@@ -252 +252 @@
     CALL xios_send_field("src_field_4D",src_field_4D)
     CALL xios_send_field("src_field_3D_pression",src_field_pression)
- !   CALL xios_send_field("tmp_field_0",tmp_field_0)
- !   CALL xios_send_field("tmp_field_1",tmp_field_1)
- !   CALL xios_send_field("tmp_field_2",tmp_field_2)
+    CALL xios_send_field("tmp_field_0",tmp_field_0)
+    CALL xios_send_field("tmp_field_1",tmp_field_1)
+    CALL xios_send_field("tmp_field_2",tmp_field_2)
     CALL wait_us(5000) ;
    ENDDO
@@ -262 +262 @@
   DEALLOCATE(src_lon, src_lat, src_boundslon,src_boundslat, src_field_2D)
   DEALLOCATE(dst_lon, dst_lat, dst_boundslon,dst_boundslat)
-  !DEALLOCATE(tmp_field_0, tmp_field_1, tmp_field_2)
+  DEALLOCATE(tmp_field_0, tmp_field_1, tmp_field_2)
   
   CALL xios_finalize()
@@ -293 +293 @@
 
 
-