Changeset 657 for XIOS/trunk/src/node/domain.hpp

Timestamp:

07/28/15 13:37:07 (9 years ago)

Author:

mhnguyen

Message:

Making changes in domain to make sure unstructed grid work with new method of index distribution

+) Change the way define i_index and j_index of a domain
+) Remove some redundant attributes of domain
+) Adjust the way to calculate index distribution on server side

Test
+) Make some minor change to test_unstruct_complete to work with new XIOS
+) On Curie
+) All test pass and correct

File:

• XIOS/trunk/src/node/domain.hpp (modified) (6 diffs)

XIOS/trunk/src/node/domain.hpp

@@ -68 +68 @@
 
          void checkAttributesOnClient();
+         void checkAttributesOnClientAfterTransformation();
 
          void sendCheckedAttributes();
@@ -100 +101 @@
          /// Test ///
          bool IsWritten(const StdString & filename) const;
-         bool hasZoom(void) const;
+//         bool hasZoom(void) const;
          bool isEmpty(void) const;
          bool isDistributed(void) const;
@@ -165 +166 @@
 
          static ENodeType GetType(void);
-
+         const std::map<int, vector<size_t> >& getIndexServer() const;
          CArray<int, 2> local_mask;
          bool isCurvilinear ;
@@ -173 +174 @@
          void checkTransformations();
          void setTransformations(const TransMapTypes&);
+         void computeNGlobDomain();
 
        private :
@@ -178 +180 @@
          std::set<StdString> relFiles;
          bool isClientChecked; // Verify whether all attributes of domain on the client side are good
+         bool isClientAfterTransformationChecked;
          std::map<int, CArray<int,1> > indiSrv, indjSrv;
          std::map<int,int> nbConnectedClients_; // Mapping of number of communicating client to a server
@@ -184 +187 @@
          bool isDistributed_;
          TransMapTypes transformationMap_;
+         std::vector<int> nGlobDomain_;
+         bool isUnstructed_;
+         CArray<bool,1> maskInter_;
+
 
          DECLARE_REF_FUNC(Domain,domain)