Changeset 888 for XIOS/trunk/src/filter/spatial_transform_filter.cpp

Timestamp:

07/05/16 15:59:10 (8 years ago)

Author:

mhnguyen

Message:

Adding new transformation for scalar: Reducing an axis to a scalar

+) Add new xml node for new transformation
+) Add new algorithms for axis reduction
+) Make change in some place to make sure everything work fine

Test
+) On Curie
+) Tests pass and are correct

File:

• XIOS/trunk/src/filter/spatial_transform_filter.cpp (modified) (4 diffs)

XIOS/trunk/src/filter/spatial_transform_filter.cpp

@@ -122 +122 @@
     const std::list<size_t>& listNbLocalIndexToReceive = gridTransformation->getNbLocalIndexToReceiveOnGridDest();
     const std::list<std::vector<bool> >& listLocalIndexMaskOnDest = gridTransformation->getLocalMaskIndexOnGridDest();
+    const std::vector<CGenericAlgorithmTransformation*>& listAlgos = gridTransformation->getAlgos();
 
     CArray<double,1> dataCurrentDest(dataSrc.copy());
@@ -130 +131 @@
     std::list<size_t>::const_iterator itNbListRecv = listNbLocalIndexToReceive.begin();
     std::list<std::vector<bool> >::const_iterator itLocalMaskIndexOnDest = listLocalIndexMaskOnDest.begin();
-
-    for (; itListSend != iteListSend; ++itListSend, ++itListRecv, ++itNbListRecv, ++itLocalMaskIndexOnDest)
+    std::vector<CGenericAlgorithmTransformation*>::const_iterator itAlgo = listAlgos.begin();
+
+    for (; itListSend != iteListSend; ++itListSend, ++itListRecv, ++itNbListRecv, ++itLocalMaskIndexOnDest, ++itAlgo)
     {
       CArray<double,1> dataCurrentSrc(dataCurrentDest);
@@ -189 +191 @@
         else dataCurrentDest(i) = defaultValue;
 
+      std::vector<bool> localInitFlag(dataCurrentDest.size(), true);
       currentBuff = 0;
       for (itRecv = itbRecv; itRecv != iteRecv; ++itRecv)
@@ -194 +197 @@
         int countSize = itRecv->second.size();
         const std::vector<std::pair<int,double> >& localIndex_p = itRecv->second;
-        for (int idx = 0; idx < countSize; ++idx)
-        {
-          dataCurrentDest(localIndex_p[idx].first) += *(recvBuff+currentBuff+idx) * localIndex_p[idx].second;
-        }
+//        for (int idx = 0; idx < countSize; ++idx)
+//        {
+//          dataCurrentDest(localIndex_p[idx].first) += *(recvBuff+currentBuff+idx) * localIndex_p[idx].second;
+//        }
+        (*itAlgo)->apply(localIndex_p,
+                         recvBuff+currentBuff,
+                         dataCurrentDest,
+                         localInitFlag);
+
         currentBuff += countSize;
       }