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

Timestamp:

11/13/14 15:09:14 (10 years ago)

Author:

mhnguyen

Message:

Implementing buffer size auto-detection for mode client -server

+) Process xml tree in client side then send all the information to server
+) Only information enabled fields in enabled files are sent to server
+) Some important change in structure of code which must be refactored

Test
+) On Curie
+) Only mode client-server
+) Passed for all tests

File:

• XIOS/trunk/src/node/field.hpp (modified) (12 diffs)

XIOS/trunk/src/node/field.hpp

@@ -18 +18 @@
 
 namespace xios {
-   
+
    /// ////////////////////// Déclarations ////////////////////// ///
 
@@ -56 +56 @@
            EVENT_ID_UPDATE_DATA, EVENT_ID_ADD_VARIABLE, EVENT_ID_ADD_VARIABLE_GROUP
          } ;
-         
+
          /// Constructeurs ///
          CField(void);
@@ -83 +83 @@
 
          boost::shared_ptr<func::CFunctor> getFieldOperation(void) const;
-         
+
          CArray<double, 1> getData(void) const;
 
@@ -95 +95 @@
          template <int N> bool updateData(const CArray<double, N>&   data);
          bool updateDataFromExpression(const CArray<double, 1>&   data);
-         void setDataFromExpression(const CArray<double, 1>& _data) ;         
-         
+         void setDataFromExpression(const CArray<double, 1>& _data) ;
+
          bool updateDataServer
                (const CDate & currDate,
                 const std::deque< CArray<double, 1>* > storedClient);
- 
+
+         std::map<int, StdSize> getGridDataSize();
+
        public :
 
@@ -116 +118 @@
          void solveGridReference(void);
          void solveOperation(void);
+         void solveCheckMaskIndex(bool doSendingIndex);
+         void solveAllReferenceEnabledField(bool doSending2Sever);
+         void buildAllExpressionEnabledField();
+         void solveGridDomainAxisRef(bool checkAtt);
+         void removeRefInheritance();  // Remove all reference of current field (it refers to itself)
 
 //         virtual void fromBinary(StdIStream & is);
@@ -125 +132 @@
          static StdString GetName(void);
          static StdString GetDefName(void);
-         
+
          static ENodeType GetType(void);
-         
+
         template <int N> void setData(const CArray<double, N>& _data) ;
         static bool dispatchEvent(CEventServer& event) ;
@@ -139 +146 @@
         void parse(xml::CXMLNode & node) ;
         CArray<double,1>* getInstantData(void)  ;
-        
+
         void setVirtualVariableGroup(CVariableGroup* newVVariableGroup);
         void setVirtualVariableGroup(void);
@@ -145 +152 @@
         vector<CVariable*> getAllVariables(void) const;
         virtual void solveDescInheritance(bool apply, const CAttributeMap * const parent = 0);
- 
+
         CVariable* addVariable(const string& id="") ;
         CVariableGroup* addVariableGroup(const string& id="") ;
@@ -154 +161 @@
         static void recvAddVariableGroup(CEventServer& event) ;
         void recvAddVariableGroup(CBufferIn& buffer) ;
-       
+        void sendAddAllVariables();
+
+
+        const std::pair<StdString, StdString>& getDomainAxisIds();
       public :
 
          /// Propriétés privées ///
          CVariableGroup* vVariableGroup ;
-                 
+
          std::vector<CField*> refObject;
          CField* baseRefObject;
@@ -172 +182 @@
          boost::shared_ptr<CDate>    last_Write, last_operation;
          boost::shared_ptr<CDate>    lastlast_Write_srv,last_Write_srv, last_operation_srv;
-         
+
          boost::shared_ptr<func::CFunctor> foperation;
          map<int,boost::shared_ptr<func::CFunctor> > foperation_srv;
-         
+
          CArray<double, 1> data;
          CArray<double, 1> instantData;
@@ -183 +193 @@
          bool isFirstOperation ;
          string content ;
-         
+
          list< pair<CField *,int> > fieldDependency ;
          void buildExpression(void) ;
@@ -195 +205 @@
          void setSlot(int slotId);
          bool processed ;
+         bool areAllReferenceSolved;
+         bool areAllExpressionBuilt;
+         std::pair<StdString,StdString> domAxisIds_;
 
    }; // class CField