Changeset 266 for XMLIO_V2/dev/common/src/xmlio/node/grid.cpp

Timestamp:

09/06/11 16:45:08 (13 years ago)

Author:

hozdoba

Message:

Corrections après tests sur titane

File:

• XMLIO_V2/dev/common/src/xmlio/node/grid.cpp (modified) (18 diffs)

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

@@ +1 @@
+
 #include "grid.hpp"
 
@@ -100 +101 @@
    //---------------------------------------------------------------
 
-   std::vector<StdSize> CGrid::getShape(void) const
+   std::vector<StdSize> CGrid::getLocalShape(void) const
    {
       std::vector<StdSize> retvalue;
-      retvalue.push_back(this->domain->ni.getValue());
-      retvalue.push_back(this->domain->nj.getValue());
+      retvalue.push_back(domain->zoom_ni_loc.getValue());
+      retvalue.push_back(domain->zoom_nj_loc.getValue());
       if (this->withAxis)
          retvalue.push_back(this->axis->size.getValue());
@@ -111 +112 @@
    //---------------------------------------------------------------
    
-   StdSize CGrid::getSize(void) const
+   StdSize CGrid::getLocalSize(void) const
    {
       StdSize retvalue = 1;
-      std::vector<StdSize> shape_ = this->getShape();
+      std::vector<StdSize> shape_ = this->getLocalShape();
+      for (StdSize s = 0; s < shape_.size(); s++)
+         retvalue *= shape_[s];
+      return (retvalue);
+   }
+   
+   //---------------------------------------------------------------
+
+   std::vector<StdSize> CGrid::getGlobalShape(void) const
+   {
+      std::vector<StdSize> retvalue;
+      retvalue.push_back(domain->ni.getValue());
+      retvalue.push_back(domain->nj.getValue());
+      if (this->withAxis)
+         retvalue.push_back(this->axis->size.getValue());
+      return (retvalue);
+   }
+   //---------------------------------------------------------------
+   
+   StdSize CGrid::getGlobalSize(void) const
+   {
+      StdSize retvalue = 1;
+      std::vector<StdSize> shape_ = this->getGlobalShape();
       for (StdSize s = 0; s < shape_.size(); s++)
          retvalue *= shape_[s];
@@ -129 +152 @@
       if (this->storeIndex.size() == 1)
       {
+         
          this->computeIndex() ;
-      }
-      else
-      {
-         this->computeIndexServer();
-      }
+         ARRAY_CREATE(storeIndex_ , int, 1, [0]);
+         ARRAY_CREATE(out_l_index_, int, 1, [0]);
+         ARRAY_CREATE(out_i_index_, int, 1, [0]);
+         ARRAY_CREATE(out_j_index_, int, 1, [0]);
+                 
+         this->storeIndex .push_front(storeIndex_);
+         this->out_i_index.push_front(out_i_index_);
+         this->out_j_index.push_front(out_j_index_);
+         this->out_l_index.push_front(out_l_index_);
+      }
+      this->computeIndexServer();
       this->isChecked = true;
    }
@@ -177 +207 @@
 
    void CGrid::computeIndex(void)
-   {  
+   {    
+   
       const int ni   = domain->ni.getValue() ,
                 nj   = domain->nj.getValue() ,
@@ -200 +231 @@
 
       ARRAY(bool, 2) mask = domain->mask.getValue() ;
+      ARRAY(int, 2) local_mask =  this->domain->getLocalMask();
 
       int indexCount = 0;
@@ -210 +242 @@
                 temp_j = (data_dim == 1) ? -1
                        : (*data_j_index)[n] + data_jbegin;
-            i = (data_dim == 1) ? (temp_i - 2) % ni
+            i = (data_dim == 1) ? (temp_i - 1) % ni
                                 : (temp_i - 1) ;
-            j = (data_dim == 1) ? (temp_i - 2) / ni
+            j = (data_dim == 1) ? (temp_i - 1) / ni
                                 : (temp_j - 1) ;
 
@@ -226 +258 @@
       ARRAY_ASSIGN(this->out_i_index[0], int, 1, [indexCount]);
       ARRAY_ASSIGN(this->out_j_index[0], int, 1, [indexCount]);
-
+      
+      // for(int count = 0, indexCount = 0,  l = 0; l < size; l++)
+      // for(int n = 0, i = 0, j = 0; n < data_n_index; n++, count++)
+
+      //for(int n = 0, i = 0, j = 0, count = 0, indexCount = 0; n < data_n_index;  n++)
+      //for(int l = 0; l < size; l++, count++)
+      
       for(int count = 0, indexCount = 0,  l = 0; l < size; l++)
       {
@@ -234 +272 @@
                 temp_j = (data_dim == 1) ? -1
                        : (*data_j_index)[n] + data_jbegin;
-            i = (data_dim == 1) ? (temp_i - 2) % ni
+            i = (data_dim == 1) ? (temp_i - 1) % ni
                                 : (temp_i - 1) ;
-            j = (data_dim == 1) ? (temp_i - 2) / ni
+            j = (data_dim == 1) ? (temp_i - 1) / ni
                                 : (temp_j - 1) ;
 
@@ -250 +288 @@
          }
       }
+
+
+//      if (this->storeIndex[0]->size() != 0)
+//         for (StdSize u = 0; u < this->storeIndex[0]->size(); u++)
+//            (*local_mask)[(*out_i_index[0])[u]][(*out_j_index[0])[u]] = 1;
+                                 
+//      std::cout << "indexCount" << indexCount << std::endl; 
+//      std::cout << this->getId() << " : "  << (*this->storeIndex[0]).num_elements() << std::endl;
+//      StdOFStream ofs2(("log_client_"+this->getId()).c_str());
+//      for (StdSize h = 0; h < storeIndex[0]->size(); h++)
+//      {
+//        ofs2 << "(" << (*storeIndex[0])[h]  << ";"
+//             << (*out_i_index[0])[h] << ","
+//             << (*out_j_index[0])[h] << ","
+//             << (*out_l_index[0])[h] << ")" << std::endl;
+//      }
+//      ofs2.close();   
    }
 
