Ignore:
Timestamp:
04/13/18 16:25:46 (3 years ago)
Author:
yushan
Message:

Branch EP merged with Dev_cmip6 @r1481

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/branch_openmp/src/functor/maximum.cpp

    r1018 r1482  
    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               } 
Note: See TracChangeset for help on using the changeset viewer.