Changeset 630 for XIOS/trunk/src/transformation/transformation_mapping.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/transformation_mapping.hpp (modified) (3 diffs)

XIOS/trunk/src/transformation/transformation_mapping.hpp

@@ -13 +13 @@
 #include <set>
 #include "grid.hpp"
+#include "axis.hpp"
 #include "array_new.hpp"
 #include "client_server_mapping_distributed.hpp"
@@ -29 +30 @@
   /** Default constructor */
   CTransformationMapping(CGrid* destination, CGrid* source);
+  CTransformationMapping(CAxis* destination, CAxis* source);
+
   ~CTransformationMapping();
 
-  void computeTransformationMapping(const std::map<size_t, std::set<size_t> >& globaIndexMapFromDestToSource);
-  const std::map<int,std::vector<std::vector<size_t> > >& getGlobalIndexReceivedOnGridDestMapping() const;
+  void computeTransformationMapping(const std::map<size_t, std::vector<std::pair<size_t,double> > >& globaIndexMapFromDestToSource);
+  const std::map<int,std::vector<std::vector<std::pair<size_t,double> > > >& getGlobalIndexReceivedOnGridDestMapping() const;
   const std::map<int,std::vector<size_t> >& getGlobalIndexSendToGridDestMapping() const;
 
@@ -43 +46 @@
 
   //! Mapping of client rank of grid source and global index received in grid destination
-  std::map<int,std::vector<std::vector<size_t> > > globalIndexReceivedOnGridDestMapping_;
+  std::map<int,std::vector<std::vector<std::pair<size_t,double> > > > globalIndexReceivedOnGridDestMapping_;
 
   //! Mapping of client rank of grid destination and global index to send from grid source