Changeset 632

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

Location:

XIOS/trunk/src

Files:

• node/field.cpp (modified) (2 diffs)
• node/grid.cpp (modified) (2 diffs)
• node/grid.hpp (modified) (1 diff)
• transformation/grid_transformation.hpp (modified) (1 diff)

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,

XIOS/trunk/src/node/grid.cpp

@@ -1161 +1161 @@
   }
 
-  void CGrid::transformGrid(CGrid* transformedGrid)
-  {
-    if (transformedGrid->isTransformed()) return;
-    transformedGrid->setTransformed();
-    if (axis_domain_order.numElements() != transformedGrid->axis_domain_order.numElements())
-    {
-      ERROR("CGrid::transformGrid(CGrid* transformedGrid)",
+  void CGrid::transformGrid(CGrid* transformGridSrc)
+  {
+    if (isTransformed()) return;
+    setTransformed();
+    if (axis_domain_order.numElements() != transformGridSrc->axis_domain_order.numElements())
+    {
+      ERROR("CGrid::transformGrid(CGrid* transformGridSrc)",
            << "Two grids have different dimension size"
-           << "Dimension of grid source " <<this->getId() << " is " << axis_domain_order.numElements() << std::endl
-           << "Dimension of grid destination " <<transformedGrid->getId() << " is " << transformedGrid->axis_domain_order.numElements());
+           << "Dimension of grid destination " <<this->getId() << " is " << axis_domain_order.numElements() << std::endl
+           << "Dimension of grid source " <<transformGridSrc->getId() << " is " << transformGridSrc->axis_domain_order.numElements());
     }
     else
@@ -1176 +1176 @@
       int ssize = axis_domain_order.numElements();
       for (int i = 0; i < ssize; ++i)
-        if (axis_domain_order(i) != (transformedGrid->axis_domain_order)(i))
-          ERROR("CGrid::transformGrid(CGrid* transformedGrid)",
-                << "Grids " <<this->getId() <<" and " << transformedGrid->getId()
+        if (axis_domain_order(i) != (transformGridSrc->axis_domain_order)(i))
+          ERROR("CGrid::transformGrid(CGrid* transformGridSrc)",
+                << "Grids " <<this->getId() <<" and " << transformGridSrc->getId()
                 << " don't have elements in the same order");
     }
 
-    transformations_ = new CGridTransformation(transformedGrid, this);
+    transformations_ = new CGridTransformation(this, transformGridSrc);
     transformations_->computeAll();
 
     // Ok, now need to compute index of grid source
-    checkMaskIndex(false);
+    transformGridSrc->checkMaskIndex(false);
   }
 

XIOS/trunk/src/node/grid.hpp

@@ -187 +187 @@
          CGridTransformation* getTransformations();
 
-         void transformGrid(CGrid* transformedGrid);
+         void transformGrid(CGrid* transformGridSrc);
          bool isTransformed();
          void setTransformed();

XIOS/trunk/src/transformation/grid_transformation.hpp

@@ -42 +42 @@
   const std::map<int, CArray<int,1>* >& getLocalIndexToSendFromGridSource() const;
   const std::map<int, std::vector<std::vector<std::pair<int,double> > > >& getLocalIndexToReceiveOnGridDest() const;
+  CGrid* getGridSource() {return gridSource_; }
+  CGrid* getGridDestination() { return gridDestination_; }
 
 private: