Changeset 1158 for XIOS/dev/dev_olga/src/functor

Timestamp:

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

Author:

oabramkina

Message:

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

Location:

XIOS/dev/dev_olga/src/functor

Files:

• accumulate.cpp (modified) (2 diffs)
• average.cpp (modified) (3 diffs)
• maximum.cpp (modified) (2 diffs)
• minimum.cpp (modified) (3 diffs)

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

@@ -1 +1 @@
 #include "accumulate.hpp"
 #include "array_new.hpp"
+#include "utils.hpp"
 
 namespace xios
@@ -33 +34 @@
             double* out=_doutput.dataFirst();
             for (i=0; i<n; ++i,++in,++out) 
-              if (*in!=missingValue)
+              if (!NumTraits<double>::isnan(*in))
               {
-                if(*out!=missingValue) *out  += *in;
+                if(!NumTraits<double>::isnan(*out)) *out  += *in;
                 else *out=*in ;
               }

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;

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 ;  
                }

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

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