Changeset 666 for XIOS/trunk/src/transformation/axis_algorithm_interpolate.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_interpolate.cpp (modified) (6 diffs)

XIOS/trunk/src/transformation/axis_algorithm_interpolate.cpp

@@ -20 +20 @@
   interpAxis->checkValid(axisSource);
   order_ = interpAxis->order.getValue();
-  if (order_ >= axisSource->size.getValue())
+  if (order_ >= axisSource->n_glo.getValue())
   {
     ERROR("CAxisAlgorithmInterpolate::CAxisAlgorithmInterpolate(CAxis* axisDestination, CAxis* axisSource, CInterpolateAxis* interpAxis)",
-           << "Order of interpolation is greater than size of axis source"
-           << "Size of axis source " <<axisSource->getId() << " is " << axisSource->size.getValue()  << std::endl
+           << "Order of interpolation is greater than global size of axis source"
+           << "Size of axis source " <<axisSource->getId() << " is " << axisSource->n_glo.getValue()  << std::endl
            << "Order of interpolation is " << order_ );
   }
@@ -43 +43 @@
   int nbClient = client->clientSize;
 
-  int srcSize  = axisSrc_->size.getValue();
+  int srcSize  = axisSrc_->n_glo.getValue();
   int numValue = axisValue.numElements();
 
@@ -67 +67 @@
   const double sfmax = NumTraits<double>::sfmax();
 
-  int ibegin = axisDest_->ibegin.getValue();
+  int ibegin = axisDest_->begin.getValue();
   CArray<double,1>& axisDestValue = axisDest_->value;
   int numValue = axisDestValue.numElements();
@@ -131 +131 @@
   std::map<int, std::vector<std::pair<int,double> > >::const_iterator itb = interpolatingIndexValues.begin(), it,
                                                                       ite = interpolatingIndexValues.end();
-  int ibegin = axisDest_->ibegin.getValue();
+  int ibegin = axisDest_->begin.getValue();
   for (it = itb; it != ite; ++it)
   {
@@ -169 +169 @@
   int nbClient = client->clientSize;
 
-  int srcSize  = axisSrc_->size.getValue();
+  int srcSize  = axisSrc_->n_glo.getValue();
   int numValue = axisValue.numElements();
 
@@ -191 +191 @@
     int* recvIndexBuff = new int [srcSize];
 
-    int ibegin = axisSrc_->ibegin.getValue();
+    int ibegin = axisSrc_->begin.getValue();
     for (int idx = 0; idx < numValue; ++idx)
     {