Changeset 1474

Timestamp:

04/04/18 12:48:53 (6 years ago)

Author:

oabramkina

Message:

DEV_CMIP6: porting changes in r1471.

Now DEV_CMIP6 compiles with PGI.

Location:

XIOS/dev/XIOS_DEV_CMIP6/src

Files:

• context_client.cpp (modified) (1 diff)
• filter/file_writer_filter.cpp (modified) (1 diff)
• filter/spatial_transform_filter.cpp (modified) (1 diff)
• filter/store_filter.cpp (modified) (1 diff)
• functor/accumulate.cpp (modified) (1 diff)
• functor/average.cpp (modified) (2 diffs)
• functor/maximum.cpp (modified) (1 diff)
• functor/minimum.cpp (modified) (1 diff)
• transformation/Functions/average_reduction.cpp (modified) (1 diff)
• transformation/Functions/max_reduction.cpp (modified) (1 diff)
• transformation/Functions/min_reduction.cpp (modified) (1 diff)
• transformation/Functions/sum_reduction.cpp (modified) (1 diff)
• transformation/domain_algorithm_interpolate.cpp (modified) (1 diff)
• transformation/generic_algorithm_transformation.cpp (modified) (1 diff)
• utils.hpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/context_client.cpp

@@ -337 +337 @@
      for (std::map<int,StdSize>::const_iterator it = mapSize.begin(), ite = mapSize.end(); it != ite; ++it)
      {
-       double ratio = double(it->second) / maxEventSize.at(it->first);
+       double ratio = double(it->second) / maxEventSizes[it->first];
        if (ratio < minBufferSizeEventSizeRatio) minBufferSizeEventSizeRatio = ratio;
      }

XIOS/dev/XIOS_DEV_CMIP6/src/filter/file_writer_filter.cpp

@@ -29 +29 @@
       for (size_t idx = 0; idx < nbData; ++idx)
       {
-        if (NumTraits<double>::isnan(dataArray(idx)))
+        if (NumTraits<double>::isNan(dataArray(idx)))
           dataArray(idx) = missingValue;
       }

XIOS/dev/XIOS_DEV_CMIP6/src/filter/spatial_transform_filter.cpp

@@ -196 +196 @@
     bool ignoreMissingValue = false; 
     double defaultValue = std::numeric_limits<double>::quiet_NaN();
-    if (0 != dataDest.numElements()) ignoreMissingValue = NumTraits<double>::isnan(dataDest(0));
+    if (0 != dataDest.numElements()) ignoreMissingValue = NumTraits<double>::isNan(dataDest(0));
 
     const std::list<CGridTransformation::SendingIndexGridSourceMap>& listLocalIndexSend = gridTransformation->getLocalIndexToSendFromGridSource();

XIOS/dev/XIOS_DEV_CMIP6/src/filter/store_filter.cpp

@@ -93 +93 @@
       for (size_t idx = 0; idx < nbData; ++idx)
       {
-        if (NumTraits<double>::isnan(packet->data(idx)))
+        if (NumTraits<double>::isNan(packet->data(idx)))
           packet->data(idx) = missingValue;
       }

XIOS/dev/XIOS_DEV_CMIP6/src/functor/accumulate.cpp

@@ -34 +34 @@
             double* out=_doutput.dataFirst();
             for (i=0; i<n; ++i,++in,++out) 
-              if (!NumTraits<double>::isnan(*in))
+              if (!NumTraits<double>::isNan(*in))
               {
-                if(!NumTraits<double>::isnan(*out)) *out  += *in;
+                if(!NumTraits<double>::isNan(*out)) *out  += *in;
                 else *out=*in ;
               }

XIOS/dev/XIOS_DEV_CMIP6/src/functor/average.cpp

@@ -43 +43 @@
             int* nc=nbcalls.dataFirst() ;
             for (i=0; i<n; ++i,++nc,++in) 
-              if (!NumTraits<double>::isnan(*in)) (*nc) ++;
+              if (!NumTraits<double>::isNan(*in)) (*nc) ++;
           }
         }
@@ -55 +55 @@
             int* nc=nbcalls.dataFirst() ;
             for (i=0; i<n; ++i,++in,++out,++nc) 
