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

Timestamp:

07/08/15 14:27:28 (9 years ago)

Author:

mhnguyen

Message:

Moving transformation from grid source to grid destination

+) grid transformation object moved to grid destination
+) Add getter methods fro grid transformation

Test
+) On Curie
+) test_complete and test_client pass

File:

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

XIOS/trunk/src/node/field.cpp

@@ -797 +797 @@
        if ((0 != gridRefOfFieldRef) && (relGridRef != gridRefOfFieldRef) && (!(relGridRef->isTransformed())))
        {
-         gridRefOfFieldRef->transformGrid(relGridRef);
+         relGridRef->transformGrid(gridRefOfFieldRef);
          filterSources_.push_back(fieldRef);
        }
@@ -817 +817 @@
         for (; itFilterSrc != iteFilterSrc; ++itFilterSrc)
         {
-          if (0 != (*itFilterSrc)->grid->getTransformations())
+          if (0 != grid->getTransformations())
           {
-             const std::map<int, CArray<int,1>* >& localIndexToSend = (*itFilterSrc)->grid->getTransformations()->getLocalIndexToSendFromGridSource();
-             const std::map<int,std::vector<std::vector<std::pair<int,double> > > >& localIndexToReceive = (*itFilterSrc)->grid->getTransformations()->getLocalIndexToReceiveOnGridDest();
+             const std::map<int, CArray<int,1>* >& localIndexToSend = grid->getTransformations()->getLocalIndexToSendFromGridSource();
+             const std::map<int,std::vector<std::vector<std::pair<int,double> > > >& localIndexToReceive = grid->getTransformations()->getLocalIndexToReceiveOnGridDest();
 
              sendAndReceiveTransformedData(localIndexToSend, dataToSend,