Changeset 933 for XIOS/trunk/src/transformation/generic_algorithm_transformation.hpp

Timestamp:

09/22/16 10:58:32 (8 years ago)

Author:

mhnguyen

Message:

Improving transformation selection. Instead of modifying directly grid_transformation
we only need to register a new transformation with the framework

+) Update all transformations with this new method

Test
+) On Curie
+) Basic tests pass

File:

• XIOS/trunk/src/transformation/generic_algorithm_transformation.hpp (modified) (4 diffs)

XIOS/trunk/src/transformation/generic_algorithm_transformation.hpp

@@ -23 +23 @@
   /*!
   \class CGenericAlgorithmTransformation
-  This class defines the interface for all other inherted algorithms class
+  This class defines the interface for all other inherited algorithms class
   */
 class CGenericAlgorithmTransformation
 {
-protected:
-  typedef std::vector<std::pair<int, std::pair<size_t,double> > > DestinationGlobalIndex;
 public:
-  // Stupid global index map, it must be replaced by tuple
+  enum AlgoTransType {
+    ELEMENT_GENERATION = 0,
+    ELEMENT_MODIFICATION_WITHOUT_DATA = 1,
+    ELEMENT_MODIFICATION_WITH_DATA = 2,
+    ELEMENT_NO_MODIFICATION_WITH_DATA = 3,
+    ELEMENT_NO_MODIFICATION_WITHOUT_DATA = 4
+  } ;
+
+public:
   // Mapping between global index map of DESTINATION and its local index with pair of global index of SOURCE and weights
-  typedef boost::unordered_map<size_t, DestinationGlobalIndex> DestinationIndexMap;
-  //
   typedef boost::unordered_map<int, boost::unordered_map<size_t, std::vector<std::pair<size_t,double> > > > SourceDestinationIndexMap;
 
@@ -54 +58 @@
 
     /*!
-    Apply a reduction operation on local data.
+    Apply a operation on local data.
     \param [in] localIndex vector contains local index of local data output and the corresponding weight
     \param [in] dataInput Pointer to the first element of data input array (in form of buffer)
@@ -67 +71 @@
 
   std::vector<StdString> getIdAuxInputs();
-
+  AlgoTransType type();
   /*!
   Compute global index mapping from one element of destination grid to the corresponding element of source grid
@@ -123 +127 @@
   //! Id of auxillary inputs which helps doing transformation dynamically
   std::vector<StdString> idAuxInputs_;
+  AlgoTransType type_;
+
 
   std::map<int, int> elementPositionInGridSrc2AxisPosition_, elementPositionInGridSrc2DomainPosition_, elementPositionInGridSrc2ScalarPosition_;