Changeset 1870 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.hpp

Timestamp:

04/17/20 18:55:28 (4 years ago)

Author:

ymipsl

Message:

Some update on XIOS_COUPLING branch...

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.hpp (modified) (10 diffs)

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

@@ -146 +146 @@
          CAxis* addAxis(const std::string& id=StdString());
          CScalar* addScalar(const std::string& id=StdString());
+
+      public:
+         void sendGridToFileServer(CContextClient* client) ;
+      private:
+         std::set<CContextClient*> sendGridToFileServer_done_ ;
+      
+      public:
          void sendAddDomain(const std::string& id,CContextClient* contextClient);
          void sendAddAxis(const std::string& id,CContextClient* contextClient);
@@ -193 +200 @@
 
          CDistributionServer* getDistributionServer();
-         CDistributionClient* getDistributionClient();
          CGridTransformation* getTransformations();
 
@@ -231 +237 @@
 
          void computeGridIndexToFileServer(CContextClient* client) ;
-
-      private:
+ 
+     private:
+        /** Client-like distribution calculated based on the knowledge of the entire grid */
+       CDistributionClient* clientDistribution_;
+     public: 
        void computeClientDistribution(void) ;
+     private:
        bool computeClientDistribution_done_ = false ;
-
+     public:
+       CDistributionClient* getClientDistribution(void); 
+
+     private:
        template<int N>
        void checkGridMask(CArray<bool,N>& gridMask,
@@ -277 +290 @@
         int getDistributedDimension();
 
-       
-        void computeClientIndex();
-        bool computeClientIndex_done_ = false ;
-        
         void computeConnectedClients(CContextClient* client);
         set<CContextClient*> computeConnectedClients_done_ ;
-
-        void computeClientIndexScalarGrid(); 
-        bool computeClientIndexScalarGrid_done_ = false ;
 
         void computeConnectedClientsScalarGrid(CContextClient* client); 
@@ -346 +352 @@
 // Maybe we need a flag to determine whether a client wants to write. TODO "
 
-/** Map storing received data on server side. This map is the equivalent to the storeIndex_client, but for data received from client
-  * instead that from model. This map is used to concatenate data received from several clients into a single array on server side
-  * which match the local workflow grid.
-  * outLocalIndexStoreOnClient_[client_rank] -> Array of index from client of rank "client_rank"
-  * outLocalIndexStoreOnClient_[client_rank](index of buffer from client) -> local index of the workflow grid
-  * The map is created in CGrid::computeClientIndex and filled upon receiving data in CField::recvUpdateData().
-  * Symetrically it is also used to send data from a server to several client for reading case. */
-         map<int, CArray<size_t, 1> > outLocalIndexStoreOnClient_; 
-
-
+      private:
+       /** Map storing received data on server side. This map is the equivalent to the storeIndex_client, but for data received from client
+        * instead that from model. This map is used to concatenate data received from several clients into a single array on server side
+        * which match the local workflow grid.
+        * outLocalIndexStoreOnClient_[client_rank] -> Array of index from client of rank "client_rank"
+        * outLocalIndexStoreOnClient_[client_rank](index of buffer from client) -> local index of the workflow grid
+        * The map is created in CGrid::computeClientIndex and filled upon receiving data in CField::recvUpdateData().
+        * Symetrically it is also used to send data from a server to several client for reading case. */
+        map<int, CArray<size_t, 1>> outLocalIndexStoreOnClient_; 
+      public:
+         void computeOutLocalIndexStoreOnClient(void) ;
+      private:
+         bool computeOutLocalIndexStoreOnClient_done_ = false ;  
+      public:   
+         map<int, CArray<size_t, 1>>& getOutLocalIndexStoreOnClient(void) 
+         { if (!computeOutLocalIndexStoreOnClient_done_) computeOutLocalIndexStoreOnClient(); return outLocalIndexStoreOnClient_ ; }
+
+      public:
 /** Indexes calculated based on server-like distribution.
  *  They are used for writing/reading data and only calculated for server level that does the writing/reading.
@@ -370 +384 @@
          CArray<size_t,1> localIndexToWriteOnClient_;
 
+      public: 
+        bool isDataDistributed(void) ; 
       private:
 
@@ -376 +392 @@
         std::set<CContextClient*> clientsSet;
 
-/** Map storing received indexes on server side sent by clients. Key = sender rank, value = global index array. 
-    Later, the global indexes received will be mapped onto local index computed with the local distribution.
-    outGlobalIndexFromClient_[rank] -> array of global index send by client of rank "rank"
-    outGlobalIndexFromClient_[rank](n) -> global index of datav n sent by client
-*/
+      private:  
+        /** Map storing received indexes on server side sent by clients. Key = sender rank, value = global index array. 
+            Later, the global indexes received will be mapped onto local index computed with the local distribution.
+            outGlobalIndexFromClient_[rank] -> array of global index send by client of rank "rank"
+            outGlobalIndexFromClient_[rank](n) -> global index of datav n sent by client
+        */      
         map<int, CArray<size_t, 1> > outGlobalIndexFromClient_;
-
+      public:  
+        map<int, CArray<size_t, 1> >& getOutGlobalIndexFromClient() { return outGlobalIndexFromClient_ ;}
+
+      private:
         bool isChecked;
         bool isDomainAxisChecked;
@@ -393 +413 @@
         bool isAxisListSet, isDomListSet, isScalarListSet;
 
-/** Client-like distribution calculated based on the knowledge of the entire grid */
-        CDistributionClient* clientDistribution_;
-
 /** Server-like distribution calculated upon receiving indexes */
         CDistributionServer* serverDistribution_;
@@ -416 +433 @@
 /** Size of data to be send in case of reading. It is calculated in recvIndex(). */
         std::map<int,size_t> connectedDataSizeRead_;
-
-        bool isDataDistributed_;        
+      
          //! True if and only if the data defined on the grid can be outputted in a compressed way
         bool isCompressible_;
@@ -424 +440 @@
         bool isTransformed_, isGenerated_;
         bool computedWrittenIndex_;
+        
         std::vector<int> axisPositionInGrid_;
+        void computeAxisPositionInGrid(void) ;
+        bool computeAxisPositionInGrid_done_ = false ;
+        std::vector<int>& getAxisPositionInGrid(void) { if (!computeAxisPositionInGrid_done_) computeAxisPositionInGrid() ; return axisPositionInGrid_ ;}
+
         CGridTransformation* transformations_;
         bool hasDomainAxisBaseRef_;