Changeset 835 for XIOS/trunk/src/node/grid.cpp

Timestamp:

04/08/16 15:00:29 (8 years ago)

Author:

mhnguyen

Message:

Exposing some functions to Fortran interface

+) Allow add axis and domain into grid with Fortran interface
+) Remove some redundant code

Test
+) On Curie
+) test_client passes

File:

• XIOS/trunk/src/node/grid.cpp (modified) (7 diffs)

XIOS/trunk/src/node/grid.cpp

@@ -32 +32 @@
       , transformations_(0), isTransformed_(false)
       , axisPositionInGrid_(), positionDimensionDistributed_(1), hasDomainAxisBaseRef_(false)
-      , gridSrc_(), hasTransform_(false)
+      , gridSrc_(), hasTransform_(false), order_()
    {
      setVirtualDomainGroup();
@@ -47 +47 @@
       , transformations_(0), isTransformed_(false)
       , axisPositionInGrid_(), positionDimensionDistributed_(1), hasDomainAxisBaseRef_(false)
-      , gridSrc_(), hasTransform_(false)
+      , gridSrc_(), hasTransform_(false), order_()
    {
      setVirtualDomainGroup();
@@ -1145 +1145 @@
    CDomain* CGrid::addDomain(const std::string& id)
    {
+     order_.push_back(true);
+     axis_domain_order.resize(order_.size());
+     for (int idx = 0; idx < order_.size(); ++idx) axis_domain_order(idx)=order_[idx];
      return vDomainGroup_->createChild(id);
    }
@@ -1150 +1153 @@
    CAxis* CGrid::addAxis(const std::string& id)
    {
+     order_.push_back(false);
+     axis_domain_order.resize(order_.size());
+     for (int idx = 0; idx < order_.size(); ++idx) axis_domain_order(idx)=order_[idx];
      return vAxisGroup_->createChild(id);
    }
@@ -1539 +1545 @@
     SuperClass::parse(node);
 
-    // List order of axis and domain in a grid, if there is a domain, it will take value 1 (true), axis 0 (false)
-    std::vector<bool> order;
-
     if (node.goToChildElement())
     {
@@ -1549 +1552 @@
       {
         if (node.getElementName() == domainName) {
-          order.push_back(true);
+          order_.push_back(true);
           this->getVirtualDomainGroup()->parseChild(node);
         }
         if (node.getElementName() == axisName) {
-          order.push_back(false);
+          order_.push_back(false);
           this->getVirtualAxisGroup()->parseChild(node);
         }
@@ -1560 +1563 @@
     }
 
-    if (!order.empty())
-    {
-      int sizeOrd = order.size();
+    if (!order_.empty())
+    {
+      int sizeOrd = order_.size();
       axis_domain_order.resize(sizeOrd);
       for (int i = 0; i < sizeOrd; ++i)
       {
-        axis_domain_order(i) = order[i];
+        axis_domain_order(i) = order_[i];
       }
     }