Changeset 666 for XIOS/trunk/src/transformation/axis_algorithm_zoom.cpp

Timestamp:

08/24/15 14:53:27 (9 years ago)

Author:

mhnguyen

Message:

Change name of several axis attributes and remove some redundant variable of domain

+) Change name of axis attributes to make them consistent with ones of domain
+) Remove zoom_client_* of domain

Test
+) On Curie
+) All tests pass and are correct

File:

• XIOS/trunk/src/transformation/axis_algorithm_zoom.cpp (modified) (3 diffs)

XIOS/trunk/src/transformation/axis_algorithm_zoom.cpp

@@ -19 +19 @@
   zoomSize_  = zoomAxis->zoom_size.getValue();
 
-  if (zoomSize_ > axisSource->size.getValue())
+  if (zoomSize_ > axisSource->n_glo.getValue())
   {
     ERROR("CAxisAlgorithmZoom::CAxisAlgorithmZoom(CAxis* axisDestination, CAxis* axisSource, CZoomAxis* zoomAxis)",
-           << "Zoom size is greater than size of axis source"
-           << "Size of axis source " <<axisSource->getId() << " is " << axisSource->size.getValue()  << std::endl
+           << "Zoom size is greater than global size of axis source"
+           << "Global size of axis source " <<axisSource->getId() << " is " << axisSource->n_glo.getValue()  << std::endl
            << "Zoom size is " << zoomSize_ );
   }
@@ -35 +35 @@
 void CAxisAlgorithmZoom::computeIndexSourceMapping()
 {
-  StdSize niSource = axisSrc_->ni.getValue();
-  StdSize ibeginSource = axisSrc_->ibegin.getValue();
+  StdSize niSource = axisSrc_->n.getValue();
+  StdSize ibeginSource = axisSrc_->begin.getValue();
   StdSize iendSource = ibeginSource + niSource - 1;
 
@@ -73 +73 @@
 {
   StdSize niMask = axisDest_->mask.numElements();
-  StdSize iBeginMask = axisDest_->ibegin.getValue();
+  StdSize iBeginMask = axisDest_->begin.getValue();
   StdSize globalIndexMask = 0;
   std::map<int, std::vector<int> >& transMap = this->transformationMapping_;