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

Timestamp:

05/26/15 16:13:47 (9 years ago)

Author:

rlacroix

Message:

Add the infrastructure to request fields from the server.

This will be used to read input files so add a new file attribute mode to define whether data is written or read from a file.

Currently the data is not actually read and random data is transfered for those fields in read mode.

File:

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

XIOS/trunk/src/node/field.hpp

@@ -54 +54 @@
          enum EEventId
          {
-           EVENT_ID_UPDATE_DATA, EVENT_ID_ADD_VARIABLE, EVENT_ID_ADD_VARIABLE_GROUP
+           EVENT_ID_UPDATE_DATA, EVENT_ID_READ_DATA, EVENT_ID_READ_DATA_READY,
+           EVENT_ID_ADD_VARIABLE, EVENT_ID_ADD_VARIABLE_GROUP
          } ;
 
@@ -133 +134 @@
         void recvUpdateData(vector<int>& ranks, vector<CBufferIn*>& buffers) ;
         void writeField(void) ;
+        void sendReadDataRequest(void);
+        bool sendReadDataRequestIfNeeded(void);
+        static void recvReadDataRequest(CEventServer& event);
+        void recvReadDataRequest(void);
+        static void recvReadDataReady(CEventServer& event);
+        void recvReadDataReady(vector<int> ranks, vector<CBufferIn*> buffers);
         void outputField(CArray<double,3>& fieldOut) ;
         void outputField(CArray<double,2>& fieldOut) ;
@@ -172 +179 @@
          boost::shared_ptr<CDate>    last_Write, last_operation;
          boost::shared_ptr<CDate>    lastlast_Write_srv,last_Write_srv, last_operation_srv;
+         CDate lastDataRequestedFromServer;
 
          boost::shared_ptr<func::CFunctor> foperation;
@@ -198 +206 @@
          bool areAllExpressionBuilt;
          std::pair<StdString,StdString> domAxisIds_;
+         bool isReadDataRequestPending;
          DECLARE_REF_FUNC(Field,field)
 //       public: