Changeset 887 for XIOS/trunk/src/transformation/grid_transformation.hpp

Timestamp:

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

Author:

mhnguyen

Message:

Adding a new type of element into grid: Scalar

+) Add a new node Scalar for xml
+) Make some change on writing scalar value
+) Reorganize some codes
+) Remove some redundant codes

Test
+) On Curie
+) All tests pass

File:

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

XIOS/trunk/src/transformation/grid_transformation.hpp

@@ -15 +15 @@
 #include "transformation_enum.hpp"
 #include "duration.hpp"
+#include "grid_transformation_selector.hpp"
 
 namespace xios {
@@ -30 +31 @@
 the grid destination of current transformation will be grid source of the next transformation
 */
-class CGridTransformation
+class CGridTransformation : public CGridTransformationSelector
 {
 public:
-  typedef std::list<std::pair<int,std::pair<ETranformationType,int> > > ListAlgoType;
-  typedef boost::unordered_map<size_t, std::vector<std::pair<int, std::pair<size_t,double> > > > DestinationIndexMap;
   typedef std::map<int, CArray<int,1> > SendingIndexGridSourceMap;
   typedef std::map<int,std::vector<std::pair<int,double> > > RecvIndexGridDestinationMap;
@@ -53 +52 @@
   CGrid* getGridSource() { return originalGridSource_; }
   CGrid* getGridDestination() { return gridDestination_; }
-  ListAlgoType getAlgoList() const {return listAlgos_; }
-  int getNbAlgo() { return nbAlgos_; }
-  const std::vector<StdString>& getAuxInputs() const { return auxInputs_; }
 
 protected:
   void computeTransformation();
-  void initializeAlgorithms();
-  void initializeAxisAlgorithms(int axisPositionInGrid);
-  void initializeDomainAlgorithms(int domPositionInGrid);
-  void initializeTransformations();
 
-  void selectAxisAlgo(int elementPositionInGrid, ETranformationType transType, int transformationOrder);
-  void selectDomainAlgo(int elementPositionInGrid, ETranformationType transType, int transformationOrder);
-  void selectAlgo(int elementPositionInGrid, ETranformationType transType, int transformationOrder, bool isDomainAlgo);
+  virtual void selectScalarAlgo(int elementPositionInGrid, ETranformationType transType, int transformationOrder);
+  virtual void selectAxisAlgo(int elementPositionInGrid, ETranformationType transType, int transformationOrder);
+  virtual void selectDomainAlgo(int elementPositionInGrid, ETranformationType transType, int transformationOrder);
+
   void setUpGridSource(int elementPositionInGrid, ETranformationType transType, int nbTransformation);
   void setUpGridDestination(int elementPositionInGrid, ETranformationType transType, int nbTransformation);
   void computeTransformationMapping(const SourceDestinationIndexMap& globalIndexWeightFromSrcToDest);
-  bool isSpecialTransformation(ETranformationType transType);
 
 protected:
-  //! Grid source on transformation
-  CGrid* gridSource_;
-
-  //! Grid destination on transformation
-  CGrid* gridDestination_, *tmpGridDestination_;
-
   //! The grid source of the first transformation (original grid source)
+  CGrid* tmpGridDestination_;
   CGrid* originalGridSource_;
+  std::vector<CGrid*> tempGridSrcs_, tempGridDests_;
 
 protected:
-  //! List of algorithm types and their order
-  ListAlgoType listAlgos_;
-
-  //! Number of algorithm
-  int nbAlgos_;
-
-  // true if domain algorithm and false if axis algorithm (can be replaced by tuple with listAlgos_
-  std::vector<bool> algoTypes_;
-
-  // Mapping between position of an element in grid and its transformation (if any)
-  std::vector<CGenericAlgorithmTransformation*> algoTransformation_;
-
   //! Mapping of (grid) global index representing tranformation.
   std::map<size_t, std::set<size_t> > globaIndexMapFromDestToSource_;
@@ -108 +84 @@
   std::list<std::vector<bool> > localMaskOnGridDest_;
 
-  //! Position of axis and domain in grid
-  std::map<int, int> elementPosition2AxisPositionInGrid_, elementPosition2DomainPositionInGrid_;
-
-  std::vector<CGrid*> tempGridSrcs_, tempGridDests_;
-  std::vector<StdString> auxInputs_;
   bool dynamicalTransformation_;
-
   std::set<Time> timeStamp_; //! Time stamps for auxillary inputs
 };