Changeset 1037 for XIOS/dev/branch_yushan/src/functor

Timestamp:

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

Author:

yushan

Message:

initialize the branch

Location:

XIOS/dev/branch_yushan/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/branch_yushan/src/functor/accumulate.cpp

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

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

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

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

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

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