Ignore:
Timestamp:
10/04/17 11:45:14 (5 years ago)
Author:
yushan
Message:

EP updated

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

Legend:

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

    r1220 r1287  
    6565 
    6666   
    67   for(int i=0; i<nbClient; i++) 
    68     printf("MPI_Allgather : recvCount[%d] = %d\n", i, recvCount[i]); 
     67  // for(int i=0; i<nbClient; i++) 
     68  //   printf("MPI_Allgather : recvCount[%d] = %d\n", i, recvCount[i]); 
    6969 
    7070  displ[0]=0 ; 
     
    7676  MPI_Allgatherv(sendBuff,nbConnectedServer,MPI_INT,recvBuff,recvCount,displ,MPI_INT,clientIntraComm) ; 
    7777 
    78   for(int i=0; i<recvSize; i++) 
    79     printf("MPI_Allgatherv : recvBuff[%d] = %d\n", i, recvBuff[i]); 
     78  // for(int i=0; i<recvSize; i++) 
     79  //   printf("MPI_Allgatherv : recvBuff[%d] = %d\n", i, recvBuff[i]); 
    8080 
    8181 
  • XIOS/dev/branch_openmp/src/data_output.hpp

    r1096 r1287  
    5959            virtual void writeTimeDimension_(void)           = 0; 
    6060            virtual void writeTimeAxis_ (CField*     field, 
    61                                          const shared_ptr<CCalendar> cal) = 0; 
     61                                         const boost::shared_ptr<CCalendar> cal) = 0; 
    6262 
    6363            /// Propriétés protégées /// 
  • XIOS/dev/branch_openmp/src/filter/spatial_transform_filter.cpp

    r1220 r1287  
    5353    CSpatialTransformFilterEngine* spaceFilter = static_cast<CSpatialTransformFilterEngine*>(engine); 
    5454    CDataPacketPtr outputPacket = spaceFilter->applyFilter(data, outputDefaultValue); 
    55     printf("spalceFilter applied\n"); 
    5655    if (outputPacket) 
    5756      onOutputReady(outputPacket); 
  • XIOS/dev/branch_openmp/src/group_factory_decl.cpp

    r976 r1287  
    55{ 
    66# define  macro(U) \ 
    7   template void CGroupFactory::AddGroup<U>(shared_ptr<U> pgroup,shared_ptr<U> cgroup); \ 
    8   template void CGroupFactory::AddChild<U>(shared_ptr<U> group, shared_ptr<U::RelChild> child); \ 
    9   template shared_ptr<U>  CGroupFactory::GetGroup<U>(shared_ptr<U> group, const StdString & id); \ 
    10   template shared_ptr<U::RelChild> CGroupFactory::GetChild<U>(shared_ptr<U> group, const StdString & id); \ 
    11   template int CGroupFactory::GetGroupNum<U>(shared_ptr<U> group); \ 
    12   template int CGroupFactory::GetGroupIdNum<U>(shared_ptr<U> group); \ 
    13   template int CGroupFactory::GetChildNum<U>(shared_ptr<U> group); \ 
     7  template void CGroupFactory::AddGroup<U>(boost::shared_ptr<U> pgroup,boost::shared_ptr<U> cgroup); \ 
     8  template void CGroupFactory::AddChild<U>(boost::shared_ptr<U> group, boost::shared_ptr<U::RelChild> child); \ 
     9  template boost::shared_ptr<U>  CGroupFactory::GetGroup<U>(boost::shared_ptr<U> group, const StdString & id); \ 
     10  template boost::shared_ptr<U::RelChild> CGroupFactory::GetChild<U>(boost::shared_ptr<U> group, const StdString & id); \ 
     11  template int CGroupFactory::GetGroupNum<U>(boost::shared_ptr<U> group); \ 
     12  template int CGroupFactory::GetGroupIdNum<U>(boost::shared_ptr<U> group); \ 
     13  template int CGroupFactory::GetChildNum<U>(boost::shared_ptr<U> group); \ 
    1414  template int CGroupFactory::GetChildIdNum<U>(boost::shared_ptr<U> group); \ 
    15   template bool CGroupFactory::HasGroup<U>(shared_ptr<U> group, const StdString & id); \ 
     15  template bool CGroupFactory::HasGroup<U>(boost::shared_ptr<U> group, const StdString & id); \ 
    1616  template bool CGroupFactory::HasChild<U>(boost::shared_ptr<U> group, const StdString & id); \ 
    17   template shared_ptr<U> CGroupFactory::CreateGroup<U>(shared_ptr<U> group, const StdString & id ); \ 
    18   template shared_ptr<U::RelChild>  CGroupFactory::CreateChild<U>(shared_ptr<U> group, const StdString & id); 
     17  template boost::shared_ptr<U> CGroupFactory::CreateGroup<U>(boost::shared_ptr<U> group, const StdString & id ); \ 
     18  template boost::shared_ptr<U::RelChild>  CGroupFactory::CreateChild<U>(boost::shared_ptr<U> group, const StdString & id); 
    1919 
    2020  macro(CFieldGroup) 
  • XIOS/dev/branch_openmp/src/io/inetcdf4.cpp

    r1172 r1287  
    2323 
    2424    mpi = comm && !multifile; 
    25     MPI_Info m_info = MPI_INFO_NULL_STD; 
     25    MPI_Info m_info = MPI_INFO_NULL.mpi_info; 
    2626 
    2727    // The file format will be detected automatically by NetCDF, it is safe to always set NC_MPIIO 
  • XIOS/dev/branch_openmp/src/io/onetcdf4.cpp

    r1205 r1287  
    5656            CTimer::get("Files : create").resume(); 
    5757            if (wmpi) 
    58                CNetCdfInterface::createPar(filename, mode, *comm, MPI_INFO_NULL_STD, this->ncidp); 
     58               CNetCdfInterface::createPar(filename, mode, *comm, MPI_INFO_NULL.mpi_info, this->ncidp); 
    5959            else 
    6060               CNetCdfInterface::create(filename, mode, this->ncidp); 
     
    6868            CTimer::get("Files : open").resume(); 
    6969            if (wmpi) 
    70                CNetCdfInterface::openPar(filename, mode, *comm, MPI_INFO_NULL_STD, this->ncidp); 
     70               CNetCdfInterface::openPar(filename, mode, *comm, MPI_INFO_NULL.mpi_info, this->ncidp); 
    7171            else 
    7272               CNetCdfInterface::open(filename, mode, this->ncidp); 
  • XIOS/dev/branch_openmp/src/node/context.cpp

    r1205 r1287  
    2121 
    2222  //shared_ptr<CContextGroup> CContext::root; 
    23   shared_ptr<CContextGroup> * CContext::root_ptr = 0; 
     23  boost::shared_ptr<CContextGroup> * CContext::root_ptr = 0; 
    2424 
    2525   /// ////////////////////// Dfinitions ////////////////////// /// 
     
    6363      if(root_ptr == 0) //root_ptr = new shared_ptr<CContextGroup>; 
    6464      // if (root_ptr->get()==NULL)  
    65       root_ptr = new shared_ptr<CContextGroup>(new CContextGroup(xml::CXMLNode::GetRootName())); 
     65      root_ptr = new boost::shared_ptr<CContextGroup>(new CContextGroup(xml::CXMLNode::GetRootName())); 
    6666      return root_ptr->get(); 
    6767   } 
  • XIOS/dev/branch_openmp/src/node/context.hpp

    r1134 r1287  
    208208         //static shared_ptr<CContextGroup> root; 
    209209 
    210          static shared_ptr<CContextGroup> *root_ptr; 
     210         static boost::shared_ptr<CContextGroup> *root_ptr; 
    211211         #pragma omp threadprivate(root_ptr) 
    212212 
  • XIOS/dev/branch_openmp/src/node/file.cpp

    r1205 r1287  
    482482         if (isOpen) data_out->closeFile(); 
    483483 
    484         data_out = shared_ptr<CDataOutput>(new CNc4DataOutput(this, oss.str(), append, useClassicFormat, useCFConvention, 
     484        data_out = boost::shared_ptr<CDataOutput>(new CNc4DataOutput(this, oss.str(), append, useClassicFormat, useCFConvention, 
    485485                                                              static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective, time_counter_name)); 
    486486        isOpen = true; 
     
    600600      multifile = true; 
    601601      if (isOpen) data_out->closeFile(); 
    602       if (time_counter_name.isEmpty()) data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective)); 
    603       else data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective, time_counter_name)); 
     602      if (time_counter_name.isEmpty()) data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective)); 
     603      else data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective, time_counter_name)); 
    604604      isOpen = true; 
    605605      #else 
    606606      if (isOpen) data_out->closeFile(); 
    607       if (time_counter_name.isEmpty()) data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective)); 
    608       else data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective, time_counter_name)); 
     607      if (time_counter_name.isEmpty()) data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective)); 
     608      else data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective, time_counter_name)); 
    609609      isOpen = true; 
    610610      #endif 
  • XIOS/dev/branch_openmp/src/object_factory_decl.cpp

    r976 r1287  
    55{ 
    66#define macro(U) \ 
    7   template shared_ptr<U> CObjectFactory::GetObject<U>(const StdString& id);  \ 
    8   template shared_ptr<U> CObjectFactory::GetObject<U>(const StdString& context,const StdString& id); \ 
    9   template shared_ptr<U> CObjectFactory::GetObject<U>(const U* const object); \ 
     7  template boost::shared_ptr<U> CObjectFactory::GetObject<U>(const StdString& id);  \ 
     8  template boost::shared_ptr<U> CObjectFactory::GetObject<U>(const StdString& context,const StdString& id); \ 
     9  template boost::shared_ptr<U> CObjectFactory::GetObject<U>(const U* const object); \ 
    1010  template int CObjectFactory::GetObjectNum<U>(void); \ 
    1111  template int CObjectFactory::GetObjectIdNum<U>(void); \ 
    12   template const std::vector<shared_ptr<U> >& CObjectFactory::GetObjectVector<U>(const StdString& context ); \ 
     12  template const std::vector<boost::shared_ptr<U> >& CObjectFactory::GetObjectVector<U>(const StdString& context ); \ 
    1313  template bool CObjectFactory::HasObject<U>(const StdString& id); \ 
    1414  template bool CObjectFactory::HasObject<U>(const StdString& context,const StdString& id); \ 
  • XIOS/dev/branch_openmp/src/object_template.hpp

    r1134 r1287  
    7777         static T* get(const string& contextId, const string& id) ; 
    7878         T* get(void) ; 
    79          shared_ptr<T> getShared(void) ; 
    80          static shared_ptr<T> getShared(const T* ptr) ; 
     79         boost::shared_ptr<T> getShared(void) ; 
     80         static boost::shared_ptr<T> getShared(const T* ptr) ; 
    8181 
    8282         static T* create(const string& id=string("")) ; 
  • XIOS/dev/branch_openmp/src/object_template_impl.hpp

    r1134 r1287  
    321321 
    322322   template <typename T> 
    323    shared_ptr<T> CObjectTemplate<T>::getShared(const T* ptr) 
     323   boost::shared_ptr<T> CObjectTemplate<T>::getShared(const T* ptr) 
    324324   { 
    325325     return CObjectFactory::GetObject<T>(ptr); 
     
    327327 
    328328   template <typename T> 
    329    shared_ptr<T> CObjectTemplate<T>::getShared(void) 
     329   boost::shared_ptr<T> CObjectTemplate<T>::getShared(void) 
    330330   { 
    331331     return CObjectFactory::GetObject<T>((T*)this); 
     
    335335   const vector<T*> CObjectTemplate<T>::getAll() 
    336336   { 
    337      const vector< shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>(); 
     337     const vector< boost::shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>(); 
    338338     vector<T*> vect; 
    339339 
    340      typename vector<shared_ptr<T> >::const_iterator it; 
     340     typename vector<boost::shared_ptr<T> >::const_iterator it; 
    341341     for(it=shared_vect.begin();it!=shared_vect.end();++it) vect.push_back(it->get()); 
    342342     return vect; 
     
    346346   const vector<T*> CObjectTemplate<T>::getAll(const string & id) 
    347347   { 
    348      const vector< shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>(id); 
     348     const vector< boost::shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>(id); 
    349349     vector<T*> vect; 
    350350 
    351      typename vector<shared_ptr<T> >::const_iterator it; 
     351     typename vector<boost::shared_ptr<T> >::const_iterator it; 
    352352     for(it=shared_vect.begin();it!=shared_vect.end();++it) vect.push_back(it->get()); 
    353353     return vect; 
Note: See TracChangeset for help on using the changeset viewer.