Changeset 1875 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.hpp

Timestamp:

05/12/20 11:52:13 (4 years ago)

Author:

ymipsl

Message:

XIOS coupling branch
Some updates.

First coupling test is beginning to work...

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.hpp (modified) (8 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.hpp

@@ -78 +78 @@
          {
            EVENT_ID_UPDATE_DATA, EVENT_ID_READ_DATA, EVENT_ID_READ_DATA_READY,
-           EVENT_ID_ADD_VARIABLE, EVENT_ID_ADD_VARIABLE_GROUP
+           EVENT_ID_ADD_VARIABLE, EVENT_ID_ADD_VARIABLE_GROUP, EVENT_ID_GRID_COMPLETED
          };
 
@@ -111 +111 @@
          std::map<int, StdSize> getGridDataBufferSize(CContextClient* client, bool bufferForWriting = false);
 
-         void setContextClient(CContextClient* newContextClient);
-         CContextClient* getContextClient();
-
+       public:
+          void makeGridAliasForCoupling(void) ;
        public:
          bool isActive(bool atCurrentTimestep = false) const;
@@ -144 +143 @@
 
          void sendFieldToFileServer(void) ;
+         void sendCloseDefinition(void) ;
+      
+      public:
+         void sendFieldToCouplerOut(void) ;
+      private:
+         bool sendFieldToCouplerOut_done_=false;
+      public:
+
          void sendFieldToInputFileServer(void) ;
 
@@ -177 +184 @@
         void sendAllAttributesToServer(CContextClient* client) ; 
         void sendUpdateData(const CArray<double,1>& data);
-        void sendUpdateData(const CArray<double,1>& data, CContextClient* client);
+        void sendUpdateData(Time timestamp, const CArray<double,1>& data, CContextClient* client);
         static void recvUpdateData(CEventServer& event);
         void recvUpdateData(std::map<int,CBufferIn*>& rankBuffers);
+        void recvUpdateDataFromClient(std::map<int,CBufferIn*>& rankBuffers);
+        void recvUpdateDataFromCoupler(std::map<int,CBufferIn*>& rankBuffers);
+        
         void writeField(void);
         bool sendReadDataRequest(const CDate& tsDataRequested, CContextClient* client);
@@ -188 +198 @@
         static void recvReadDataReady(CEventServer& event);
         void recvReadDataReady(vector<int> ranks, vector<CBufferIn*> buffers);
+        void recvDataFromCoupler(vector<int> ranks, vector<CBufferIn*> buffers) ;
         void checkForLateDataFromServer(void);
-        void checkIfMustAutoTrigger(void);
-        void autoTriggerIfNeeded(void);
+        void checkForLateDataFromCoupler(void) ;
+
+        void checkIfMustAutoTrigger(void); // ym obsolete
+        void autoTriggerIfNeeded(void); //ym obsolete
+        void triggerLateField(void) ;
+
         void outputField(CArray<double,3>& fieldOut);
         void outputField(CArray<double,2>& fieldOut);
@@ -227 +242 @@
 
         void connectToFileServer(CGarbageCollector& gc) ;
+        void connectToCouplerOut(CGarbageCollector& gc) ;
+        void connectToCouplerIn(CGarbageCollector& gc) ;
         void connectToModelInput(CGarbageCollector& gc) ;
         void connectToFileWriter(CGarbageCollector& gc) ;
@@ -241 +258 @@
                                                  map<CContextClient*,map<int,size_t>>& maxEventSize, 
                                                  bool bufferForWriting) ;
+      private:
+          bool isGridCompleted_ = true ;
+      public:
+          bool isGridCompleted() { return isGridCompleted_ ;} 
+          void setGridCompleted(void) { isGridCompleted_= true; }
+          void unsetGridCompleted(void) { isGridCompleted_ = false ;}
+      
+      public:     
+          void sendGridCompleted(void) ;
+      private:   
+          static void recvGridCompleted(CEventServer& event);
+          void recvGridCompleted(CBufferIn& buffer);
+
+
       private:
         std::vector<CGrid*> getGridPath(void) ;
@@ -315 +346 @@
       private:
          CContextClient* client;
+      public:
+         void setContextClient(CContextClient* newContextClient);
+         CContextClient* getContextClient(void) {return client;}
+
+      private:
 
          bool areAllReferenceSolved;