@@ -282 +337 @@
          (const ARRAY(double, 1) stored,  ARRAY(double, 3) field) const
    {
+      //std::cout <<"champ : " ;
       for(StdSize n = 0; n < storeIndex[0]->num_elements(); n++)
+      {
          (*field)[(*out_i_index[0])[n]][(*out_j_index[0])[n]][(*out_l_index[0])[n]] = (*stored)[n] ;
+         /*if (storeIndex[0]->num_elements() == 31)
+         {
+            std::cout << "( " << (*field)[(*out_i_index[0])[n]][(*out_j_index[0])[n]][(*out_l_index[0])[n]] << ", "
+                      << (*out_i_index[0])[n] << ", "
+                      << (*out_j_index[0])[n] << ", "
+                      << (*out_l_index[0])[n] << ")";
+         }*/
+      }
+      //std::cout << std::endl;
+
    }
 
@@ -311 +378 @@
       (const double * const data, ARRAY(double, 1) stored) const
    {
-      const StdSize size = storeIndex[0]->num_elements() ;
+      const StdSize size = (this->storeIndex[0])->num_elements() ;
+//    std::cout << this->getId() << "> size : " << size << std::endl;
       stored->resize(boost::extents[size]) ;
       for(StdSize i = 0; i < size; i++)
@@ -365 +433 @@
    void CGrid::computeIndexServer(void)
    {
-      ARRAY(int, 1) storeIndex_srv   =  this->storeIndex[0];
-      ARRAY(int, 1) out_i_index_srv  =  this->out_i_index[0];
-      ARRAY(int, 1) out_j_index_srv  =  this->out_j_index[0];
-      ARRAY(int, 1) out_l_index_srv  =  this->out_l_index[0];
-
       ARRAY(int, 2) local_mask =  this->domain->getLocalMask();
       
@@ -375 +438 @@
       const std::vector<int> & jbegin = this->domain->getJBeginSub();
       
-      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_loc.getValue();
-      const int zoom_nj_srv   = this->domain->zoom_nj_loc.getValue();
+      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_loc.getValue();
+      const int zoom_nj_srv = this->domain->zoom_nj_loc.getValue();
       
       const int ibegin_zoom_srv = this->domain->zoom_ibegin_loc.getValue();
@@ -387 +450 @@
          dn += this->out_i_index[j]->size();
          
-      ARRAY_ASSIGN(storeIndex_srv , int, 1, [dn]);
-      ARRAY_ASSIGN(out_i_index_srv, int, 1, [dn]);
-      ARRAY_ASSIGN(out_j_index_srv, int, 1, [dn]);
-      ARRAY_ASSIGN(out_l_index_srv, int, 1, [dn]);
+      ARRAY_CREATE(storeIndex_srv , int, 1, [dn]);
+      ARRAY_CREATE(out_i_index_srv, int, 1, [dn]);
+      ARRAY_CREATE(out_j_index_srv, int, 1, [dn]);
+      ARRAY_CREATE(out_l_index_srv, int, 1, [dn]);
       
       for (StdSize i = 0, dn = 0; i < ibegin.size(); i++)
@@ -404 +467 @@
          for (StdSize n = dn, m = 0; n < (dn + storeIndex_cl->size()); n++, m++)
          {
-            (*storeIndex_srv)[n]  = (*storeIndex_cl)[m]  + dn; // Faux mais inutile dans tous les cas.
+            (*storeIndex_srv)[n]  = (*storeIndex_cl)[m]; // Faux mais inutile dans le cas serveur.
             (*out_i_index_srv)[n] = (*out_i_index_cl)[m] 
                                   + (ibegin_cl - 1) - (ibegin_srv - 1) - (ibegin_zoom_srv - 1);
@@ -438 +501 @@
             (*local_mask)[(*out_i_index_srv)[u]][(*out_j_index_srv)[u]] = 1;
 
-      //~ StdOFStream ofs(this->getId().c_str());
-      //~ for (StdSize h = 0; h < storeIndex_srv->size(); h++)
-      //~ {
-        //~ ofs << "(" << (*storeIndex_srv)[h]  << ";"
-            //~ << (*out_i_index_srv)[h] << ","
-            //~ << (*out_j_index_srv)[h] << ","
-            //~ << (*out_l_index_srv)[h] << ")" << std::endl;
-      //~ }
-      //~ ofs.close();
+//      StdOFStream ofs(("log_server_"+this->getId()).c_str());
+//      for (StdSize h = 0; h < storeIndex_srv->size(); h++)
+//      {
+//        ofs << "(" << (*storeIndex_srv)[h]  << ";"
+//            << (*out_i_index_srv)[h] << ","
+//            << (*out_j_index_srv)[h] << ","
+//            << (*out_l_index_srv)[h] << ")" << std::endl;
+//      }
+//       ofs.close();
+   
+      this->storeIndex [0] = storeIndex_srv ;
+      this->out_i_index[0] = out_i_index_srv;
+      this->out_j_index[0] = out_j_index_srv;
+      this->out_l_index[0] = out_l_index_srv;
+      
       this->storeIndex.resize(1);
       this->out_i_index.resize(1);
@@ -454 +523 @@
    }
    
-   //----------------------------------------------------------------
    
    void CGrid::inputFieldServer