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

Timestamp:

09/15/15 17:30:55 (9 years ago)

Author:

mhnguyen

Message:

Implementing auto-generate rectilinear domain

+) Add a new special transformation to generate (complete) rectilinear domain

Test
+) On Curie
+) test_new_feature passed

File:

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

XIOS/trunk/src/node/grid.cpp

@@ -17 +17 @@
 #include "distribution_client.hpp"
 #include "grid_transformation.hpp"
+#include "grid_generate.hpp"
 
 namespace xios {
@@ -1168 +1169 @@
         pDom->solveRefInheritance(apply);
         pDom->solveBaseReference();
+        pDom->solveSrcInheritance();
         pDom->solveInheritanceTransformation();
         if ((!pDom->domain_ref.isEmpty()) && (pDom->name.isEmpty()))
@@ -1203 +1205 @@
   {
     return transformations_;
+  }
+
+  /*!
+     Complete all the necessary (and lacking) attributes of a grid
+     This function is similar to gridTransformation but works only (till now) on generate_rectilinear_domain transformation
+  */
+  void CGrid::completeGrid(CGrid* transformGridSrc)
+  {
+    if (axis_domain_order.numElements() != transformGridSrc->axis_domain_order.numElements())
+    {
+      ERROR("CGrid::transformGrid(CGrid* transformGridSrc)",
+           << "Two grids have different dimension size"
+           << "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
+    {
+      int ssize = axis_domain_order.numElements();
+      for (int i = 0; i < ssize; ++i)
+        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");
+    }
+
+    CGridGenerate gridGenerate(this, transformGridSrc);
+    gridGenerate.completeGrid();
   }