Changeset 551 for XIOS/trunk/src/node/grid.hpp

Timestamp:

02/11/15 16:23:02 (9 years ago)

Author:

mhnguyen

Message:

Redesigning grid structure

+) Add an intermediate class to calculate distribution on client and servers
+) Change all index of attributes to zero (0), instead of one(1)

Test
+) On Curie
+) Test new features passes but some data are still shifted

File:

• XIOS/trunk/src/node/grid.hpp (modified) (7 diffs)

XIOS/trunk/src/node/grid.hpp

@@ -11 +11 @@
 #include "array_new.hpp"
 #include "attribute_array.hpp"
+#include "distribution_client.hpp"
 
 namespace xios {
@@ -21 +22 @@
    class CAxisGroup;
    class CGrid;
+   class CDistributionClient;
 
    ///--------------------------------------------------------------
@@ -97 +99 @@
          void outputField(int rank, const CArray<double,1>& stored,  CArray<double,2>& field)  ;
          void outputField(int rank, const CArray<double,1>& stored,  CArray<double,1>& field)  ;
+         void outputField(int rank, const CArray<double,1>& stored,  double* field);
 
          virtual void parse(xml::CXMLNode & node);
@@ -154 +157 @@
          std::vector<CDomain*> getDomains();
          std::vector<CAxis*> getAxis();
+         std::vector<int> getAxisOrder();
 
       public:
@@ -161 +165 @@
          bool isChecked;
          bool isDomainAxisChecked;
+         bool isIndexSent;
 
          CAxis*   axis ;
@@ -184 +189 @@
          map<int, CArray<int, 1>* > out_j_fromClient ;
          map<int, CArray<int, 1>* > out_l_fromClient ;
+
+         map<int, CArray<size_t, 1>* > outIndexFromClient;
          void checkMask(void) ;
 
@@ -209 +216 @@
         std::vector<std::string> axisList_, domList_;
         bool isAxisListSet, isDomListSet;
-
-        // List order of axis in a grid, if there is a domain, it will take value -1
-        std::vector<int> axisOrder_;
+        CDistributionClient* clientDistribution_;
    }; // class CGrid