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

Timestamp:

02/16/16 10:14:23 (8 years ago)

Author:

mhnguyen

Message:

Implementing grid destination clone in case of two grid source

+) Clone attributes of grid destination as well as its transformation
+) Clean some redundant codes

Test
+) All tests pass

File:

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

XIOS/trunk/src/node/grid.cpp

@@ -32 +32 @@
       , transformations_(0), isTransformed_(false)
       , axisPositionInGrid_(), positionDimensionDistributed_(1), hasDomainAxisBaseRef_(false)
+      , gridSrc_()
    {
      setVirtualDomainGroup();
@@ -46 +47 @@
       , transformations_(0), isTransformed_(false)
       , axisPositionInGrid_(), positionDimensionDistributed_(1), hasDomainAxisBaseRef_(false)
+      , gridSrc_()
    {
      setVirtualDomainGroup();
@@ -551 +553 @@
    }
 
+   CGrid* CGrid::cloneGrid(const StdString& idNewGrid, CGrid* gridSrc)
+   {
+     std::vector<CAxis*> axisSrcTmp = gridSrc->getAxis(), axisSrc;
+     std::vector<CDomain*> domainSrcTmp = gridSrc->getDomains(), domainSrc;
+     for (int idx = 0; idx < axisSrcTmp.size(); ++idx)
+     {
+       CAxis* axis = CAxis::createAxis();
+       axis->duplicateAttributes(axisSrcTmp[idx]);
+       axis->duplicateTransformation(axisSrcTmp[idx]);
+       axis->solveRefInheritance(true);
+       axis->solveInheritanceTransformation();
+       axisSrc.push_back(axis);
+     }
+
+     for (int idx = 0; idx < domainSrcTmp.size(); ++idx)
+     {
+       CDomain* domain = CDomain::createDomain();
+       domain->duplicateAttributes(domainSrcTmp[idx]);
+       domain->duplicateTransformation(domainSrcTmp[idx]);
+       domain->solveRefInheritance(true);
+       domain->solveInheritanceTransformation();
+       domainSrc.push_back(domain);
+     }
+
+      CGrid* grid = CGrid::createGrid(idNewGrid, domainSrc, axisSrc, gridSrc->axis_domain_order);
+
+      return grid;
+   }
+
    StdString CGrid::generateId(const std::vector<CDomain*>& domains, const std::vector<CAxis*>& axis,
                                const CArray<bool,1>& axisDomainOrder)
@@ -588 +619 @@
 
       return id.str();
+   }
+
+   StdString CGrid::generateId(const CGrid* gridSrc, const CGrid* gridDest)
+   {
+     StdString idSrc  = gridSrc->getId();
+     StdString idDest = gridDest->getId();
+
+     std::ostringstream id;
+     id << idSrc << "__" << idDest;
+
+     return id.str();
    }
 
@@ -1298 +1340 @@
   }
 
+  void CGrid::addTransGridSource(CGrid* gridSrc)
+  {
+    if (gridSrc_.end() == gridSrc_.find(gridSrc))
+      gridSrc_.insert(make_pair(gridSrc,make_pair(false,"")));
+  }
+
+  std::map<CGrid*,std::pair<bool,StdString> >& CGrid::getTransGridSource()
+  {
+    return gridSrc_;
+  }
+
   /*!
      Complete all the necessary (and lacking) attributes of a grid