Changeset 687 for XIOS/trunk/src/transformation/grid_transformation.cpp

Timestamp:

09/15/15 17:30:55 (9 years ago)

Author:

mhnguyen

Message:

Implementing auto-generate rectilinear domain

+) Add a new special transformation to generate (complete) rectilinear domain

Test
+) On Curie
+) test_new_feature passed

File:

• XIOS/trunk/src/transformation/grid_transformation.cpp (modified) (4 diffs)

XIOS/trunk/src/transformation/grid_transformation.cpp

@@ -58 +58 @@
 
   gridSource_ = CGrid::createGrid(domainSrc, axisSrc, gridDestination_->axis_domain_order);
-  gridSourceDimensionSize_ = gridSource_->getGlobalDimension();
-  gridDestinationDimensionSize_ = gridDestination_->getGlobalDimension();
 
   initializeMappingOfOriginalGridSource();
@@ -77 +75 @@
 
   CDistributionClient distribution(client->clientRank, originalGridSource_);
-  const std::vector<size_t>& globalIndexGridDestSendToServer = distribution.getGlobalDataIndexSendToServer();
-
-  weightOfGlobalIndexOfOriginalGridSource_.resize(globalIndexGridDestSendToServer.size());
-  globalIndexOfCurrentGridSource_  = globalIndexGridDestSendToServer;
-  globalIndexOfOriginalGridSource_ = globalIndexGridDestSendToServer;
+  const std::vector<size_t>& globalIndexGridSrcSendToServer = distribution.getGlobalDataIndexSendToServer();
+
+  weightOfGlobalIndexOfOriginalGridSource_.resize(globalIndexGridSrcSendToServer.size());
+  globalIndexOfCurrentGridSource_  = globalIndexGridSrcSendToServer;
+  globalIndexOfOriginalGridSource_ = globalIndexGridSrcSendToServer;
   weightOfGlobalIndexOfOriginalGridSource_ = 1.0;
 }
@@ -346 +344 @@
                                ite = listAlgos_.end(), it;
   CGenericAlgorithmTransformation* algo = 0;
-
+  int nbAgloTransformation = 0; // Only count for executed transformation. Generate domain is a special one, not executed in the list
   for (it = itb; it != ite; ++it)
   {
@@ -358 +356 @@
     algo = algoTransformation_.back();
 
-    // Recalculate the distribution of grid destination
-    CDistributionClient distributionClientDest(client->clientRank, gridDestination_);
-    const std::vector<size_t>& globalIndexGridDestSendToServer = distributionClientDest.getGlobalDataIndexSendToServer();
-
-    // ComputeTransformation of global index of each element
-    std::vector<int> gridDestinationDimensionSize = gridDestination_->getGlobalDimension();
-    std::vector<int> gridSrcDimensionSize = gridSource_->getGlobalDimension();
-    int elementPosition = it->first;
-    algo->computeGlobalSourceIndex(elementPosition,
-                                   gridDestinationDimensionSize,
-                                   gridSrcDimensionSize,
-                                   globalIndexGridDestSendToServer,
-                                   globaIndexWeightFromDestToSource);
-
-    // Compute transformation of global indexes among grids
-    computeTransformationFromOriginalGridSource(globaIndexWeightFromDestToSource);
-
-    // Now grid destination becomes grid source in a new transformation
-    setUpGrid(elementPositionInGrid, transType);
-  }
-
-  updateFinalGridDestination();
-  computeFinalTransformationMapping();
+    if (0 != algo) // Only registered transformation can be executed
+    {
+      // Recalculate the distribution of grid destination
+      CDistributionClient distributionClientDest(client->clientRank, gridDestination_);
+      const std::vector<size_t>& globalIndexGridDestSendToServer = distributionClientDest.getGlobalDataIndexSendToServer();
+
+      // ComputeTransformation of global index of each element
+      std::vector<int> gridDestinationDimensionSize = gridDestination_->getGlobalDimension();
+      std::vector<int> gridSrcDimensionSize = gridSource_->getGlobalDimension();
+      int elementPosition = it->first;
+      algo->computeGlobalSourceIndex(elementPosition,
+                                     gridDestinationDimensionSize,
+                                     gridSrcDimensionSize,
+                                     globalIndexGridDestSendToServer,
+                                     globaIndexWeightFromDestToSource);
+
+      // Compute transformation of global indexes among grids
+      computeTransformationFromOriginalGridSource(globaIndexWeightFromDestToSource);
+
+      // Now grid destination becomes grid source in a new transformation
+      setUpGrid(elementPositionInGrid, transType);
+      ++nbAgloTransformation;
+    }
+  }
+
+  if (0 != nbAgloTransformation)
+  {
+    updateFinalGridDestination();
+    computeFinalTransformationMapping();
+  }
 }