Changeset 889 for XIOS

Timestamp:

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

Author:

mhnguyen

Message:

Correcting a bug in transformation_selector

+) Make sure transformation selector chose a correct transformation
+) Correct a bug of updating transformation value

Test
+) On Curie
+) All test pass

Location:

XIOS/trunk/src/transformation

Files:

• generic_algorithm_transformation.cpp (modified) (1 diff)
• grid_generate.cpp (modified) (1 diff)
• grid_transformation_selector.cpp (modified) (3 diffs)
• grid_transformation_selector.hpp (modified) (2 diffs)

XIOS/trunk/src/transformation/generic_algorithm_transformation.cpp

@@ -27 +27 @@
   for (int idx = 0; idx < nbLocalIndex; ++idx)
   {
-    dataOut(localIndex[idx].first) = *(dataInput + idx) * localIndex[idx].second;
+    dataOut(localIndex[idx].first) += *(dataInput + idx) * localIndex[idx].second;
   }
 }

XIOS/trunk/src/transformation/grid_generate.cpp

@@ -14 +14 @@
 namespace xios {
 CGridGenerate::CGridGenerate(CGrid* destination, CGrid* source)
-  : CGridTransformationSelector(destination, source)
+  : CGridTransformationSelector(destination, source, special)
 {
 }

XIOS/trunk/src/transformation/grid_transformation_selector.cpp

@@ -13 +13 @@
 namespace xios {
 
-CGridTransformationSelector::CGridTransformationSelector(CGrid* destination, CGrid* source)
+CGridTransformationSelector::CGridTransformationSelector(CGrid* destination, CGrid* source, TransformationType type)
  : gridSource_(source), gridDestination_(destination),
   listAlgos_(), algoTypes_(), nbNormalAlgos_(0), nbSpecialAlgos_(0), auxInputs_()
@@ -26 +26 @@
        << "Number of elements of grid source " <<gridSource_->getId() << " is " << gridSource_->axis_domain_order.numElements()  << std::endl
        << "Number of elements of grid destination " <<gridDestination_->getId() << " is " << numElement);
-  initializeTransformations();
+  initializeTransformations(type);
 }
 
@@ -35 +35 @@
 for each transformation, we need to make sure that the current "temporary source" maps its global index correctly to the original one.
 */
-void CGridTransformationSelector::initializeTransformations()
+void CGridTransformationSelector::initializeTransformations(TransformationType type)
 {
   // Initialize algorithms
   initializeAlgorithms();
-  ListAlgoType::const_iterator itb = listAlgos_.begin(),
-                               ite = listAlgos_.end(), it;
+  ListAlgoType::iterator itb = listAlgos_.begin(),
+                         ite = listAlgos_.end(), it;
 
   for (it = itb; it != ite; ++it)
   {
     ETranformationType transType = (it->second).first;
-    if (!isSpecialTransformation(transType)) ++nbNormalAlgos_;
-    else ++nbSpecialAlgos_;
+    if (!isSpecialTransformation(transType))
+    {
+      ++nbNormalAlgos_;
+      if (special == type)
+      {
+        it = listAlgos_.erase(it);
+        --it;
+      }
+    }
+    else
+    {
+      ++nbSpecialAlgos_;
+      if (normal == type)
+      {
+        it = listAlgos_.erase(it);
+        --it;
+      }
+    }
+
   }
 }

XIOS/trunk/src/transformation/grid_transformation_selector.hpp

@@ -34 +34 @@
   };
 
+protected:
+  enum TransformationType {
+    special = 0, normal = 1
+  };
+
 public:
   /** Default constructor */
-  CGridTransformationSelector(CGrid* destination, CGrid* source);
+  CGridTransformationSelector(CGrid* destination, CGrid* source, TransformationType type = normal);
   virtual ~CGridTransformationSelector();
 
@@ -49 +54 @@
   void initializeAxisAlgorithms(int axisPositionInGrid);
   void initializeScalarAlgorithms(int scalarPositionInGrid);
-  void initializeTransformations();
+  void initializeTransformations(TransformationType type);
   void selectAlgo(int elementPositionInGrid, ETranformationType transType, int transformationOrder, AlgoType algo);
   bool isSpecialTransformation(ETranformationType transType);