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

Timestamp:

12/16/14 12:55:53 (10 years ago)

Author:

mhnguyen

Message:

Reorganizing structure of grid

+) Grid doesn't have domain_ref and axis_ref anymore.
All domain and axis of a grid must be inside grid (These domain and axis can be defined or refer to others)
+) Grid contains list of domain and axis
+) Reorder some functions to make sure new functionlities work

Test
+) On Curie
+) Mode attached and detached
+) Only test_new_features
+) Passed

File:

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

XIOS/trunk/src/node/grid.hpp

@@ -18 +18 @@
    class CGridGroup;
    class CGridAttributes;
+   class CDomainGroup;
+   class CAxisGroup;
    class CGrid;
 
@@ -44 +46 @@
          enum EEventId
          {
-           EVENT_ID_INDEX
+           EVENT_ID_INDEX, EVENT_ID_ADD_DOMAIN, EVENT_ID_ADD_AXIS
          } ;
 
@@ -96 +98 @@
          void outputField(int rank, const CArray<double,1>& stored,  CArray<double,1>& field)  ;
 
+         virtual void parse(xml::CXMLNode & node);
+
          /// Destructeur ///
          virtual ~CGrid(void);
@@ -110 +114 @@
          static CGrid* createGrid(CDomain* domain);
          static CGrid* createGrid(CDomain* domain, CAxis* axis);
+         static CGrid* createGrid(std::vector<CDomain*> domains, std::vector<CAxis*> axis);
 
       public :
@@ -124 +129 @@
          void solveDomainRef(bool checkAtt);
          void solveAxisRef(bool checkAtt);
+         void solveDomainAxisRefInheritance(bool apply = true);
+
+         void sendAddDomain(const std::string& id="");
+         void sendAddAxis(const std::string& id="");
+         void sendAllDomains();
+         void sendAllAxis();
+
+         static void recvAddDomain(CEventServer& event) ;
+         void recvAddDomain(CBufferIn& buffer) ;
+         static void recvAddAxis(CEventServer& event) ;
+         void recvAddAxis(CBufferIn& buffer) ;
 
          static bool dispatchEvent(CEventServer& event) ;
@@ -134 +150 @@
          std::map<int, int> getDomConServerSide();
          std::map<int, StdSize> getConnectedServerDataSize();
+         std::vector<StdString> getDomainList();
+         std::vector<StdString> getAxisList();
+         std::vector<CDomain*> getDomains();
+         std::vector<CAxis*> getAxis();
+
       public:
 
@@ -167 +188 @@
          std::map<int, int> domConnectedServerSide_;
          bool isDomConServerComputed_;
+
+      private:
+        void setVirtualDomainGroup(CDomainGroup* newVDomainGroup);
+        void setVirtualDomainGroup();
+        void setVirtualAxisGroup(CAxisGroup* newVAxisGroup);
+        void setVirtualAxisGroup();
+//        void setAxisList();
+        void setAxisList(const std::vector<CAxis*> axis = std::vector<CAxis*>());
+//        void setDomainList();
+        void setDomainList(const std::vector<CDomain*> domains = std::vector<CDomain*>());
+
+        CDomain* addDomain(const std::string& id);
+        CAxis* addAxis(const std::string& id);
+
+        CAxisGroup* getVirtualAxisGroup() const;
+        CDomainGroup* getVirtualDomainGroup() const;
+      private:
+        CDomainGroup* vDomainGroup_;
+        CAxisGroup* vAxisGroup_;
+        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_;
    }; // class CGrid