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

Timestamp:

09/10/20 13:51:02 (4 years ago)

Author:

ymipsl

Message:

Big update on on going work related to data distribution and transfer between clients and servers.
Revisite of the source and store filter using "connectors".

YM

File:

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

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

@@ -19 +19 @@
 #include "pass_through_filter.hpp"
 #include "temporal_filter.hpp"
-
-
-
-namespace xios {
+#include "model_to_client_source_filter.hpp"
+#include "client_from_client_source_filter.hpp"
+#include "client_from_server_source_filter.hpp"
+#include "client_to_model_store_filter.hpp"
+
+
+
+
+namespace xios 
+{
 
    /// ////////////////////// Déclarations ////////////////////// ///
@@ -40 +46 @@
    class COutputPin;
    class CSourceFilter;
-   class CStoreFilter;
    class CFileWriterFilter;
    class CFileServerWriterFilter;
-   class CFileServerReaderFilter;
+   class CFileReaderSourceFilter;
    class CServerToClientFilter;
+   class CModelToClientSourceFilter;
+   class CServerFromClientSourceFilter;
    ///--------------------------------------------------------------
 
@@ -66 +73 @@
          typedef CFieldAttributes SuperClassAttribute;
 
+      public :   
          enum EReadField
          {
@@ -188 +196 @@
 
         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 receiveUpdateData(CEventServer& event);  
+        
+        void recvUpdateData(std::map<int,CBufferIn*>& rankBuffers); // old interface to be removed
+        void recvUpdateDataFromClient(std::map<int,CBufferIn*>& rankBuffers); // old interface to be removed
+        void recvUpdateDataFromCoupler(std::map<int,CBufferIn*>& rankBuffers); // old interface to be removed
         
         void writeField(const CArray<double,1>& data);
@@ -196 +206 @@
         bool sendReadDataRequestIfNeeded(void);
         static void recvReadDataRequest(CEventServer& event);
-        void recvReadDataRequest(CContextServer* server);
+        void recvReadDataRequest(void);
         EReadField readField(CArray<double,1>& data);
         static void recvReadDataReady(CEventServer& event);
-        void recvReadDataReady(vector<int> ranks, vector<CBufferIn*> buffers);
-        void recvDataFromCoupler(vector<int> ranks, vector<CBufferIn*> buffers) ;
+        void receiveReadDataReady(CEventServer& event);
+        void recvReadDataReady(vector<int> ranks, vector<CBufferIn*> buffers); // old interface to remove
+        void recvDataFromCoupler(vector<int> ranks, vector<CBufferIn*> buffers) ; // old interface to remove
         void checkForLateDataFromServer(void);
         void checkForLateDataFromCoupler(void) ;
@@ -393 +404 @@
 
          //! The source filter for data provided by the client
-         std::shared_ptr<CSourceFilter> clientSourceFilter;
-         
+         std::shared_ptr<CSourceFilter> clientSourceFilter; // obsolete to remove
+ 
+         //! The source filter for data provided by the model to enter the client workflow
+         std::shared_ptr<CModelToClientSourceFilter> modelToClientSourceFilter_;
+
+         //! The source filter for data provided by the model to enter the client workflow
+         std::shared_ptr<CClientToModelStoreFilter> clientToModelStoreFilter_;
+
+         //! The source filter for data provided by the client that send data to server workflow
+         std::shared_ptr<CServerFromClientSourceFilter> serverFromClientSourceFilter_;
+
+         //! The source filter for data provided by an other to enter the current client workflow (coupling mode)
+         std::shared_ptr<CClientFromClientSourceFilter> clientFromClientSourceFilter_;
+
+         //! The source filter for data provided by server to enter the current client workflow (reading mode)
+         std::shared_ptr<CClientFromServerSourceFilter> clientFromServerSourceFilter_;
+         
+         //! The source filter for data read from file on server side 
+         std::shared_ptr<CFileReaderSourceFilter> fileReaderSourceFilter_;
+
          //! The source filter for data provided by the server
-         std::shared_ptr<CSourceFilter> serverSourceFilter;
-         
-         //! The terminal filter which stores the instant data
-         std::shared_ptr<CStoreFilter> storeFilter;
+         std::shared_ptr<CSourceFilter> serverSourceFilter; // obsolete to remove
         
          //! The terminal filter which writes the data to file
@@ -407 +433 @@
          std::shared_ptr<CFileServerWriterFilter> fileServerWriterFilter;
 
-         //! The source filter which read data from file
-         std::shared_ptr<CFileServerReaderFilter> fileServerReaderFilter_;
-
-         //! The terminal filter which send data from file server to client
+         //! The terminal filter which send data from server to client
          std::shared_ptr<CServerToClientFilter> serverToClientFilter_;