Changeset 1287 for XIOS/dev/branch_openmp/src/node

Timestamp:

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

Author:

yushan

Message:

EP updated

Location:

XIOS/dev/branch_openmp/src/node

Files:

• context.cpp (modified) (2 diffs)
• context.hpp (modified) (1 diff)
• file.cpp (modified) (2 diffs)

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