Changeset 897 for XIOS

Timestamp:

07/11/16 17:36:11 (8 years ago)

Author:

mhnguyen

Message:

Fixing bug in transformation selector

+) If grid source and grid destination are the same (case of special transformations)
we still check transformation list

Location:

XIOS/trunk/src/transformation

Files:

• grid_transformation_selector.cpp (modified) (4 diffs)
• grid_transformation_selector.hpp (modified) (1 diff)

XIOS/trunk/src/transformation/grid_transformation_selector.cpp

@@ -14 +14 @@
 
 CGridTransformationSelector::CGridTransformationSelector(CGrid* destination, CGrid* source, TransformationType type)
- : gridSource_(source), gridDestination_(destination),
+ : gridSource_(source), gridDestination_(destination), isSameGrid_(false),
   listAlgos_(), algoTypes_(), nbNormalAlgos_(0), nbSpecialAlgos_(0), auxInputs_()
 {
-  if (0 == source) gridSource_ = gridDestination_;
+  if (0 == source)
+  {  gridSource_ = gridDestination_; isSameGrid_ = true; }
 
   //Verify the compatibity between two grids
@@ -162 +163 @@
     // If source and destination grid share the same scalar
     if ((-1 != scalarDstPos) && (-1 != scalarSrcPos) &&
-        (scalarListDestP[scalarDstPos] == scalarListSrcP[scalarSrcPos])) return;
+        (scalarListDestP[scalarDstPos] == scalarListSrcP[scalarSrcPos]) && !isSameGrid_) return;
 
     if (scalarListDestP[scalarDstPos]->hasTransformation())
@@ -203 +204 @@
     // If source and destination grid share the same axis
     if ((-1 != axisDstPos) && (-1 != axisSrcPos) &&
-        (axisListDestP[axisDstPos] == axisListSrcP[axisSrcPos])) return;
+        (axisListDestP[axisDstPos] == axisListSrcP[axisSrcPos]) && !isSameGrid_) return;
 
     if (axisListDestP[axisDstPos]->hasTransformation())
@@ -243 +244 @@
     // If source and destination grid share the same domain
     if ((-1 != domDstPos) && (-1 != domSrcPos) &&
-        (domListDestP[domDstPos] == domListSrcP[domSrcPos])) return;
+        (domListDestP[domDstPos] == domListSrcP[domSrcPos]) && !isSameGrid_) return;
 
     if (domListDestP[domDstPos]->hasTransformation())

XIOS/trunk/src/transformation/grid_transformation_selector.hpp

@@ -70 +70 @@
   CGrid* gridDestination_;
 
+  //! Grid source and grid destination it's the same
+  bool isSameGrid_;
+
 protected:
   //! List of algorithm types and their order