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

Timestamp:

09/21/11 09:42:30 (13 years ago)

Author:

hozdoba

Message:

Corrections

File:

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

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

@@ -463 +463 @@
          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];
-         const int jbegin_cl = jbegin[i];
-         
+                 
          int ibegin_zoom_cl = ibegin[i]; //ibegin_zoom[i];
          int jbegin_zoom_cl = jbegin[i]; //jbegin_zoom[i];
@@ -480 +477 @@
             (*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_cl - 1) - (ibegin_zoom_srv - 1); 
+                                  /*+ (ibegin_cl - 1) - (ibegin_srv - 1)*/ + (ibegin_zoom_cl - 1) - (ibegin_zoom_srv - 1);
             (*out_j_index_srv)[n] = (*out_j_index_cl)[m]
-                                  /*+ (jbegin_cl - 1)*/ - (jbegin_srv - 1) + (jbegin_zoom_cl - 1) - (jbegin_zoom_srv - 1);
+                                  /*+ (jbegin_cl - 1) - (jbegin_srv - 1)*/ + (jbegin_zoom_cl - 1) - (jbegin_zoom_srv - 1);
             (*out_l_index_srv)[n] = (*out_l_index_cl)[m];
          }
@@ -532 +529 @@
       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);
-      this->out_j_index.resize(1);
-      this->out_l_index.resize(1);
-      
+      this->out_l_index[0] = out_l_index_srv;      
    }
    
@@ -552 +543 @@
                 << "Les données d'un client sont manquantes !") ;
       if (storedServer.get() != NULL)
-         storedServer->resize(boost::extents[this->storeIndex.size()-1]);
+         storedServer->resize(boost::extents[this->storeIndex[0]->num_elements()]);
       else 
-         ARRAY_ASSIGN(storedServer, double, 1, [this->storeIndex.size()-1]);
+         ARRAY_ASSIGN(storedServer, double, 1, [this->storeIndex[0]->num_elements()]);
          
       for (StdSize i = 0, n = 0; i < storedClient.size(); i++)