Changeset 1460 for XIOS/dev/branch_openmp/src/transformation/axis_algorithm_interpolate.cpp

Timestamp:

03/22/18 10:43:20 (6 years ago)

Author:

yushan

Message:

branch_openmp merged with XIOS_DEV_CMIP6@1459

File:

• XIOS/dev/branch_openmp/src/transformation/axis_algorithm_interpolate.cpp (modified) (7 diffs)

XIOS/dev/branch_openmp/src/transformation/axis_algorithm_interpolate.cpp

@@ -17 +17 @@
 #include "grid_transformation_factory_impl.hpp"
 #include "distribution_client.hpp"
+#include "timer.hpp"
 
 namespace xios {
@@ -63 +64 @@
 void CAxisAlgorithmInterpolate::computeIndexSourceMapping_(const std::vector<CArray<double,1>* >& dataAuxInputs)
 {
+  CTimer::get("CAxisAlgorithmInterpolate::computeIndexSourceMapping_").resume() ;
   CContext* context = CContext::getCurrent();
   CContextClient* client=context->client;
@@ -84 +86 @@
     computeInterpolantPoint(valueSrc, indexVec, idx);
   }
+  CTimer::get("CAxisAlgorithmInterpolate::computeIndexSourceMapping_").suspend() ;
 }
 
@@ -148 +151 @@
       while (it < iteRange)
       {
-        while (itsecond < ite && ((*itsecond -*it) < precision))
+        while ( (itsecond < ite) && ((*itsecond -*it) < precision) )
         { ++itsecond; ++it; }
         int index = std::distance(itb, it);
@@ -313 +316 @@
     for (size_t idx = 0; idx < vecAxisValueSize; ++idx)
     {
-      if (dom->mask_1d(idx)) ++vecAxisValueSizeWithMask;
+      if (dom->domainMask(idx)) ++vecAxisValueSizeWithMask;
     }
 
@@ -324 +327 @@
       for (size_t idx = 0; idx < vecAxisValueSize; ++idx)
       {
-        if (dom->mask_1d(idx))
+        if (dom->domainMask(idx))
         {
           transPosition_[indexMask].resize(1);
@@ -345 +348 @@
     for (size_t idx = 0; idx < vecAxisValueSize; ++idx)
     {
-      if (dom->mask_1d(idx))
+      if (dom->domainMask(idx))
       {
         size_t axisValueSize = 0;