Changeset 624 for XIOS/trunk/src/transformation/axis_algorithm_transformation.cpp

Timestamp:

06/22/15 13:36:37 (9 years ago)

Author:

mhnguyen

Message:

Final tests of zoom and inverse on axis

+) Modify test_client and test_complete to work with new grid definition
+) Correct some bugs causing memory leak
+) Clean abundant code
+) Add more comments to new files

Test
+) On Curie
+) test_client and test_complete pass with correct results

Location:

XIOS/trunk/src/transformation

Files:

• . (added)
• axis_algorithm_transformation.cpp (moved) (moved from XIOS/trunk/src/filter/axis_algorithm_transformation.cpp) (3 diffs)

XIOS/trunk/src/transformation/axis_algorithm_transformation.cpp

@@ +1 @@
+/*!
+   \file axis_algorithm_transformation.hpp
+   \author Ha NGUYEN
+   \since 14 May 2015
+   \date 09 June 2015
+
+   \brief Interface for all axis transformation algorithms.
+ */
+
 #include "axis_algorithm_transformation.hpp"
-#include "axis_inverse.hpp"
-#include "axis_zoom.hpp"
+#include "axis_algorithm_inverse.hpp"
+#include "axis_algorithm_zoom.hpp"
 
 namespace xios {
@@ -8 +17 @@
  : CGenericAlgorithmTransformation()
 {
-//  if (axisDestination->size.getValue() != axisSource->size.getValue())
-//  {
-//    ERROR("CAxisZoom::CAxisZoom(CAxis* axisDestination, CAxis* axisSource)",
-//           << "Two axis have different size"
-//           << "Size of axis source " <<axisSource->getId() << " is " << axisSource->size.getValue()  << std::endl
-//           << "Size of axis destionation " <<axisDestination->getId() << " is " << axisDestination->size.getValue());
-//  }
-//
-//
-//  axisDestGlobalSize_ = axisDestination->size.getValue();
-//  int niDest = axisDestination->ni.getValue();
-//  int ibeginDest = axisDestination->ibegin.getValue();
-//
-//  for (int idx = 0; idx < niDest; ++idx) axisDestGlobalIndex_.push_back(ibeginDest+idx);
 }
 
 CAxisAlgorithmTransformation::~CAxisAlgorithmTransformation()
 {
-//  for (int idx = 0; idx < algosOfAnAxis_.size(); ++idx) delete algosOfAnAxis_[idx];
 }
 
 void CAxisAlgorithmTransformation::computeIndexSourceMapping()
 {
-//  if (!algosOfAnAxis_.empty())
-//  {
-//    algosOfAnAxis_[0]->computeIndexSourceMapping(this->transformationMapping_);
-//    for (int idx = 1; idx < algosOfAnAxis_.size(); ++idx)
-//    {
-//      algosOfAnAxis_[idx]->computeIndexSourceMapping(algosOfAnAxis_[idx-1]->getTransformationMapping());
-//    }
-//    this->transformationMapping_ = algosOfAnAxis_[algosOfAnAxis_.size()-1]->getTransformationMapping();
-//  }
 }
 
@@ -162 +147 @@
   }
 }
-
-
 }