Changeset 622 for XIOS/trunk/src/node/grid.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/grid.cpp (modified) (5 diffs)

XIOS/trunk/src/node/grid.cpp

@@ -450 +450 @@
       std::vector<CDomain*> vecDom(1,domain);
       std::vector<CAxis*> vecAxis;
-
-      CGrid* grid = createGrid(vecDom, vecAxis);
+      CArray<bool,1> axisDomainOrder;
+      CGrid* grid = createGrid(vecDom, vecAxis, axisDomainOrder);
 
       return (grid);
@@ -460 +460 @@
       std::vector<CDomain*> vecDom(1,domain);
       std::vector<CAxis*> vecAxis(1,axis);
-      CGrid* grid = createGrid(vecDom, vecAxis);
+      CArray<bool,1> axisDomainOrder;
+      CGrid* grid = createGrid(vecDom, vecAxis, axisDomainOrder);
 
       return (grid);
    }
 
-   CGrid* CGrid::createGrid(std::vector<CDomain*> domains, std::vector<CAxis*> axis)
+   CGrid* CGrid::createGrid(std::vector<CDomain*> domains, std::vector<CAxis*> axis, CArray<bool,1> axisDomainOrder)
    {
       StdString new_id = StdString("__");
@@ -478 +479 @@
 
       //By default, domains are always the first ones of a grid
-      if (grid->axis_domain_order.isEmpty())
+      if (0 == axisDomainOrder.numElements())
       {
         int size = domains.size()+axis.size();
@@ -487 +488 @@
           else grid->axis_domain_order(i) = false;
         }
+      }
+      else
+      {
+        grid->axis_domain_order.resize(axisDomainOrder.numElements());
+        grid->axis_domain_order = axisDomainOrder;
       }
 
@@ -1151 +1157 @@
 
     transformations_ = new CGridTransformation(transformedGrid, this);
-    transformations_->computeTransformationMapping();
+    transformations_->computeAll();
   }