Changeset 567 for XIOS/trunk/src/node/axis.hpp

Timestamp:

03/10/15 10:49:02 (9 years ago)

Author:

mhnguyen

Message:

Implementing a grid formed by only one axis or group of axis

+) Add several new attributes to axis. From now on, each axis can be distributed on client side
+) Modify mask of grid to make it more flexible to different dimension
+) Fix some bugs relating to calculation of local data index on client
+) Clean some redundant codes

Test
+) On Curie, only test_new_features.f90
+) Test cases:

• Grid composed of: 1 domain and 1 axis, 3 axis, 1 axis
• Mode: Attached and connected
• No of client-server: 6-2(Connected), 2 (Attached)

+) All tests passed and results are correct

File:

• XIOS/trunk/src/node/axis.hpp (modified) (3 diffs)

XIOS/trunk/src/node/axis.hpp

@@ -11 +11 @@
 #include "attribute_enum.hpp"
 #include "attribute_enum_impl.hpp"
+#include "server_distribution_description.hpp"
 
 namespace xios {
@@ -33 +34 @@
       , public CAxisAttributes
    {
+         enum EEventId
+         {
+           EVENT_ID_SERVER_ATTRIBUT
+         } ;
+
          /// typedef ///
          typedef CObjectTemplate<CAxis>   SuperClass;
@@ -66 +72 @@
          static StdString GetName(void);
          static StdString GetDefName(void);
-
          static ENodeType GetType(void);
 
+         void sendServerAttribut(void);
+         static bool dispatchEvent(CEventServer& event);
+         static void recvServerAttribut(CEventServer& event);
+         void recvServerAttribut(CBufferIn& buffer) ;
+         void checkAttributesOnClient(const std::vector<int>& globalDim, int orderPositionInGrid,
+                                      CServerDistributionDescription::ServerDistributionType disType = CServerDistributionDescription::BAND_DISTRIBUTION);
+         void sendCheckedAttributes(const std::vector<int>& globalDim, int orderPositionInGrid,
+                                    CServerDistributionDescription::ServerDistributionType disType = CServerDistributionDescription::BAND_DISTRIBUTION);
+      public:
+        int zoom_begin_srv, zoom_end_srv, zoom_size_srv;
+        int ni_srv, begin_srv, end_srv;
       private :
          void checkData();
          void checkMask();
+         void checkZoom();
+         void computeServerIndex(const std::vector<int>& globalDim, int orderPositionInGrid,
+                                 CServerDistributionDescription::ServerDistributionType disType);
+      private:
+
          bool isChecked;
+         bool areClientAttributesChecked_;
          std::set<StdString> relFiles;