Changeset 888 for XIOS/trunk/src/transformation/grid_transformation.cpp

Timestamp:

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

Author:

mhnguyen

Message:

Adding new transformation for scalar: Reducing an axis to a scalar

+) Add new xml node for new transformation
+) Add new algorithms for axis reduction
+) Make change in some place to make sure everything work fine

Test
+) On Curie
+) Tests pass and are correct

File:

• XIOS/trunk/src/transformation/grid_transformation.cpp (modified) (6 diffs)

XIOS/trunk/src/transformation/grid_transformation.cpp

@@ -8 +8 @@
  */
 #include "grid_transformation.hpp"
+#include "reduce_axis_to_scalar.hpp"
+#include "scalar_algorithm_reduce_axis.hpp"
 #include "axis_algorithm_inverse.hpp"
 #include "axis_algorithm_zoom.hpp"
@@ -42 +44 @@
 void CGridTransformation::selectScalarAlgo(int elementPositionInGrid, ETranformationType transType, int transformationOrder)
 {
-
+  int scalarSrcIndex = -1, axisSrcIndex = -1, domainSrcIndex = -1;
+  std::vector<CScalar*> scaListDestP = gridDestination_->getScalars();
+  std::vector<CScalar*> scaListSrcP  = gridSource_->getScalars();
+  std::vector<CAxis*> axisListSrcP   = gridSource_->getAxis();
+  std::vector<CDomain*> domainListSrcP = gridSource_->getDomains();
+
+  int scalarDstIndex =  elementPositionInGridDst2ScalarPosition_[elementPositionInGrid];
+  CScalar::TransMapTypes trans = scaListDestP[scalarDstIndex]->getAllTransformations();
+  CScalar::TransMapTypes::const_iterator it = trans.begin();
+
+  for (int i = 0; i < transformationOrder; ++i, ++it) {}  // Find the correct transformation
+
+  CReduceAxisToScalar* reduceAxis = 0;
+  CGenericAlgorithmTransformation* algo = 0;
+  switch (transType)
+  {
+    case TRANS_REDUCE_AXIS_TO_SCALAR:
+      reduceAxis = dynamic_cast<CReduceAxisToScalar*> (it->second);
+      axisSrcIndex = elementPositionInGridSrc2AxisPosition_[elementPositionInGrid];
+      algo = new CScalarAlgorithmReduceScalar(scaListDestP[scalarDstIndex], axisListSrcP[axisSrcIndex], reduceAxis);
+      break;
+    default:
+      break;
+  }
+  algoTransformation_.push_back(algo);
 }
 
@@ -53 +79 @@
 void CGridTransformation::selectAxisAlgo(int elementPositionInGrid, ETranformationType transType, int transformationOrder)
 {
+  int axisSrcIndex = -1, domainSrcIndex = -1;
   std::vector<CAxis*> axisListDestP = gridDestination_->getAxis();
   std::vector<CAxis*> axisListSrcP = gridSource_->getAxis();
-
-  int axisIndex =  elementPositionInGridDst2AxisPosition_[elementPositionInGrid];
-  CAxis::TransMapTypes trans = axisListDestP[axisIndex]->getAllTransformations();
+  std::vector<CDomain*> domainListSrcP = gridSource_->getDomains();
+
+  int axisDstIndex =  elementPositionInGridDst2AxisPosition_[elementPositionInGrid];
+  CAxis::TransMapTypes trans = axisListDestP[axisDstIndex]->getAllTransformations();
   CAxis::TransMapTypes::const_iterator it = trans.begin();
 
@@ -69 +97 @@
     case TRANS_INTERPOLATE_AXIS:
       interpAxis = dynamic_cast<CInterpolateAxis*> (it->second);
-      algo = new CAxisAlgorithmInterpolate(axisListDestP[axisIndex], axisListSrcP[axisIndex], interpAxis);
+      axisSrcIndex = elementPositionInGridSrc2AxisPosition_[elementPositionInGrid];
+      algo = new CAxisAlgorithmInterpolate(axisListDestP[axisDstIndex], axisListSrcP[axisSrcIndex], interpAxis);
       break;
     case TRANS_ZOOM_AXIS:
       zoomAxis = dynamic_cast<CZoomAxis*> (it->second);
-      algo = new CAxisAlgorithmZoom(axisListDestP[axisIndex], axisListSrcP[axisIndex], zoomAxis);
+      axisSrcIndex = elementPositionInGridSrc2AxisPosition_[elementPositionInGrid];
+      algo = new CAxisAlgorithmZoom(axisListDestP[axisDstIndex], axisListSrcP[axisSrcIndex], zoomAxis);
       break;
     case TRANS_INVERSE_AXIS:
-      algo = new CAxisAlgorithmInverse(axisListDestP[axisIndex], axisListSrcP[axisIndex]);
+      axisSrcIndex = elementPositionInGridSrc2AxisPosition_[elementPositionInGrid];
+      algo = new CAxisAlgorithmInverse(axisListDestP[axisDstIndex], axisListSrcP[axisSrcIndex]);
       break;
     default:
@@ -159 +190 @@
     case TRANS_INVERSE_AXIS:
       axisIndex =  elementPositionInGridDst2AxisPosition_[elementPositionInGrid];
+      break;
+
+    case TRANS_REDUCE_AXIS_TO_SCALAR:
+      scalarIndex = elementPositionInGridDst2ScalarPosition_[elementPositionInGrid];
       break;
     default:
@@ -233 +268 @@
     case TRANS_INVERSE_AXIS:
       axisIndex =  elementPositionInGridDst2AxisPosition_[elementPositionInGrid];
+      break;
+
+    case TRANS_REDUCE_AXIS_TO_SCALAR:
+      scalarIndex = elementPositionInGridDst2ScalarPosition_[elementPositionInGrid];
       break;
     default: