Changeset 1158 for XIOS/dev/dev_olga/src/attribute_array_impl.hpp

Timestamp:

06/06/17 17:58:16 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging with trunk r1137.
There are bugs.

File:

• XIOS/dev/dev_olga/src/attribute_array_impl.hpp (modified) (2 diffs)

XIOS/dev/dev_olga/src/attribute_array_impl.hpp

@@ -83 +83 @@
     void CAttributeArray<T_numtype,N_rank>::setInheritedValue(const CAttributeArray& attr)
     {
-      if (this->isEmpty() && attr.hasInheritedValue())
+      if (this->isEmpty() && _canInherite && attr.hasInheritedValue())
       {
         inheritedValue.resize(attr.shape()) ;
@@ -103 +103 @@
     }
 
+    template <typename T_numtype, int N_rank>
+    bool CAttributeArray<T_numtype,N_rank>::isEqual(const CAttributeArray& attr)
+    {
+      return ((dynamic_cast<CArray<T_numtype,N_rank>& >(*this)) == (dynamic_cast<const CArray<T_numtype,N_rank>& >(attr)));      
+    }
+
+    template <typename T_numtype, int N_rank>
+    bool CAttributeArray<T_numtype,N_rank>::isEqual(const CAttribute& attr)
+    {
+      return ((*this) == (dynamic_cast<const CAttributeArray<T_numtype,N_rank>& >(attr)));      
+    }
 
     template <typename T_numtype, int N_rank>