Changeset 459 for XIOS/trunk/src/node/context.cpp

Timestamp:

01/16/14 14:28:23 (10 years ago)

Author:

ymipsl

Message:

Add new parsing expression functionnalities
(modified files)

YM

File:

• XIOS/trunk/src/node/context.cpp (modified) (5 diffs)

XIOS/trunk/src/node/context.cpp

@@ -175 +175 @@
    }
    
-   //----------------------------------------------------------------
-/*
-   void CContext::toBinary(StdOStream & os) const
-   {
-      SuperClass::toBinary(os);
-
-#define DECLARE_NODE(Name_, name_)                                         \
-   {                                                                       \
-      ENodeType renum = C##Name_##Definition::GetType();                   \
-      bool val = C##Name_##Definition::has(C##Name_##Definition::GetDefName()); \
-      os.write (reinterpret_cast<const char*>(&renum), sizeof(ENodeType)); \
-      os.write (reinterpret_cast<const char*>(&val), sizeof(bool));        \
-      if (val) C##Name_##Definition::get(C##Name_##Definition::GetDefName())->toBinary(os);   \
-   }   
-#define DECLARE_NODE_PAR(Name_, name_)
-#include "node_type.conf"
-   }
-*/
-   //----------------------------------------------------------------
-/*
-   void CContext::fromBinary(StdIStream & is)
-   {
-      SuperClass::fromBinary(is);
-#define DECLARE_NODE(Name_, name_)                                         \
-   {                                                                       \
-      bool val = false;                                                    \
-      ENodeType renum = Unknown;                                           \
-      is.read (reinterpret_cast<char*>(&renum), sizeof(ENodeType));        \
-      is.read (reinterpret_cast<char*>(&val), sizeof(bool));               \
-      if (renum != C##Name_##Definition::GetType())                        \
-         ERROR("CContext::fromBinary(StdIStream & is)",                    \
-               << "[ renum = " << renum << "] Bad type !");                \
-      if (val) C##Name_##Definition::create(C##Name_##Definition::GetDefName()) -> fromBinary(is); \
-   }   
-#define DECLARE_NODE_PAR(Name_, name_)
-#include "node_type.conf"
-      
-   }
- */
-   
+
    //----------------------------------------------------------------
 
@@ -337 +298 @@
       this->findEnabledFiles();
 
+        
+      this->processEnabledFiles() ;
+
+/*        
       //Recherche des champs à sortir (enable à true + niveau de sortie correct)
       // pour chaque fichier précédemment listé.
@@ -347 +312 @@
       this->solveAllOperation();
 
+      // Traitement des expressions.
+      this->solveAllExpression();
+*/
       // Nettoyage de l'arborescence
       CleanTree();
@@ -357 +325 @@
      (void)this->enabledFiles[i]->getEnabledFields();
    }
+   
+    void CContext::processEnabledFiles(void)
+   {
+     for (unsigned int i = 0; i < this->enabledFiles.size(); i++)
+     this->enabledFiles[i]->processEnabledFile();
+   }
+  
 
    void CContext::solveAllGridRef(void)
@@ -370 +345 @@
    }
 
+   void CContext::solveAllExpression(void)
+   {
+      for (unsigned int i = 0; i < this->enabledFiles.size(); i++)
+      this->enabledFiles[i]->solveEFExpression();
+   }
+   
    void CContext::solveAllInheritance(bool apply)
    {