Changeset 199 for XMLIO_V2/dev/dev_rv/src/xmlio

Timestamp:

05/19/11 23:51:02 (13 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv/src/xmlio

Files:

• buffer_list.cpp (modified) (3 diffs)
• buffer_pair.hpp (modified) (2 diffs)
• circular_buffer.cpp (modified) (3 diffs)
• client.cpp (modified) (2 diffs)
• client.hpp (modified) (1 diff)
• config/properties.conf (modified) (1 diff)
• main_server.cpp (modified) (1 diff)
• node/grid.cpp (modified) (3 diffs)
• server.cpp (modified) (3 diffs)

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

@@ -36 +36 @@
                   if (SuperClass::operator[](i-1).isAvailable(size))
                   {
-                     std::cout << "Données reçues de " << i << std::endl;
+                     //std::cout << "Données reçues de " << i << std::endl;
                      CMPIManager::ReceiveCircularBuffer
                         (com_client_server, i, SuperClass::operator[](i-1));
@@ -51 +51 @@
          }
          
-         static int u = 0;
-         std::cout << "Nouvelle requête disponible " << u++ << std::endl;
+         //static int u = 0;
+         //std::cout << "Nouvelle requête disponible " << u++ << std::endl;
          /*if (u == 3046)
             for (int i = 1; i < CMPIManager::GetCommSize(com_client_server); i++)
@@ -67 +67 @@
          for (StdSize i = 0; i < this->nbbuffer; i++)
          {
-            std::cout << "Récupération de la requête " << (i+1) << std::endl;
+            //std::cout << "Récupération de la requête " << (i+1) << std::endl;
             lbuffer.push_back(SuperClass::operator[](i).getNextRequest());
          }

XMLIO_V2/dev/dev_rv/src/xmlio/buffer_pair.hpp

@@ -65 +65 @@
                                           const long int & methodId,
                                           A1 * arg1, A2 * arg2, A3 * arg3, A4 * arg4)
-      {
-         static int recurse = 0;
-         if (recurse > 1)
-         {
-            std::cout << "putain :" <<  recurse << "," << this->mustBeSent() 
-                      << "," << currentBuffer << "," << first.getUsedSize() << "," << second.getUsedSize();
-            if ((currentBuffer  ==  0) && (first.getUsedSize()  != 0) && (second_request != -1))
-               std::cout << "," << CMPIManager::Test (second_request);
-            if ((currentBuffer  ==  1) && (second.getUsedSize()  != 0) && (first_request != -1))
-               std::cout << "," << CMPIManager::Test (first_request);
-            std::cout << "," << second_request << "," << first_request << std::endl;
-         }
-         
-         if (recurse == 10) exit (-1);
-         
+      {       
          if (this->mustBeSent()) 
             this->sendCurrentBuffer();
-
            
          CLinearBuffer & cbuffer = this->getCurrentBuffer();
@@ -102 +87 @@
          {
             cbuffer.appendRequestInfos(managerId, methodId, nbargs);
-            recurse = 0;       
          }
          else
          {
-            int o = this->wait();
-            recurse ++;
-            if (recurse > 1)
-            {
-               
-               std::cout << "putain bis:" <<  recurse << "," << this->mustBeSent()  << "," << CMPIManager::Test (o)
-                         << "," << currentBuffer << "," << first.getUsedSize() << "," << second.getUsedSize();
-               if ((currentBuffer  ==  0) && (first.getUsedSize()  != 0) && (second_request != -1))
-                  std::cout << "," << CMPIManager::Test (second_request);
-               if ((currentBuffer  ==  1) && (second.getUsedSize()  != 0) && (first_request != -1))
-                  std::cout << "," << CMPIManager::Test (first_request);
-               std::cout << "," << second_request << "," << first_request << "," << o << std::endl;
-            }
+            this->wait();
             this->prepareRequest(managerId, methodId, arg1, arg2, arg3, arg4);
          }

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

@@ -69 +69 @@
          this->movePRead(currsize);
          this->nbrequest--;
-         std::cout <<  this->nbrequest << std::endl;
+         //std::cout <<  this->nbrequest << std::endl;
         
          return (CLinearBuffer(SuperClass::getData(startpos), currsize));
@@ -118 +118 @@
          {
             this->clear();
+            return;
          }
          
@@ -206 +207 @@
 
       StdSize CCircularBuffer::getNumberOfRequest(void) const
-      { return (this->nbrequest); }
+      { 
+         return (this->nbrequest); 
+      }
+
+      //---------------------------------------------------------------
 
       StdSize CCircularBuffer::getReadPosition(void) const
-      { return (this->p_read); }
+      { 
+         return (this->p_read); 
+      }
+
+      //---------------------------------------------------------------
 
       StdSize CCircularBuffer::getWritePosition(void) const
-      { return (this->p_write); }
+      { 
+         return (this->p_write); 
+      }
+
+      //---------------------------------------------------------------
 
       StdSize CCircularBuffer::getUnusedPosition(void) const
-      { return (this->p_unused); }
+      { 
+         return (this->p_unused); 
+      }
 
       //---------------------------------------------------------------

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

@@ -10 +10 @@
    CClient::CClient(MPIComm comm_client_server)
       : bpair(comm_client_server)
-   { /* Ne rien faire de plus */ }  
+   { 
+      this->initialize();
+   }  
         
    CClient::~CClient(void)
