Changeset 1545 for XIOS/dev/branch_openmp/src/transformation/scalar_algorithm_reduce_domain.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_domain.cpp (modified) (3 diffs)

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

@@ -14 +14 @@
 #include "grid_transformation_factory_impl.hpp"
 
-//#include "reduction.hpp"
 
 namespace xios {
@@ -75 +74 @@
     CReductionAlgorithm::initReductionOperation();
   }
-
-  //if (CReductionAlgorithm::ReductionOperations.end() == CReductionAlgorithm::ReductionOperations.find(op))
   if (CReductionAlgorithm::ReductionOperations_ptr->end() == CReductionAlgorithm::ReductionOperations_ptr->find(op))
     ERROR("CScalarAlgorithmReduceDomain::CScalarAlgorithmReduceDomain(CDomain* domainDestination, CDomain* domainSource, CReduceDomainToScalar* algo)",
@@ -83 +80 @@
        << "Scalar destination " << scalarDestination->getId());
 
-  //reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations[op]);
   reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations_ptr->at(op));
   local = algo->local ;