Changeset 666 for XIOS/trunk/src/transformation/axis_algorithm_inverse.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_inverse.cpp (modified) (3 diffs)

XIOS/trunk/src/transformation/axis_algorithm_inverse.cpp

@@ -17 +17 @@
  : CAxisAlgorithmTransformation(axisDestination, axisSource)
 {
-  if (axisDestination->size.getValue() != axisSource->size.getValue())
+  if (axisDestination->n_glo.getValue() != axisSource->n_glo.getValue())
   {
     ERROR("CAxisAlgorithmInverse::CAxisAlgorithmInverse(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());
+           << "Two axis have different global size"
+           << "Size of axis source " <<axisSource->getId() << " is " << axisSource->n_glo.getValue()  << std::endl
+           << "Size of axis destionation " <<axisDestination->getId() << " is " << axisDestination->n_glo.getValue());
   }
 
   this->computeIndexSourceMapping();
-  int niSrc   = axisSrc_->ni.getValue();
-  int sizeSrc = axisSrc_->size.getValue();
+  int niSrc   = axisSrc_->n.getValue();
+  int sizeSrc = axisSrc_->n_glo.getValue();
   if (niSrc != sizeSrc) updateAxisValue();
   else
@@ -60 +60 @@
   CContextClient* client=context->client;
 
-  int niSrc     = axisSrc_->ni.getValue();
-  int ibeginSrc = axisSrc_->ibegin.getValue();
+  int niSrc     = axisSrc_->n.getValue();
+  int ibeginSrc = axisSrc_->begin.getValue();
 
   CTransformationMapping transformationMap(axisDest_, axisSrc_);
@@ -128 +128 @@
  }
 
- int ibeginDest = axisDest_->ibegin.getValue();
+ int ibeginDest = axisDest_->begin.getValue();
  currentRecvBuff = recvBuff;
  for (itRecv = itbRecv; itRecv != iteRecv; ++itRecv)