Changeset 369 for XIOS/trunk/src/functor

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

Location:

XIOS/trunk/src/functor

Files:

• average.cpp (modified) (4 diffs)
• average.hpp (modified) (3 diffs)
• instant.cpp (modified) (3 diffs)
• instant.hpp (modified) (3 diffs)
• maximum.cpp (modified) (3 diffs)
• maximum.hpp (modified) (3 diffs)
• minimum.cpp (modified) (3 diffs)
• minimum.hpp (modified) (3 diffs)
• once.cpp (modified) (3 diffs)
• once.hpp (modified) (3 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

XIOS/trunk/src/functor/average.hpp

@@ -4 +4 @@
 /// xmlioserver headers ///
 #include "functor.hpp"
+#include "array_new.hpp"
 
 namespace xios
@@ -14 +15 @@
          /// Définition de type ///
          typedef CFunctor SuperClass;
-         typedef ARRAY(double, 1) DoubleArray;
 
          public :
@@ -21 +21 @@
             //CAverage(void);                             // Not implemented.
             //CAverage(const CFunData & data);
-            CAverage(DoubleArray doutput);
+            CAverage(CArray<double,1>& doutput);
             //CAverage(const CAverage & average);         // Not implemented.
             //CAverage(const CAverage * const average);   // Not implemented.
 
             /// Traitement ///
-            virtual void apply(const DoubleArray dinput, DoubleArray doutput);
+            virtual void apply(const CArray<double,1>& dinput, CArray<double,1>& doutput);
             virtual void final(void) ;
             

XIOS/trunk/src/functor/instant.cpp

@@ -1 +1 @@
 #include "instant.hpp"
+#include "array_new.hpp"
 
 namespace xios
@@ -7 +8 @@
       /// ////////////////////// Définitions ////////////////////// ///
 
-      CInstant::CInstant(DoubleArray doutput)
+      CInstant::CInstant(CArray<double,1>& doutput)
          : SuperClass(StdString("instant"), doutput)
       { /* Ne rien faire de plus */ }
@@ -16 +17 @@
       //---------------------------------------------------------------
 
-      void CInstant::apply(const DoubleArray _dinput,
-                                 DoubleArray _doutput)
+      void CInstant::apply(const CArray<double,1>& _dinput,
+                                 CArray<double,1>& _doutput)
       {
-         const double * it1  = _dinput->data(),
+/*               const double * it1  = _dinput->data(),
                       * end1 = _dinput->data() + _dinput->num_elements();
          double * it   = _doutput->data();
-         for (; it1 != end1; it1++, it++) *it  = *it1;
+         for (; it1 != end1; it1++, it++) *it  = *it1;*/
+        _doutput=_dinput ;
       }
 

XIOS/trunk/src/functor/instant.hpp

@@ -4 +4 @@
 /// xios headers ///
 #include "functor.hpp"
+#include "array_new.hpp"
 
 namespace xios
@@ -14 +15 @@
          /// Définition de type ///
          typedef CFunctor SuperClass;
-         typedef ARRAY(double, 1) DoubleArray;
 
          public :
@@ -21 +21 @@
             //CInstant(void);                             // Not implemented.
             //CInstant(const CFunData & data);
-            CInstant(DoubleArray doutput);
+            CInstant(CArray<double,1>& doutput);
             //CInstant(const CInstant & instant);         // Not implemented.
             //CInstant(const CInstant * const instant);   // Not implemented.
 
             /// Traitement ///
-            virtual void apply(const DoubleArray dinput, DoubleArray doutput);
+            virtual void apply(const CArray<double,1>& dinput, CArray<double,1>& doutput);
 
             /// Destructeur ///

XIOS/trunk/src/functor/maximum.cpp

@@ -1 +1 @@
 #include "maximum.hpp"
-#include <algorithm>
+#include "array_new.hpp"
+
 
 
@@ -9 +10 @@
       /// ////////////////////// Définitions ////////////////////// ///
 
-      CMaximum::CMaximum(DoubleArray doutput)
+      CMaximum::CMaximum(CArray<double,1>& doutput)
          : SuperClass(StdString("maximum"), doutput)
       { /* Ne rien faire de plus */ }
@@ -18 +19 @@
       //---------------------------------------------------------------
 
-      void CMaximum::apply(const DoubleArray _dinput,
-                                 DoubleArray _doutput)
+      void CMaximum::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;
+        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::max(*it1, *it);
 
-         it1  = _dinput->data(),
-         end1 = _dinput->data() + _dinput->num_elements();
-         it  = _doutput->data();
-         double sum=0 ;
-         for (; it1 != end1; it1++, it++) sum+=*it;
+
       }
 

