Changeset 369 for XIOS/trunk/src/functor/average.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/average.cpp (modified) (4 diffs)

XIOS/trunk/src/functor/average.cpp

@@ -1 +1 @@
 #include "average.hpp"
+#include "array_new.hpp"
 
 namespace xios
@@ -7 +8 @@
       /// ////////////////////// Définitions ////////////////////// ///
 
-      CAverage::CAverage(DoubleArray doutput)
+      CAverage::CAverage(CArray<double,1>& doutput)
          : SuperClass(StdString("average"), doutput)
-      { /* Ne rien faire de plus */ }
+      { doutput.dumpStructureInformation(cout) ;/* Ne rien faire de plus */ }
 
       CAverage::~CAverage(void)
@@ -16 +17 @@
       //---------------------------------------------------------------
 
-      void CAverage::apply(const DoubleArray _dinput,
-                                 DoubleArray _doutput)
+      void CAverage::apply(const CArray<double,1>& _dinput,
+                                 CArray<double,1>& _doutput)
       {
+/*
          const double * it1  = _dinput->data(),
                       * end1 = _dinput->data() + _dinput->num_elements(); 
@@ -25 +27 @@
               for (; it1 != end1; it1++, it++) *it  = *it1;
          else for (; it1 != end1; it1++, it++) *it += *it1;               
+*/
+        if (this->nbcall == 1) _doutput=_dinput ;
+        else _doutput+=_dinput ;
+      
       }
       
       void CAverage::final(void)
       {
-          double * it1  = this->getDataOutput()->data(),
+/*          double * it1  = this->getDataOutput()->data(),
                  * end1 = this->getDataOutput()->data() + this->getDataOutput()->num_elements();
           for (; it1 != end1; it1++) *it1 /= this->nbcall;
           this->nbcall = 0;                                                   
+*/
+        doutput/=this->nbcall; 
+        this->nbcall = 0; 
       }
    } // namespace func