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

Timestamp:

07/07/15 10:46:25 (9 years ago)

Author:

mhnguyen

Message:

Implementing interpolation (polynomial) and correct some bugs

+) Implement interpolation (polynomial)
+) Correct some minor bugs relating to memory allocation
+) Clear some redundant codes

Test
+) On Curie
+) test_client and test_complete pass

File:

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

XIOS/trunk/src/transformation/generic_algorithm_transformation.hpp

@@ -3 +3 @@
    \author Ha NGUYEN
    \since 14 May 2015
-   \date 09 June 2015
+   \date 29 June 2015
 
    \brief Interface for all transformation algorithms.
@@ -11 +11 @@
 
 #include <map>
-#include <vector>
+#include <set>
 #include "array_new.hpp"
 
@@ -29 +29 @@
                                 const std::vector<int>& gridDestGlobalDim,
                                 const CArray<size_t,1>& globalIndexGridDestSendToServer,
-                                std::map<size_t, std::set<size_t> >& globaIndexMapFromDestToSource);
+                                std::map<size_t, std::vector<std::pair<size_t,double> > >& globaIndexWeightFromDestToSource);
 
   /*!
@@ -47 +47 @@
     \param[in/out] globalIndexSrcGrid array of global index of source grid (for 2d grid, this array is a line, for 3d, this array represents a plan). It should be preallocated
   */
-  virtual void computeGlobalIndexFromGlobalIndexElement(int destGlobalIndex,
+  virtual void computeGlobalGridIndexFromGlobalIndexElement(int destGlobalIndex,
                                                         const std::vector<int>& srcGlobalIndex,
                                                         int elementPositionInGrid,
@@ -53 +53 @@
                                                         const CArray<size_t,1>& globalIndexGridDestSendToServer,
                                                         CArray<size_t,1>& globalIndexDestGrid,
-                                                        std::vector<CArray<size_t,1> >& globalIndexSrcGrid) = 0;
+                                                        std::vector<std::vector<size_t> >& globalIndexSrcGrid) = 0;
 
 
@@ -59 +59 @@
 protected:
   std::map<int, std::vector<int> > transformationMapping_;
+  std::map<int, std::vector<double> > transformationWeight_;
 };