XIOS/trunk/src/functor/maximum.hpp

@@ -4 +4 @@
 /// xios headers ///
 #include "functor.hpp"
+#include "array_new.hpp"
 
 namespace xios
@@ -14 +15 @@
          /// Définition de type ///
          typedef CFunctor SuperClass;
-         typedef ARRAY(double, 1) DoubleArray;
 
          public :
@@ -21 +21 @@
             //CMaximum(void);                             // Not implemented.
             //CMaximum(const CFunData & data);
-            CMaximum(DoubleArray doutput);
+            CMaximum(CArray<double,1>& doutput);
             //CMaximum(const CMaximum & Maximum);         // Not implemented.
             //CMaximum(const CMaximum * const Maximum);   // Not implemented.
 
             /// Traitement ///
-            virtual void apply(const DoubleArray dinput, DoubleArray doutput);
+            virtual void apply(const CArray<double,1>& dinput, CArray<double,1>& doutput);
 
             /// Destructeur ///

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

XIOS/trunk/src/functor/minimum.hpp

@@ -4 +4 @@
 /// xmlioserver headers ///
 #include "functor.hpp"
+#include "array_new.hpp"
 
 namespace xios
@@ -14 +15 @@
          /// Définition de type ///
          typedef CFunctor SuperClass;
-         typedef ARRAY(double, 1) DoubleArray;
 
          public :
@@ -21 +21 @@
             //CMinimum(void);                             // Not implemented.
             //CMinimum(const CFunData & data);
-            CMinimum(DoubleArray doutput);
+            CMinimum(CArray<double,1>& doutput);
             //CMinimum(const CMinimum & Minimum);         // Not implemented.
             //CMinimum(const CMinimum * const Minimum);   // Not implemented.
 
             /// Traitement ///
-            virtual void apply(const DoubleArray dinput, DoubleArray doutput);
+            virtual void apply(const CArray<double,1>& dinput, CArray<double,1>& doutput);
 
             /// Destructeur ///

XIOS/trunk/src/functor/once.cpp

@@ -1 +1 @@
 #include "once.hpp"
+#include "array_new.hpp"
 
 namespace xios
@@ -7 +8 @@
       /// ////////////////////// Définitions ////////////////////// ///
 
-      COnce::COnce(DoubleArray doutput)
+      COnce::COnce(CArray<double,1>& doutput)
          : SuperClass(StdString("once"), doutput)
       { /* Ne rien faire de plus */ }
@@ -16 +17 @@
       //---------------------------------------------------------------
 
-      void COnce::apply(const DoubleArray _dinput,
-                              DoubleArray _doutput)
+      void COnce::apply(const CArray<double,1>& _dinput,
+                              CArray<double,1>& _doutput)
       {
-         const double * it1  = _dinput->data(),
+/*               const double * it1  = _dinput->data(),
                       * end1 = _dinput->data() + _dinput->num_elements();
                double * it   = _doutput->data();
-        for (; it1 != end1; it1++, it++) *it  = *it1;
+        for (; it1 != end1; it1++, it++) *it  = *it1;*/
+        _doutput=_dinput ;
       }
 

XIOS/trunk/src/functor/once.hpp

@@ -4 +4 @@
 /// xios headers ///
 #include "functor.hpp"
+#include "array_new.hpp"
 
 namespace xios
@@ -14 +15 @@
          /// Définition de type ///
          typedef CFunctor SuperClass;
-         typedef ARRAY(double, 1) DoubleArray;
 
          public :
@@ -20 +20 @@
             /// Constructeurs ///
             //COnce(void);                       // Not implemented.
-            COnce(DoubleArray doutput);
+            COnce(CArray<double,1>& doutput);
             //COnce(const COnce & once);         // Not implemented.
             //COnce(const COnce * const once);   // Not implemented.
 
             /// Traitement ///
-            virtual void apply(const DoubleArray dinput, DoubleArray doutput);
+            virtual void apply(const CArray<double,1>& dinput, CArray<double,1>& doutput);
 
             /// Destructeur ///