Changeset 459 for XIOS/trunk/src/node/field.hpp

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/field.hpp (modified) (6 diffs)

XIOS/trunk/src/node/field.hpp

@@ -13 +13 @@
 #include "array_new.hpp"
 #include "attribute_array.hpp"
+#include "expr_node.hpp"
 //#include "context.hpp"
 
@@ -65 +66 @@
          CField* getDirectFieldReference(void) const;
          CField* getBaseFieldReference(void)   const;
+         void addReference(CField* field) ;
          const std::vector<CField*> & getAllReference(void) const;
 
@@ -92 +94 @@
 
          template <int N> bool updateData(const CArray<double, N>&   data);
+         bool updateDataFromExpression(const CArray<double, 1>&   data);
          
          bool updateDataServer
@@ -102 +105 @@
          bool hasDirectFieldReference(void) const;
          bool isActive(void) const;
+         bool active ;
+         bool hasOutputFile ;
 
          /// Traitements ///
+         void processEnabledField(void) ;
          void solveRefInheritance(bool apply);
          void solveGridReference(void);
@@ -127 +133 @@
         void outputField(CArray<double,3>& fieldOut) ;
         void outputField(CArray<double,2>& fieldOut) ;
-        
+        void parse(xml::CXMLNode & node) ;
+        CArray<double,1>* getInstantData(void)  ;
       public :
 
@@ -148 +155 @@
          
          CArray<double, 1> data;
+         CArray<double, 1> instantData;
+         bool hasInstantData ;
          map<int, CArray<double,1>* > data_srv ;
          bool isOnceOperation ;
          bool isFirstOperation ;
+         string content ;
+         
+         list< pair<CField *,int> > fieldDependency ;
+         void buildExpression(void) ;
+         void addDependency(CField* field, int slotId) ;
+         void resetSlots(void) ;
+         vector<bool> slots ;
+         CDate* slotUpdateDate ;
+         CFieldNode * expression ;
+         bool hasExpression ;
+         bool slotsFull(void) ;
+         void setSlot(int slotId);
+         bool processed ;
 
    }; // class CField