Changeset 2305

Timestamp:

03/08/22 12:30:26 (3 years ago)

Author:

ymipsl

Message:

Fix bug when calling to "xios_solve_inheritance" that inhibit transformation chaining.

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src

Files:

• attribute_array_impl.hpp (modified) (1 diff)
• attribute_enum_impl.hpp (modified) (1 diff)
• attribute_template_impl.hpp (modified) (1 diff)
• declare_ref_func.hpp (modified) (1 diff)
• node/grid.cpp (modified) (3 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/attribute_array_impl.hpp

@@ -113 +113 @@
     bool CAttributeArray<T_numtype,N_rank>::isEqual_(const CAttributeArray& attr)
     {
-      if ((!this->hasInheritedValue() && !attr.hasInheritedValue()))
-          return true;
-      if (this->hasInheritedValue() && attr.hasInheritedValue())
-          return (this->getInheritedValue() == attr.getInheritedValue());
-      else 
-        return false;      
+      if (this->isEmpty() && attr.isEmpty()) return true ;
+      if (!this->isEmpty() && !attr.isEmpty())  return (this->getValue() == attr.getValue());
+      else return false;  
     }
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/attribute_enum_impl.hpp

@@ -121 +121 @@
   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;    
+    if (this->isEmpty() && attr.isEmpty()) return true ;
+    if (!this->isEmpty() && !attr.isEmpty())  return (this->getValue() == attr.getValue());
+    else return false;
   }
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/attribute_template_impl.hpp

@@ -165 +165 @@
     bool CAttributeTemplate<T>::isEqual_(const CAttributeTemplate& attr)
     {
-      if ((!this->hasInheritedValue() && !attr.hasInheritedValue()))
-          return true;
-      if (this->hasInheritedValue() && attr.hasInheritedValue())
-          return (this->getInheritedValue() == attr.getInheritedValue());
-      else 
-        return false;
+      if (this->isEmpty() && attr.isEmpty()) return true ;
+      if (!this->isEmpty() && !attr.isEmpty())  return (this->getValue() == attr.getValue());
+      else return false;
     }
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/declare_ref_func.hpp

@@ -50 +50 @@
     refObjects.push_back(refer_ptr);                                   \
     SuperClassAttribute::setAttributes(refer_ptr, apply);              \
-    setInheritedId(refer_ptr) ;                                        \
+    if (apply) setInheritedId(refer_ptr) ;                                        \
   }                                                                    \
 }                                                                      \

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp

@@ -1810 +1810 @@
       CDomain* pDom = CDomain::get(domainId);
       pDom->solveRefInheritance(apply);
-      pDom->solveInheritanceTransformation();
+      if (apply) pDom->solveInheritanceTransformation();
     }
 
@@ -1818 +1818 @@
       CAxis* pAxis = CAxis::get(axisId);
       pAxis->solveRefInheritance(apply);
-      pAxis->solveInheritanceTransformation();
+      if (apply) pAxis->solveInheritanceTransformation();
     }
 
@@ -1826 +1826 @@
       CScalar* pScalar = CScalar::get(scalarId);
       pScalar->solveRefInheritance(apply);
-      pScalar->solveInheritanceTransformation();
+      if (apply) pScalar->solveInheritanceTransformation();
     }
   }