Changeset 1460 for XIOS/dev/branch_openmp/src/attribute_array_impl.hpp

Timestamp:

03/22/18 10:43:20 (6 years ago)

Author:

yushan

Message:

branch_openmp merged with XIOS_DEV_CMIP6@1459

File:

• XIOS/dev/branch_openmp/src/attribute_array_impl.hpp (modified) (1 diff)

XIOS/dev/branch_openmp/src/attribute_array_impl.hpp

@@ -104 +104 @@
 
     template <typename T_numtype, int N_rank>
-    bool CAttributeArray<T_numtype,N_rank>::isEqual(const CAttributeArray& attr)
+    bool CAttributeArray<T_numtype,N_rank>::isEqual(const CAttribute& attr)
     {
-      return ((dynamic_cast<CArray<T_numtype,N_rank>& >(*this)) == (dynamic_cast<const CArray<T_numtype,N_rank>& >(attr)));      
+      const CAttributeArray<T_numtype,N_rank>& tmp = dynamic_cast<const CAttributeArray<T_numtype,N_rank>& >(attr);
+      return this->isEqual_(tmp);      
     }
 
     template <typename T_numtype, int N_rank>
-    bool CAttributeArray<T_numtype,N_rank>::isEqual(const CAttribute& attr)
+    bool CAttributeArray<T_numtype,N_rank>::isEqual_(const CAttributeArray& attr)
     {
-      return ((*this) == (dynamic_cast<const CAttributeArray<T_numtype,N_rank>& >(attr)));      
+      if ((!this->hasInheritedValue() && !attr.hasInheritedValue()))
+          return true;
+      if (this->hasInheritedValue() && attr.hasInheritedValue())
+          return (this->getInheritedValue() == attr.getInheritedValue());
+      else 
+        return false;      
     }