Changeset 1339 for XIOS/dev/branch_openmp/src/transformation/scalar_algorithm_reduce_axis.cpp

Timestamp:

11/21/17 13:42:35 (6 years ago)

Author:

yushan

Message:

dev_omp OK

File:

• XIOS/dev/branch_openmp/src/transformation/scalar_algorithm_reduce_axis.cpp (modified) (3 diffs)

XIOS/dev/branch_openmp/src/transformation/scalar_algorithm_reduce_axis.cpp

@@ -13 +13 @@
 #include "grid.hpp"
 #include "grid_transformation_factory_impl.hpp"
-#include "reduction.hpp"
 
 namespace xios {
@@ -73 +72 @@
   }
   
+  if(CReductionAlgorithm::ReductionOperations_ptr == 0) 
+  {
+    CReductionAlgorithm::initReductionOperation();
+  }
+  
   //if (CReductionAlgorithm::ReductionOperations.end() == CReductionAlgorithm::ReductionOperations.find(op))
-  if (CReductionAlgorithm::ReductionOperations_ptr->end() == CReductionAlgorithm::ReductionOperations_ptr->find(op))
+  if ((*CReductionAlgorithm::ReductionOperations_ptr).end() == (*CReductionAlgorithm::ReductionOperations_ptr).find(op))
     ERROR("CScalarAlgorithmReduceAxis::CScalarAlgorithmReduceAxis(CAxis* axisDestination, CAxis* axisSource, CReduceAxisToScalar* algo)",
        << "Operation '" << op << "' not found. Please make sure to use a supported one"
@@ -81 +85 @@
 
   //reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations[op]);
-  reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations_ptr->at(op));
+  reduction_ = CReductionAlgorithm::createOperation((*CReductionAlgorithm::ReductionOperations_ptr)[op]);
 }