Changeset 1869 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/axis.hpp

Timestamp:

04/15/20 13:23:39 (4 years ago)

Author:

ymipsl

Message:

Some update...

YM

File:

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

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

@@ -86 +86 @@
          void addRelFileCompressed(const StdString& filename);
 
-         /// Vérifications ///
-         void checkAttributes(void);
+         
 
          /// Destructeur ///
@@ -102 +101 @@
 
          static bool dispatchEvent(CEventServer& event);         
+        
+         /// Vérifications ///
+         void checkAttributes(void);
+         bool checkAttributes_done_ = false ;
          
          void checkAttributesOnClient();
@@ -121 +124 @@
          bool isEqual(CAxis* axis);
 
+         bool checkIfCompleted(void) ;
+         void setCompleted(void) ;
+         void setUncompleted(void) ;
+
       public: 
         bool hasValue;        
@@ -127 +134 @@
 
         CArray<int,1> localIndexToWriteOnServer;
+         
+         void computeConnectedClients(CContextClient* client, const std::vector<int>& globalDim, int orderPositionInGrid);
+         private: std::set<CContextClient*> computeConnectedClients_done_ ; public :
+         /** The number of server of a context client. Avoid to re-compute indice computed in a previous computeConnectedClient */
+         private: std::set<int> listNbServer_ ; public:
 
       private:
@@ -137 +149 @@
          void sendDistributionAttribute(const std::vector<int>& globalDim, int orderPositionInGrid,
                                         CServerDistributionDescription::ServerDistributionType distType);
-         void computeConnectedClients(const std::vector<int>& globalDim, int orderPositionInGrid,
-                                     CServerDistributionDescription::ServerDistributionType distType);
+         
 
          void sendNonDistributedAttributes(void);
@@ -157 +168 @@
          std::list<CContextClient*> clients;
          std::set<CContextClient*> clientsSet;
+
+         /** define if the axis is completed or not ie all attributes have been received before in case 
+             of grid reading from file or coupling */ 
+         bool isCompleted_=true ;  
 
          bool isChecked;
@@ -165 +180 @@
          //! True if and only if the data defined on the axis can be outputted in a compressed way
          bool isCompressible_;
+
          std::map<int, map<int,int> > nbSenders; // Mapping of number of communicating client to a server
          std::map<int, std::unordered_map<int, vector<size_t> > > indSrv_; // Global index of each client sent to server