Changeset 1158 for XIOS/dev/dev_olga/src/functor/maximum.cpp

Timestamp:

06/06/17 17:58:16 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging with trunk r1137.
There are bugs.

File:

• XIOS/dev/dev_olga/src/functor/maximum.cpp (modified) (2 diffs)

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

@@ -1 +1 @@
 #include "maximum.hpp"
 #include "array_new.hpp"
-
-
+#include "utils.hpp"
 
 namespace xios
@@ -35 +34 @@
            { 
              for (; it1 != end1; it1++, it++) 
-               if (*it1 != missingValue)
+               if (!NumTraits<double>::isnan(*it1))
                {
-                 if ( *it != missingValue) *it = std::max(*it1, *it);
+                 if (!NumTraits<double>::isnan(*it)) *it = std::max(*it1, *it);
                  else *it=*it1 ;  
                }