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

Timestamp:

04/08/16 15:00:29 (8 years ago)

Author:

mhnguyen

Message:

Exposing some functions to Fortran interface

+) Allow add axis and domain into grid with Fortran interface
+) Remove some redundant code

Test
+) On Curie
+) test_client passes

File:

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

XIOS/trunk/src/node/grid.hpp

@@ -148 +148 @@
          void solveDomainAxisBaseRef();
 
+         CDomain* addDomain(const std::string& id=StdString());
+         CAxis* addAxis(const std::string& id=StdString());
          void sendAddDomain(const std::string& id="");
          void sendAddAxis(const std::string& id="");
@@ -236 +238 @@
         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;
@@ -275 +274 @@
         std::map<CGrid*, std::pair<bool,StdString> > gridSrc_;
         bool hasTransform_;
+            // List order of axis and domain in a grid, if there is a domain, it will take value 1 (true), axis 0 (false)
+        std::vector<bool> order_;
    }; // class CGrid