Changeset 620 for XIOS/trunk/src/node/axis.cpp

Timestamp:

06/22/15 13:36:17 (9 years ago)

Author:

mhnguyen

Message:

Implementing generic transformation algorithm (local commit)

+) Implement 3 important classes:

-gridTransformation to read transformation info from grid and interface with the rest of XIOS
-transformationMapping to be in charge of sending/receiving transformation info among clients
-transformationAlgorithm to represent various algorithms

+) Make some change on field to use the new classes

Test
+) Only test_new_features with inversed axis

File:

• XIOS/trunk/src/node/axis.cpp (modified) (4 diffs)

XIOS/trunk/src/node/axis.cpp

@@ -85 +85 @@
       }
       else this->ni.setValue(size);
-
+      std::cout <<  "value " <<  value <<  std::endl;
       StdSize true_size = value.numElements();
       if (this->ni.getValue() != true_size)
@@ -311 +311 @@
   }
 
-  void CAxis::setTransformations(const std::vector<ETransformationType>& transformations)
+  void CAxis::setTransformations(const std::vector<CTransformation*>& transformations)
   {
     transformations_ = transformations;
+  }
+
+  std::vector<CTransformation*> CAxis::getAllTransformations(void)
+  {
+    if (!hasTransformation())
+      setTransformations(this->getVirtualTransformationGroup()->getAllChildren());
+
+    return transformations_;
   }
 
@@ -333 +341 @@
     if (refer_ptr->hasTransformation())
       for (int idx = 0; idx < refAxis.size(); ++idx)
-        refAxis[idx]->setTransformations(refer_ptr->getTransformations());
+        refAxis[idx]->setTransformations(refer_ptr->getAllTransformations());
   }
 
@@ -347 +355 @@
         if (node.getElementName() == tranformation) {
            this->getVirtualTransformationGroup()->parseChild(node);
-           transformations_.push_back(eInverse);
         }
       } while (node.goToNextElement()) ;
       node.goToParentElement();
     }
-  }
-
-  const std::vector<ETransformationType>& CAxis::getTransformations()
-  {
-    return transformations_;
-  }
-
-   DEFINE_REF_FUNC(Axis,axis)
+    setTransformations(this->getVirtualTransformationGroup()->getAllChildren());
+  }
+
+  DEFINE_REF_FUNC(Axis,axis)
 
    ///---------------------------------------------------------------