Changeset 1037 for XIOS/dev/branch_yushan/src/functor/minimum.cpp

Timestamp:

01/25/17 16:25:17 (7 years ago)

Author:

yushan

Message:

initialize the branch

File:

• XIOS/dev/branch_yushan/src/functor/minimum.cpp (modified) (3 diffs)

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

@@ -2 +2 @@
 #include "array_new.hpp"
 #include <algorithm>
-#include "utils.hpp"
 
 namespace xios
@@ -27 +26 @@
       {
         const double * it1  = _dinput.dataFirst(),
-                      *end1 = _dinput.dataFirst() + _dinput.numElements();
+                      * end1 = _dinput.dataFirst() + _dinput.numElements();
         double * it   = _doutput.dataFirst();
         
@@ -36 +35 @@
           { 
             for (; it1 != end1; it1++, it++) 
-              if (!NumTraits<double>::isnan(*it1))
+              if (*it1!=missingValue)
               {
-                if (!NumTraits<double>::isnan(*it)) *it = std::min(*it1, *it);
+                if (*it != missingValue) *it = std::min(*it1, *it);
                 else *it=*it1 ;
               }