Changeset 872

Timestamp:

06/09/16 17:36:58 (9 years ago)

Author:

mhnguyen

Message:

Correcting a bug invovling with the order of transformations

+) Add a check to make sure that, if the grid destination and grid source share a
same element, all transformations associated with this elements will not be accounted
in transformations list

Test
+) On Curie
+) all tests pass

File:

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

XIOS/trunk/src/transformation/grid_transformation.cpp

@@ -136 +136 @@
 {
   std::vector<CAxis*> axisListDestP = gridDestination_->getAxis();
+  std::vector<CAxis*> axisListSrcP = gridSource_->getAxis();
   if (!axisListDestP.empty())
   {
+    // If source and destination grid share the same axis
+    if (axisListDestP[elementPosition2AxisPositionInGrid_[axisPositionInGrid]] ==
+        axisListSrcP[elementPosition2AxisPositionInGrid_[axisPositionInGrid]]) return;
+
     if (axisListDestP[elementPosition2AxisPositionInGrid_[axisPositionInGrid]]->hasTransformation())
     {
@@ -165 +170 @@
 {
   std::vector<CDomain*> domListDestP = gridDestination_->getDomains();
+  std::vector<CDomain*> domListSrcP = gridSource_->getDomains();
   if (!domListDestP.empty())
   {
+    // If source and destination grid share the same domain
+    if (domListDestP[elementPosition2DomainPositionInGrid_[domPositionInGrid]] ==
+        domListSrcP[elementPosition2DomainPositionInGrid_[domPositionInGrid]]) return;
+
     if (domListDestP[elementPosition2DomainPositionInGrid_[domPositionInGrid]]->hasTransformation())
     {
@@ -291 +301 @@
   {
     tempGridDests_.resize(0);
-//    tmpGridDestination_ = tempGridDests_[nbTransformation];
-//    return;
   }
   std::vector<CAxis*> axisListDestP = gridDestination_->getAxis();
@@ -346 +354 @@
   {
     tempGridSrcs_.resize(0);
-//    gridSource_ = tempGridSrcs_[nbTransformation];
-//    return;
   }
 
@@ -406 +412 @@
     }
   }
-
-//  for (int idx = 0; idx < axisListSrcP.size(); ++idx)
-//  {
-//    CAxis* axis = CAxis::createAxis();
-//    if (axisIndex != idx) axis->axis_ref.setValue(axisListSrcP[idx]->getId());
-//    else axis->axis_ref.setValue(axisListDestP[idx]->getId());
-//    axis->solveRefInheritance(true);
-//    axis->checkAttributesOnClient();
-//    axisSrc.push_back(axis);
-//  }
-//
-//  for (int idx = 0; idx < domListSrcP.size(); ++idx)
-//  {
-//    CDomain* domain = CDomain::createDomain();
-//    if (domainIndex != idx) domain->domain_ref.setValue(domListSrcP[idx]->getId());
-//    else domain->domain_ref.setValue(domListDestP[idx]->getId());
-//    domain->solveRefInheritance(true);
-//    domain->checkAttributesOnClient();
-//    domainSrc.push_back(domain);
-//  }
 
   gridSource_ = CGrid::createGrid(domainSrc, axisSrc, tmpGridDestination_->axis_domain_order);