Changeset 459 for XIOS/trunk/src/node/file.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/file.cpp (modified) (3 diffs)

XIOS/trunk/src/node/file.cpp

@@ -102 +102 @@
          newEnabledFields.push_back(*it) ;
          // Le champ est finalement actif, on y ajoute sa propre reference.
-         (*it)->refObject.push_back(*it);
+//         (*it)->refObject.push_back(*it);
          // Le champ est finalement actif, on y ajoute la référence au champ de base.
          (*it)->setRelFile(CFile::get(this));
-         (*it)->baseRefObject->refObject.push_back(*it);
+//         (*it)->baseRefObject->refObject.push_back(*it);
          // A faire, ajouter les references intermediaires...
       }
@@ -366 +366 @@
    //----------------------------------------------------------------
 
+   void CFile::processEnabledFile(void)
+   {
+     if (output_freq.isEmpty()) ERROR("void CFile::processEnabledFile(void)",
+                                       <<"File attribute <<output_freq>> is undefined"); 
+     solveFieldRefInheritance(true) ;
+     getEnabledFields() ;
+     processEnabledFields() ;
+   }
+   
+   void CFile::processEnabledFields(void)
+   {
+      for (unsigned int i = 0; i < this->enabledFields.size(); i++)
+      {
+        this->enabledFields[i]->processEnabledField() ;
+      }
+    }
+    
    void CFile::solveFieldRefInheritance(bool apply)
    {
@@ -389 +406 @@
          this->enabledFields[i]->solveOperation();
    }
-   
-   //---------------------------------------------------------------
-/*
-   void CFile::toBinary  (StdOStream & os) const
-   {
-      ENodeType genum = CFileGroup::GetType();
-      bool hasVFG = (this->getVirtualFieldGroup() != NULL);
-      SuperClass::toBinary(os);
-      
-      os.write (reinterpret_cast<const char*>(&genum) , sizeof(ENodeType));
-      os.write (reinterpret_cast<const char*>(&hasVFG) , sizeof(bool));
-      
-      if (hasVFG)this->getVirtualFieldGroup()->toBinary(os);
-         
-   }
-   
-   //----------------------------------------------------------------
-   
-   void CFile::fromBinary(StdIStream & is)
-   {
-      ENodeType renum = Unknown;
-      bool hasVFG = false;
-      SuperClass::fromBinary(is);
-      
-      is.read (reinterpret_cast<char*>(&renum), sizeof(ENodeType));
-      is.read (reinterpret_cast<char*>(&hasVFG), sizeof(bool));
-      
-      if (renum != CFileGroup::GetType())
-         ERROR("CFile::fromBinary(StdIStream & is)",
-               << "[ renum = " << renum << "] Bad type !");
-      
-//      this->setVirtualFieldGroup(this->getId());
-      if (hasVFG)this->getVirtualFieldGroup()->fromBinary(is);
-      
-   }
-*/
+ 
+   void CFile::solveEFExpression(void)
+   {
+      for (unsigned int i = 0; i < this->enabledFields.size(); i++)
+         this->enabledFields[i]->buildExpression();
+   }   
+ 
 
    CField* CFile::addField(const string& id)