Changeset 1219 for XIOS/dev/XIOS_DEV_CMIP6

Timestamp:

07/18/17 11:50:10 (7 years ago)

Author:

mhnguyen

Message:

Correcting minor bug of reference key word

+) Comparison of two objects with *_ref keyword is checked correctly

Test
+) On Curie
+) Only simple case

Location:

XIOS/dev/XIOS_DEV_CMIP6/src

Files:

• attribute_array.hpp (modified) (2 diffs)
• attribute_array_impl.hpp (modified) (1 diff)
• attribute_enum.hpp (modified) (2 diffs)
• attribute_enum_impl.hpp (modified) (1 diff)
• attribute_template.hpp (modified) (2 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/attribute_array.hpp

@@ -43 +43 @@
             CArray<T_numtype, N_rank> getInheritedValue(void) const ;
             bool hasInheritedValue(void) const;
-            
-            bool isEqual(const CAttributeArray& attr);
+                        
             bool isEqual(const CAttribute& attr);
 
@@ -67 +66 @@
 
          private :
+          bool isEqual_(const CAttributeArray& attr);
           CArray<T_numtype, N_rank> inheritedValue ;
           StdString _toString(void) const;

XIOS/dev/XIOS_DEV_CMIP6/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;      
     }
 

XIOS/dev/XIOS_DEV_CMIP6/src/attribute_enum.hpp

@@ -49 +49 @@
             T_enum getInheritedValue(void)  const;
             string getInheritedStringValue(void) const;
-            bool hasInheritedValue(void) const;          
-          
-            bool isEqual(const CAttributeEnum& attr );
+            bool hasInheritedValue(void) const;                    
+            
             bool isEqual(const CAttribute& attr );
 
@@ -74 +73 @@
             virtual void generateFortranInterfaceGetDeclaration_(ostream& oss,const string& className) ;
             virtual void generateFortranInterfaceGetBody_(ostream& oss,const string& className) ;
-            virtual void generateFortranInterfaceGetDeclaration(ostream& oss,const string& className) ;
+            virtual void generateFortranInterfaceGetDeclaration(ostream& oss,const string& className) ;      
 
          private :
+          bool isEqual_(const CAttributeEnum& attr );
           StdString _toString(void) const;
           void _fromString(const StdString & str);

XIOS/dev/XIOS_DEV_CMIP6/src/attribute_enum_impl.hpp

@@ -114 +114 @@
   bool CAttributeEnum<T>::isEqual(const CAttribute& attr)
   {
-    return (this->isEqual(dynamic_cast<const CAttributeEnum<T>& >(attr)));
-  }
-
-  template <class T>
-  bool CAttributeEnum<T>::isEqual(const CAttributeEnum& attr)
-  {
-    return ((dynamic_cast<const CEnum<T>& >(*this)) == (dynamic_cast<const CEnum<T>& >(attr)));
+    const CAttributeEnum<T>& tmp = dynamic_cast<const CAttributeEnum<T>& >(attr);
+    return this->isEqual_(tmp);
+  }
+
+  template <class T>
+  bool CAttributeEnum<T>::isEqual_(const CAttributeEnum& attr)
+  {
+    if ((!this->hasInheritedValue() && !attr.hasInheritedValue()))
+        return true;
+    if (this->hasInheritedValue() && attr.hasInheritedValue())
+        return (this->getInheritedValue() == attr.getInheritedValue());
+    else 
+      return false;    
   }
 

XIOS/dev/XIOS_DEV_CMIP6/src/attribute_template.hpp

@@ -57 +57 @@
             T getInheritedValue(void) const ;
             bool hasInheritedValue(void) const;
-
-            bool isEqual_(const CAttributeTemplate& attr );
+            
             bool isEqual(const CAttribute& attr );
 
@@ -95 +94 @@
 //            CAttributeTemplate(void); // Not implemented.
          private :
+          bool isEqual_(const CAttributeTemplate& attr);
           StdString _toString(void) const;
           void _fromString(const StdString & str);