Changeset 1106 for XIOS/trunk/src/transformation/grid_transformation_selector.cpp

Timestamp:

04/25/17 10:57:55 (7 years ago)

Author:

mhnguyen

Message:

Fixing bug of referencing to an object.

+) From now on, two objects of a same grid element (domain, axis, scalar) are equal if
they have the same non-empty attributes and the same transformations.
(This is very common case with inheritance by *_ref).

Test
+) On Curie
+) Ok with toy_cmip6

File:

• XIOS/trunk/src/transformation/grid_transformation_selector.cpp (modified) (3 diffs)

XIOS/trunk/src/transformation/grid_transformation_selector.cpp

@@ -202 +202 @@
 
     // If source and destination grid share the same scalar
-    if ((-1 != scalarDstPos) && (-1 != scalarSrcPos) &&
-        (scalarListDestP[scalarDstPos] == scalarListSrcP[scalarSrcPos]) && !isSameGrid_) return;
+    if ((-1 != scalarDstPos) && (-1 != scalarSrcPos)  && !isSameGrid_ &&
+        ((scalarListDestP[scalarDstPos] == scalarListSrcP[scalarSrcPos]) ||
+         (scalarListDestP[scalarDstPos]->isEqual(scalarListSrcP[scalarSrcPos])))) return;
 
     if (scalarListDestP[scalarDstPos]->hasTransformation())
@@ -242 +243 @@
 
     // If source and destination grid share the same axis
-    if ((-1 != axisDstPos) && (-1 != axisSrcPos) &&
-        (axisListDestP[axisDstPos] == axisListSrcP[axisSrcPos]) && !isSameGrid_) return;
+    if ((-1 != axisDstPos) && (-1 != axisSrcPos) && !isSameGrid_ &&
+        ((axisListDestP[axisDstPos] == axisListSrcP[axisSrcPos]) ||
+         (axisListDestP[axisDstPos]->isEqual(axisListSrcP[axisSrcPos]))) ) return;
 
     if (axisListDestP[axisDstPos]->hasTransformation())
@@ -281 +283 @@
 
     // If source and destination grid share the same domain
-    if ((-1 != domDstPos) && (-1 != domSrcPos) &&
-        (domListDestP[domDstPos] == domListSrcP[domSrcPos]) && !isSameGrid_) return;
+    if ((-1 != domDstPos) && (-1 != domSrcPos) && !isSameGrid_ &&
+        ((domListDestP[domDstPos] == domListSrcP[domSrcPos]) ||
+         (domListDestP[domDstPos]->isEqual(domListSrcP[domSrcPos])))) return;
 
     if (domListDestP[domDstPos]->hasTransformation())