Changeset 138 for XMLIO_V2/dev/dev_rv/src/XMLIO/grid.hpp

Timestamp:

12/10/10 16:04:54 (13 years ago)

Author:

hozdoba

Message:

Mise à jour

File:

• XMLIO_V2/dev/dev_rv/src/XMLIO/grid.hpp (modified) (4 diffs)

XMLIO_V2/dev/dev_rv/src/XMLIO/grid.hpp

@@ -78 +78 @@
          static string GetDefName(void) { return (CGrid::GetName()); }
 
-         static CGrid* CreateObject(const CDomain* const a_domain, const CAxis* const a_axis)
-         {
-            string new_id = string("___") + a_domain->getId() + string("_") + a_axis->getId() + string("__") ;
+         static CGrid* CreateObject(const CDomain * const a_domain,
+                                    const CAxis   * const a_axis)
+         {
+            string new_id = string("___") + a_domain->getId() +
+                            string("_") + a_axis->getId() + string("__") ;
             CGrid* const grid = ObjectTemplate<CGrid>::CreateObject(new_id) ;
 
@@ -124 +126 @@
    void CGrid::computeIndex(void)
    {
-      int ni = domain->ni ;
-      int nj = domain->nj ;
-      int size = (hasAxis) ? (int)axis->size : 1 ;
-      int data_dim = domain->data_dim ;
-      int data_n_index = domain->data_n_index ;
-      int data_ibegin  = domain->data_ibegin ;
-      int data_jbegin  = (data_dim == 2) ? (int)domain->data_jbegin : -1;
-
-      Array<int, 1>& data_i_index =* domain->data_i_index ;
-      Array<int, 1>& data_j_index =* domain->data_j_index ;
-      Array<bool, 2>& mask =* domain->mask ;
-      int i, j, l, n ;
-      int count, indexCount ;
-
-      for(indexCount=0, l=0; l<size ; l++)
+      const int ni   = domain->ni ,
+                nj   = domain->nj ,
+                size = (hasAxis) ? (int)axis->size : 1 ;
+
+      /*std::cout << ni   << " : "
+                  << nj   << " : "
+                  << size << std::endl;*/
+
+      const int data_dim     = domain->data_dim ,
+                data_n_index = domain->data_n_index ,
+                data_ibegin  = domain->data_ibegin ,
+                data_jbegin  = (data_dim == 2) ? (int)domain->data_jbegin : -1;
+
+      Array<int, 1>& data_i_index =* domain->data_i_index ,
+                     data_j_index =* domain->data_j_index ;
+
+      /*std::cout << data_n_index        << " : "
+                  << data_i_index.size() << " : "
+                  << data_j_index.size()  << std::endl;*/
+
+      Array<bool, 2>& mask = *domain->mask ;
+
+      int indexCount = 0;
+
+      for(int l = 0; l < size ; l++)
       {
-         for(n=0; n<data_n_index; n++)
-         {
-            if (data_dim == 1)
-            {
-               i = (data_i_index(n) + data_ibegin) % ni ;
-               j = (data_i_index(n) + data_ibegin) / ni ;
-               //cout<<i<<" "<<j<<" "<<mask(i,j)<<endl ;
-            }
-            else
-            {
-               i = data_i_index(n) + data_ibegin ;
-               j = data_j_index(n) + data_jbegin ;
-               //cout<<i<<" "<<j<<" "<<mask(i,j)<<endl ;
-            }
-
-            if (i>=0 && i<ni && j>=0 && j<nj && mask(i,j) ) indexCount++ ;
+         for(int n = 0, i = 0, j = 0; n < data_n_index; n++)
+         {
+            int temp_i = data_i_index(n) + data_ibegin,
+                temp_j = (data_dim == 1) ? -1
+                       : data_j_index(n) + data_jbegin;
+            i = (data_dim == 1) ? (temp_i - 2) % ni
+                                : (temp_i - 1) ;
+            j = (data_dim == 1) ? (temp_i - 2) / ni
+                                : (temp_j - 1) ;
+
+            if ((i >= 0 && i < ni) &&
+                (j >= 0 && j < nj) && mask(i, j))
+               indexCount++ ;
          }
       }
 
-      storeIndex.resize(indexCount) ;
+      //std::cout << indexCount  << std::endl;
+
+       storeIndex.resize(indexCount) ;
       out_l_index.resize(indexCount) ;
       out_i_index.resize(indexCount) ;
       out_j_index.resize(indexCount) ;
 
-      for(count=0, indexCount=0, l=0; l<size; l++)
+      for(int count = 0, indexCount = 0,  l = 0; l < size; l++)
       {
-         for(n=0; n<data_n_index; n++, count++)
-         {
-            if (data_dim == 1)
+         for(int n = 0, i = 0, j = 0; n < data_n_index; n++, count++)
+         {
+            int temp_i = data_i_index(n) + data_ibegin,
+                temp_j = (data_dim == 1) ? -1
+                       : data_j_index(n) + data_jbegin;
+            i = (data_dim == 1) ? (temp_i - 2) % ni
+                                : (temp_i - 1) ;
+            j = (data_dim == 1) ? (temp_i - 2) / ni
+                                : (temp_j - 1) ;
+
+            if ((i >= 0 && i < ni) &&
+                (j >= 0 && j < nj) && mask(i, j))
             {
-               i = (data_i_index(n) + data_ibegin) % ni ;
-               j = (data_i_index(n) + data_ibegin) / ni ;
-            }
-            else // (dat_dim == 2)
-            {
-               i = data_i_index(n) + data_ibegin ;
-               j = data_j_index(n) + data_jbegin ;
-            }
-
-            if (i>=0 && i<ni && j>=0 && j<nj && mask(i,j))
-            {
-               storeIndex(indexCount) = count ;
+               storeIndex(indexCount)  = count ;
                out_l_index(indexCount) = l ;
                out_i_index(indexCount) = i ;
@@ -192 +201 @@
 
    template<>
-      void CGrid::outputField(const Array<double, 1>& stored, Array<double, 2>& outField) const
+      void CGrid::outputField(const Array<double, 1>& stored,
+                                    Array<double, 2>& outField) const
    {
       for(int n = 0; n < storeIndex.size(); n++)
@@ -199 +209 @@
 
    template<>
-      void CGrid::outputField(const Array<double, 1>& stored, Array<double, 3>& outField) const
+      void CGrid::outputField(const Array<double, 1>& stored,
+                                    Array<double, 3>& outField) const
    {
       for(int n = 0; n < storeIndex.size(); n++)