Changeset 1158 for XIOS/dev/dev_olga/src/functor/average.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/average.cpp (modified) (3 diffs)

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

@@ -1 +1 @@
 #include "average.hpp"
 #include "array_new.hpp"
+#include "utils.hpp"
 
 namespace xios
@@ -42 +43 @@
             int* nc=nbcalls.dataFirst() ;
             for (i=0; i<n; ++i,++nc,++in) 
-              if (*in!=missingValue) (*nc) ++;
+              if (!NumTraits<double>::isnan(*in)) (*nc) ++;
           }
         }
@@ -54 +55 @@
             int* nc=nbcalls.dataFirst() ;
             for (i=0; i<n; ++i,++in,++out,++nc) 
-              if (*in!=missingValue) 
+              if (!NumTraits<double>::isnan(*in)) 
               {
                 if (*nc != 0) (*out)  += *in;