-   { /* Ne rien faire de plus */ } 
+   { 
+      this->finalize();
+   } 
    
    ///--------------------------------------------------------------
@@ -42 +46 @@
                                        CLinearBuffer::NULL_ARG);
       // Pas d'argument à ajouter.
-      this->bpair.sendCurrentBuffer(); 
+      this->bpair.sendCurrentBuffer();
+      comm::CMPIManager::Barrier();
    }
    

XMLIO_V2/dev/dev_rv/src/xmlio/client.hpp

@@ -27 +27 @@
          /// Accesseur ///
          const CBufferPair & getBufferPair(void) const;
-         
-      public :
-      
+              
          /// Appels distants///   
          void initialize(void); // manager 0, method 0
          void finalize(void);   // manager 0, method 1
-             
+         
+      public : 
+       
          void setContext(const StdString & idContext); // manager 1, method 0
          void updateCalendar(long int timestep);       // manager 1, method 1
          
-         void sendData(const StdString & fieldId, const ARRAY(float, 1) dataArray);  // manager 2, method 0
+         void sendData(const StdString & fieldId, const ARRAY(float, 1)  dataArray); // manager 2, method 0
          void sendData(const StdString & fieldId, const ARRAY(double, 1) dataArray); // manager 2, method 1
          

XMLIO_V2/dev/dev_rv/src/xmlio/config/properties.conf

@@ -15 +15 @@
 
 /// Buffer Size ///
-DECLARE_PROPERTY (StdSize, BUFFER_CLIENT_SIZE, 1E6) // 1 Mo
+DECLARE_PROPERTY (StdSize, BUFFER_CLIENT_SIZE,  1E6) // 1 Mo
 DECLARE_PROPERTY (StdSize, BUFFER_SERVER_SIZE, 10E6) // 10 Mo
 

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

