Ignore:
Timestamp:
06/15/17 19:32:13 (7 years ago)
Author:
yushan
Message:

save dev. need to unify the file type when using EP

Location:
XIOS/dev/branch_yushan_merged/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/branch_yushan_merged/src/client_client_dht_template_impl.hpp

    r1164 r1172  
    718718    MPI_Irecv(&recvBuff[0]+2*idx, 2, MPI_INT, 
    719719              recvRank[idx], MPI_DHT_INDEX_0, this->internalComm_, &request[nRequest]); 
    720     printf("proc %d recv from proc %d with tag %d\n", my_rank, recvRank[idx], MPI_DHT_INDEX_0);           
    721720    ++nRequest; 
    722721  } 
     
    735734    MPI_Isend(&sendBuff[idx*2], 2, MPI_INT, 
    736735              sendRank[idx], MPI_DHT_INDEX_0, this->internalComm_, &request[nRequest]); 
    737     printf("proc %d send to proc %d with tag %d\n", my_rank, sendRank[idx], MPI_DHT_INDEX_0); 
    738736    ++nRequest; 
    739737  } 
  • XIOS/dev/branch_yushan_merged/src/io/inetcdf4.cpp

    r1138 r1172  
    2121        comm = NULL; 
    2222    } 
     23 
    2324    mpi = comm && !multifile; 
    2425    MPI_Info m_info = MPI_INFO_NULL_STD; 
  • XIOS/dev/branch_yushan_merged/src/io/nc4_data_input.cpp

    r1138 r1172  
    5555    CArray<double,1> fieldData(grid->getWrittenDataSize()); 
    5656    if (!field->default_value.isEmpty()) fieldData = field->default_value; 
    57  
     57    #ifdef _usingEP 
     58    SuperClass::type = ONE_FILE; 
     59    //printf("SuperClass::type = %d\n", SuperClass::type); 
     60    #endif 
    5861    switch (SuperClass::type) 
    5962    { 
  • XIOS/dev/branch_yushan_merged/src/io/nc4_data_output.cpp

    r1160 r1172  
    11021102 
    11031103            SuperClassWriter::definition_end(); 
    1104  
     1104            printf("SuperClass::type = %d\n", SuperClass::type); 
    11051105            switch (SuperClass::type) 
    11061106            { 
  • XIOS/dev/branch_yushan_merged/src/node/file.cpp

    r1160 r1172  
    579579 
    580580      #ifdef _usingEP 
    581       if(omp_get_num_threads() != 1 ) multifile = true; 
    582       #endif 
    583  
     581      //printf("multifile was %d\n", multifile); 
     582      multifile = true; 
    584583      if (isOpen) data_out->closeFile(); 
    585584      if (time_counter_name.isEmpty()) data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective)); 
    586585      else data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective, time_counter_name)); 
    587586      isOpen = true; 
     587      #else 
     588      if (isOpen) data_out->closeFile(); 
     589      if (time_counter_name.isEmpty()) data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective)); 
     590      else data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective, time_counter_name)); 
     591      isOpen = true; 
     592      #endif 
     593 
     594       
    588595    } 
    589596  } 
Note: See TracChangeset for help on using the changeset viewer.