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

Timestamp:

07/05/16 15:59:18 (8 years ago)

Author:

mhnguyen

Message:

Removing some redundant codes and make some minor improvements

+) Make a check to not do grid generation twice

Test
+) On Curie
+) On test compilation

File:

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

XIOS/trunk/src/node/grid.hpp

@@ -120 +120 @@
          static CGrid* createGrid(const std::vector<CDomain*>& domains, const std::vector<CAxis*>& axis,
                                   const CArray<int,1>& axisDomainOrder = CArray<int,1>());
-//         static CGrid* createGrid(StdString id, const std::vector<CDomain*>& domains, const std::vector<CAxis*>& axis,
-//                                  const CArray<int,1>& axisDomainOrder = CArray<int,1>());
          static CGrid* createGrid(StdString id, const std::vector<CDomain*>& domains, const std::vector<CAxis*>& axis,
                                   const std::vector<CScalar*>& scalars, const CArray<int,1>& axisDomainOrder = CArray<int,1>());
          static CGrid* createGrid(const std::vector<CDomain*>& domains, const std::vector<CAxis*>& axis,
                                   const std::vector<CScalar*>& scalars, const CArray<int,1>& axisDomainOrder);
-//         static StdString generateId(const std::vector<CDomain*>& domains, const std::vector<CAxis*>& axis,
-//                                     const std::vector<CScalar*>& scalars, const CArray<int,1>& axisDomainOrder = CArray<int,1>());
          static StdString generateId(const std::vector<CDomain*>& domains, const std::vector<CAxis*>& axis,
                                      const std::vector<CScalar*>& scalars, const CArray<int,1>& axisDomainOrder = CArray<int,1>());
@@ -206 +202 @@
          bool isTransformed();
          void setTransformed();
+         bool isGenerated();
+         void setGenerated();
          void addTransGridSource(CGrid* gridSrc);
          std::map<CGrid*, std::pair<bool,StdString> >& getTransGridSource();
@@ -283 +281 @@
 
         bool isTransformed_;
+        bool isGenerated_;
         std::vector<int> axisPositionInGrid_;
         CGridTransformation* transformations_;