Changeset 979

Timestamp:

10/24/16 16:16:31 (7 years ago)

Author:

mhnguyen

Message:

Implementing AVERAGE operation

+) Add average operation for reduction transformation

Test
+) On Curie
+) Correct

Location:

XIOS/trunk/src

Files:

• filter/spatial_transform_filter.cpp (modified) (1 diff)
• transformation/Functions/average_reduction.cpp (added)
• transformation/Functions/average_reduction.hpp (added)
• transformation/Functions/max_reduction.cpp (moved) (moved from XIOS/trunk/src/transformation/Functions/max.cpp) (1 diff)
• transformation/Functions/max_reduction.hpp (moved) (moved from XIOS/trunk/src/transformation/Functions/max.hpp)
• transformation/Functions/min_reduction.cpp (moved) (moved from XIOS/trunk/src/transformation/Functions/min.cpp) (1 diff)
• transformation/Functions/min_reduction.hpp (moved) (moved from XIOS/trunk/src/transformation/Functions/min.hpp)
• transformation/Functions/reduction.cpp (modified) (2 diffs)
• transformation/Functions/reduction.hpp (modified) (2 diffs)
• transformation/Functions/reduction_types.hpp (modified) (1 diff)
• transformation/Functions/sum_reduction.cpp (moved) (moved from XIOS/trunk/src/transformation/Functions/sum.cpp) (1 diff)
• transformation/Functions/sum_reduction.hpp (moved) (moved from XIOS/trunk/src/transformation/Functions/sum.hpp)
• transformation/axis_algorithm_extract_domain.cpp (modified) (1 diff, 1 prop)
• transformation/axis_algorithm_reduce_domain.cpp (modified) (2 diffs, 1 prop)
• transformation/axis_algorithm_reduce_domain.hpp (modified) (2 diffs)
• transformation/generic_algorithm_transformation.cpp (modified) (1 diff)
• transformation/generic_algorithm_transformation.hpp (modified) (2 diffs)
• transformation/scalar_algorithm_reduce_axis.cpp (modified) (2 diffs)
• transformation/scalar_algorithm_reduce_axis.hpp (modified) (1 diff)
• transformation/scalar_algorithm_reduce_domain.cpp (modified) (1 diff)
• transformation/scalar_algorithm_reduce_domain.hpp (modified) (1 diff)

XIOS/trunk/src/filter/spatial_transform_filter.cpp

@@ -206 +206 @@
       }
 
+      (*itAlgo)->updateData(dataCurrentDest);
+
       idxSendBuff = 0;
       for (itSend = itbSend; itSend != iteSend; ++itSend, ++idxSendBuff)

XIOS/trunk/src/transformation/Functions/max_reduction.cpp

@@ -7 +7 @@
    \brief max reduction
  */