-              if (!NumTraits<double>::isnan(*in)) 
+              if (!NumTraits<double>::isNan(*in)) 
               {
                 if (*nc != 0) (*out)  += *in;

XIOS/dev/XIOS_DEV_CMIP6/src/functor/maximum.cpp

@@ -34 +34 @@
            { 
              for (; it1 != end1; it1++, it++) 
-               if (!NumTraits<double>::isnan(*it1))
+               if (!NumTraits<double>::isNan(*it1))
                {
-                 if (!NumTraits<double>::isnan(*it)) *it = std::max(*it1, *it);
+                 if (!NumTraits<double>::isNan(*it)) *it = std::max(*it1, *it);
                  else *it=*it1 ;  
                }

XIOS/dev/XIOS_DEV_CMIP6/src/functor/minimum.cpp

@@ -36 +36 @@
           { 
             for (; it1 != end1; it1++, it++) 
-              if (!NumTraits<double>::isnan(*it1))
+              if (!NumTraits<double>::isNan(*it1))
               {
-                if (!NumTraits<double>::isnan(*it)) *it = std::min(*it1, *it);
+                if (!NumTraits<double>::isNan(*it)) *it = std::min(*it1, *it);
                 else *it=*it1 ;
               }

XIOS/dev/XIOS_DEV_CMIP6/src/transformation/Functions/average_reduction.cpp

@@ -47 +47 @@
       currentlocalIndex = localIndex[idx].first;
       currentWeight     = localIndex[idx].second;
-      if (!NumTraits<double>::isnan(*(dataInput + idx)))
+      if (!NumTraits<double>::isNan(*(dataInput + idx)))
       {
         if (flagInitial[currentlocalIndex])

XIOS/dev/XIOS_DEV_CMIP6/src/transformation/Functions/max_reduction.cpp

@@ -41 +41 @@
     {
       currentlocalIndex = localIndex[idx].first;      
-      if (!NumTraits<double>::isnan(*(dataInput + idx)))
+      if (!NumTraits<double>::isNan(*(dataInput + idx)))
       {
         if (flagInitial[currentlocalIndex])

XIOS/dev/XIOS_DEV_CMIP6/src/transformation/Functions/min_reduction.cpp

@@ -41 +41 @@
     {
       currentlocalIndex = localIndex[idx].first;
-      if (!NumTraits<double>::isnan(*(dataInput + idx)))
+      if (!NumTraits<double>::isNan(*(dataInput + idx)))
       {
         if (flagInitial[currentlocalIndex])

XIOS/dev/XIOS_DEV_CMIP6/src/transformation/Functions/sum_reduction.cpp

@@ -43 +43 @@
     {
       currentlocalIndex = localIndex[idx].first;   
-      if (!NumTraits<double>::isnan(*(dataInput + idx)))
+      if (!NumTraits<double>::isNan(*(dataInput + idx)))
       {   
         if (flagInitial[currentlocalIndex])

XIOS/dev/XIOS_DEV_CMIP6/src/transformation/domain_algorithm_interpolate.cpp

@@ -914 +914 @@
     for (int idx = 0; idx < nbLocalIndex; ++idx)
     {
-      if (NumTraits<double>::isnan(*(dataInput + idx)))
+      if (NumTraits<double>::isNan(*(dataInput + idx)))
       {
         flagInitial[localIndex[idx].first] = false;

XIOS/dev/XIOS_DEV_CMIP6/src/transformation/generic_algorithm_transformation.cpp

@@ -41 +41 @@
     for (int idx = 0; idx < nbLocalIndex; ++idx)
     {
-      if (NumTraits<double>::isnan(*(dataInput + idx)))
+      if (NumTraits<double>::isNan(*(dataInput + idx)))
       {
         flagInitial[localIndex[idx].first] = false;

XIOS/dev/XIOS_DEV_CMIP6/src/utils.hpp

@@ -257 +257 @@
     return 1e-12;
   }
-  static inline bool isnan(const Scalar& v) {
+  static inline bool isNan(const Scalar& v) {
     return (v != v);
   }