Changeset 1021 for XIOS/dev/dev_olga/src/node/field.hpp

Timestamp:

01/10/17 14:36:29 (7 years ago)

Author:

oabramkina

Message:

Intermeadiate version for merging with new server functionalities.

File:

• XIOS/dev/dev_olga/src/node/field.hpp (modified) (7 diffs)

XIOS/dev/dev_olga/src/node/field.hpp

@@ -16 +16 @@
 #include "transformation_enum.hpp"
 #include "variable.hpp"
+#include "context_client.hpp"
 
 
@@ -124 +125 @@
          boost::shared_ptr<COutputPin> getSelfReference(CGarbageCollector& gc);
          boost::shared_ptr<COutputPin> getTemporalDataFilter(CGarbageCollector& gc, CDuration outFreq);
+         boost::shared_ptr<COutputPin> getSelfTemporalDataFilter(CGarbageCollector& gc, CDuration outFreq);
 
 //         virtual void fromBinary(StdIStream& is);
@@ -139 +141 @@
         static bool dispatchEvent(CEventServer& event);
         void sendUpdateData(const CArray<double,1>& data);
-        void sendUpdateData(const CArray<double,1>& data, const int srvPool);
+        void sendUpdateData(const CArray<double,1>& data, CContextClient* client);
         static void recvUpdateData(CEventServer& event);
         void recvUpdateData(vector<int>& ranks, vector<CBufferIn*>& buffers);
         void writeField(void);
-        void sendReadDataRequest(void);
+        void sendReadDataRequest(const CDate& tsDataRequested);
         bool sendReadDataRequestIfNeeded(void);
         static void recvReadDataRequest(CEventServer& event);
@@ -169 +171 @@
         CVariableGroup* addVariableGroup(const string& id = "");
         void sendAddVariable(const string& id = "");
-        void sendAddVariable(const string& id, const int srvPool);
+        void sendAddVariable(const string& id, CContextClient* client);
         void sendAddVariableGroup(const string& id = "");
         static void recvAddVariable(CEventServer& event);
@@ -176 +178 @@
         void recvAddVariableGroup(CBufferIn& buffer);
         void sendAddAllVariables();
-        void sendAddAllVariables(const int srvPool);
-
+        void sendAddAllVariables(CContextClient* client);
 
         const std::vector<StdString>& getRefDomainAxisIds();
+
+        const string& getExpression(void);
+        bool hasExpression(void) const;
 
       public:
@@ -194 +198 @@
          bool isEOF;
          CDate lastlast_Write_srv, last_Write_srv, last_operation_srv;
-         CDate lastDataRequestedFromServer;
+         CDate lastDataRequestedFromServer, lastDataReceivedFromServer;
+         bool wasDataAlreadyReceivedFromServer;
 
          map<int,boost::shared_ptr<func::CFunctor> > foperation_srv;
@@ -204 +209 @@
          bool isReferenceSolved;
          std::vector<StdString> domAxisScalarIds_;
-         bool isReadDataRequestPending;
          bool useCompressedOutput;
+
+         // Two variables to identify the time_counter meta data written in file, which has no time_counter
+         bool hasTimeInstant;
+         bool hasTimeCentered;
 
          DECLARE_REF_FUNC(Field,field)