Changeset 630 for XIOS/trunk/src/node/field.cpp

Timestamp:

07/07/15 10:46:25 (9 years ago)

Author:

mhnguyen

Message:

Implementing interpolation (polynomial) and correct some bugs

+) Implement interpolation (polynomial)
+) Correct some minor bugs relating to memory allocation
+) Clear some redundant codes

Test
+) On Curie
+) test_client and test_complete pass

File:

• XIOS/trunk/src/node/field.cpp (modified) (5 diffs)

XIOS/trunk/src/node/field.cpp

@@ -814 +814 @@
      {
         itFilterSrc = filterSources_.begin(); iteFilterSrc = filterSources_.end();
+        dataToReceive = 0.0; // Reset all data destination
         for (; itFilterSrc != iteFilterSrc; ++itFilterSrc)
         {
@@ -819 +820 @@
           {
              const std::map<int, CArray<int,1>* >& localIndexToSend = (*itFilterSrc)->grid->getTransformations()->getLocalIndexToSendFromGridSource();
-             const std::map<int, std::vector<CArray<int,1>* > >& localIndexToReceive = (*itFilterSrc)->grid->getTransformations()->getLocalIndexToReceiveOnGridDest();
+             const std::map<int,std::vector<std::vector<std::pair<int,double> > > >& localIndexToReceive = (*itFilterSrc)->grid->getTransformations()->getLocalIndexToReceiveOnGridDest();
 
              sendAndReceiveTransformedData(localIndexToSend, dataToSend,
@@ -831 +832 @@
    void CField::sendAndReceiveTransformedData(const std::map<int, CArray<int,1>* >& localIndexToSend,
                                               const CArray<double, 1>& dataSrc,
-                                              const std::map<int, std::vector<CArray<int,1>* > >& localIndexToReceive,
+                                              const std::map<int,std::vector<std::vector<std::pair<int,double> > > >& localIndexToReceive,
                                               CArray<double,1>& dataDest)
    {
@@ -858 +859 @@
 
      // Receiving data on destination fields
-     std::map<int, std::vector<CArray<int,1>* > >::const_iterator itbRecv = localIndexToReceive.begin(), itRecv,
+     std::map<int,std::vector<std::vector<std::pair<int,double> > > >::const_iterator itbRecv = localIndexToReceive.begin(), itRecv,
                                                                   iteRecv = localIndexToReceive.end();
      int recvBuffSize = 0;
@@ -873 +874 @@
        for (int idx = 0; idx < countSize; ++idx)
        {
-         CArray<int,1>* localIndex_p = (itRecv->second)[idx];
-         int numIndex = localIndex_p->numElements();
+         const std::vector<std::pair<int,double> >& localIndex_p = (itRecv->second)[idx];
+         int numIndex = localIndex_p.size();
          for (int i = 0; i < numIndex; ++i)
          {
-           dataDest((*localIndex_p)(i)) = recvBuff[idx];
+//           if ((localIndex_p)[i].first >= dataDest.numElements() )
+           dataDest((localIndex_p)[i].first) += recvBuff[idx] * ((localIndex_p)[i].second);
          }
        }