Changeset 445 for XIOS/trunk/src/node/context.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/node/context.cpp (modified) (5 diffs)

XIOS/trunk/src/node/context.cpp

@@ -245 +245 @@
    //----------------------------------------------------------------
 
-   void CContext::solveDescInheritance(const CAttributeMap * const UNUSED(parent))
+   void CContext::solveDescInheritance(bool apply, const CAttributeMap * const UNUSED(parent))
    {
 #define DECLARE_NODE(Name_, name_)    \
    if (C##Name_##Definition::has(C##Name_##Definition::GetDefName())) \
-     C##Name_##Definition::get(C##Name_##Definition::GetDefName())->solveDescInheritance();
+     C##Name_##Definition::get(C##Name_##Definition::GetDefName())->solveDescInheritance(apply);
 #define DECLARE_NODE_PAR(Name_, name_)
 #include "node_type.conf"
@@ -268 +268 @@
    //----------------------------------------------------------------
 
-   void CContext::solveFieldRefInheritance(void)
+   void CContext::solveFieldRefInheritance(bool apply)
    {
       if (!this->hasId()) return;
@@ -279 +279 @@
       {
          CField* field = *it;
-         field->solveRefInheritance();
+         field->solveRefInheritance(apply);
       }
    }
@@ -370 +370 @@
    }
 
-   void CContext::solveAllInheritance(void)
+   void CContext::solveAllInheritance(bool apply)
    {
      // Résolution des héritages descendants (cà d des héritages de groupes)
      // pour chacun des contextes.
-      solveDescInheritance();
+      solveDescInheritance(apply);
 
      // Résolution des héritages par référence au niveau des fichiers.
@@ -380 +380 @@
 
       for (unsigned int i = 0; i < allFiles.size(); i++)
-         allFiles[i]->solveFieldRefInheritance();
+         allFiles[i]->solveFieldRefInheritance(apply);
    }