Changeset 1287 for XIOS/dev/branch_openmp/src

Timestamp:

10/04/17 11:45:14 (7 years ago)

Author:

yushan

Message:

EP updated

Location:

XIOS/dev/branch_openmp/src

Files:

• client_server_mapping.cpp (modified) (2 diffs)
• data_output.hpp (modified) (1 diff)
• filter/spatial_transform_filter.cpp (modified) (1 diff)
• group_factory_decl.cpp (modified) (1 diff)
• io/inetcdf4.cpp (modified) (1 diff)
• io/onetcdf4.cpp (modified) (2 diffs)
• node/context.cpp (modified) (2 diffs)
• node/context.hpp (modified) (1 diff)
• node/file.cpp (modified) (2 diffs)
• object_factory_decl.cpp (modified) (1 diff)
• object_template.hpp (modified) (1 diff)
• object_template_impl.hpp (modified) (4 diffs)

XIOS/dev/branch_openmp/src/client_server_mapping.cpp

@@ -65 +65 @@
 
   
-  for(int i=0; i<nbClient; i++)
-    printf("MPI_Allgather : recvCount[%d] = %d\n", i, recvCount[i]);
+  // for(int i=0; i<nbClient; i++)
+  //   printf("MPI_Allgather : recvCount[%d] = %d\n", i, recvCount[i]);
 
   displ[0]=0 ;
@@ -76 +76 @@
   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 i=0; i<recvSize; i++)
+  //   printf("MPI_Allgatherv : recvBuff[%d] = %d\n", i, recvBuff[i]);
 
 

XIOS/dev/branch_openmp/src/data_output.hpp

@@ -59 +59 @@
             virtual void writeTimeDimension_(void)           = 0;
             virtual void writeTimeAxis_ (CField*     field,
-                                         const shared_ptr<CCalendar> cal) = 0;
+                                         const boost::shared_ptr<CCalendar> cal) = 0;
 
             /// Propriétés protégées ///

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);

XIOS/dev/branch_openmp/src/group_factory_decl.cpp

@@ -5 +5 @@
 {
 # define  macro(U) \
-  template void CGroupFactory::AddGroup<U>(shared_ptr<U> pgroup,shared_ptr<U> cgroup); \
-  template void CGroupFactory::AddChild<U>(shared_ptr<U> group, shared_ptr<U::RelChild> child); \
-  template shared_ptr<U>  CGroupFactory::GetGroup<U>(shared_ptr<U> group, const StdString & id); \
-  template shared_ptr<U::RelChild> CGroupFactory::GetChild<U>(shared_ptr<U> group, const StdString & id); \
-  template int CGroupFactory::GetGroupNum<U>(shared_ptr<U> group); \
-  template int CGroupFactory::GetGroupIdNum<U>(shared_ptr<U> group); \
-  template int CGroupFactory::GetChildNum<U>(shared_ptr<U> group); \
+  template void CGroupFactory::AddGroup<U>(boost::shared_ptr<U> pgroup,boost::shared_ptr<U> cgroup); \
+  template void CGroupFactory::AddChild<U>(boost::shared_ptr<U> group, boost::shared_ptr<U::RelChild> child); \
+  template boost::shared_ptr<U>  CGroupFactory::GetGroup<U>(boost::shared_ptr<U> group, const StdString & id); \
+  template boost::shared_ptr<U::RelChild> CGroupFactory::GetChild<U>(boost::shared_ptr<U> group, const StdString & id); \
+  template int CGroupFactory::GetGroupNum<U>(boost::shared_ptr<U> group); \
+  template int CGroupFactory::GetGroupIdNum<U>(boost::shared_ptr<U> group); \
+  template int CGroupFactory::GetChildNum<U>(boost::shared_ptr<U> group); \
   template int CGroupFactory::GetChildIdNum<U>(boost::shared_ptr<U> group); \
-  template bool CGroupFactory::HasGroup<U>(shared_ptr<U> group, const StdString & id); \
+  template bool CGroupFactory::HasGroup<U>(boost::shared_ptr<U> group, const StdString & id); \
   template bool CGroupFactory::HasChild<U>(boost::shared_ptr<U> group, const StdString & id); \
-  template shared_ptr<U> CGroupFactory::CreateGroup<U>(shared_ptr<U> group, const StdString & id ); \
-  template shared_ptr<U::RelChild>  CGroupFactory::CreateChild<U>(shared_ptr<U> group, const StdString & id);
+  template boost::shared_ptr<U> CGroupFactory::CreateGroup<U>(boost::shared_ptr<U> group, const StdString & id ); \
+  template boost::shared_ptr<U::RelChild>  CGroupFactory::CreateChild<U>(boost::shared_ptr<U> group, const StdString & id);
 
   macro(CFieldGroup)

XIOS/dev/branch_openmp/src/io/inetcdf4.cpp

@@ -23 +23 @@
 
     mpi = comm && !multifile;
-    MPI_Info m_info = MPI_INFO_NULL_STD;
+    MPI_Info m_info = MPI_INFO_NULL.mpi_info;
 
     // 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

@@ -56 +56 @@
             CTimer::get("Files : create").resume();
             if (wmpi)
-               CNetCdfInterface::createPar(filename, mode, *comm, MPI_INFO_NULL_STD, this->ncidp);
+               CNetCdfInterface::createPar(filename, mode, *comm, MPI_INFO_NULL.mpi_info, this->ncidp);
             else
                CNetCdfInterface::create(filename, mode, this->ncidp);
@@ -68 +68 @@
             CTimer::get("Files : open").resume();
             if (wmpi)
-               CNetCdfInterface::openPar(filename, mode, *comm, MPI_INFO_NULL_STD, this->ncidp);
+               CNetCdfInterface::openPar(filename, mode, *comm, MPI_INFO_NULL.mpi_info, this->ncidp);
             else
                CNetCdfInterface::open(filename, mode, this->ncidp);

XIOS/dev/branch_openmp/src/node/context.cpp

@@ -21 +21 @@
 
   //shared_ptr<CContextGroup> CContext::root;
-  shared_ptr<CContextGroup> * CContext::root_ptr = 0;
+  boost::shared_ptr<CContextGroup> * CContext::root_ptr = 0;
 
    /// ////////////////////// Dfinitions ////////////////////// ///
@@ -63 +63 @@
       if(root_ptr == 0) //root_ptr = new shared_ptr<CContextGroup>;
       // if (root_ptr->get()==NULL) 
-      root_ptr = new shared_ptr<CContextGroup>(new CContextGroup(xml::CXMLNode::GetRootName()));
+      root_ptr = new boost::shared_ptr<CContextGroup>(new CContextGroup(xml::CXMLNode::GetRootName()));
       return root_ptr->get();
    }

