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

XIOS/trunk/src/transformation/grid_generate.hpp

@@ -12 +12 @@
 #include "xios_spl.hpp"
 #include "transformation_enum.hpp"
-#include "generic_algorithm_transformation.hpp"
+#include "grid_transformation_selector.hpp"
 
 namespace xios {
@@ -25 +25 @@
 This class only plays a role of interface between XIOS and specific algorithm of auto filling-in and auto distributing on sub-component
 */
-class CGridGenerate
+class CGridGenerate : public CGridTransformationSelector
 {
-public:
-  typedef std::list<std::pair<int,std::pair<ETranformationType,int> > > ListAlgoType;
-
 public:
   /** Default constructor */
@@ -36 +33 @@
 
   void completeGrid();
-  ListAlgoType getAlgoList() const {return listAlgos_; }
 
 protected:
-  void initializeAlgorithms();
-  void initializeAxisAlgorithms(int axisPositionInGrid);
-  void initializeDomainAlgorithms(int domPositionInGrid);
-
-  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);
-
-protected:
-  //! Grid source on transformation
-  CGrid* gridSource_;
-
-  //! Grid destination on transformation
-  CGrid* gridDestination_;
-
-protected:
-  //! List of algorithm types and their order
-  ListAlgoType listAlgos_;
-  // 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::list<CGenericAlgorithmTransformation*> algoTransformation_;
-
-  //! Position of axis and domain in grid
-  std::map<int, int> elementPosition2AxisPositionInGrid_, elementPosition2DomainPositionInGrid_;
+  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);
 };