Changeset 1328 for XIOS/dev/branch_openmp/src/transformation/scalar_algorithm_reduce_domain.cpp

Timestamp:

11/15/17 12:14:34 (7 years ago)

Author:

yushan

Message:

dev_omp

File:

• XIOS/dev/branch_openmp/src/transformation/scalar_algorithm_reduce_domain.cpp (modified) (4 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 {
@@ -68 +68 @@
 
   }
+  
+  // if(CReductionAlgorithm::ReductionOperations_ptr == 0) 
+  //   CReductionAlgorithm::initReductionOperation();
 
-  if(CReductionAlgorithm::ReductionOperations_ptr == 0) 
-    CReductionAlgorithm::initReductionOperation();
-
-  if ((*CReductionAlgorithm::ReductionOperations_ptr).end() == (*CReductionAlgorithm::ReductionOperations_ptr).find(op))
+  //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)",
        << "Operation '" << op << "' not found. Please make sure to use a supported one"
@@ -78 +79 @@
        << "Scalar destination " << scalarDestination->getId());
 
-  reduction_ = CReductionAlgorithm::createOperation((*CReductionAlgorithm::ReductionOperations_ptr)[op]);
+  //reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations[op]);
+  reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations_ptr->at(op));
 }
 
@@ -85 +87 @@
                                          CArray<double,1>& dataOut,
                                          std::vector<bool>& flagInitial,                     
-                                         bool ignoreMissingValue)
+                                         bool ignoreMissingValue, bool firstPass)
 {
-  reduction_->apply(localIndex, dataInput, dataOut, flagInitial, ignoreMissingValue);
+  reduction_->apply(localIndex, dataInput, dataOut, flagInitial, ignoreMissingValue, firstPass);
 }