Changeset 1558 for XIOS/trunk/src/node

Timestamp:

07/12/18 17:22:39 (6 years ago)

Author:

oabramkina

Message:

Adding transformation "extract" for axis.

Location:

XIOS/trunk/src/node

Files:

• axis.cpp (modified) (1 diff)
• axis.hpp (modified) (2 diffs)
• extract_axis.cpp (added)
• extract_axis.hpp (added)
• node_enum.hpp (modified) (1 diff)
• node_type.hpp (modified) (1 diff)
• transformation_enum.hpp (modified) (1 diff)

XIOS/trunk/src/node/axis.cpp

@@ -51 +51 @@
      m["zoom_axis"] = TRANS_ZOOM_AXIS;
      m["interpolate_axis"] = TRANS_INTERPOLATE_AXIS;
+     m["extract_axis"] = TRANS_EXTRACT_AXIS;
      m["inverse_axis"] = TRANS_INVERSE_AXIS;
      m["reduce_domain"] = TRANS_REDUCE_DOMAIN_TO_AXIS;

XIOS/trunk/src/node/axis.hpp

@@ -125 +125 @@
       public: 
         bool hasValue;        
+        bool hasBounds;
+        bool hasLabel;
+
         CArray<size_t,1> localIndexToWriteOnServer;        
 
@@ -173 +176 @@
          std::map<int, CArray<int, 1> > compressedIndexToWriteOnServer;
          std::map<int, std::vector<int> > connectedServerRank_;
-         bool hasBounds;
-         bool hasLabel;         
          bool computedWrittenIndex_;                  
 

XIOS/trunk/src/node/node_enum.hpp

@@ -23 +23 @@
          eZoomAxis,
          eInterpolateAxis,
+         eExtractAxis,
          eZoomDomain,
          eInterpolateDomain,

XIOS/trunk/src/node/node_type.hpp

@@ -13 +13 @@
 #include "zoom_axis.hpp"
 #include "interpolate_axis.hpp"
+#include "extract_axis.hpp"
 #include "zoom_domain.hpp"
 #include "interpolate_domain.hpp"

XIOS/trunk/src/node/transformation_enum.hpp

@@ -25 +25 @@
         TRANS_REDUCE_SCALAR_TO_SCALAR = 16,
         TRANS_REORDER_DOMAIN = 17,
-        TRANS_EXTRACT_DOMAIN = 18
+        TRANS_EXTRACT_DOMAIN = 18,
+        TRANS_EXTRACT_AXIS = 19
       } ETranformationType;