Changeset 775 for XIOS/trunk/src/transformation/domain_algorithm_generate_rectilinear.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/transformation/domain_algorithm_generate_rectilinear.cpp (modified) (4 diffs)

XIOS/trunk/src/transformation/domain_algorithm_generate_rectilinear.cpp

@@ -17 +17 @@
 
 CDomainAlgorithmGenerateRectilinear::CDomainAlgorithmGenerateRectilinear(CDomain* domainDestination, CDomain* domainSource,
-                                                                         CGrid* gridSource, CGenerateRectilinearDomain* genRectDomain)
-: CDomainAlgorithmTransformation(domainDestination, domainSource), gridSrc_(gridSource), nbDomainDistributedPart_(0)
+                                                                         CGrid* gridDest, CGrid* gridSource,
+                                                                         CGenerateRectilinearDomain* genRectDomain)
+: CDomainAlgorithmTransformation(domainDestination, domainSource), nbDomainDistributedPart_(0)
 {
   genRectDomain->checkValid(domainDestination);
-  computeDistributionGridSource();
+  if (0 != gridSource) computeDistributionGridSource(gridSource);
+  else
+  {
+    computeDistributionGridDestination(gridDest);
+  }
   fillInAttributesDomainDestination();
 }
@@ -36 +41 @@
   Calculate the number of distributed parts on domain source
 */
-void CDomainAlgorithmGenerateRectilinear::computeDistributionGridSource()
+void CDomainAlgorithmGenerateRectilinear::computeDistributionGridSource(CGrid* gridSrc)
 {
   CContext* context = CContext::getCurrent();
   CContextClient* client = context->client;
 
-  std::vector<CDomain*> domListSrcP = gridSrc_->getDomains();
-  std::vector<CAxis*> axisListSrcP = gridSrc_->getAxis();
+  std::vector<CDomain*> domListSrcP = gridSrc->getDomains();
+  std::vector<CAxis*> axisListSrcP = gridSrc->getAxis();
 
   for (int i = 0; i < domListSrcP.size(); ++i) // support we have only domain, more than one, for now, dont know how to process
@@ -50 +55 @@
     else
     {
-      gridSrc_->solveAxisRef(false);
+      gridSrc->solveAxisRef(false);
       int nbAxis = axisListSrcP.size();
       std::vector<int> nbLocalAxis(nbAxis, 0);
@@ -90 +95 @@
 
 /*!
+  Compute the distribution of the domain destination by using available information provided by user such as n_distributed_partition of axis
+*/
+void CDomainAlgorithmGenerateRectilinear::computeDistributionGridDestination(CGrid* gridDest)
+{
+  // For now, just suppose that the grid contains only one domain
+  std::vector<CAxis*> axisListDestP = gridDest->getAxis();
+  int nbPartition = 1, idx = 0;
+  for (int i = 0; i < gridDest->axis_domain_order.numElements(); ++i)
+  {
+    if (false == (gridDest->axis_domain_order)(i))
+    {
+      nbPartition *= (axisListDestP[idx]->n_distributed_partition.isEmpty()) ? 1: (axisListDestP[idx]->n_distributed_partition.getValue());
+      ++idx;
+    }
+  }
+
+  CContext* context = CContext::getCurrent();
+  CContextClient* client = context->client;
+  int modPart = (client->clientSize) % nbPartition;
+  if (0 != modPart)
+    ERROR("CDomainAlgorithmGenerateRectilinear::computeDistributionGridDestination(CGrid* gridDest)",
+       << "The grid " <<gridDest->getId() << " is not well-distributed. There is an incompatibility between distribution of axis and domain.");
+  nbDomainDistributedPart_ = client->clientSize/nbPartition;
+
+}
+
+/*!
   Fill in all necessary attributes of domain destination and their values
 */