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

Timestamp:

07/28/15 13:37:07 (9 years ago)

Author:

mhnguyen

Message:

Making changes in domain to make sure unstructed grid work with new method of index distribution

+) Change the way define i_index and j_index of a domain
+) Remove some redundant attributes of domain
+) Adjust the way to calculate index distribution on server side

Test
+) Make some minor change to test_unstruct_complete to work with new XIOS
+) On Curie
+) All test pass and correct

File:

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

XIOS/trunk/src/node/grid.cpp

@@ -13 +13 @@
 #include "context_server.hpp"
 #include "array_new.hpp"
+#include "server_distribution_description.hpp"
 #include "client_server_mapping_distributed.hpp"
 
@@ -23 +24 @@
       , isChecked(false), isDomainAxisChecked(false)
       , vDomainGroup_(), vAxisGroup_(), axisList_(), isAxisListSet(false), isDomListSet(false), clientDistribution_(0), isIndexSent(false)
-      , serverDistribution_(0), serverDistributionDescription_(0), clientServerMap_(0), writtenDataSize_(0), globalDim_()
+      , serverDistribution_(0), clientServerMap_(0), writtenDataSize_(0), globalDim_()
       , connectedDataSize_(), connectedServerRank_(), isDataDistributed_(true), transformations_(0), isTransformed_(false)
-      , axisPositionInGrid_()
+      , axisPositionInGrid_(), positionDimensionDistributed_(1)
    {
      setVirtualDomainGroup();
@@ -35 +36 @@
       , isChecked(false), isDomainAxisChecked(false)
       , vDomainGroup_(), vAxisGroup_(), axisList_(), isAxisListSet(false), isDomListSet(false), clientDistribution_(0), isIndexSent(false)
-      , serverDistribution_(0), serverDistributionDescription_(0), clientServerMap_(0), writtenDataSize_(0), globalDim_()
+      , serverDistribution_(0), clientServerMap_(0), writtenDataSize_(0), globalDim_()
       , connectedDataSize_(), connectedServerRank_(), isDataDistributed_(true), transformations_(0), isTransformed_(false)
-      , axisPositionInGrid_()
+      , axisPositionInGrid_(), positionDimensionDistributed_(1)
    {
      setVirtualDomainGroup();
@@ -47 +48 @@
     if (0 != clientDistribution_) delete clientDistribution_;
     if (0 != serverDistribution_) delete serverDistribution_;
-    if (0 != serverDistributionDescription_) delete serverDistributionDescription_;
     if (0 != clientServerMap_) delete clientServerMap_;
     if (0 != transformations_) delete transformations_;
@@ -58 +58 @@
    ENodeType CGrid::GetType(void)    { return eGrid; }
 
-   //---------------------------------------------------------------
 
    StdSize CGrid::getDimension(void) const
@@ -112 +111 @@
      }
 
+     // In some cases in which domain is masked, we need to count for connected server for longitude and latitude
+     std::vector<CDomain*> domListP = this->getDomains();
+     if (!domListP.empty())
+     {
+       for (int i = 0; i < domListP.size(); ++i)
+       {
+         const std::map<int, vector<size_t> >& indexDomainServer = domListP[i]->getIndexServer();
+         std::map<int, vector<size_t> >::const_iterator itDom = indexDomainServer.begin(), iteDom = indexDomainServer.end();
+         for (; itDom != iteDom; ++itDom)
+         {
+           if (ret.end() == ret.find(itDom->first))
+           {
+              retVal = (itDom->second).size();
+              retVal *= secureFactor;
+              ret.insert(std::make_pair<int,StdSize>(itDom->first, retVal));
+           }
+         }
+       }
+     }
+
      return ret;
    }
 
+   void CGrid::checkAttributesAfterTransformation()
+   {
+     setDomainList();
+     std::vector<CDomain*> domListP = this->getDomains();
+     if (!domListP.empty())
+     {
+       for (int i = 0; i < domListP.size(); ++i)
+       {
+         domListP[i]->checkAttributesOnClientAfterTransformation();
+       }
+     }
+   }
 
    void CGrid::solveDomainAxisRef(bool areAttributesChecked)
@@ -122 +153 @@
      this->solveAxisRef(areAttributesChecked);
      this->solveDomainRef(areAttributesChecked);
-
+     computeGridGlobalDimension(getDomains(), getAxis(), axis_domain_order);
      this->isDomainAxisChecked = areAttributesChecked;
    }
@@ -153 +184 @@
      if (context->hasClient)
      {
-        checkMask();
+        this->checkAttributesAfterTransformation();
+        this->checkMask();
         this->computeIndex();
      }
@@ -229 +261 @@
       if (!domListP.empty())
       {
-        computeGridGlobalDimension(getDomains(), getAxis(), axis_domain_order);
         for (int i = 0; i < domListP.size(); ++i)
         {
@@ -258 +289 @@
         }
 
-        computeGridGlobalDimension(getDomains(), getAxis(), axis_domain_order);
         for (int i = 0; i < axisListP.size(); ++i)
         {
@@ -267 +297 @@
           ++idx;
         }
-
       }
    }
@@ -275 +304 @@
      return axisPositionInGrid_;
    }
-
 
    //---------------------------------------------------------------
@@ -317 +345 @@
 
      // Then compute distribution on server side
-     serverDistributionDescription_ = new CServerDistributionDescription(clientDistribution_->getNGlob());
-     serverDistributionDescription_->computeServerDistribution(client->serverSize, true);
-     serverDistributionDescription_->computeServerGlobalIndexInRange(client->serverSize,
-                                                                     std::make_pair<size_t,size_t>(indexBegin, indexEnd));
+     CServerDistributionDescription serverDistributionDescription(globalDim_);
+     serverDistributionDescription.computeServerGlobalIndexInRange(client->serverSize,
+                                                                   std::make_pair<size_t,size_t>(indexBegin, indexEnd),
+                                                                   positionDimensionDistributed_);
 
      // Finally, compute index mapping between client(s) and server(s)
-     clientServerMap_ = new CClientServerMappingDistributed(serverDistributionDescription_->getGlobalIndexRange(),
+     clientServerMap_ = new CClientServerMappingDistributed(serverDistributionDescription.getGlobalIndexRange(),
                                                             client->intraComm,
                                                             clientDistribution_->isDataDistributed());
@@ -330 +358 @@
      const std::map<int, std::vector<size_t> >& globalIndexOnServer = clientServerMap_->getGlobalIndexOnServer();
      const CArray<size_t,1>& globalIndexSendToServer = clientDistribution_->getGlobalDataIndexSendToServer();
-
      std::map<int, std::vector<size_t> >::const_iterator iteGlobalMap, itbGlobalMap, itGlobalMap;
      itbGlobalMap = itGlobalMap = globalIndexOnServer.begin();
@@ -640 +667 @@
       if (axisDomainOrder(i))
       {
+        if (!(domains[idxDomain]->type.isEmpty()) && (domains[idxDomain]->type==CDomain::type_attr::unstructured))
+        {
+          positionDimensionDistributed_ = idx;
+        }
+        else
+        {
+          positionDimensionDistributed_ = idx +1;
+        }
+
         globalDim_[idx]   = domains[idxDomain]->ni_glo.getValue();
         globalDim_[idx+1] = domains[idxDomain]->nj_glo.getValue();
+
         ++idxDomain;
         idx += 2;