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

Timestamp:

11/02/15 11:46:25 (8 years ago)

Author:

mhnguyen

Message:

Implementing the reading of attributes of an axis from a file

+) 3d grid can be read directly from a file
+) Clean some redundant codes
+) Add new attribute declaration that allows to output only desired attributes

Test
+) On Curie
+) test_remap passes and result is correct

File:

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

XIOS/trunk/src/node/grid.cpp

@@ -31 +31 @@
       , globalDim_(), connectedDataSize_(), connectedServerRank_(), isDataDistributed_(true), isCompressible_(false)
       , transformations_(0), isTransformed_(false)
-      , axisPositionInGrid_(), positionDimensionDistributed_(1)
+      , axisPositionInGrid_(), positionDimensionDistributed_(1), hasDomainAxisBaseRef_(false)
    {
      setVirtualDomainGroup();
@@ -45 +45 @@
       , globalDim_(), connectedDataSize_(), connectedServerRank_(), isDataDistributed_(true), isCompressible_(false)
       , transformations_(0), isTransformed_(false)
-      , axisPositionInGrid_(), positionDimensionDistributed_(1)
+      , axisPositionInGrid_(), positionDimensionDistributed_(1), hasDomainAxisBaseRef_(false)
    {
      setVirtualDomainGroup();
@@ -203 +203 @@
      computeGridGlobalDimension(getDomains(), getAxis(), axis_domain_order);
      this->isDomainAxisChecked = areAttributesChecked;
+   }
+
+   void CGrid::solveDomainAxisBaseRef()
+   {
+     if (this->hasDomainAxisBaseRef_) return;
+     // Account for the axis attributes
+     std::vector<CAxis*> axisList = getAxis();
+     for (size_t i = 0; i < axisList.size(); ++i)
+     {
+       axisList[i]->solveBaseReference();
+       axisList[i]->setAttributesBaseReference();
+     }
+
+     // Account for the domain attributes
+     std::vector<CDomain*> domList = getDomains();
+     for (size_t i = 0; i < domList.size(); ++i)
+     {
+       domList[i]->solveBaseReference();
+       domList[i]->setAttributesBaseReference();
+     }
+     this->hasDomainAxisBaseRef_ = true;
    }
 
@@ -1260 +1281 @@
   void CGrid::completeGrid(CGrid* transformGridSrc)
   {
-    if (!transformGridSrc)
-      ERROR("CGrid::completeGrid(CGrid* transformGridSrc)",
-            << "Impossible to complete grid '" << getId() << "', the source grid is null.");
-
-    if (axis_domain_order.numElements() != transformGridSrc->axis_domain_order.numElements())
-    {
-      ERROR("CGrid::completeGrid(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::completeGrid(CGrid* transformGridSrc)",
-                << "Grids " << this->getId() << " and " << transformGridSrc->getId()
-                << " don't have elements in the same order");
+    if (0 != transformGridSrc)
+    {
+      if (axis_domain_order.numElements() != transformGridSrc->axis_domain_order.numElements())
+      {
+        ERROR("CGrid::completeGrid(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::completeGrid(CGrid* transformGridSrc)",
+                  << "Grids " << this->getId() << " and " << transformGridSrc->getId()
+                  << " don't have elements in the same order");
+      }
     }