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

Timestamp:

07/07/15 10:46:33 (9 years ago)

Author:

mhnguyen

Message:

Implementing zooming on a domain

+) Add algorithm to do zooming on a domain
+) Remove some redundant codes

Test
+) On Curie
+) test_complete and test_client are correct

File:

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

XIOS/trunk/src/node/domain.hpp

@@ -14 +14 @@
 #include "attribute_array.hpp"
 #include "attribute_enum.hpp"
+#include "transformation.hpp"
+#include "transformation_enum.hpp"
 
 namespace xios {
@@ -49 +51 @@
          typedef CDomainAttributes RelAttributes;
          typedef CDomainGroup      RelGroup;
+         typedef CTransformation<CDomain>::TransformationMapTypes TransMapTypes;
 
          /// Constructeurs ///
@@ -59 +62 @@
          void duplicateAttributes(CDomain* domain);
 
+         virtual void parse(xml::CXMLNode & node);
+
          /// Vérifications ///
          void checkAttributes(void);
@@ -65 +70 @@
 
          void sendCheckedAttributes();
+
+         bool hasTransformation();
+         void solveInheritanceTransformation();
+         TransMapTypes getAllTransformations();
 
       private :
@@ -122 +131 @@
         CArray<int,2> mapConnectedServer ;  // (ni,nj) => mapped to connected server number, -1 if no server is target
 
-
+        int global_zoom_ibegin, global_zoom_ni;
+        int global_zoom_jbegin, global_zoom_nj;
 //        vector<int> ib_srv, ie_srv, in_srv ;
 //        vector<int> jb_srv, je_srv, jn_srv ;
@@ -160 +170 @@
          bool hasBounds ;
          bool hasArea;
+      private:
+         void checkTransformations();
+         void setTransformations(const TransMapTypes&);
+
        private :
-
-         /// Proriétés protégées ///
          bool isChecked;
          std::set<StdString> relFiles;
@@ -171 +183 @@
          std::vector<int> connectedServerRank_;
          bool isDistributed_;
+         TransMapTypes transformationMap_;
 
          DECLARE_REF_FUNC(Domain,domain)