Ignore:
Timestamp:
07/20/17 09:18:34 (5 years ago)
Author:
yushan
Message:

test_remap_omp tested on ADA except two fields

Location:
XIOS/dev/branch_openmp/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/branch_openmp/src/client_server_mapping.cpp

    r843 r1220  
    6464  MPI_Allgather(&nbConnectedServer,1,MPI_INT,recvCount,1,MPI_INT,clientIntraComm) ; 
    6565 
     66   
     67  for(int i=0; i<nbClient; i++) 
     68    printf("MPI_Allgather : recvCount[%d] = %d\n", i, recvCount[i]); 
     69 
    6670  displ[0]=0 ; 
    6771  for(int n=1;n<nbClient;n++) displ[n]=displ[n-1]+recvCount[n-1] ; 
     
    7175 
    7276  MPI_Allgatherv(sendBuff,nbConnectedServer,MPI_INT,recvBuff,recvCount,displ,MPI_INT,clientIntraComm) ; 
     77 
     78  for(int i=0; i<recvSize; i++) 
     79    printf("MPI_Allgatherv : recvBuff[%d] = %d\n", i, recvBuff[i]); 
     80 
     81 
    7382  for(int n=0;n<recvSize;n++) clientRes[recvBuff[n]]++ ; 
    7483 
  • XIOS/dev/branch_openmp/src/filter/spatial_transform_filter.cpp

    r1203 r1220  
    5353    CSpatialTransformFilterEngine* spaceFilter = static_cast<CSpatialTransformFilterEngine*>(engine); 
    5454    CDataPacketPtr outputPacket = spaceFilter->applyFilter(data, outputDefaultValue); 
     55    printf("spalceFilter applied\n"); 
    5556    if (outputPacket) 
    5657      onOutputReady(outputPacket); 
     
    122123    double defaultValue = std::numeric_limits<double>::quiet_NaN(); 
    123124    if (0 != dataDest.numElements()) ignoreMissingValue = NumTraits<double>::isnan(dataDest(0)); 
    124  
     125     
     126    const std::list<CGridTransformation::SendingIndexGridSourceMap> *listLocalIndexSend_ptr = & (gridTransformation->getLocalIndexToSendFromGridSource()); 
     127     
    125128    const std::list<CGridTransformation::SendingIndexGridSourceMap>& listLocalIndexSend = gridTransformation->getLocalIndexToSendFromGridSource(); 
    126129    const std::list<CGridTransformation::RecvIndexGridDestinationMap>& listLocalIndexToReceive = gridTransformation->getLocalIndexToReceiveOnGridDest(); 
     
    131134    CArray<double,1> dataCurrentDest(dataSrc.copy()); 
    132135 
    133     std::list<CGridTransformation::SendingIndexGridSourceMap>::const_iterator itListSend  = listLocalIndexSend.begin(), 
    134                                                                               iteListSend = listLocalIndexSend.end(); 
     136    std::list<CGridTransformation::SendingIndexGridSourceMap>::const_iterator itListSend  = listLocalIndexSend_ptr->begin(), 
     137                                                                              iteListSend = listLocalIndexSend_ptr->end(); 
    135138    std::list<CGridTransformation::RecvIndexGridDestinationMap>::const_iterator itListRecv = listLocalIndexToReceive.begin(); 
    136139    std::list<size_t>::const_iterator itNbListRecv = listNbLocalIndexToReceive.begin(); 
     
    186189        int srcRank = itRecv->first; 
    187190        int countSize = itRecv->second.size(); 
    188          
    189191        MPI_Irecv(recvBuff + currentBuff, countSize, MPI_DOUBLE, srcRank, 12, client->intraComm, &sendRecvRequest[position]); 
    190192        position++; 
  • XIOS/dev/branch_openmp/src/test/test_remap_omp.f90

    r1203 r1220  
    222222  CALL xios_close_context_definition() 
    223223 
    224 !  CALL xios_get_domain_attr("src_domain_regular_read", ni=src_tmp_ni, nj=src_tmp_nj) 
    225 !  ALLOCATE(tmp_field_0(src_tmp_ni*src_tmp_nj)) 
    226  
    227 !  CALL xios_get_axis_attr("src_axis_curvilinear_read", n=src_tmp_n) 
    228 !  CALL xios_get_domain_attr("src_domain_curvilinear_read", ni=src_tmp_ni, nj=src_tmp_nj) 
    229 !  ALLOCATE(tmp_field_1(src_tmp_ni*src_tmp_nj*src_tmp_n)) 
    230  
    231 !  CALL xios_get_domain_attr("src_domain_unstructured_read", ni=src_tmp_ni, nj=src_tmp_nj) 
    232 !  ALLOCATE(tmp_field_2(src_tmp_ni*src_tmp_nj)) 
    233    
    234 !  CALL xios_recv_field("src_field_regular", tmp_field_0) 
    235 !  CALL xios_recv_field("src_field_curvilinear", tmp_field_1) 
    236 !  CALL xios_recv_field("src_field_unstructured", tmp_field_2) 
     224  CALL xios_get_domain_attr("src_domain_regular_read", ni=src_tmp_ni, nj=src_tmp_nj) 
     225  ALLOCATE(tmp_field_0(src_tmp_ni*src_tmp_nj)) 
     226 
     227  CALL xios_get_axis_attr("src_axis_curvilinear_read", n=src_tmp_n) 
     228  CALL xios_get_domain_attr("src_domain_curvilinear_read", ni=src_tmp_ni, nj=src_tmp_nj) 
     229  ALLOCATE(tmp_field_1(src_tmp_ni*src_tmp_nj*src_tmp_n)) 
     230 
     231  CALL xios_get_domain_attr("src_domain_unstructured_read", ni=src_tmp_ni, nj=src_tmp_nj) 
     232  ALLOCATE(tmp_field_2(src_tmp_ni*src_tmp_nj)) 
     233   
     234  CALL xios_recv_field("src_field_regular", tmp_field_0) 
     235  CALL xios_recv_field("src_field_curvilinear", tmp_field_1) 
     236  CALL xios_recv_field("src_field_unstructured", tmp_field_2) 
    237237 
    238238  DO ts=1,10 
     
    252252    CALL xios_send_field("src_field_4D",src_field_4D) 
    253253    CALL xios_send_field("src_field_3D_pression",src_field_pression) 
    254  !   CALL xios_send_field("tmp_field_0",tmp_field_0) 
    255  !   CALL xios_send_field("tmp_field_1",tmp_field_1) 
    256  !   CALL xios_send_field("tmp_field_2",tmp_field_2) 
     254    CALL xios_send_field("tmp_field_0",tmp_field_0) 
     255    CALL xios_send_field("tmp_field_1",tmp_field_1) 
     256    CALL xios_send_field("tmp_field_2",tmp_field_2) 
    257257    CALL wait_us(5000) ; 
    258258   ENDDO 
     
    262262  DEALLOCATE(src_lon, src_lat, src_boundslon,src_boundslat, src_field_2D) 
    263263  DEALLOCATE(dst_lon, dst_lat, dst_boundslon,dst_boundslat) 
    264   !DEALLOCATE(tmp_field_0, tmp_field_1, tmp_field_2) 
     264  DEALLOCATE(tmp_field_0, tmp_field_1, tmp_field_2) 
    265265   
    266266  CALL xios_finalize() 
     
    293293 
    294294 
    295  
Note: See TracChangeset for help on using the changeset viewer.