Changeset 184 for XMLIO_V2/dev/dev_rv/src/xmlio/node/grid.cpp

Timestamp:

04/26/11 13:21:35 (13 years ago)

Author:

hozdoba

Message:

 

File:

• XMLIO_V2/dev/dev_rv/src/xmlio/node/grid.cpp (modified) (8 diffs)

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

@@ -148 +148 @@
 
    void CGrid::computeIndex(void)
-   {    
+   {  
       const int ni   = domain->ni.getValue() ,
                 nj   = domain->nj.getValue() ,
@@ -293 +293 @@
    {
       SuperClass::toBinary(os);
-      this->storeIndex[0]->toBinary(os);
-      this->out_i_index[0]->toBinary(os);
-      this->out_j_index[0]->toBinary(os);
-      this->out_l_index[0]->toBinary(os);
+     
+      os.write (reinterpret_cast<const char*>(&this->isChecked), sizeof(bool)); 
+     
+      if (this->isChecked)
+      {
+         this->storeIndex [0]->toBinary(os);
+         this->out_i_index[0]->toBinary(os);
+         this->out_j_index[0]->toBinary(os);
+         this->out_l_index[0]->toBinary(os);
+      }
    }
 
@@ -303 +309 @@
    void CGrid::fromBinary(StdIStream & is)
    {
-      SuperClass::fromBinary(is);
-      
-      ARRAY_CREATE(storeIndex_ , int, 1, [1]);
-      ARRAY_CREATE(out_l_index_, int, 1, [1]);
-      ARRAY_CREATE(out_i_index_, int, 1, [1]);
-      ARRAY_CREATE(out_j_index_, int, 1, [1]);
-      
-      storeIndex_ ->fromBinary(is);
-      out_i_index_->fromBinary(is);
-      out_j_index_->fromBinary(is);
-      out_l_index_->fromBinary(is);
-      
-      this->storeIndex .push_back(storeIndex_);
-      this->out_i_index.push_back(out_i_index_);
-      this->out_j_index.push_back(out_j_index_);
-      this->out_l_index.push_back(out_l_index_);
+      bool hasIndex = false;
+      SuperClass::fromBinary(is);            
+      is.read (reinterpret_cast<char*>(&hasIndex), sizeof(bool)); 
+      
+      if (hasIndex)
+      {
+         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]);
+         
+         storeIndex_ ->fromBinary(is);
+         out_i_index_->fromBinary(is);
+         out_j_index_->fromBinary(is);
+         out_l_index_->fromBinary(is);
+         
+         this->storeIndex .push_back(storeIndex_);
+         this->out_i_index.push_back(out_i_index_);
+         this->out_j_index.push_back(out_j_index_);
+         this->out_l_index.push_back(out_l_index_);
+      }
    }
    
@@ -336 +347 @@
       const int jbegin_srv = this->domain->jbegin.getValue();
       
+      const int ibegin_zoom_srv = this->domain->zoom_ibegin_loc.getValue();
+      const int jbegin_zoom_srv = this->domain->zoom_jbegin_loc.getValue();
+           
       StdSize dn = 0;      
       for (StdSize j = 1; j < this->out_i_index.size(); j++)
          dn += this->out_i_index[j]->size();
          
-      ARRAY_ASSIGN(storeIndex_srv, int, 1, [dn]);
+      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]);
@@ -347 +361 @@
       for (StdSize i = 0, dn = 0; i < ibegin.size(); i++)
       {
-         ARRAY(int, 1) storeIndex_cl   =  this->storeIndex[i+1];
-         ARRAY(int, 1) out_i_index_cl  =  this->out_i_index[i+1];
-         ARRAY(int, 1) out_j_index_cl  =  this->out_j_index[i+1];
-         ARRAY(int, 1) out_l_index_cl  =  this->out_l_index[i+1];
+         ARRAY(int, 1) storeIndex_cl   =  this->storeIndex [i + 1];
+         ARRAY(int, 1) out_i_index_cl  =  this->out_i_index[i + 1];
+         ARRAY(int, 1) out_j_index_cl  =  this->out_j_index[i + 1];
+         ARRAY(int, 1) out_l_index_cl  =  this->out_l_index[i + 1];
          
          const int ibegin_cl = ibegin[i];
@@ -357 +371 @@
          for (StdSize n = dn, m = 0; n < (dn + storeIndex_cl->size()); n++, m++)
          {
-            (*storeIndex_srv)[n]  = (*storeIndex_cl)[m]  + dn;
-            (*out_i_index_srv)[n] = (*out_i_index_cl)[m] + (ibegin_cl - 1) - (ibegin_srv - 1);
-            (*out_j_index_srv)[n] = (*out_j_index_cl)[m] + (jbegin_cl - 1) - (jbegin_srv - 1);
+            (*storeIndex_srv)[n]  = (*storeIndex_cl)[m]  + dn; // Faux mais inutile dans tous les cas.
+            (*out_i_index_srv)[n] = (*out_i_index_cl)[m] 
+                                  + (ibegin_cl - 1) - (ibegin_srv - 1) - (ibegin_zoom_srv - 1);
+            (*out_j_index_srv)[n] = (*out_j_index_cl)[m]
+                                  + (jbegin_cl - 1) - (jbegin_srv - 1) - (jbegin_zoom_srv - 1);
             (*out_l_index_srv)[n] = (*out_l_index_cl)[m];
          }
@@ -367 +383 @@
       }
       
-      //~ 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(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();
       
    }
@@ -385 +401 @@
                            ARRAY(double, 1)  storedServer) const
    {
-      if (this->storeIndex.size()-1 != storedClient.size())
+      if ((this->storeIndex.size() -1 ) != storedClient.size())
          ERROR("CGrid::inputFieldServer(...)",
                 << "[ Nombre de tableau attendu = " << (this->storeIndex.size()-1) << ", "