Changeset 1099 for XIOS/dev/dev_olga/src/node/axis.hpp

Timestamp:

04/14/17 16:53:56 (7 years ago)

Author:

mhnguyen

Message:

Updating 2-level server

+) Make some changes in the way data rebuilt on each level of server
+) Make some changes in the order of functions call during close context to make sure that each server receives the global indexes before calculating index to send to next level
+) Modify some functions to make sure data sent to the correct server pool

Test
+) On Curie
+) Only test_client

File:

• XIOS/dev/dev_olga/src/node/axis.hpp (modified) (4 diffs)

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

@@ -45 +45 @@
          enum EEventId
          {
-           EVENT_ID_SERVER_ATTRIBUT,
+           EVENT_ID_DISTRIBUTION_ATTRIBUTE,
            EVENT_ID_INDEX,
            EVENT_ID_DISTRIBUTED_VALUE,
@@ -108 +108 @@
          static ENodeType GetType(void);
 
-         // void sendServerAttribut(const std::vector<int>& globalDim, int orderPositionInGrid,
-         //                         CServerDistributionDescription::ServerDistributionType distType);
          static bool dispatchEvent(CEventServer& event);
-         static void recvServerAttribut(CEventServer& event);
-         // void recvServerAttribut(CBufferIn& buffer) ;
+         static void recvDistributionAttribute(CEventServer& event);
+         void recvDistributionAttribute(CBufferIn& buffer) ;
          void checkAttributesOnClient();
          void checkAttributesOnClientAfterTransformation(const std::vector<int>& globalDim, int orderPositionInGrid,
@@ -142 +140 @@
          void checkZoom();
          void checkBounds();         
-         void sendAttributes();
+         void sendAttributes(const std::vector<int>& globalDim, int orderPositionInGrid,
+                             CServerDistributionDescription::ServerDistributionType distType);
+         void sendDistributionAttribute(const std::vector<int>& globalDim, int orderPositionInGrid,
+                                        CServerDistributionDescription::ServerDistributionType distType);
          void computeConnectedServer(const std::vector<int>& globalDim, int orderPositionInGrid,
                                      CServerDistributionDescription::ServerDistributionType distType);
@@ -180 +181 @@
          int global_write_size_;
 
+         bool doZoomByIndex_;
+
        private:
          static bool initializeTransformationMap(std::map<StdString, ETranformationType>& m);