Changeset 445 for XIOS/trunk/src/node/file.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/file.cpp (modified) (1 diff)

XIOS/trunk/src/node/file.cpp

@@ -358 +358 @@
    //----------------------------------------------------------------
    
-   void CFile::solveDescInheritance(const CAttributeMap * const parent)
-   {
-      SuperClassAttribute::setAttributes(parent);
-      this->getVirtualFieldGroup()->solveDescInheritance(NULL);
-   }
-
-   //----------------------------------------------------------------
-
-   void CFile::solveFieldRefInheritance(void)
+   void CFile::solveDescInheritance(bool apply, const CAttributeMap * const parent)
+   {
+      SuperClassAttribute::setAttributes(parent,apply);
+      this->getVirtualFieldGroup()->solveDescInheritance(apply, NULL);
+   }
+
+   //----------------------------------------------------------------
+
+   void CFile::solveFieldRefInheritance(bool apply)
    {
       // Résolution des héritages par référence de chacun des champs contenus dans le fichier.
       std::vector<CField*> allF = this->getAllFields();
       for (unsigned int i = 0; i < allF.size(); i++)
-         allF[i]->solveRefInheritance();
+         allF[i]->solveRefInheritance(apply);
    }