@@ -15 +15 @@
    try
    {
-      ARRAY_CREATE(value0, double, 1, [200]);
-      ARRAY_CREATE(value1, double, 1, [1000]);
-      ARRAY_CREATE(value2, double, 1, [2000]);
-      comm::CMPIManager::Initialise(&argc, &argv); // < seulement en mode connecté
-      
-      if (comm::CMPIManager::IsMaster(comm::CMPIManager::GetCommWorld()))
-      {
-         comm::CServer server(comm::CMPIManager::GetCommWorld());
-         server.run();
-         std::cout << "fin serveur" << std::endl;
-         comm::CMPIManager::Barrier();
-         
-      }
-      else
-      {
-         
-         comm::CClient client(comm::CMPIManager::GetCommWorld());
-         client.initialize();
-         client.setContext("lol");
-         
-         for (int j = 0; j < 10000; j++)
-         {
-            client.updateCalendar(j);
-            client.sendData("mon_champ0", value0);
-            client.sendData("mon_champ1", value1);
-            client.sendData("mon_champ2", value2);
-         }
-         client.finalize();
-         comm::CMPIManager::Barrier();
-      }
-      
-      comm::CMPIManager::Finalize(); // < seulement en mode connecté
+      //comm::CMPIManager::Initialise(&argc, &argv); // < seulement en mode connecté
+      //comm::CMPIManager::Finalize();               // < seulement en mode connecté
       
      
-      /*CXIOSManager::Initialise(CXIOSManager::CLIENT_SERVER, &argc, &argv);
-      
+      CXIOSManager::Initialise(CXIOSManager::CLIENT_SERVER, &argc, &argv);      
       CXIOSManager::AddClient("nemo"    , 4, 2, &nemo_fake_entry);
       //CXIOSManager::AddClient("orchidee", 1, 1, &orchidee_fake_entry);
       //CXIOSManager::AddClient("lmdz"    , 4, 2, &lmdz_fake_entry);
       CXIOSManager::RunClientServer(comm::CMPIManager::GetCommWorld());
-      CXIOSManager::Finalize();*/
-      
-      
-
+      CXIOSManager::Finalize();     
    }
    catch (CException & exc)

XMLIO_V2/dev/dev_rv/src/xmlio/node/grid.cpp

@@ -346 +346 @@
       const int ibegin_srv = this->domain->ibegin.getValue();
       const int jbegin_srv = this->domain->jbegin.getValue();
+      const int zoom_ni_srv   = this->domain->zoom_ni.getValue();
+      const int zoom_nj_srv   = this->domain->zoom_nj.getValue();
       
       const int ibegin_zoom_srv = this->domain->zoom_ibegin_loc.getValue();
@@ -379 +381 @@
          }
                   
-         dn += storeIndex_cl->size();
-                 
+         dn += storeIndex_cl->size();                 
+      }
+           
+      if (storeIndex_srv->size() != 0)
+      {
+         const int ibegin_t = 
+            *std::min_element(out_i_index_srv->begin(), out_i_index_srv->end());
+         const int iend_t   =
+            *std::max_element(out_i_index_srv->begin(), out_i_index_srv->end());
+         const int jbegin_t =   
+            *std::min_element(out_j_index_srv->begin(), out_j_index_srv->end());
+         const int jend_t   =
+            *std::max_element(out_j_index_srv->begin(), out_j_index_srv->end());
+            
+         if (ibegin_t < 0) 
+         {
+            std::cout << "Erreur 1 " << std::endl;
+         }
+         if (jbegin_t < 0) 
+         {
+            std::cout << "Erreur 2 " <<  std::endl;
+         }
+         if (iend_t >= zoom_ni_srv)
+         {
+            std::cout << "Erreur 3 " << std::endl;
+         }
+         if (jend_t >= zoom_nj_srv) 
+         {
+            std::cout << "Erreur 4 " << std::endl;
+         }
       }
       
@@ -392 +422 @@
       //~ }
       //~ ofs.close();
+      this->storeIndex.resize(1);
+      this->out_i_index.resize(1);
+      this->out_j_index.resize(1);
+      this->out_l_index.resize(1);
       
    }

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

@@ -112 +112 @@
    void CServer::initialize(void) // manager 0, method 0
    {
-      std::cout << "initialize called " << std::endl;
+      // Ne rien faire de plus
    }
    
@@ -119 +119 @@
    void CServer::finalize(void) // manager 0, method 1
    {
-      std::cout << "finalize called " << std::endl;
+       comm::CMPIManager::Barrier();
    }   
    
@@ -159 +159 @@
          }
          else timestep = timestep_;
-         
       }
       std::cout << "updateCalendar called " << timestep <<std::endl;