Changeset 1314 for XIOS/dev/XIOS_DEV_CMIP6/src/transformation

Timestamp:

10/24/17 11:27:52 (7 years ago)

Author:

ymipsl

Message:

Add 2 new spatial transformations :

• reduce_scalar_to_scalar : global reduction between scalar
• duplicate_scalar_to_axis : a scalar value is duplicated on each level of the axis.

YM

Location:

XIOS/dev/XIOS_DEV_CMIP6/src/transformation

Files:

• algo_types.hpp (modified) (1 diff)
• axis_algorithm_duplicate_scalar.cpp (added)
• axis_algorithm_duplicate_scalar.hpp (added)
• axis_algorithm_reduce_axis.cpp (modified) (1 diff)
• axis_algorithm_reduce_axis.hpp (modified) (1 diff)
• grid_transformation_selector.cpp (modified) (2 diffs)
• scalar_algorithm_reduce_scalar.cpp (added)
• scalar_algorithm_reduce_scalar.hpp (added)

XIOS/dev/XIOS_DEV_CMIP6/src/transformation/algo_types.hpp

@@ -27 +27 @@
 #include "domain_algorithm_compute_connectivity.hpp"
 #include "domain_algorithm_expand.hpp"
+#include "axis_algorithm_duplicate_scalar.hpp"
+#include "scalar_algorithm_reduce_scalar.hpp"
 
 

XIOS/dev/XIOS_DEV_CMIP6/src/transformation/axis_algorithm_reduce_axis.cpp

@@ -70 +70 @@
 
   reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations[op]);
-  local = algo->local ;
 }
 

XIOS/dev/XIOS_DEV_CMIP6/src/transformation/axis_algorithm_reduce_axis.hpp

@@ -40 +40 @@
   static bool registerTrans();
 protected:
-  bool local ;
   
 protected:

XIOS/dev/XIOS_DEV_CMIP6/src/transformation/grid_transformation_selector.cpp

@@ -22 +22 @@
   CScalarAlgorithmExtractAxis::registerTrans();
   CScalarAlgorithmReduceDomain::registerTrans();
+  CScalarAlgorithmReduceScalar::registerTrans();
 
   //! Axis
@@ -31 +32 @@
   CAxisAlgorithmReduceAxis::registerTrans();
   CAxisAlgorithmTemporalSplitting::registerTrans();
+  CAxisAlgorithmDuplicateScalar::registerTrans();
 
   //! Domain