Changeset 1545 for XIOS/dev/branch_openmp/src/transformation/scalar_algorithm_reduce_scalar.cpp

Timestamp:

06/18/18 20:32:55 (6 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1544

File:

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

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

@@ -9 +9 @@
 #include "grid.hpp"
 #include "grid_transformation_factory_impl.hpp"
-//#include "reduction.hpp"
+
 
 
@@ -76 +76 @@
   }
   
-  //if (CReductionAlgorithm::ReductionOperations.end() == CReductionAlgorithm::ReductionOperations.find(op))
   if (CReductionAlgorithm::ReductionOperations_ptr->end() == CReductionAlgorithm::ReductionOperations_ptr->find(op))
     ERROR("CScalarAlgorithmReduceScalar::CScalarAlgorithmReduceScalar(CScalar* scalarDestination, CScalar* scalarSource, CReduceScalarToScalar* algo)",
@@ -82 +81 @@
        << "Scalar source " <<scalarSource->getId() << std::endl
        << "Scalar destination " << scalarDestination->getId());
-  
-  //reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations[op]);
+
   reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations_ptr->at(op));
 }