Changeset 369 for XIOS/trunk/src/functor/minimum.cpp

Timestamp:

10/16/12 13:04:44 (12 years ago)

Author:

ymipsl

Message:

Major Update

• redesign Type and attribute manipulation
• add enumerate type and attribute
• use blitz class array instead of boost class array

YM

File:

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

XIOS/trunk/src/functor/minimum.cpp

@@ -1 +1 @@
 #include "minimum.hpp"
+#include "array_new.hpp"
+#include <algorithm>
 
 namespace xios
@@ -7 +9 @@
       /// ////////////////////// Définitions ////////////////////// ///
 
-      CMinimum::CMinimum(DoubleArray doutput)
+      CMinimum::CMinimum(CArray<double,1>& doutput)
          : SuperClass(StdString("minimum"), doutput)
       { /* Ne rien faire de plus */ }
@@ -16 +18 @@
       //---------------------------------------------------------------
 
-      void CMinimum::apply(const DoubleArray _dinput,
-                                 DoubleArray _doutput)
+      void CMinimum::apply(const CArray<double,1>& _dinput,
+                                 CArray<double,1>& _doutput)
       {
-         const double * it1  = _dinput->data(),
-                      * end1 = _dinput->data() + _dinput->num_elements();
-         double * it   = _doutput->data();
-         if (this->nbcall == 1)
-              for (; it1 != end1; it1++, it++) *it = *it1;
-         else for (; it1 != end1; it1++, it++) *it = std::min(*it1, *it);
+        const double * it1  = _dinput.dataFirst(),
+                      * end1 = _dinput.dataFirst() + _dinput.numElements();
+        double * it   = _doutput.dataFirst();
+        
+        if (this->nbcall == 1)  for (; it1 != end1; it1++, it++) *it = *it1;
+        else for (; it1 != end1; it1++, it++) *it = std::min(*it1, *it);
+
       }