-#include "max.hpp"
+#include "max_reduction.hpp"
 
 namespace xios {

XIOS/trunk/src/transformation/Functions/min_reduction.cpp

@@ -7 +7 @@
    \brief min reduction
  */
-#include "min.hpp"
+#include "min_reduction.hpp"
 
 namespace xios {

XIOS/trunk/src/transformation/Functions/reduction.cpp

@@ -1 +1 @@
 #include "reduction.hpp"
-#include "sum.hpp"
-#include "min.hpp"
-#include "max.hpp"
+#include "sum_reduction.hpp"
+#include "min_reduction.hpp"
+#include "max_reduction.hpp"
 #include "extract.hpp"
+#include "average_reduction.hpp"
 
 namespace xios {
@@ -23 +24 @@
   m["extract"] = TRANS_REDUCE_EXTRACT;
   CExtractReductionAlgorithm::registerTrans();
+
+  m["average"] = TRANS_REDUCE_AVERAGE;
+  CAverageReductionAlgorithm::registerTrans();
 }
 

XIOS/trunk/src/transformation/Functions/reduction.hpp

@@ -40 +40 @@
     \param [in] dataInput Pointer to the first element of data input array (in form of buffer)
     \param [in/out] dataOut Array contains local data
-    \param [in/out] flagInitial vector of boolean to mark the local index already initialized. True means there is a need for initalization
+    \param [in/out] flagInitial vector of boolean to mark the local index already initialized. True means there is a need for initialization
   */
   virtual void apply(const std::vector<std::pair<int,double> >& localIndex,
@@ -46 +46 @@
                      CArray<double,1>& dataOut,
                      std::vector<bool>& flagInitial) = 0;
+  /*!
+    Update local data 
+    In some case (e.g average) we need global information (e.g weights) then update data with this information
+    \param [in] dataOut local data output
+  */
+  virtual void updateData(CArray<double,1>& dataOut) {}
 
   virtual ~CReductionAlgorithm() {}

XIOS/trunk/src/transformation/Functions/reduction_types.hpp

@@ -17 +17 @@
     TRANS_REDUCE_MIN = 1,
     TRANS_REDUCE_MAX = 2,
-    TRANS_REDUCE_EXTRACT = 3
+    TRANS_REDUCE_EXTRACT = 3,
+    TRANS_REDUCE_AVERAGE = 4
   } EReductionType;
 

XIOS/trunk/src/transformation/Functions/sum_reduction.cpp

@@ -7 +7 @@
    \brief sum reduction
  */
-#include "sum.hpp"
+#include "sum_reduction.hpp"
 
 namespace xios {

XIOS/trunk/src/transformation/axis_algorithm_extract_domain.cpp

@@ -13 +13 @@
 #include "grid.hpp"
 #include "grid_transformation_factory_impl.hpp"
-
 #include "reduction.hpp"
 

XIOS/trunk/src/transformation/axis_algorithm_reduce_domain.cpp

@@ -13 +13 @@
 #include "grid.hpp"
 #include "grid_transformation_factory_impl.hpp"
-
 #include "reduction.hpp"
 
@@ -59 +58 @@
 {
   reduction_->apply(localIndex, dataInput, dataOut, flagInitial);
+}
+
+void CAxisAlgorithmReduceDomain::updateData(CArray<double,1>& dataOut)
+{
+  reduction_->updateData(dataOut);
 }
 

XIOS/trunk/src/transformation/axis_algorithm_reduce_domain.hpp

@@ -35 +35 @@
                      const double& defaultValue);
 
+  virtual void updateData(CArray<double,1>& dataOut);
+  
   virtual ~CAxisAlgorithmReduceDomain();
 
@@ -47 +49 @@
   ReduceDirection dir_;
 protected:
-  void computeIndexSourceMapping_(const std::vector<CArray<double,1>* >& dataAuxInputs);
-
+  void computeIndexSourceMapping_(const std::vector<CArray<double,1>* >& dataAuxInputs); 
+  
 protected:
   CReductionAlgorithm* reduction_;

XIOS/trunk/src/transformation/generic_algorithm_transformation.cpp

@@ -18 +18 @@
    idAuxInputs_(), type_(ELEMENT_NO_MODIFICATION_WITH_DATA)
 {
+}
+
+void CGenericAlgorithmTransformation::updateData(CArray<double,1>& dataOut)
+{
+
 }
 

XIOS/trunk/src/transformation/generic_algorithm_transformation.hpp

@@ -70 +70 @@
                      const double& defaultValue);
 
+  /*!
+   * Update whole dataOut (on necessary).
+   * (Example:  Impose a weight, whose value is only known after being applied an operation, on dataOut)
+   * \param [in/out] dataOut dataOut
+   */
+  virtual void updateData(CArray<double,1>& dataOut);
+
   std::vector<StdString> getIdAuxInputs();
   AlgoTransType type();
@@ -129 +136 @@
   AlgoTransType type_;
 
-
   std::map<int, int> elementPositionInGridSrc2AxisPosition_, elementPositionInGridSrc2DomainPosition_, elementPositionInGridSrc2ScalarPosition_;
   std::map<int, int> elementPositionInGridDst2AxisPosition_, elementPositionInGridDst2DomainPosition_, elementPositionInGridDst2ScalarPosition_;

XIOS/trunk/src/transformation/scalar_algorithm_reduce_axis.cpp

@@ -13 +13 @@
 #include "grid.hpp"
 #include "grid_transformation_factory_impl.hpp"
+#include "reduction.hpp"
 
 #include "reduction.hpp"
@@ -70 +71 @@
 }
 
+void CScalarAlgorithmReduceScalar::updateData(CArray<double,1>& dataOut)
+{
+  reduction_->updateData(dataOut);
+}
+
 CScalarAlgorithmReduceScalar::~CScalarAlgorithmReduceScalar()
 {

XIOS/trunk/src/transformation/scalar_algorithm_reduce_axis.hpp

@@ -35 +35 @@
                      const double& defaultValue);
 
+  virtual void updateData(CArray<double,1>& dataOut);
+  
   virtual ~CScalarAlgorithmReduceScalar();
 

XIOS/trunk/src/transformation/scalar_algorithm_reduce_domain.cpp

@@ -87 +87 @@
 }
 
+void CScalarAlgorithmReduceDomain::updateData(CArray<double,1>& dataOut)
+{
+  reduction_->updateData(dataOut);
+}
+
 CScalarAlgorithmReduceDomain::~CScalarAlgorithmReduceDomain()
 {

XIOS/trunk/src/transformation/scalar_algorithm_reduce_domain.hpp

@@ -35 +35 @@
                      const double& defaultValue);
 
+  virtual void updateData(CArray<double,1>& dataOut);
+  
   virtual ~CScalarAlgorithmReduceDomain();