Changeset 1601 for XIOS/dev/dev_trunk_omp/src/transformation/axis_algorithm_reduce_domain.cpp

Timestamp:

11/19/18 15:52:54 (5 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1597

File:

• XIOS/dev/dev_trunk_omp/src/transformation/axis_algorithm_reduce_domain.cpp (modified) (2 diffs)

XIOS/dev/dev_trunk_omp/src/transformation/axis_algorithm_reduce_domain.cpp

@@ -13 +13 @@
 #include "grid.hpp"
 #include "grid_transformation_factory_impl.hpp"
-#include "reduction.hpp"
+
 
 namespace xios {
@@ -70 +70 @@
 
   dir_ = (CReduceDomainToAxis::direction_attr::iDir == algo->direction)  ? iDir : jDir;
-  reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations[op]);
+  if(CReductionAlgorithm::ReductionOperations_ptr == 0) 
+  {
+    CReductionAlgorithm::initReductionOperation();
+  }
+  reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations_ptr->at(op));
   local = algo->local ;
 }