Changeset 1132 for XIOS/dev/dev_olga/src/node

Timestamp:

05/15/17 16:58:35 (7 years ago)

Author:

mhnguyen

Message:

Correcting a minor bug on writting unstructured grid

+) Correct the mapping between received data and written data.
+) Clean some redundant codes

Test
+) On Curie
+) Writing on unstructured grid works correctly

Location:

XIOS/dev/dev_olga/src/node

Files:

• domain.cpp (modified) (2 diffs)
• file.cpp (modified) (2 diffs)
• file.hpp (modified) (1 diff)
• grid.cpp (modified) (2 diffs)

XIOS/dev/dev_olga/src/node/domain.cpp

@@ -1370 +1370 @@
        hasBounds = true;
      }
+     else if (hasBoundValues)
+     {
+       hasBounds = true;       
+     }
      else
      {
@@ -2773 +2777 @@
       }       
     }
-
-
-
-    // lonvalue.resize(zoom_ni*zoom_nj);
-    // lonvalue = 0;
-
-    // if (hasBounds)
-    // {
-    //   bounds_lonvalue.resize(nvertex,zoom_ni*zoom_nj);
-    //   bounds_lonvalue = 0.;
-    // }
-    
-    // if (0 == lonvalue.numElements()) return;
-
-    // for (i = 0; i < nbReceived; ++i)
-    // {
-    //   int rank = recvClientRanks_[i];
-    //   CArray<int,1> &indi = indGlob_[rank], &indj = indGlob_[rank];      
-    //   for (ind = 0; ind < indi.numElements(); ++ind)
-    //   {
-    //      iindex = indi(ind) % ni_glo; jindex = indj(ind) / ni_glo;
-    //      index = (iindex - zoom_ibegin) + (jindex - zoom_jbegin) * zoom_ni;
-    //      lonvalue(index) = recvLonValue[i](ind);
-    //      if (hasBounds)
-    //      {          
-    //       for (int nv = 0; nv < nvertex; ++nv)
-    //         bounds_lonvalue(nv, index) = recvBoundsLonValue[i](nv, ind);
-    //      }         
-    //   }
-    // }
   }
 

XIOS/dev/dev_olga/src/node/file.cpp

@@ -974 +974 @@
 
    /*!
+   \brief Send a message to create a variable group on server side
+   \param[in] id String identity of variable group that will be created on server
+   \param [in] client client to which we will send this adding action
+   */
+   void CFile::sendAddVariableGroup(const string& id, CContextClient* client)
+   {
+      sendAddItem(id, (int)EVENT_ID_ADD_VARIABLE_GROUP, client);
+   }
+
+   /*!
    \brief Send a message to create a variable on server side
       A variable always belongs to a variable group
@@ -983 +993 @@
    }
 
+   /*
+     Send message to add a variable into a file within a certain client
+     \param [in] id String identity of a variable
+     \param [in] client client to which we will send this adding action
+   */
    void CFile::sendAddVariable(const string& id, CContextClient* client)
    {

XIOS/dev/dev_olga/src/node/file.hpp

@@ -133 +133 @@
          void sendAddVariable(const string& id, CContextClient* client);
          void sendAddVariableGroup(const string& id = "");
+         void sendAddVariableGroup(const string& id, CContextClient* client);
 
          // Receive info from client

XIOS/dev/dev_olga/src/node/grid.cpp

@@ -632 +632 @@
             CArray<size_t,1>& localIndex = outLocalIndexStoreOnClient[rank];
             size_t nbIndex = 0;
+            
+            // Keep this code for this moment but it should be removed (or moved to DEBUG) to improve performance
             for (size_t idx = 0; idx < globalIndex.numElements(); ++idx)
             {
@@ -640 +642 @@
             }
 
+            
             if (nbIndex != localIndex.numElements())
                  ERROR("void CGrid::computeClientIndex()",