Changeset 214 for XMLIO_V2/dev/dev_rv/src/xmlio/server.cpp

Timestamp:

06/14/11 16:20:27 (13 years ago)

Author:

hozdoba

Message:

 

File:

• XMLIO_V2/dev/dev_rv/src/xmlio/server.cpp (modified) (11 diffs)

XMLIO_V2/dev/dev_rv/src/xmlio/server.cpp

@@ -1 +1 @@
 #include "server.hpp"
+
+#include "tree_manager.hpp"
+#include "duration.hpp"
+#include "data_treatment.hpp"
 
 namespace xmlioserver {
@@ -14 +18 @@
    
    ///--------------------------------------------------------------
+
+   boost::shared_ptr<CServer> CServer::Server;
+
+   ///--------------------------------------------------------------
    
    const CBufferList & CServer::getBufferList(void) const 
    {
       return (this->blist);
-   }   
+   }
+
+   ///--------------------------------------------------------------
+
+   boost::shared_ptr<CServer> CServer::CreateServer(MPIComm comm_client_server)
+   {
+      if (CServer::Server.get() != NULL)
+         CServer::Server = boost::shared_ptr<CServer>(new CServer(comm_client_server));
+      return (CServer::GetServer());
+   }
+
+   ///--------------------------------------------------------------
+
+   boost::shared_ptr<CServer> CServer::GetServer(void)
+   {
+      return (CServer::Server);
+   }
    
    //---------------------------------------------------------------
@@ -74 +98 @@
                   this->updateCalendar(lbuffer);
                   continue;
+               case (2) :
+                  this->setTimestep(lbuffer);
+                  continue;
                default  :
                   ERROR("CServer::run(void)", 
@@ -121 +148 @@
        comm::CMPIManager::Barrier();
    }   
-   
+
+   //--------------------------------------------------------------
+
+   void CServer::setTimestep(const std::vector<CLinearBuffer> & buffer)// manager 1, method 2
+   {
+      boost::shared_ptr<CContext> context =
+         CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId());
+      boost::shared_ptr<data::CDataTreatment> dtreat = context->getDataTreatment();
+
+      StdString durationstr;
+      for (StdSize i = 0; i < buffer.size(); i++)
+      {
+         StdString durationstr_ = buffer[i].getString(3);
+         if (durationstr.compare(durationstr_) != 0 && (i != 0))
+         {
+            ERROR("CServer::setTimestep(const std::vector<CLinearBuffer> & buffer)",
+                  << "[ durationstr 1 = " << durationstr   << ", "
+                  << "[ durationstr 2 = " << durationstr_  << "] "
+                  << " Modification de timestep désynchronisé !");
+         }
+         else durationstr = durationstr_;
+
+      }
+      std::cout << "setTimestep called " << durationstr << std::endl;
+      dtreat->set_timestep(date::CDuration::FromString(durationstr));
+   }
+
    //--------------------------------------------------------------
              
@@ -141 +194 @@
       }
       std::cout << "setContext called " << contextId << std::endl;
+      CTreeManager::SetCurrentContextId(contextId);
    }
    
@@ -147 +201 @@
    void CServer::updateCalendar(const std::vector<CLinearBuffer> & buffer) // manager 1, method 1
    {
+      boost::shared_ptr<CContext> context =
+         CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId());
+      boost::shared_ptr<data::CDataTreatment> dtreat = context->getDataTreatment();
+
       int timestep = -1;
       for (StdSize i = 0; i < buffer.size(); i++)
@@ -161 +219 @@
       }
       std::cout << "updateCalendar called " << timestep <<std::endl;
+      dtreat->update_calendar(timestep);
    }
    
@@ -167 +226 @@
    void CServer::writeData(const std::vector<CLinearBuffer> & buffer, int prec)  // manager 2, method 0 - 1
    {
-      StdString fieldId;
+      boost::shared_ptr<CContext> context =
+         CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId());
+      boost::shared_ptr<data::CDataTreatment> dtreat = context->getDataTreatment();
+
+      StdString fieldId, fileId;
       for (StdSize i = 0; i < buffer.size(); i++)
       {
          StdString fieldId_ = buffer[i].getString(3);
+         StdString fileId_ = buffer[i].getString(4);
+
          if (fieldId.compare(fieldId_) != 0 && (i != 0))
          {           
@@ -178 +243 @@
                   << " Ecriture des données désynchronisée !");
          }
-         else fieldId = fieldId_;         
+         else fieldId = fieldId_;
+
+         if (fileId.compare(fileId_) != 0 && (i != 0))
+         {
+            ERROR("CServer::writeData(const std::vector<CLinearBuffer> & buffer, int prec)",
+                  << "[fileId 1 = " << fileId   << ", "
+                  << " fileId 2 = " << fileId_  << "] "
+                  << " Ecriture des données désynchronisée !");
+         }
+         else fileId = fileId_;
       }
       
@@ -185 +259 @@
          std::deque<ARRAY(float, 1)> dataArray(buffer.size());
          for (StdSize i = 0; i < buffer.size(); i++)
-            dataArray[i] = buffer[i].getFloatArray(4);
-
+            dataArray[i] = buffer[i].getFloatArray(5);
          std::cout << "writeData called (float) " << fieldId << ", " << dataArray[0] << std::endl;
+         // Jamais atteint car les données sont transférées en tant que double
          return;
       }      
@@ -194 +268 @@
          std::deque<ARRAY(double, 1)> dataArray(buffer.size());
          for (StdSize i = 0; i < buffer.size(); i++)
-            dataArray[i] = buffer[i].getDoubleArray(4);
-
+            dataArray[i] = buffer[i].getDoubleArray(5);
          std::cout << "writeData called (double) " << fieldId << ", " << dataArray[0]  << std::endl;
+         dtreat->write_data(fieldId, fileId, dataArray);
          return;
       }