XIOS/dev/branch_openmp/src/node/context.hpp

@@ -208 +208 @@
          //static shared_ptr<CContextGroup> root;
 
-         static shared_ptr<CContextGroup> *root_ptr;
+         static boost::shared_ptr<CContextGroup> *root_ptr;
          #pragma omp threadprivate(root_ptr)
 

XIOS/dev/branch_openmp/src/node/file.cpp

@@ -482 +482 @@
          if (isOpen) data_out->closeFile();
 
-        data_out = shared_ptr<CDataOutput>(new CNc4DataOutput(this, oss.str(), append, useClassicFormat, useCFConvention,
+        data_out = boost::shared_ptr<CDataOutput>(new CNc4DataOutput(this, oss.str(), append, useClassicFormat, useCFConvention,
                                                               static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective, time_counter_name));
         isOpen = true;
@@ -600 +600 @@
       multifile = true;
       if (isOpen) data_out->closeFile();
-      if (time_counter_name.isEmpty()) data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective));
-      else data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective, time_counter_name));
+      if (time_counter_name.isEmpty()) data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective));
+      else data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective, time_counter_name));
       isOpen = true;
       #else
       if (isOpen) data_out->closeFile();
-      if (time_counter_name.isEmpty()) data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective));
-      else data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective, time_counter_name));
+      if (time_counter_name.isEmpty()) data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective));
+      else data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective, time_counter_name));
       isOpen = true;
       #endif

XIOS/dev/branch_openmp/src/object_factory_decl.cpp

@@ -5 +5 @@
 {
 #define macro(U) \
-  template shared_ptr<U> CObjectFactory::GetObject<U>(const StdString& id);  \
-  template shared_ptr<U> CObjectFactory::GetObject<U>(const StdString& context,const StdString& id); \
-  template shared_ptr<U> CObjectFactory::GetObject<U>(const U* const object); \
+  template boost::shared_ptr<U> CObjectFactory::GetObject<U>(const StdString& id);  \
+  template boost::shared_ptr<U> CObjectFactory::GetObject<U>(const StdString& context,const StdString& id); \
+  template boost::shared_ptr<U> CObjectFactory::GetObject<U>(const U* const object); \
   template int CObjectFactory::GetObjectNum<U>(void); \
   template int CObjectFactory::GetObjectIdNum<U>(void); \
-  template const std::vector<shared_ptr<U> >& CObjectFactory::GetObjectVector<U>(const StdString& context ); \
+  template const std::vector<boost::shared_ptr<U> >& CObjectFactory::GetObjectVector<U>(const StdString& context ); \
   template bool CObjectFactory::HasObject<U>(const StdString& id); \
   template bool CObjectFactory::HasObject<U>(const StdString& context,const StdString& id); \

XIOS/dev/branch_openmp/src/object_template.hpp

@@ -77 +77 @@
          static T* get(const string& contextId, const string& id) ;
          T* get(void) ;
-         shared_ptr<T> getShared(void) ;
-         static shared_ptr<T> getShared(const T* ptr) ;
+         boost::shared_ptr<T> getShared(void) ;
+         static boost::shared_ptr<T> getShared(const T* ptr) ;
 
          static T* create(const string& id=string("")) ;

XIOS/dev/branch_openmp/src/object_template_impl.hpp

@@ -321 +321 @@
 
    template <typename T>
-   shared_ptr<T> CObjectTemplate<T>::getShared(const T* ptr)
+   boost::shared_ptr<T> CObjectTemplate<T>::getShared(const T* ptr)
    {
      return CObjectFactory::GetObject<T>(ptr);
@@ -327 +327 @@
 
    template <typename T>
-   shared_ptr<T> CObjectTemplate<T>::getShared(void)
+   boost::shared_ptr<T> CObjectTemplate<T>::getShared(void)
    {
      return CObjectFactory::GetObject<T>((T*)this);
@@ -335 +335 @@
    const vector<T*> CObjectTemplate<T>::getAll()
    {
-     const vector< shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>();
+     const vector< boost::shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>();
      vector<T*> vect;
 
-     typename vector<shared_ptr<T> >::const_iterator it;
+     typename vector<boost::shared_ptr<T> >::const_iterator it;
      for(it=shared_vect.begin();it!=shared_vect.end();++it) vect.push_back(it->get());
      return vect;
@@ -346 +346 @@
    const vector<T*> CObjectTemplate<T>::getAll(const string & id)
    {
-     const vector< shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>(id);
+     const vector< boost::shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>(id);
      vector<T*> vect;
 
-     typename vector<shared_ptr<T> >::const_iterator it;
+     typename vector<boost::shared_ptr<T> >::const_iterator it;
      for(it=shared_vect.begin();it!=shared_vect.end();++it) vect.push_back(it->get());
      return vect;