Changeset 278 for XMLIO_V2/dev/common/src/xmlio/data_treatment.hpp

Timestamp:

09/21/11 09:42:30 (13 years ago)

Author:

hozdoba

Message:

Corrections

File:

• XMLIO_V2/dev/common/src/xmlio/data_treatment.hpp (modified) (4 diffs)

XMLIO_V2/dev/common/src/xmlio/data_treatment.hpp

@@ -47 +47 @@
 
             /// Création des sorties ///
-            template <class T> void createDataOutput(void);
+            template <class T> void createDataOutput(comm::MPIComm comm_server = CXIOSManager::Comm_Server);
 
             /// Destructeur ///
@@ -72 +72 @@
 
       template <class T>
-         void CDataTreatment::createDataOutput(void)
+         void CDataTreatment::createDataOutput(comm::MPIComm comm_server )
       {
          std::vector<boost::shared_ptr<CFile> >::const_iterator
@@ -79 +79 @@
          for (; it != end; it++)
          {
+            CXIOSManager::Comm_Server = comm_server;
             boost::shared_ptr<CFile> file = *it;
             StdString filename = (!file->name.isEmpty())
@@ -89 +90 @@
             if (!file->name_suffix.isEmpty())
                 oss << file->name_suffix.getValue();
-            if (comm::CMPIManager::GetCommSize() > 1)
-                oss << "_node" << comm::CMPIManager::GetCommRank();
-            oss << ".nc";
+            if (comm::CMPIManager::GetCommSize(comm_server) > 1)
+                     oss << "." << comm::CMPIManager::GetCommRank(comm_server);
+                 oss << ".nc";
             boost::shared_ptr<io::CDataOutput> dout(new T(oss.str(), false));
             file->initializeDataOutput(dout);