Changeset 1482 for XIOS/dev/branch_openmp/src/functor
- Timestamp:
- 04/13/18 16:25:46 (6 years ago)
- Location:
- XIOS/dev/branch_openmp/src/functor
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/branch_openmp/src/functor/accumulate.cpp
r1018 r1482 34 34 double* out=_doutput.dataFirst(); 35 35 for (i=0; i<n; ++i,++in,++out) 36 if (!NumTraits<double>::is nan(*in))36 if (!NumTraits<double>::isNan(*in)) 37 37 { 38 if(!NumTraits<double>::is nan(*out)) *out += *in;38 if(!NumTraits<double>::isNan(*out)) *out += *in; 39 39 else *out=*in ; 40 40 } -
XIOS/dev/branch_openmp/src/functor/average.cpp
r1018 r1482 43 43 int* nc=nbcalls.dataFirst() ; 44 44 for (i=0; i<n; ++i,++nc,++in) 45 if (!NumTraits<double>::is nan(*in)) (*nc) ++;45 if (!NumTraits<double>::isNan(*in)) (*nc) ++; 46 46 } 47 47 } … … 55 55 int* nc=nbcalls.dataFirst() ; 56 56 for (i=0; i<n; ++i,++in,++out,++nc) 57 if (!NumTraits<double>::is nan(*in))57 if (!NumTraits<double>::isNan(*in)) 58 58 { 59 59 if (*nc != 0) (*out) += *in; -
XIOS/dev/branch_openmp/src/functor/maximum.cpp
r1018 r1482 34 34 { 35 35 for (; it1 != end1; it1++, it++) 36 if (!NumTraits<double>::is nan(*it1))36 if (!NumTraits<double>::isNan(*it1)) 37 37 { 38 if (!NumTraits<double>::is nan(*it)) *it = std::max(*it1, *it);38 if (!NumTraits<double>::isNan(*it)) *it = std::max(*it1, *it); 39 39 else *it=*it1 ; 40 40 } -
XIOS/dev/branch_openmp/src/functor/minimum.cpp
r1018 r1482 36 36 { 37 37 for (; it1 != end1; it1++, it++) 38 if (!NumTraits<double>::is nan(*it1))38 if (!NumTraits<double>::isNan(*it1)) 39 39 { 40 if (!NumTraits<double>::is nan(*it)) *it = std::min(*it1, *it);40 if (!NumTraits<double>::isNan(*it)) *it = std::min(*it1, *it); 41 41 else *it=*it1 ; 42 42 }
Note: See TracChangeset
for help on using the changeset viewer.