Changeset 1471


Ignore:
Timestamp:
04/03/18 16:52:37 (2 years ago)
Author:
oabramkina
Message:

Trunk: few corrections in order to be in compliance with c++98 norms.

Compilation with PGI on curie: ok.

Location:
XIOS/trunk/src
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/src/context_client.cpp

    r1198 r1471  
    290290     for (std::map<int,StdSize>::const_iterator it = mapSize.begin(), ite = mapSize.end(); it != ite; ++it) 
    291291     { 
    292        double ratio = double(it->second) / maxEventSize.at(it->first); 
     292       double ratio = double(it->second) / maxEventSizes[it->first]; 
    293293       if (ratio < minBufferSizeEventSizeRatio) minBufferSizeEventSizeRatio = ratio; 
    294294     } 
  • XIOS/trunk/src/filter/file_writer_filter.cpp

    r1358 r1471  
    2929      for (size_t idx = 0; idx < nbData; ++idx) 
    3030      { 
    31         if (NumTraits<double>::isnan(dataArray(idx))) 
     31        if (NumTraits<double>::isNan(dataArray(idx))) 
    3232          dataArray(idx) = missingValue; 
    3333      } 
  • XIOS/trunk/src/filter/spatial_transform_filter.cpp

    r1261 r1471  
    119119    bool ignoreMissingValue = false;  
    120120    double defaultValue = std::numeric_limits<double>::quiet_NaN(); 
    121     if (0 != dataDest.numElements()) ignoreMissingValue = NumTraits<double>::isnan(dataDest(0)); 
     121    if (0 != dataDest.numElements()) ignoreMissingValue = NumTraits<double>::isNan(dataDest(0)); 
    122122 
    123123    const std::list<CGridTransformation::SendingIndexGridSourceMap>& listLocalIndexSend = gridTransformation->getLocalIndexToSendFromGridSource(); 
  • XIOS/trunk/src/filter/store_filter.cpp

    r1358 r1471  
    9393      for (size_t idx = 0; idx < nbData; ++idx) 
    9494      { 
    95         if (NumTraits<double>::isnan(packet->data(idx))) 
     95        if (NumTraits<double>::isNan(packet->data(idx))) 
    9696          packet->data(idx) = missingValue; 
    9797      } 
  • XIOS/trunk/src/functor/accumulate.cpp

    r1018 r1471  
    3434            double* out=_doutput.dataFirst(); 
    3535            for (i=0; i<n; ++i,++in,++out)  
    36               if (!NumTraits<double>::isnan(*in)) 
     36              if (!NumTraits<double>::isNan(*in)) 
    3737              { 
    38                 if(!NumTraits<double>::isnan(*out)) *out  += *in; 
     38                if(!NumTraits<double>::isNan(*out)) *out  += *in; 
    3939                else *out=*in ; 
    4040              } 
  • XIOS/trunk/src/functor/average.cpp

    r1018 r1471  
    4343            int* nc=nbcalls.dataFirst() ; 
    4444            for (i=0; i<n; ++i,++nc,++in)  
    45               if (!NumTraits<double>::isnan(*in)) (*nc) ++; 
     45              if (!NumTraits<double>::isNan(*in)) (*nc) ++; 
    4646          } 
    4747        } 
     
    5555            int* nc=nbcalls.dataFirst() ; 
    5656            for (i=0; i<n; ++i,++in,++out,++nc)  
    57               if (!NumTraits<double>::isnan(*in))  
     57              if (!NumTraits<double>::isNan(*in))  
    5858              { 
    5959                if (*nc != 0) (*out)  += *in; 
  • XIOS/trunk/src/functor/maximum.cpp

    r1018 r1471  
    3434           {  
    3535             for (; it1 != end1; it1++, it++)  
    36                if (!NumTraits<double>::isnan(*it1)) 
     36               if (!NumTraits<double>::isNan(*it1)) 
    3737               { 
    38                  if (!NumTraits<double>::isnan(*it)) *it = std::max(*it1, *it); 
     38                 if (!NumTraits<double>::isNan(*it)) *it = std::max(*it1, *it); 
    3939                 else *it=*it1 ;   
    4040               } 
  • XIOS/trunk/src/functor/minimum.cpp

    r1018 r1471  
    3636          {  
    3737            for (; it1 != end1; it1++, it++)  
    38               if (!NumTraits<double>::isnan(*it1)) 
     38              if (!NumTraits<double>::isNan(*it1)) 
    3939              { 
    40                 if (!NumTraits<double>::isnan(*it)) *it = std::min(*it1, *it); 
     40                if (!NumTraits<double>::isNan(*it)) *it = std::min(*it1, *it); 
    4141                else *it=*it1 ; 
    4242              } 
  • XIOS/trunk/src/transformation/Functions/average_reduction.cpp

    r1261 r1471  
    4747      currentlocalIndex = localIndex[idx].first; 
    4848      currentWeight     = localIndex[idx].second; 
    49       if (!NumTraits<double>::isnan(*(dataInput + idx))) 
     49      if (!NumTraits<double>::isNan(*(dataInput + idx))) 
    5050      { 
    5151        if (flagInitial[currentlocalIndex]) 
  • XIOS/trunk/src/transformation/Functions/max_reduction.cpp

    r1261 r1471  
    4141    { 
    4242      currentlocalIndex = localIndex[idx].first;       
    43       if (!NumTraits<double>::isnan(*(dataInput + idx))) 
     43      if (!NumTraits<double>::isNan(*(dataInput + idx))) 
    4444      { 
    4545        if (flagInitial[currentlocalIndex]) 
  • XIOS/trunk/src/transformation/Functions/min_reduction.cpp

    r1261 r1471  
    4141    { 
    4242      currentlocalIndex = localIndex[idx].first; 
    43       if (!NumTraits<double>::isnan(*(dataInput + idx))) 
     43      if (!NumTraits<double>::isNan(*(dataInput + idx))) 
    4444      { 
    4545        if (flagInitial[currentlocalIndex]) 
  • XIOS/trunk/src/transformation/Functions/sum_reduction.cpp

    r1261 r1471  
    4343    { 
    4444      currentlocalIndex = localIndex[idx].first;    
    45       if (!NumTraits<double>::isnan(*(dataInput + idx))) 
     45      if (!NumTraits<double>::isNan(*(dataInput + idx))) 
    4646      {    
    4747        if (flagInitial[currentlocalIndex]) 
  • XIOS/trunk/src/transformation/generic_algorithm_transformation.cpp

    r1261 r1471  
    3838    for (int idx = 0; idx < nbLocalIndex; ++idx) 
    3939    { 
    40       if (NumTraits<double>::isnan(*(dataInput + idx))) 
     40      if (NumTraits<double>::isNan(*(dataInput + idx))) 
    4141      { 
    4242        flagInitial[localIndex[idx].first] = false; 
  • XIOS/trunk/src/utils.hpp

    r1018 r1471  
    257257    return 1e-12; 
    258258  } 
    259   static inline bool isnan(const Scalar& v) { 
     259  static inline bool isNan(const Scalar& v) { 
    260260    return (v != v); 
    261261  } 
Note: See TracChangeset for help on using the changeset viewer.