Changeset 1900 for XIOS/branchs/xios-2.5/src/node

Timestamp:

06/12/20 12:04:23 (4 years ago)

Author:

yushan

Message:

xios-2.5 : minormodif for Jean-Zay after system maintenance to RH8 and complr update frr om 8 à to 8.3.1. To be checked

Location:

XIOS/branchs/xios-2.5/src/node

Files:

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

XIOS/branchs/xios-2.5/src/node/axis.cpp

@@ -623 +623 @@
       
         std::vector<int> serverZeroIndex;
-        serverZeroIndex = serverDescription.computeServerGlobalIndexInRange(std::make_pair<size_t,size_t>(indexBegin, indexEnd), 0);      
+        serverZeroIndex = serverDescription.computeServerGlobalIndexInRange(std::make_pair(indexBegin, indexEnd), 0);      
 
         std::list<int> serverZeroIndexLeader;

XIOS/branchs/xios-2.5/src/node/context.cpp

@@ -23 +23 @@
 namespace xios {
 
-  shared_ptr<CContextGroup> CContext::root;
+  boost::shared_ptr<CContextGroup> CContext::root;
 
    /// ////////////////////// Définitions ////////////////////// ///
@@ -66 +66 @@
    CContextGroup* CContext::getRoot(void)
    {
-      if (root.get()==NULL) root=shared_ptr<CContextGroup>(new CContextGroup(xml::CXMLNode::GetRootName()));
+      if (root.get()==NULL) root=boost::shared_ptr<CContextGroup>(new CContextGroup(xml::CXMLNode::GetRootName()));
       return root.get();
    }
@@ -476 +476 @@
          //! Free internally allocated communicators
          for (std::list<MPI_Comm>::iterator it = comms.begin(); it != comms.end(); ++it)
-           /* MPI_Comm_free(&(*it)) */ ; // WARNING remove freeing communicator !! --> deadlock raised, to be checked
+           MPI_Comm_free(&(*it));
          comms.clear();
 
@@ -518 +518 @@
          //! Free internally allocated communicators
          for (std::list<MPI_Comm>::iterator it = comms.begin(); it != comms.end(); ++it)
-           /* MPI_Comm_free(&(*it)) */;  // WARNING remove freeing communicator !! --> deadlock raised, to be checked
+           MPI_Comm_free(&(*it));
          comms.clear();
 
@@ -532 +532 @@
    {
      for (std::list<MPI_Comm>::iterator it = comms.begin(); it != comms.end(); ++it)
-       /* MPI_Comm_free(&(*it)) */ ; // WARNING remove freeing communicator !! --> deadlock raised, to be checked
+       MPI_Comm_free(&(*it));
      comms.clear();
    }

XIOS/branchs/xios-2.5/src/node/context.hpp

@@ -241 +241 @@
 
          // Context root
-         static shared_ptr<CContextGroup> root;
+         static boost::shared_ptr<CContextGroup> root;
 
          // Determine context on client or not

XIOS/branchs/xios-2.5/src/node/domain.cpp

@@ -1834 +1834 @@
            CServerDistributionDescription serverDescription(nGlobDomain, nbServer);
            std::vector<int> serverZeroIndex;
-           if (isUnstructed_) serverZeroIndex = serverDescription.computeServerGlobalIndexInRange(std::make_pair<size_t,size_t>(indexBegin, indexEnd), 0);
-           else serverZeroIndex = serverDescription.computeServerGlobalIndexInRange(std::make_pair<size_t,size_t>(indexBegin, indexEnd), 1);
+           if (isUnstructed_) serverZeroIndex = serverDescription.computeServerGlobalIndexInRange(std::make_pair(indexBegin, indexEnd), 0);
+           else serverZeroIndex = serverDescription.computeServerGlobalIndexInRange(std::make_pair(indexBegin, indexEnd), 1);
 
            std::list<int> serverZeroIndexLeader;

XIOS/branchs/xios-2.5/src/node/file.cpp

@@ -545 +545 @@
          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,
                                                               fileComm, multifile, isCollective, time_counter_name));
         isOpen = true;
@@ -669 +669 @@
       bool ugridConvention = !convention.isEmpty() ? (convention == convention_attr::UGRID) : false;
       if (time_counter_name.isEmpty())
-        data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, readMetaDataPar, ugridConvention));
+        data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, readMetaDataPar, ugridConvention));
       else
-        data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, readMetaDataPar, ugridConvention, time_counter_name));
+        data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, readMetaDataPar, ugridConvention, time_counter_name));
       isOpen = true;
     }