Changeset 1106 for XIOS/trunk/src/node/scalar.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/node/scalar.cpp (modified) (2 diffs)

XIOS/trunk/src/node/scalar.cpp

@@ -65 +65 @@
   }
 
+  /*!
+    Compare two scalar objects. 
+    They are equal if only if they have identical attributes as well as their values.
+    Moreover, they must have the same transformations.
+  \param [in] scalar Compared scalar
+  \return result of the comparison
+  */
+  bool CScalar::isEqual(CScalar* obj)
+  {
+    bool objEqual = SuperClass::isEqual(obj);
+    if (!objEqual) return objEqual;
+
+    TransMapTypes thisTrans = this->getAllTransformations();
+    TransMapTypes objTrans  = obj->getAllTransformations();
+
+    TransMapTypes::const_iterator it, itb, ite;
+    std::vector<ETranformationType> thisTransType, objTransType;
+    for (it = thisTrans.begin(); it != thisTrans.end(); ++it)
+      thisTransType.push_back(it->first);
+    for (it = objTrans.begin(); it != objTrans.end(); ++it)
+      objTransType.push_back(it->first);
+
+    if (thisTransType.size() != objTransType.size()) return false;
+    for (int idx = 0; idx < thisTransType.size(); ++idx)
+      objEqual &= (thisTransType[idx] == objTransType[idx]);
+
+    return objEqual;
+  }
+
   CTransformation<CScalar>* CScalar::addTransformation(ETranformationType transType, const StdString& id)
   {
@@ -84 +113 @@
   {
     return transformationMap_;
-  }
-
-  /*!
-    Check the validity of all transformations applied on scalar
-  This functions is called AFTER all inherited attributes are solved
-  */
-  void CScalar::checkTransformations()
-  {
-    TransMapTypes::const_iterator itb = transformationMap_.begin(), it,
-                                  ite = transformationMap_.end();
-//    for (it = itb; it != ite; ++it)
-//    {
-//      (it->second)->checkValid(this);
-//    }
   }