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

Timestamp:

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

Author:

mhnguyen

Message:

Final testing transfomation algorithm: inverse axis (local commit)

+) Make some minor change to make sure one element (axis or domain) be able to have several similar transformation

Test
+) On Curie
+) test_new_feature: test passed with correct data written

File:

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

XIOS/trunk/src/node/axis.cpp

@@ -62 +62 @@
 
    //----------------------------------------------------------------
+
+   CAxis* CAxis::createAxis()
+   {
+     CAxis* axis = CAxisGroup::get("axis_definition")->createChild();
+     return axis;
+   }
+
+   void CAxis::duplicateAttributes(CAxis* axis)
+   {
+     axis->setAttributes(this);
+   }
 
    void CAxis::checkAttributes(void)
@@ -374 +385 @@
           CInverseAxis* tmp = (CInverseAxisGroup::get(inverseAxisDefRoot))->createChild();
           tmp->parse(node);
-          transformationMap_[TRANS_INVERSE_AXIS] = tmp;
+          transformationMap_.push_back(std::make_pair(TRANS_INVERSE_AXIS,tmp));
         } else if (node.getElementName() == zoom) {
           CZoomAxis* tmp = (CZoomAxisGroup::get(zoomAxisDefRoot))->createChild();
           tmp->parse(node);
-          transformationMap_[TRANS_ZOOM_AXIS] = tmp;
+          transformationMap_.push_back(std::make_pair(TRANS_ZOOM_AXIS,tmp));
         }
       } while (node.goToNextElement()) ;