Changeset 274 for XMLIO_V2/dev/common/src/xmlio/manager/xios_manager.cpp

Timestamp:

09/15/11 10:19:26 (13 years ago)

Author:

hozdoba

Message:

nouvelle interface fortran et corrections

File:

• XMLIO_V2/dev/common/src/xmlio/manager/xios_manager.cpp (modified) (5 diffs)

XMLIO_V2/dev/common/src/xmlio/manager/xios_manager.cpp

@@ -67 +67 @@
          StdString main_data_tree = clientBuffer[0]->getString(0);        
          tree::CTreeManager::FromBinary(main_data_tree);
+         std::cout << "main_data_tree" << main_data_tree.size() << std::endl;
          
          // Obtention des sous-domaines clients.
@@ -74 +75 @@
             tree::CTreeManager::DomainsFromBinary(main_data_tree);
          }
+         
+         StdOStringStream osss;
+         osss << StdString("./def_server_next.")
+              << CMPIManager::GetCommRank(CMPIManager::GetCommWorld());
+         CTreeManager::PrintTreeToFile(osss.str());
 
          {  // Traitement de tous les contextes
@@ -82 +88 @@
                                it = def_vector.begin(), end = def_vector.end();
 
-            for (; it != end; it++)
+            //for (; it != end; it++ )
             {
                boost::shared_ptr<CContext> context = *it;
+               CTreeManager::SetCurrentContextId(context->getId());
                boost::shared_ptr<data::CDataTreatment> dt(new data::CDataTreatment (context));
                context->setDataTreatment(dt);
@@ -93 +100 @@
         
          StdOStringStream oss;
-         oss << StdString("data/def/def_server_end.")
+         oss << StdString("./def_server_end.")
              << CMPIManager::GetCommRank(CMPIManager::GetCommWorld());
          CTreeManager::PrintTreeToFile(oss.str());      
@@ -233 +240 @@
       //---------------------------------------------------------------
       
-      void CXIOSManager::RunClient(comm::MPIComm comm_client)
-      {
-         CXIOSManager::Status  = LOC_CLIENT_SERVER;
-         (CXIOSManager::Clients.begin()->second.entry)(comm_client, comm_client, comm_client);
+      void CXIOSManager::RunClient(bool launch, comm::MPIComm comm_client)
+      {
+         if (launch)
+         {
+            CXIOSManager::Status  = LOC_CLIENT_SERVER;         
+            (CXIOSManager::Clients.begin()->second.entry)
+               (comm_client, comm_client, comm_client);
+         }
+         else
+         {
+            CXIOSManager::Status  = LOC_CLIENT;
+         }
       }