Changeset 445 for XIOS/trunk/src/attribute_map.cpp

Timestamp:

06/19/13 10:09:36 (11 years ago)

Author:

ymipsl

Message:

Add possibility to make inheritance of attributes and reference before closing the context definition.
New fortran fonction : xios_solve inheritance()
After this call, the value of attribute have the inherited value of their parent.

YM

File:

• XIOS/trunk/src/attribute_map.cpp (modified) (2 diffs)

XIOS/trunk/src/attribute_map.cpp

@@ -107 +107 @@
       //---------------------------------------------------------------
       
-      void CAttributeMap::setAttributes(const CAttributeMap * const _parent)
+      void CAttributeMap::setAttributes(const CAttributeMap * const _parent, bool apply)
       {
          typedef std::pair<StdString, CAttribute*> StdStrAttPair;
@@ -117 +117 @@
             if (this->hasAttribute(el.first))
             {
-               CAttribute * currAtt = CAttributeMap::operator[](el.first);
-               if (currAtt->isEmpty() && !el.second->isEmpty())
+               CAttribute * currentAtt = CAttributeMap::operator[](el.first);
+               CAttribute * parentAtt = el.second ;
+               if (apply)
                {
-                  this->setAttribute(el.first, el.second);
+                 if (currentAtt->isEmpty() && !el.second->isEmpty())
+                 {
+                    this->setAttribute(el.first, el.second);
+                 }
                }
+               else currentAtt->setInheritedValue(*parentAtt) ;
             }
          }