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

Timestamp:

07/05/16 15:59:18 (8 years ago)

Author:

mhnguyen

Message:

Removing some redundant codes and make some minor improvements

+) Make a check to not do grid generation twice

Test
+) On Curie
+) On test compilation

File:

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

XIOS/trunk/src/node/grid.cpp

@@ -34 +34 @@
       , transformations_(0), isTransformed_(false)
       , axisPositionInGrid_(), positionDimensionDistributed_(1), hasDomainAxisBaseRef_(false)
-      , gridSrc_(), hasTransform_(false), order_(), globalIndexOnServer_()
+      , gridSrc_(), hasTransform_(false), isGenerated_(false), order_(), globalIndexOnServer_()
    {
      setVirtualDomainGroup();
@@ -52 +52 @@
       , transformations_(0), isTransformed_(false)
       , axisPositionInGrid_(), positionDimensionDistributed_(1), hasDomainAxisBaseRef_(false)
-      , gridSrc_(), hasTransform_(false), order_(), globalIndexOnServer_()
+      , gridSrc_(), hasTransform_(false), isGenerated_(false), order_(), globalIndexOnServer_()
    {
      setVirtualDomainGroup();
@@ -707 +707 @@
    }
 
-//   CGrid* CGrid::createGrid(StdString id, const std::vector<CDomain*>& domains, const std::vector<CAxis*>& axis,
-//                            const CArray<int,1>& axisDomainOrder)
-//   {
-//      if (axisDomainOrder.numElements() > 0 && axisDomainOrder.numElements() != (domains.size() + axis.size()))
-//        ERROR("CGrid* CGrid::createGrid(...)",
-//              << "The size of axisDomainOrder (" << axisDomainOrder.numElements()
-//              << ") is not coherent with the number of elements (" << domains.size() + axis.size() <<").");
-//
-//      CGrid* grid = CGridGroup::get("grid_definition")->createChild(id);
-//      grid->setDomainList(domains);
-//      grid->setAxisList(axis);
-//
-//      // By default, domains are always the first elements of a grid
-//      if (0 == axisDomainOrder.numElements())
-//      {
-//        int size = domains.size() + axis.size();
-//        grid->axis_domain_order.resize(size);
-//        for (int i = 0; i < size; ++i)
-//        {
-//          if (i < domains.size()) grid->axis_domain_order(i) = 2;
-//          else grid->axis_domain_order(i) = 1;
-//        }
-//      }
-//      else
-//      {
-//        grid->axis_domain_order.resize(axisDomainOrder.numElements());
-//        grid->axis_domain_order = axisDomainOrder;
-//      }
-//
-//      grid->solveDomainAxisRefInheritance(true);
-//
-//      return grid;
-//   }
-
    CGrid* CGrid::createGrid(StdString id, const std::vector<CDomain*>& domains, const std::vector<CAxis*>& axis,
                             const std::vector<CScalar*>& scalars, const CArray<int,1>& axisDomainOrder)
@@ -1040 +1006 @@
     list<CMessage> listMsg;
     list<CArray<size_t,1> > listOutIndex;
-//    const CClientServerMapping::GlobalIndexMap& globalIndexOnServer = clientServerMap_->getGlobalIndexOnServer();
-//    const CClientServerMapping::GlobalIndexMap& globalIndexOnServer = clientServerMap_->getGlobalIndexOnServer();
     const CDistributionClient::GlobalLocalDataMap& globalLocalIndexSendToServer = clientDistribution_->getGlobalLocalDataSendToServer();
     CDistributionClient::GlobalLocalDataMap::const_iterator itIndex = globalLocalIndexSendToServer.begin(),
@@ -1735 +1699 @@
     }
 
+    if (isGenerated()) return;
+    setGenerated();
+
     CGridGenerate gridGenerate(this, transformGridSrc);
     gridGenerate.completeGrid();
+  }
+
+  bool CGrid::isGenerated()
+  {
+    return isGenerated_;
+  }
+
+  void CGrid::setGenerated()
+  {
+    isGenerated_ = true;
   }